r24452 by jghali - #16454: Update layout for Barcode Generator <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Sat Feb 6 23:50:52 UTC 2021
Author: jghali
Date: Sat Feb 6 23:50:52 2021
New Revision: 24452
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24452
Log:
#16454: Update layout for Barcode Generator <bubu>
Modified:
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24452&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Sat Feb 6 23:50:52 2021
@@ -36,6 +36,9 @@
ui.setupUi(this);
setObjectName(name);
setModal(true);
+
+ ui.bcodeBox->layout()->setAlignment(Qt::AlignTop);
+ ui.colorBox->layout()->setAlignment(Qt::AlignTop);
connect(&thread, SIGNAL(renderedImage(QString)),this, SLOT(updatePreview(QString)));
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24452&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui Sat Feb 6 23:50:52 2021
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>497</width>
- <height>574</height>
+ <width>504</width>
+ <height>541</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,137 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="8" column="0" colspan="3">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item row="4" column="1" colspan="2">
+ <widget class="QGroupBox" name="colorBox">
+ <property name="title">
+ <string>Colors</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="2" column="1">
+ <widget class="QLabel" name="txtLabel">
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="linesLabel">
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QPushButton" name="txtColorButton">
+ <property name="toolTip">
+ <string>Color of the text and numbers</string>
+ </property>
+ <property name="text">
+ <string>&Text</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+T</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="bgLabel">
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QPushButton" name="bgColorButton">
+ <property name="toolTip">
+ <string>Background color - under the code lines</string>
+ </property>
+ <property name="text">
+ <string>&Background</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+B</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPushButton" name="lnColorButton">
+ <property name="toolTip">
+ <string>Color of the lines in barcode</string>
+ </property>
+ <property name="text">
+ <string>&Lines</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+L</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="7" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
@@ -53,16 +183,36 @@
<item row="4" column="0">
<widget class="QGroupBox" name="bcodeBox">
<property name="title">
- <string/>
+ <string>Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item row="6" column="1">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="includecheckCheck">
+ <property name="toolTip">
+ <string>Generate and include a checksum in barcode</string>
+ </property>
+ <property name="text">
+ <string>Add checksum</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+N</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="formatLabel">
+ <property name="text">
+ <string>Version:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>formatCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
<widget class="QCheckBox" name="includecheckintextCheck">
<property name="toolTip">
<string>Include the checksum digit in the barcode text</string>
@@ -75,7 +225,47 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="guardwhitespaceCheck">
+ <property name="toolTip">
+ <string>Draw arrows to be sure of space next the code</string>
+ </property>
+ <property name="text">
+ <string>Guard whitespace</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+G</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="parseCheck">
+ <property name="text">
+ <string>^NNN as ASCII</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="eccLabel">
+ <property name="text">
+ <string>Error correction level:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>eccCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="parsefncCheck">
+ <property name="text">
+ <string>Parse specials</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
<widget class="QCheckBox" name="includetextCheck">
<property name="toolTip">
<string>If checked, there will be numbers in the barcode too</string>
@@ -91,151 +281,29 @@
</property>
</widget>
</item>
- <item row="8" column="1">
- <widget class="QCheckBox" name="parsefncCheck">
- <property name="text">
- <string>Parse specials</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QCheckBox" name="guardwhitespaceCheck">
- <property name="toolTip">
- <string>Draw arrows to be sure of space next the code</string>
- </property>
- <property name="text">
- <string>Guard whitespace</string>
- </property>
- <property name="shortcut">
- <string>Alt+G</string>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QCheckBox" name="parseCheck">
- <property name="text">
- <string>^NNN as ASCII</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QCheckBox" name="includecheckCheck">
- <property name="toolTip">
- <string>Generate and include a checksum in barcode</string>
- </property>
- <property name="text">
- <string>Add checksum</string>
- </property>
- <property name="shortcut">
- <string>Alt+N</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="1" colspan="2">
- <widget class="QGroupBox" name="colorBox">
- <property name="title">
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <property name="topMargin">
- <number>6</number>
- </property>
- <item row="0" column="0">
- <widget class="QPushButton" name="bgColorButton">
- <property name="toolTip">
- <string>Background color - under the code lines</string>
- </property>
- <property name="text">
- <string>&Background</string>
- </property>
- <property name="shortcut">
- <string>Alt+B</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="bgLabel">
- <property name="minimumSize">
- <size>
- <width>10</width>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="formatCombo">
+ <property name="minimumSize">
+ <size>
+ <width>125</width>
<height>0</height>
</size>
</property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QPushButton" name="lnColorButton">
- <property name="toolTip">
- <string>Color of the lines in barcode</string>
- </property>
- <property name="text">
- <string>&Lines</string>
- </property>
- <property name="shortcut">
- <string>Alt+L</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="linesLabel">
- <property name="minimumSize">
- <size>
- <width>10</width>
+ <property name="toolTip">
+ <string>Version of the symbol</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="eccCombo">
+ <property name="minimumSize">
+ <size>
+ <width>125</width>
<height>0</height>
</size>
</property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QPushButton" name="txtColorButton">
- <property name="toolTip">
- <string>Color of the text and numbers</string>
- </property>
- <property name="text">
- <string>&Text</string>
- </property>
- <property name="shortcut">
- <string>Alt+T</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="txtLabel">
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
+ <property name="toolTip">
+ <string>Error correction level</string>
</property>
</widget>
</item>
@@ -251,7 +319,7 @@
</size>
</property>
<property name="title">
- <string/>
+ <string>Type</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -364,90 +432,26 @@
</layout>
</widget>
</item>
- <item row="6" column="0" colspan="3">
- <widget class="QGroupBox" name="optionsBox">
- <property name="title">
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <property name="verticalSpacing">
- <number>6</number>
- </property>
- <item row="2" column="0" colspan="5">
- <widget class="QLabel" name="sampleLabel">
- <property name="minimumSize">
- <size>
- <width>450</width>
- <height>190</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color : #FFF</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="formatLabel">
- <property name="text">
- <string>Version:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- <property name="buddy">
- <cstring>formatCombo</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="formatCombo">
- <property name="minimumSize">
- <size>
- <width>125</width>
- <height>1</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Version of the symbol</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QComboBox" name="eccCombo">
- <property name="minimumSize">
- <size>
- <width>125</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Error correction level</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="eccLabel">
- <property name="text">
- <string>Error correction level:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- <property name="buddy">
- <cstring>eccCombo</cstring>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="5" column="0" colspan="3">
+ <widget class="QLabel" name="sampleLabel">
+ <property name="minimumSize">
+ <size>
+ <width>450</width>
+ <height>190</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color : #FFF</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
</layout>
More information about the scribus-commit
mailing list