From 57c9ff012c10e8b9443df7bf6726c52114bdedfc Mon Sep 17 00:00:00 2001 From: hooper114 Date: Tue, 3 Nov 2009 10:52:34 +0000 Subject: [PATCH] GUI Tidy-Up --- frontend_qt4/grpAztec.ui | 190 ++--- frontend_qt4/grpC128.ui | 69 +- frontend_qt4/grpC16k.ui | 53 +- frontend_qt4/grpC39.ui | 69 +- frontend_qt4/grpC49.ui | 53 +- frontend_qt4/grpCodablock.ui | 71 +- frontend_qt4/grpCodeOne.ui | 96 ++- frontend_qt4/grpDM.ui | 414 +++++------ frontend_qt4/grpMaxicode.ui | 200 +++--- frontend_qt4/grpMicroPDF.ui | 63 +- frontend_qt4/grpQR.ui | 95 ++- frontend_qt4/mainWindow.ui | 1270 +++++++++++++++++----------------- frontend_qt4/mainwindow.cpp | 37 +- 13 files changed, 1358 insertions(+), 1322 deletions(-) diff --git a/frontend_qt4/grpAztec.ui b/frontend_qt4/grpAztec.ui index 18e23868..006dee37 100644 --- a/frontend_qt4/grpAztec.ui +++ b/frontend_qt4/grpAztec.ui @@ -1,7 +1,8 @@ - + + grpAztec - - + + 0 0 @@ -9,271 +10,294 @@ 237 - + Form - + - - - - + + + + A&utomatic Resizing - + true - - - + + + Adjust Si&ze To: - - - + + + false - + 15 x 15 Compact - + 19 x 19 Compact - + 23 x 23 Compact - + 27 x 27 Compact - + 19 x 19 - + 23 x 23 - + 27 x 27 - + 31 x 31 - + 37 x 37 - + 41 x 41 - + 45 x 45 - + 49 x 49 - + 53 x 53 - + 57 x 57 - + 61 x 61 - + 67 x 67 - + 71 x 71 - + 75 x 75 - + 79 x 79 - + 83 x 83 - + 87 x 87 - + 91 x 91 - + 95 x 95 - + 101 x 101 - + 105 x 105 - + 109 x 109 - + 113 x 113 - + 117 x 117 - + 121 x 121 - + 125 x 125 - + 131 x 131 - + 135 x 135 - + 139 x 139 - + 143 x 143 - + 147 x 147 - + 151 x 151 - - - + + + Add Minimum &Error Correction: - - - + + + false - + 10% + 3 words - + 23% + 3 words - + 36% + 3 words - + 50% + 3 words - - - - Encode as &GS-1 Data - - - - - - Qt::Vertical + + + Encoding Mode - - - 20 - 53 - - - + + + + 30 + 30 + 453 + 71 + + + + + + + HIBC Aztec Code + + + + + + + GS1 Data Mode + + + + + + + Standard Mode + + + true + + + + + + @@ -285,11 +309,11 @@ cmbAztecSize setEnabled(bool) - + 85 47 - + 331 47 @@ -301,11 +325,11 @@ cmbAztecECC setEnabled(bool) - + 200 80 - + 366 80 diff --git a/frontend_qt4/grpC128.ui b/frontend_qt4/grpC128.ui index 249068de..69891ac3 100644 --- a/frontend_qt4/grpC128.ui +++ b/frontend_qt4/grpC128.ui @@ -1,7 +1,8 @@ - + + grpC128 - - + + 0 0 @@ -9,63 +10,63 @@ 156 - + Form - + - - - - + + + + S&tandard - + true - - - + + + Subset &C Supression - - - + + + &GS1-128 - - - + + + &HIBC 128 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Note: Composite symbols require a</p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GS1-128 linear component.</p></body></html> - - - - - + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Note: Composite symbols require a</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GS1-128 linear component.</p></body></html> + + + + + + Qt::Vertical - + 20 43 diff --git a/frontend_qt4/grpC16k.ui b/frontend_qt4/grpC16k.ui index ad4efefb..6330d46b 100644 --- a/frontend_qt4/grpC16k.ui +++ b/frontend_qt4/grpC16k.ui @@ -1,7 +1,8 @@ - + + grpC16k - - + + 0 0 @@ -9,36 +10,40 @@ 123 - + Form - + - - - S&tandard Mode - - - true - - + + + + + S&tandard Mode + + + true + + + + + + + &GS-1 Data Mode + + + + - - - &GS-1 Data Mode - - - - - - + + Qt::Vertical - + 20 - 60 + 40 diff --git a/frontend_qt4/grpC39.ui b/frontend_qt4/grpC39.ui index 38cf8869..c82aabee 100644 --- a/frontend_qt4/grpC39.ui +++ b/frontend_qt4/grpC39.ui @@ -1,51 +1,56 @@ - + + grpC39 - - + + 0 0 - 200 + 254 131 - + Form - + - - - &No Check Digit - - - true - - + + + + + &No Check Digit + + + true + + + + + + + &HIBC 39 + + + + + + + &Mod-43 Check Digit + + + + - - - &Mod-43 Check Digit - - - - - - - &HIBC 39 - - - - - - + + Qt::Vertical - + 20 - 42 + 40 diff --git a/frontend_qt4/grpC49.ui b/frontend_qt4/grpC49.ui index d72e8a8a..abea4f22 100644 --- a/frontend_qt4/grpC49.ui +++ b/frontend_qt4/grpC49.ui @@ -1,7 +1,8 @@ - + + grpC16k - - + + 0 0 @@ -9,36 +10,40 @@ 123 - + Form - + - - - S&tandard Mode - - - true - - + + + + + S&tandard Mode + + + true + + + + + + + &GS-1 Data Mode + + + + - - - &GS-1 Data Mode - - - - - - + + Qt::Vertical - + 20 - 60 + 40 diff --git a/frontend_qt4/grpCodablock.ui b/frontend_qt4/grpCodablock.ui index 279bcad7..3df44a44 100644 --- a/frontend_qt4/grpCodablock.ui +++ b/frontend_qt4/grpCodablock.ui @@ -1,51 +1,56 @@ - + + grpCodablock - - + + 0 0 - 184 - 118 + 372 + 175 - + Form - + - - - S&tandard Mode - - - true - - + + + + + S&tandard Mode + + + true + + + + + + + &HIBC Codablock-F + + + + + + + &GS-1 Data Mode + + + + - - - &GS-1 Data Mode - - - - - - - &HIBC Codablock-F - - - - - - + + Qt::Vertical - + 20 - 29 + 40 diff --git a/frontend_qt4/grpCodeOne.ui b/frontend_qt4/grpCodeOne.ui index ad87c4a4..4fe513f7 100644 --- a/frontend_qt4/grpCodeOne.ui +++ b/frontend_qt4/grpCodeOne.ui @@ -1,7 +1,8 @@ - + + grpChannel - - + + 0 0 @@ -9,123 +10,118 @@ 124 - + Form - + - - - - + + + + S&ymbol Size: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + cmbC1Size - - + + - + Automatic - + 16 x 18 (Version A) - + 22 x 22 (Version B) - + 28 x 32 (Version C) - + 40 x 42 (Version D) - + 52 x 54 (Version E) - + 70 x 76 (Version F) - + 104 x 98 (Version G) - + 148 x 134 (Version H) - + 8X height (Version S) - + 16X height (Version T) + + + + S&tandard Mode + + + true + + + + + + + &GS-1 Data Mode + + + - - - S&tandard Mode - - - true - - - - - - - &GS-1 Data Mode - - - - - - + + Qt::Vertical - + 20 - 30 + 40 - - cmbC1Size - radC1Stand - radC1GS1 - diff --git a/frontend_qt4/grpDM.ui b/frontend_qt4/grpDM.ui index c5203ccd..e48f3fab 100644 --- a/frontend_qt4/grpDM.ui +++ b/frontend_qt4/grpDM.ui @@ -6,7 +6,7 @@ 0 0 - 410 + 463 339 @@ -15,198 +15,198 @@ - - - - - - - Encoding &Mode: - - - cmbDMMode - - - - - - - - ECC 200 (Recommended) - - - - - ECC 000 - - - - - ECC 050 - - - - - ECC 080 - - - - - ECC 100 - - - - - ECC 140 - - - - - - - - - - Non ECC 200 Options + + + + + Encoding &Mode: + + + cmbDMMode - - - - - Si&ze: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - cmbDMNon200Size - - - - - - - - Automatic - - - - - 9 x 9 - - - - - 11 x 11 - - - - - 13 x 13 - - - - - 15 x 15 - - - - - 17 x 17 - - - - - 19 x 19 - - - - - 21 x 21 - - - - - 23 x 23 - - - - - 25 x 25 - - - - - 27 x 27 - - - - - 29 x 29 - - - - - 31 x 31 - - - - - 33 x 33 - - - - - 35 x 35 - - - - - 37 x 37 - - - - - 39 x 39 - - - - - 41 x 41 - - - - - 43 x 43 - - - - - 45 x 45 - - - - - 47 x 47 - - - - - 49 x 49 - - - - - - - - - ECC 200 Options - + + + + + ECC 200 (Recommended) + + + + + ECC 000 + + + + + ECC 050 + + + + + ECC 080 + + + + + ECC 100 + + + + + ECC 140 + + + + + + + + + + Non ECC 200 Options + + + + + + Si&ze: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + cmbDMNon200Size + + + + + + + + Automatic + + + + + 9 x 9 + + + + + 11 x 11 + + + + + 13 x 13 + + + + + 15 x 15 + + + + + 17 x 17 + + + + + 19 x 19 + + + + + 21 x 21 + + + + + 23 x 23 + + + + + 25 x 25 + + + + + 27 x 27 + + + + + 29 x 29 + + + + + 31 x 31 + + + + + 33 x 33 + + + + + 35 x 35 + + + + + 37 x 37 + + + + + 39 x 39 + + + + + 41 x 41 + + + + + 43 x 43 + + + + + 45 x 45 + + + + + 47 x 47 + + + + + 49 x 49 + + + + + + + + + + + ECC 200 Options + + + - + S&tandard @@ -216,21 +216,21 @@ - + &HIBC Data Matrix - + &GS-1 Data Mode - + Si&ze: @@ -240,7 +240,7 @@ - + @@ -399,20 +399,20 @@ - - - - Suppress Rectangular Symbols in Automatic Mode - - - true - - - - - - + + + + + Suppress Rectangular Symbols in Automatic Mode + + + true + + + + + @@ -422,7 +422,7 @@ 20 - 71 + 40 diff --git a/frontend_qt4/grpMaxicode.ui b/frontend_qt4/grpMaxicode.ui index 2c8a013e..5145b59e 100644 --- a/frontend_qt4/grpMaxicode.ui +++ b/frontend_qt4/grpMaxicode.ui @@ -1,113 +1,115 @@ - - Form - - + + + grpMicroPDF + + 0 0 - 436 - 180 + 532 + 251 - - - 0 - 0 - - - + Form - - - - 18 - 15 - 413 - 69 - - - - - - - - 0 - 0 - - - - 1 - - - - Structured Carrier Message (Mode 2 or 3) + + + + + + + Encoding &Mode: - - - - Standard Symbol, SEC (Mode 4) + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - Full ECC Symbol (Mode 5) + + cmbMaxiMode - - - - Reader Program, SEC (Mode 6) + + + + + + false - - - - - - - false - - - - 0 - 0 - - - - Primary Data Here! - - - - - - - Encoding &Mode: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - cmbMaxiMode - - - - - - - false - - - &Primary Data: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - txtMaxiPrimary - - - - - + + &Primary Data: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + txtMaxiPrimary + + + + + + + + 0 + 0 + + + + 1 + + + + Structured Carrier Message (Mode 2 or 3) + + + + + Standard Symbol, SEC (Mode 4) + + + + + Full ECC Symbol (Mode 5) + + + + + Reader Program, SEC (Mode 6) + + + + + + + + false + + + + 0 + 0 + + + + Primary Data Here! + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/frontend_qt4/grpMicroPDF.ui b/frontend_qt4/grpMicroPDF.ui index 9c0a8e4b..27e8f272 100644 --- a/frontend_qt4/grpMicroPDF.ui +++ b/frontend_qt4/grpMicroPDF.ui @@ -1,75 +1,76 @@ - + + grpMicroPDF - - + + 0 0 - 351 - 100 + 763 + 376 - + Form - + - - - - + + + + &Number of Data Columns: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + cmbMPDFCols - - + + - + Automatic - + 1 - + 2 - + 3 - + 4 - - - + + + S&tandard - + true - - - + + + &HIBC MicroPDF417 @@ -77,14 +78,14 @@ - - + + Qt::Vertical - + 20 - 26 + 40 diff --git a/frontend_qt4/grpQR.ui b/frontend_qt4/grpQR.ui index f33df9f1..0f77101b 100644 --- a/frontend_qt4/grpQR.ui +++ b/frontend_qt4/grpQR.ui @@ -7,7 +7,7 @@ 0 0 441 - 208 + 238 @@ -287,69 +287,52 @@ Data Encoding - + 10 - 17 - 102 - 24 + 30 + 411 + 80 - - - 0 - 0 - - - - S&tandard - - - true - - - - - - 200 - 14 - 142 - 24 - - - - &HIBC QR Code - - - - - - 9 - 41 - 151 - 24 - - - - &GS-1 Data Mode - + + + + + + 0 + 0 + + + + S&tandard Mode + + + true + + + + + + + &HIBC QR Code + + + + + + + &GS-1 Data Mode + + + + + gridLayoutWidget + - - - - Qt::Vertical - - - - 20 - 35 - - - - diff --git a/frontend_qt4/mainWindow.ui b/frontend_qt4/mainWindow.ui index bfb16159..0f9f4ea2 100644 --- a/frontend_qt4/mainWindow.ui +++ b/frontend_qt4/mainWindow.ui @@ -7,7 +7,7 @@ 0 0 749 - 650 + 711 @@ -26,669 +26,672 @@ background-image: url(:/blueback.png); - - - - 9 - 9 - 731 - 312 - - - - false - - - Preview - - - - - - - 0 - 0 - - - - false - - - - - - - Zoom out - - - ... - - - - :/zoomout.png:/zoomout.png - - - - 22 - 22 - - - - - - - - Adjust zoom - - - 50 - - - 400 - - - 100 - - - Qt::Vertical - - - true - - - false - - - - - - - Zoom in - - - - :/zoomin.png:/zoomin.png - - - - 22 - 22 - - - - - - - - Rotate anti-clockwise - - - - :/rotateleft.png:/rotateleft.png - - - - 22 - 22 - - - - - - - - Adjust Rotation - - - 360 - - - Qt::Horizontal - - - - - - - Rotate clockwise - - - - :/rotateright.png:/rotateright.png - - - - 22 - 22 - - - - - - - - - - 10 - 340 - 731 - 299 - - - - - QLayout::SetMaximumSize - - - - - - - - - S&ymbology: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - bstyle - - - - - - - - 0 - 0 - - - - Select type of barcode to generate. - - - - - - - + + + + + false + + + Preview + + + + 0 0 - - - 16777215 - 350 - - false - - - - - 0 - - - - General - - - - - - - 0 - 0 - - - - &Data to Encode - - - - - - Enter data to be encoded. - - - Your Data Here! - - - - - - - ... - - - - - - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 400 - - - - Composite Code - - - - - - - - Create a composite symbol. - - - Add &2D Component - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - Component &Type: - - - cmbCompType - - - - - - - false - - - - Automatic - - - - - CC-A - - - - - CC-B - - - - - CC-C - - - - - - - - - - - - false - - - 2D Component Data: - - - txtComposite - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 60 - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Your Data Here!</span></p></body></html> - - - false - - - - - - - - - - - - - Appearance - - - - - - - - - - &Height: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - heightb - - - - - - - B&order Width: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - bwidth - - - - - - - Adjust width of boundary bars or border. - - - X - - - 0 - - - 16 - - - 0 - - - - - - - &Whitespace: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - spnWhitespace - - - - - - - Adjust whitespace to left and right of barcode. - - - X - - - - - - - &Printing Scale: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - spnScale - - - - - - - Adjust image size when output to file. - - - - - - 2 - - - 0.500000000000000 - - - 99.500000000000000 - - - 0.500000000000000 - - - 1.000000000000000 - - - - - - - Adjust overall symbol height. - - - X - - - - - - 300 - - - 50 - - - - - - - - - - - Border Ty&pe: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - btype - - - - - - - - No border - - - - - Bind - - - - - Box - - - - - - - - - - - &Backgound Colour - - - - - - - &Foreground Colour - - - - - - - - - - - Qt::Vertical - - - - 20 - 228 - - - - - - - - - - - - - - &About Zint - - - - - + + - Reset zoom, rotation and colour. + Zoom out - &Reset Preview + ... + + + + :/zoomout.png:/zoomout.png + + + + 22 + 22 + - - + + + + Adjust zoom + + + 50 + + + 400 + + + 100 + Qt::Vertical - + + true + + + false + + + + + + + Zoom in + + + + :/zoomin.png:/zoomin.png + + - 20 - 40 + 22 + 22 - - - - - - Se&quence - - - + + - Save barcode image to file. + Rotate anti-clockwise - - &Save + + + :/rotateleft.png:/rotateleft.png + + + + 22 + 22 + - - - - E&xit + + + + Adjust Rotation + + + 360 + + + Qt::Horizontal + + + + + + + Rotate clockwise + + + + :/rotateright.png:/rotateright.png + + + + 22 + 22 + - - - + + + + + + QLayout::SetMaximumSize + + + + + + + + + S&ymbology: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + bstyle + + + + + + + + 0 + 0 + + + + Select type of barcode to generate. + + + + + + + + + + 0 + 0 + + + + + 16777215 + 350 + + + + false + + + + + + 1 + + + + General + + + + + + + 0 + 0 + + + + &Data to Encode + + + + + + Enter data to be encoded. + + + Your Data Here! + + + + + + + ... + + + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 400 + + + + Composite Code + + + + + + + + Create a composite symbol. + + + Add &2D Component + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Component &Type: + + + cmbCompType + + + + + + + false + + + + Automatic + + + + + CC-A + + + + + CC-B + + + + + CC-C + + + + + + + + + + + + false + + + 2D Component Data: + + + txtComposite + + + + + + + false + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Your Data Here!</span></p></body></html> + + + false + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Appearance + + + + + + + + &Height: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + heightb + + + + + + + B&order Width: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + bwidth + + + + + + + &Whitespace: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + spnWhitespace + + + + + + + &Printing Scale: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + spnScale + + + + + + + Adjust overall symbol height. + + + X + + + + + + 300 + + + 50 + + + + + + + Adjust width of boundary bars or border. + + + X + + + 0 + + + 16 + + + 0 + + + + + + + Adjust whitespace to left and right of barcode. + + + X + + + + + + + Adjust image size when output to file. + + + + + + 2 + + + 0.500000000000000 + + + 99.500000000000000 + + + 0.500000000000000 + + + 1.000000000000000 + + + + + + + Border Ty&pe: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + btype + + + + + + + + No border + + + + + Bind + + + + + Box + + + + + + + + &Foreground Colour + + + + + + + + + + &Backgound Colour + + + + + + + + + Show Human Readable Text + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + + &About Zint + + + + + + + Reset zoom, rotation and colour. + + + &Reset Preview + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Se&quence + + + + + + + Save barcode image to file. + + + &Save + + + + + + + E&xit + + + + + + + + tabMain @@ -700,13 +703,6 @@ p, li { white-space: pre-wrap; } btnReset btnSave btnExit - heightb - bwidth - spnWhitespace - spnScale - btype - bgcolor - fgcolor view toolButton_5 scaleSlider diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp index ebffbc90..859e0130 100644 --- a/frontend_qt4/mainwindow.cpp +++ b/frontend_qt4/mainwindow.cpp @@ -131,6 +131,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) connect(btnReset, SIGNAL(clicked( bool )), SLOT(reset_view())); connect(btnMoreData, SIGNAL(clicked( bool )), SLOT(open_data_dialog())); connect(btnSequence, SIGNAL(clicked( bool )), SLOT(open_sequence_dialog())); + connect(chkHRTHide, SIGNAL(stateChanged( int )), SLOT(update_preview())); } MainWindow::~MainWindow() @@ -174,18 +175,22 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 1.0.1

