r22073 by jghali - #14865: Barcode colors QGroupBox does not have margin borders <FirasH>

[scribus-commit]

Author: jghali
Date: Sun Jun 18 12:22:58 2017
New Revision: 22073

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22073
Log:
#14865: Barcode colors QGroupBox does not have margin borders <FirasH>

Modified:
    trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22073&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui	Sun Jun 18 12:22:58 2017
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>514</width>
-    <height>591</height>
+    <width>497</width>
+    <height>574</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -141,7 +141,7 @@
      </property>
      <layout class="QGridLayout">
       <property name="topMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <item row="0" column="0">
        <widget class="QPushButton" name="bgColorButton">
@@ -253,168 +253,115 @@
      <property name="title">
       <string/>
      </property>
-     <widget class="QLabel" name="bcFamilyLabel">
-      <property name="geometry">
-       <rect>
-        <x>15</x>
-        <y>15</y>
-        <width>100</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Barcode Family:</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="bcFamilyCombo">
-      <property name="geometry">
-       <rect>
-        <x>122</x>
-        <y>13</y>
-        <width>331</width>
-        <height>26</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLabel" name="bcLabel">
-      <property name="geometry">
-       <rect>
-        <x>15</x>
-        <y>45</y>
-        <width>56</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>&Barcode:</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-      <property name="buddy">
-       <cstring>bcCombo</cstring>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="bcCombo">
-      <property name="geometry">
-       <rect>
-        <x>122</x>
-        <y>43</y>
-        <width>331</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="toolTip">
-       <string>Select one of the available barcode types here</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="codeLabel">
-      <property name="geometry">
-       <rect>
-        <x>15</x>
-        <y>75</y>
-        <width>60</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>&Contents:</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-      <property name="buddy">
-       <cstring>codeEdit</cstring>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="optionsEdit">
-      <property name="geometry">
-       <rect>
-        <x>125</x>
-        <y>106</y>
-        <width>321</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>21</height>
-       </size>
-      </property>
-      <property name="toolTip">
-       <string>Advanced options for the barcode</string>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="codeEdit">
-      <property name="geometry">
-       <rect>
-        <x>125</x>
-        <y>75</y>
-        <width>321</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>21</height>
-       </size>
-      </property>
-      <property name="toolTip">
-       <string>The contents encoded in the barcode</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="optionsLabel">
-      <property name="geometry">
-       <rect>
-        <x>15</x>
-        <y>106</y>
-        <width>53</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Options:</string>
-      </property>
-      <property name="textInteractionFlags">
-       <set>Qt::LinksAccessibleByMouse</set>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="resetButton">
-      <property name="geometry">
-       <rect>
-        <x>457</x>
-        <y>75</y>
-        <width>24</width>
-        <height>24</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>24</width>
-        <height>24</height>
-       </size>
-      </property>
-      <property name="toolTip">
-       <string>Reset the barcode samples</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="bcFamilyLabel">
+        <property name="text">
+         <string>Barcode Family:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="bcFamilyCombo"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="bcLabel">
+        <property name="text">
+         <string>&Barcode:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+        <property name="buddy">
+         <cstring>bcCombo</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="bcCombo">
+        <property name="toolTip">
+         <string>Select one of the available barcode types here</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="codeLabel">
+        <property name="text">
+         <string>&Contents:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+        <property name="buddy">
+         <cstring>codeEdit</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="codeEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The contents encoded in the barcode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="resetButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Reset the barcode samples</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="optionsLabel">
+        <property name="text">
+         <string>Options:</string>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::LinksAccessibleByMouse</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="optionsEdit">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Advanced options for the barcode</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="6" column="0" colspan="3">
@@ -423,9 +370,6 @@
       <string/>
      </property>
      <layout class="QGridLayout">
-      <property name="topMargin">
-       <number>0</number>
-      </property>
       <property name="verticalSpacing">
        <number>6</number>
       </property>