Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-23 04:47:03 +00:00
Code Issues Projects Releases Wiki Activity

composite: less confusing error message for no linear data

Browse Source 
GUI: restore mainWindow min width to allow squashability
GUI/manual: use EAN and UPC initials first rather than long names
  (easier to spot)
This commit is contained in:
gitlost
2022-06-11 12:28:48 +01:00
parent 270f1d136c
commit a232dec4ff
12 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend_qt/mainWindow.ui
View File

@@ -11,6 +11,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Zint Barcode Studio</string>
</property>
@@ -512,7 +518,7 @@ for this symbology to defaults</string>
<string>GS1 Composite symbol settings</string>
</property>
<property name="title">
<string>GS1 Composite Code</string>
<string>GS1 Composite</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@@ -1818,7 +1824,8 @@ in X-dimensions</string>
<item row="5" column="0">
<widget class="QLabel" name="lblScale">
<property name="toolTip">
<string>Image scale when output to file</string>
<string>Image scale when output to file
(adjusts the X-dimension)</string>
</property>
<property name="text">
<string>&amp;Printing Scale:</string>
@@ -1834,7 +1841,8 @@ in X-dimensions</string>
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="spnScale">
<property name="toolTip">
<string>Image scale when output to file</string>
<string>Image scale when output to file
(adjusts the X-dimension)</string>
</property>
<property name="suffix">
<string/>

10
frontend_qt/mainwindow.cpp
View File

@@ -96,9 +96,9 @@ static const struct bstyle_item bstyle_items[] = {
{ QSL("DotCode"), BARCODE_DOTCODE },
{ QSL("DPD Code"), BARCODE_DPD },
{ QSL("Dutch Post KIX"), BARCODE_KIX },
{ QSL("EAN (EAN-2, EAN-5, EAN-8 and EAN-13) (ISO 15420)"), BARCODE_EANX },
{ QSL("EAN-14"), BARCODE_EAN14 },
{ QSL("European Article Number (EAN) (ISO 15420)"), BARCODE_EANX },
{ QSL("Facing Identification Mark (FIM)"), BARCODE_FIM },
{ QSL("FIM (Facing Identification Mark)"), BARCODE_FIM },
{ QSL("Flattermarken"), BARCODE_FLAT },
{ QSL("Grid Matrix"), BARCODE_GRIDMATRIX },
{ QSL("GS1 DataBar Expanded (ISO 24724)"), BARCODE_DBAR_EXP },
@@ -108,7 +108,7 @@ static const struct bstyle_item bstyle_items[] = {
{ QSL("GS1 DataBar Stacked (ISO 24724)"), BARCODE_DBAR_STK },
{ QSL("GS1 DataBar Stacked Omnidirectional (ISO 24724)"), BARCODE_DBAR_OMNSTK },
{ QSL("Han Xin (Chinese Sensible) Code (ISO 20830)"), BARCODE_HANXIN },
{ QSL("International Standard Book Number (ISBN)"), BARCODE_ISBNX },
{ QSL("ISBN (International Standard Book Number)"), BARCODE_ISBNX },
{ QSL("ITF-14"), BARCODE_ITF14 },
{ QSL("Japanese Postal Barcode"), BARCODE_JAPANPOST },
{ QSL("Korean Postal Barcode"), BARCODE_KOREAPOST },
@@ -132,8 +132,8 @@ static const struct bstyle_item bstyle_items[] = {
{ QSL("Telepen Numeric"), BARCODE_TELEPEN_NUM },
{ QSL("UK Plessey"), BARCODE_PLESSEY },
{ QSL("Ultracode"), BARCODE_ULTRA },
{ QSL("Universal Product Code (UPC-A) (ISO 15420)"), BARCODE_UPCA },
{ QSL("Universal Product Code (UPC-E) (ISO 15420)"), BARCODE_UPCE },
{ QSL("UPC-A (ISO 15420)"), BARCODE_UPCA },
{ QSL("UPC-E (ISO 15420)"), BARCODE_UPCE },
{ QSL("UPNQR"), BARCODE_UPNQR },
{ QSL("USPS Intelligent Mail (OneCode)"), BARCODE_USPS_IMAIL },
{ QSL("VIN (Vehicle Identification Number)"), BARCODE_VIN },