" - "

A simple barcode generator" - "

Requires libzint 2.2.2 or greater." - "

WARNING! This release is a work-in-progress and should be considered as \"unstable\". " - "Although most things should work fine it has not yet been thoroughly tested. In particular using " - "input characters outside the 7-bit ASCII set could lead to unpredictable results." + tr("

Zint Barcode Studio 2.3

" + "

A free barcode generator" "

Visit the Zint Project Homepage for more information." - "

Copyright © 2009 Robin Stuart & Bogdan Vatra.
" - "QR Code support by Kentaro Fukuchi.
" - "Released under the GNU General Public License ver. 3 or later" - "

\"QR Code\" is a Registered Trademark of Denso Corp.
" + "

Copyright © 2009 Robin Stuart.
" + "Qt4 code by BogDan Vatra, MS Windows port by \"tgotic\".
" + "With thanks to Norbert Szabó, and Robert Elliott." + "

Released under the GNU General Public License ver. 3 or later.
" + "\"QR Code\" is a Registered Trademark of Denso Corp.
" "\"Telepen\" is a Registered Trademark of SB Electronics." + "

Currently supported standards include:
" + "EN 797:1996, EN 798:1996, EN 12323:2005, ISO/IEC 15417:2007,
" + "ISO/IEC 15438:2006, ISO/IEC 16022:2006, ISO/IEC 16023:2000,
" + "ISO/IEC 16388:2007, ISO/IEC 18004:2006, ISO/IEC 24723:2006,
" + "ISO/IEC 24724:2006, ISO/IEC 24728:2006, ISO/IEC 24778:2008,
" + "ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,
" + "AIMD014 (v 1.63), USPS-B-3200
" )); } @@ -296,7 +301,9 @@ void MainWindow::change_options() connect(m_optionWidget->findChild("radAztecECC"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbAztecSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbAztecECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); - connect(m_optionWidget->findChild("chkAztecMode"), SIGNAL(stateChanged( int )), SLOT(update_preview())); + connect(m_optionWidget->findChild("radAztecStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); + connect(m_optionWidget->findChild("radAztecGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); + connect(m_optionWidget->findChild("radAztecHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); } if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_MSI_PLESSEY) @@ -567,6 +574,10 @@ void MainWindow::update_preview() m_bc.bc.setSecurityLevel(0); m_bc.bc.setWidth(0); m_bc.bc.setInputMode(UNICODE_MODE); + m_bc.bc.setHideText(FALSE); + if(chkHRTHide->isChecked() == false) { + m_bc.bc.setHideText(TRUE); + } switch(metaObject()->enumerator(0).value(bstyle->currentIndex())) { case BARCODE_CODE128: @@ -682,8 +693,10 @@ void MainWindow::update_preview() if(m_optionWidget->findChild("radAztecECC")->isChecked()) m_bc.bc.setSecurityLevel(m_optionWidget->findChild("cmbAztecECC")->currentIndex() + 1); - if(m_optionWidget->findChild("chkAztecMode")->isChecked()) + if(m_optionWidget->findChild("radAztecGS1")->isChecked()) m_bc.bc.setInputMode(GS1_MODE); + if(m_optionWidget->findChild("radAztecHIBC")->isChecked()) + m_bc.bc.setSymbol(BARCODE_HIBC_AZTEC); break; case MSI_PLESSEY: