r19491 by jghali - #12671: Some non consistent tabstops

scribus-commit scribus-commit at lists.scribus.net
Sun Sep 7 16:06:05 UTC 2014


Author: jghali
Date: Sun Sep  7 16:06:05 2014
New Revision: 19491

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19491
Log:
#12671: Some non consistent tabstops

Modified:
    branches/Version14x/Scribus/scribus/smlinestylewidget.cpp
    branches/Version14x/Scribus/scribus/smlinestylewidget.h
    branches/Version14x/Scribus/scribus/smlinestylewidget.ui
    branches/Version14x/Scribus/scribus/smpstylewidget.ui

Modified: branches/Version14x/Scribus/scribus/smlinestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19491&path=/branches/Version14x/Scribus/scribus/smlinestylewidget.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/smlinestylewidget.cpp (original)
+++ branches/Version14x/Scribus/scribus/smlinestylewidget.cpp Sun Sep  7 16:06:05 2014
@@ -24,14 +24,8 @@
 	addButton->setIcon(QIcon(loadIcon("penciladd.png")));
 	removeButton->setIcon(QIcon(loadIcon("pencilsub.png")));
 
-	dashCombo = new LineCombo(this);
-	gridLayout->addWidget(dashCombo, 0, 0);
-
-	lineWidth = new ScrSpinBox( 0, 300, this, 0 );
-	gridLayout1->addWidget(lineWidth, 0, 1);
-	
-	colorCombo = new ColorCombo(this);
-	gridLayout1->addWidget(colorCombo, 1, 0);
+	lineWidth->setMinimum(0.0);
+	lineWidth->setMaximum(300.0);
 
 	endCombo->addItem(loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
 	endCombo->addItem(loadIcon("SquareCap.png"), tr( "Square Cap" ) );

Modified: branches/Version14x/Scribus/scribus/smlinestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19491&path=/branches/Version14x/Scribus/scribus/smlinestylewidget.h
==============================================================================
--- branches/Version14x/Scribus/scribus/smlinestylewidget.h (original)
+++ branches/Version14x/Scribus/scribus/smlinestylewidget.h Sun Sep  7 16:06:05 2014
@@ -32,9 +32,6 @@
 	void unitChange(int unitIndex);
 
 private:
-	LineCombo *dashCombo;
-	ScrSpinBox  *lineWidth;
-	ColorCombo *colorCombo;
 	multiLine  currentStyle;
 	ColorList  colors;
 

Modified: branches/Version14x/Scribus/scribus/smlinestylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19491&path=/branches/Version14x/Scribus/scribus/smlinestylewidget.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/smlinestylewidget.ui (original)
+++ branches/Version14x/Scribus/scribus/smlinestylewidget.ui Sun Sep  7 16:06:05 2014
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SMLineStyleWidget</class>
- <widget class="QWidget" name="SMLineStyleWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SMLineStyleWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,98 +10,98 @@
     <height>298</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>5</number>
-   </property>
-   <property name="leftMargin" >
-    <number>5</number>
-   </property>
-   <property name="topMargin" >
-    <number>5</number>
-   </property>
-   <property name="rightMargin" >
-    <number>5</number>
-   </property>
-   <property name="bottomMargin" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>5</number>
+   </property>
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
     <number>5</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="addButton" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="addButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize" >
+       <property name="minimumSize">
         <size>
          <width>20</width>
          <height>20</height>
         </size>
        </property>
-       <property name="maximumSize" >
+       <property name="maximumSize">
         <size>
          <width>20</width>
          <height>20</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="removeButton" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+      <widget class="QPushButton" name="removeButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize" >
+       <property name="minimumSize">
         <size>
          <width>20</width>
          <height>20</height>
         </size>
        </property>
-       <property name="maximumSize" >
+       <property name="maximumSize">
         <size>
          <width>20</width>
          <height>20</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint">
         <size>
          <width>150</width>
          <height>21</height>
@@ -111,25 +112,25 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QListWidget" name="lineStyles" >
-       <property name="maximumSize" >
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QListWidget" name="lineStyles">
+       <property name="maximumSize">
         <size>
          <width>200</width>
          <height>32767</height>
@@ -138,139 +139,148 @@
       </widget>
      </item>
      <item>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="leftMargin" >
+       <property name="leftMargin">
         <number>0</number>
        </property>
-       <property name="topMargin" >
+       <property name="topMargin">
         <number>0</number>
        </property>
-       <property name="rightMargin" >
+       <property name="rightMargin">
         <number>0</number>
        </property>
-       <property name="bottomMargin" >
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
-         <property name="horizontalSpacing" >
+        <layout class="QGridLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing">
           <number>6</number>
          </property>
-         <property name="verticalSpacing" >
+         <property name="verticalSpacing">
           <number>6</number>
          </property>
-         <item row="1" column="0" >
-          <widget class="QComboBox" name="endCombo" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <item row="1" column="0">
+          <widget class="QComboBox" name="endCombo">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" >
-          <widget class="QComboBox" name="joinCombo" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <item row="2" column="0">
+          <widget class="QComboBox" name="joinCombo">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
+         <item row="0" column="0">
+          <widget class="LineCombo" name="dashCombo"/>
+         </item>
         </layout>
        </item>
        <item>
-        <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
-         <property name="horizontalSpacing" >
+        <layout class="QGridLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing">
           <number>6</number>
          </property>
-         <property name="verticalSpacing" >
+         <property name="verticalSpacing">
           <number>6</number>
          </property>
-         <item row="1" column="1" >
-          <widget class="QSpinBox" name="shadeBox" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="shadeBox">
+           <property name="sizePolicy">
+            <sizepolicy vsizetype="Fixed" hsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize" >
+           <property name="minimumSize">
             <size>
              <width>70</width>
              <height>0</height>
             </size>
            </property>
-           <property name="suffix" >
+           <property name="suffix">
             <string>%</string>
            </property>
-           <property name="minimum" >
+           <property name="minimum">
             <number>0</number>
            </property>
-           <property name="maximum" >
+           <property name="maximum">
             <number>100</number>
            </property>
-           <property name="value" >
+           <property name="value">
             <number>100</number>
            </property>
           </widget>
          </item>
-         <item row="0" column="0" >
-          <widget class="QLabel" name="textLabel2" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <item row="0" column="0">
+          <widget class="QLabel" name="textLabel2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Line Width:</string>
            </property>
-           <property name="wordWrap" >
+           <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="ColorCombo" name="colorCombo"/>
+         </item>
+         <item row="0" column="1">
+          <widget class="ScrSpinBox" name="lineWidth"/>
+         </item>
         </layout>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint">
           <size>
            <width>20</width>
            <height>16</height>
@@ -279,36 +289,36 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="previewLabel" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <widget class="QLabel" name="previewLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize" >
+         <property name="minimumSize">
           <size>
            <width>0</width>
            <height>60</height>
           </size>
          </property>
-         <property name="text" >
+         <property name="text">
           <string/>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint">
           <size>
            <width>41</width>
            <height>26</height>
@@ -322,7 +332,35 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>LineCombo</class>
+   <extends>QComboBox</extends>
+   <header>linecombo.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ColorCombo</class>
+   <extends>QComboBox</extends>
+   <header>colorcombo.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ScrSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>scrspinbox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>addButton</tabstop>
+  <tabstop>removeButton</tabstop>
+  <tabstop>lineStyles</tabstop>
+  <tabstop>dashCombo</tabstop>
+  <tabstop>endCombo</tabstop>
+  <tabstop>joinCombo</tabstop>
+  <tabstop>lineWidth</tabstop>
+  <tabstop>colorCombo</tabstop>
+  <tabstop>shadeBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

Modified: branches/Version14x/Scribus/scribus/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19491&path=/branches/Version14x/Scribus/scribus/smpstylewidget.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/smpstylewidget.ui (original)
+++ branches/Version14x/Scribus/scribus/smpstylewidget.ui Sun Sep  7 16:06:05 2014
@@ -711,6 +711,27 @@
    <header>smradiobutton.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>parentCombo</tabstop>
+  <tabstop>lineSpacingMode_</tabstop>
+  <tabstop>lineSpacing_</tabstop>
+  <tabstop>spaceAbove_</tabstop>
+  <tabstop>spaceBelow_</tabstop>
+  <tabstop>dropCapsBox</tabstop>
+  <tabstop>dropCapLines_</tabstop>
+  <tabstop>dropCapOffset_</tabstop>
+  <tabstop>parentDropCapButton</tabstop>
+  <tabstop>optMarginRadioNone</tabstop>
+  <tabstop>optMarginRadioBoth</tabstop>
+  <tabstop>optMarginRadioLeft</tabstop>
+  <tabstop>optMarginRadioRight</tabstop>
+  <tabstop>optMarginDefaultButton</tabstop>
+  <tabstop>optMarginParentButton</tabstop>
+  <tabstop>minSpaceSpin</tabstop>
+  <tabstop>minGlyphExtSpin</tabstop>
+  <tabstop>maxGlyphExtSpin</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>




More information about the scribus-commit mailing list