From a91e4fab79ac6cefd60096e85892d288bf652236 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Mon, 30 Oct 2017 21:02:07 +0000 Subject: [PATCH] Revert "Select escape mode from GUI" This reverts commit 7f897608d4afbc772550c6b1443a1c7488286461. After testing it was found this doesn't work in Windows - further testing is required before adding this functionality to the GUI. --- backend_qt/qzint.cpp | 4 ++-- frontend_qt/mainwindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend_qt/qzint.cpp b/backend_qt/qzint.cpp index 65527d02..cd2b8637 100644 --- a/backend_qt/qzint.cpp +++ b/backend_qt/qzint.cpp @@ -37,7 +37,7 @@ namespace Zint { m_bgColor = Qt::white; m_zintSymbol = 0; m_error = 0; - m_input_mode = UNICODE_MODE; + m_input_mode = UNICODE_MODE + ESCAPE_MODE; m_scale = 1.0; m_option_3 = 0; m_hidetext = 0; @@ -252,7 +252,7 @@ namespace Zint { m_zintSymbol->whitespace_width = m_whitespace; m_zintSymbol->border_width = m_borderWidth; m_zintSymbol->option_1 = m_securityLevel; - m_zintSymbol->input_mode = m_input_mode + ESCAPE_MODE; + m_zintSymbol->input_mode = m_input_mode; m_zintSymbol->option_2 = m_width; m_zintSymbol->dot_size = m_dot_size; if (m_hidetext) { diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index e8305bd4..ace69705 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -733,7 +733,7 @@ void MainWindow::update_preview() } m_bc.bc.setSecurityLevel(0); m_bc.bc.setWidth(0); - m_bc.bc.setInputMode(UNICODE_MODE + ESCAPE_MODE); + m_bc.bc.setInputMode(UNICODE_MODE); m_bc.bc.setHideText(0); if(chkHRTHide->isChecked() == false) { m_bc.bc.setHideText(1); @@ -895,7 +895,7 @@ void MainWindow::update_preview() case BARCODE_CODE16K: m_bc.bc.setSymbol(BARCODE_CODE16K); if(m_optionWidget->findChild("radC16kStand")->isChecked()) - m_bc.bc.setInputMode(UNICODE_MODE + ESCAPE_MODE); + m_bc.bc.setInputMode(UNICODE_MODE); else m_bc.bc.setInputMode(GS1_MODE); break;