mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Select escape mode from GUI"

Browse Source 
This reverts commit 7f897608d4.

After testing it was found this doesn't work in Windows - further testing is required before adding this functionality to the GUI.
This commit is contained in:
Robin Stuart 2017-10-30 21:02:07 +00:00
parent 7f897608d4
commit a91e4fab79
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend_qt/qzint.cpp
View File

@ -37,7 +37,7 @@ namespace Zint {
m_bgColor = Qt::white; m_bgColor = Qt::white;
m_zintSymbol = 0; m_zintSymbol = 0;
m_error = 0; m_error = 0;
m_input_mode = UNICODE_MODE; m_input_mode = UNICODE_MODE + ESCAPE_MODE;
m_scale = 1.0; m_scale = 1.0;
m_option_3 = 0; m_option_3 = 0;
m_hidetext = 0; m_hidetext = 0;
@ -252,7 +252,7 @@ namespace Zint {
m_zintSymbol->whitespace_width = m_whitespace; m_zintSymbol->whitespace_width = m_whitespace;
m_zintSymbol->border_width = m_borderWidth; m_zintSymbol->border_width = m_borderWidth;
m_zintSymbol->option_1 = m_securityLevel; 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->option_2 = m_width;
m_zintSymbol->dot_size = m_dot_size; m_zintSymbol->dot_size = m_dot_size;
if (m_hidetext) { if (m_hidetext) {

4
frontend_qt/mainwindow.cpp
View File

@ -733,7 +733,7 @@ void MainWindow::update_preview()
} }
m_bc.bc.setSecurityLevel(0); m_bc.bc.setSecurityLevel(0);
m_bc.bc.setWidth(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); m_bc.bc.setHideText(0);
if(chkHRTHide->isChecked() == false) { if(chkHRTHide->isChecked() == false) {
m_bc.bc.setHideText(1); m_bc.bc.setHideText(1);
@ -895,7 +895,7 @@ void MainWindow::update_preview()
case BARCODE_CODE16K: case BARCODE_CODE16K:
m_bc.bc.setSymbol(BARCODE_CODE16K); m_bc.bc.setSymbol(BARCODE_CODE16K);
if(m_optionWidget->findChild<QRadioButton*>("radC16kStand")->isChecked()) if(m_optionWidget->findChild<QRadioButton*>("radC16kStand")->isChecked())
m_bc.bc.setInputMode(UNICODE_MODE + ESCAPE_MODE); m_bc.bc.setInputMode(UNICODE_MODE);
else else
m_bc.bc.setInputMode(GS1_MODE); m_bc.bc.setInputMode(GS1_MODE);
break; break;