r23354 by jghali - #15936: Remove ui/sccombobox (ale)

scribus-commit scribus-commit at lists.scribus.net
Wed Nov 13 02:55:22 UTC 2019


Author: jghali
Date: Wed Nov 13 02:55:22 2019
New Revision: 23354

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23354
Log:
#15936: Remove ui/sccombobox (ale)

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/annot.cpp
    trunk/Scribus/scribus/ui/charselectenhanced.ui
    trunk/Scribus/scribus/ui/checkDocument.cpp
    trunk/Scribus/scribus/ui/checkDocument.h
    trunk/Scribus/scribus/ui/cmykfw.cpp
    trunk/Scribus/scribus/ui/cmykfwbase.ui
    trunk/Scribus/scribus/ui/colorcombo.cpp
    trunk/Scribus/scribus/ui/colorpalette.ui
    trunk/Scribus/scribus/ui/cpalette.cpp
    trunk/Scribus/scribus/ui/cpalette.h
    trunk/Scribus/scribus/ui/customfdialog.cpp
    trunk/Scribus/scribus/ui/effectsdialog.cpp
    trunk/Scribus/scribus/ui/extimageprops.cpp
    trunk/Scribus/scribus/ui/fontcombo.cpp
    trunk/Scribus/scribus/ui/gtdialogs.cpp
    trunk/Scribus/scribus/ui/gtfiledialog.ui
    trunk/Scribus/scribus/ui/layers.cpp
    trunk/Scribus/scribus/ui/layers.h
    trunk/Scribus/scribus/ui/mergedoc.cpp
    trunk/Scribus/scribus/ui/mergedoc.h
    trunk/Scribus/scribus/ui/newfile.cpp
    trunk/Scribus/scribus/ui/newfile.h
    trunk/Scribus/scribus/ui/pagelayout.cpp
    trunk/Scribus/scribus/ui/pagelayout.h
    trunk/Scribus/scribus/ui/pagepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_pages.cpp
    trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
    trunk/Scribus/scribus/ui/prefs_fonts.cpp
    trunk/Scribus/scribus/ui/prefs_fonts.h
    trunk/Scribus/scribus/ui/propertiespalette.h
    trunk/Scribus/scribus/ui/propertiespalette_group.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.h
    trunk/Scribus/scribus/ui/propertiespalette_line.cpp
    trunk/Scribus/scribus/ui/propertiespalette_line.h
    trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
    trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
    trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.h
    trunk/Scribus/scribus/ui/propertiespalette_utils.cpp
    trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
    trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
    trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
    trunk/Scribus/scribus/ui/proptree.cpp
    trunk/Scribus/scribus/ui/sccombobox.cpp
    trunk/Scribus/scribus/ui/sccombobox.h
    trunk/Scribus/scribus/ui/smsccombobox.cpp
    trunk/Scribus/scribus/ui/smsccombobox.h
    trunk/Scribus/scribus/ui/smtextstyles.cpp
    trunk/Scribus/scribus/ui/transparencypalette.h
    trunk/Scribus/scribus/ui/transparencypalette.ui
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro	(original)
+++ trunk/Scribus/Scribus.pro	Wed Nov 13 02:55:22 2019
@@ -582,7 +582,6 @@
            scribus/ui/resourcemanagerlicense.h \
            scribus/ui/rulermover.h \
            scribus/ui/sccolorslider.h \
-           scribus/ui/sccombobox.h \
            scribus/ui/scdockpalette.h \
            scribus/ui/scescapecatcher.h \
            scribus/ui/scfilewidget.h \
@@ -1708,7 +1707,6 @@
            scribus/ui/resourcemanagerlicense.cpp \
            scribus/ui/rulermover.cpp \
            scribus/ui/sccolorslider.cpp \
-           scribus/ui/sccombobox.cpp \
            scribus/ui/scdockpalette.cpp \
            scribus/ui/scescapecatcher.cpp \
            scribus/ui/scfilewidget.cpp \

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Wed Nov 13 02:55:22 2019
@@ -486,7 +486,6 @@
 	ui/resourcemanagerlicense.h
 	ui/rulermover.h
 	ui/sccolorslider.h
-	ui/sccombobox.h
 	ui/scdockpalette.h
 	ui/scescapecatcher.h
 	ui/scfilewidget.h
@@ -988,7 +987,6 @@
 	ui/resourcemanagerlicense.cpp
 	ui/rulermover.cpp
 	ui/sccolorslider.cpp
-	ui/sccombobox.cpp
 	ui/scdockpalette.cpp
 	ui/scescapecatcher.cpp
 	ui/scfilewidget.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Wed Nov 13 02:55:22 2019
@@ -231,7 +231,6 @@
 #include "ui/recoverdialog.h"
 #include "ui/replacecolors.h"
 #include "ui/resourcemanager.h"
-#include "ui/sccombobox.h"
 #include "ui/scfilewidget.h"
 #include "ui/scmessagebox.h"
 #include "ui/scmwmenumanager.h"

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp	(original)
+++ trunk/Scribus/scribus/ui/annot.cpp	Wed Nov 13 02:55:22 2019
@@ -42,7 +42,6 @@
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scfonts.h"
 #include "scimage.h"
 #include "scribusstructs.h"

Modified: trunk/Scribus/scribus/ui/charselectenhanced.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/charselectenhanced.ui
==============================================================================
--- trunk/Scribus/scribus/ui/charselectenhanced.ui	(original)
+++ trunk/Scribus/scribus/ui/charselectenhanced.ui	Wed Nov 13 02:55:22 2019
@@ -1,217 +1,212 @@
-<ui version="4.0" >
- <class>CharSelectEnhanced</class>
- <widget class="QDialog" name="CharSelectEnhanced" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>506</width>
-    <height>492</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Enhanced Character Palette</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>&Font:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fontSelector</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="FontCombo" name="fontSelector" />
-   </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>38</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="3" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>C&haracter Class:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>rangeSelector</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4" >
-    <widget class="ScComboBox" name="rangeSelector" />
-   </item>
-   <item row="0" column="5" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>66</width>
-       <height>28</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="6" >
-    <widget class="CharTableView" name="m_charTable" >
-     <property name="minimumSize" >
-      <size>
-       <width>340</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>You can see a thumbnail if you press and hold down the right mouse button.
-The Insert key inserts a Glyph into the Selection below and the Delete key removes the last inserted one</string>
-     </property>
-     <property name="dragDropOverwriteMode" >
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode" >
-      <enum>QAbstractItemView::DragOnly</enum>
-     </property>
-     <property name="selectionMode" >
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="6" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Insert &Code:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>hexLineEdit</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="hexLineEdit" >
-       <property name="toolTip" >
-        <string>Type in a four digit Unicode value directly here</string>
-       </property>
-       <property name="maxLength" >
-        <number>32767</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="6" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Glyphs to Insert</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_1" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="sample" >
-        <property name="minimumSize" >
-         <size>
-          <width>460</width>
-          <height>48</height>
-         </size>
-        </property>
-        <property name="frameShape" >
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="lineWidth" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="6" >
-    <layout class="QHBoxLayout" name="_2" >
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="insertButton" >
-       <property name="toolTip" >
-        <string>Insert the characters at the cursor in the text</string>
-       </property>
-       <property name="text" >
-        <string>&Insert</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="deleteButton" >
-       <property name="toolTip" >
-        <string>Delete the current selection(s).</string>
-       </property>
-       <property name="text" >
-        <string>C&lear</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>FontCombo</class>
-   <extends>QComboBox</extends>
-   <header>ui/fontcombo.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>CharTableView</class>
-   <extends>QTableView</extends>
-   <header>chartableview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<ui version="4.0" >
+ <class>CharSelectEnhanced</class>
+ <widget class="QDialog" name="CharSelectEnhanced" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>506</width>
+    <height>492</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Enhanced Character Palette</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>&Font:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontSelector</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="FontCombo" name="fontSelector" />
+   </item>
+   <item row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>38</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>C&haracter Class:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>rangeSelector</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" >
+    <widget class="QComboBox" name="rangeSelector" />
+   </item>
+   <item row="0" column="5" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>66</width>
+       <height>28</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="6" >
+    <widget class="CharTableView" name="m_charTable" >
+     <property name="minimumSize" >
+      <size>
+       <width>340</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="toolTip" >
+      <string>You can see a thumbnail if you press and hold down the right mouse button.
+The Insert key inserts a Glyph into the Selection below and the Delete key removes the last inserted one</string>
+     </property>
+     <property name="dragDropOverwriteMode" >
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode" >
+      <enum>QAbstractItemView::DragOnly</enum>
+     </property>
+     <property name="selectionMode" >
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="6" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
+        <string>Insert &Code:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>hexLineEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="hexLineEdit" >
+       <property name="toolTip" >
+        <string>Type in a four digit Unicode value directly here</string>
+       </property>
+       <property name="maxLength" >
+        <number>32767</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="6" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Glyphs to Insert</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_1" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="sample" >
+        <property name="minimumSize" >
+         <size>
+          <width>460</width>
+          <height>48</height>
+         </size>
+        </property>
+        <property name="frameShape" >
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="lineWidth" >
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="6" >
+    <layout class="QHBoxLayout" name="_2" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="insertButton" >
+       <property name="toolTip" >
+        <string>Insert the characters at the cursor in the text</string>
+       </property>
+       <property name="text" >
+        <string>&Insert</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="deleteButton" >
+       <property name="toolTip" >
+        <string>Delete the current selection(s).</string>
+       </property>
+       <property name="text" >
+        <string>C&lear</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FontCombo</class>
+   <extends>QComboBox</extends>
+   <header>ui/fontcombo.h</header>
+  </customwidget>
+  <customwidget>
+   <class>CharTableView</class>
+   <extends>QTableView</extends>
+   <header>chartableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp	(original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp	Wed Nov 13 02:55:22 2019
@@ -6,6 +6,7 @@
 */
 #include "checkDocument.h"
 
+#include <QComboBox>
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -23,7 +24,6 @@
 #include "documentchecker.h"
 #include "pdfoptions.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
@@ -60,7 +60,7 @@
 	layout1->setSpacing(5);
 	textLabel1 = new QLabel( this );
 	layout1->addWidget( textLabel1 );
-	curCheckProfile = new ScComboBox( this );
+	curCheckProfile = new QComboBox( this );
 	layout1->addWidget( curCheckProfile );
 	checkDocumentLayout->addLayout( layout1 );
 

Modified: trunk/Scribus/scribus/ui/checkDocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/checkDocument.h
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.h	(original)
+++ trunk/Scribus/scribus/ui/checkDocument.h	Wed Nov 13 02:55:22 2019
@@ -26,8 +26,8 @@
 #include "scribusstructs.h"
 #include "ui/scrpalettebase.h"
 
+class QComboBox;
 class ScribusDoc;
-class ScComboBox;
 class ScPage;
 
 /*! \brief Preflight Verifier GUI (P.V.)
@@ -162,7 +162,7 @@
 
 	//! \brief Flag if is ignore button shown. true = hidden, false = shown.
 	bool noButton;
-	ScComboBox* curCheckProfile;
+	QComboBox* curCheckProfile;
 	QLabel* textLabel1;
 	QTreeWidget* reportDisplay;
 	QPushButton* ignoreErrors;

Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp	(original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp	Wed Nov 13 02:55:22 2019
@@ -38,7 +38,6 @@
 #include "colorlistbox.h"
 #include "commonstrings.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "scconfig.h"
 #include "scpaths.h"
 #include "scribusdoc.h"

Modified: trunk/Scribus/scribus/ui/cmykfwbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/cmykfwbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfwbase.ui	(original)
+++ trunk/Scribus/scribus/ui/cmykfwbase.ui	Wed Nov 13 02:55:22 2019
@@ -74,7 +74,7 @@
       </widget>
      </item>
      <item>
-      <widget class="ScComboBox" name="ComboBox1"/>
+      <widget class="QComboBox" name="ComboBox1"/>
      </item>
      <item>
       <widget class="QCheckBox" name="Separations">
@@ -587,11 +587,6 @@
    <header>ui/swatchcombo.h</header>
   </customwidget>
   <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
-  <customwidget>
    <class>ColorChart</class>
    <extends>QWidget</extends>
    <header>ui/colorchart.h</header>

Modified: trunk/Scribus/scribus/ui/colorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/colorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorcombo.cpp	Wed Nov 13 02:55:22 2019
@@ -5,9 +5,6 @@
 for which a new license (GPL+exception) is in place.
 */
 /*
- *  sccombobox.h
- *  ScribusCVS
- *
  *  Created by Andreas Vox on 01.10.05.
  *  Copyright 2005 under GPL2. All rights reserved.
  *

Modified: trunk/Scribus/scribus/ui/colorpalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/colorpalette.ui
==============================================================================
--- trunk/Scribus/scribus/ui/colorpalette.ui	(original)
+++ trunk/Scribus/scribus/ui/colorpalette.ui	Wed Nov 13 02:55:22 2019
@@ -201,7 +201,7 @@
              <widget class="QWidget" name="page_3">
               <layout class="QVBoxLayout" name="verticalLayout_4">
                <item>
-                <widget class="ScComboBox" name="namedGradient"/>
+                <widget class="QComboBox" name="namedGradient"/>
                </item>
                <item>
                 <widget class="GradientEditor" name="gradEdit">
@@ -889,7 +889,7 @@
             </layout>
            </item>
            <item>
-            <widget class="ScComboBox" name="namedGradientStroke"/>
+            <widget class="QComboBox" name="namedGradientStroke"/>
            </item>
            <item>
             <widget class="GradientEditor" name="gradEditStroke">
@@ -1062,11 +1062,6 @@
    <header>ui/scrspinbox.h</header>
   </customwidget>
   <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
-  <customwidget>
    <class>GradientEditor</class>
    <extends>QFrame</extends>
    <header>ui/gradienteditor.h</header>

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp	Wed Nov 13 02:55:22 2019
@@ -51,7 +51,6 @@
 #include "insertTable.h"
 #include "pageitem.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "sclistwidgetdelegate.h"
 #include "scpage.h"
 #include "scpainter.h"

Modified: trunk/Scribus/scribus/ui/cpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/cpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.h	(original)
+++ trunk/Scribus/scribus/ui/cpalette.h	Wed Nov 13 02:55:22 2019
@@ -40,7 +40,6 @@
 class PageItem;
 class ColorListBox;
 class ScrSpinBox;
-class ScComboBox;
 class ScPattern;
 class UndoManager;
 

Modified: trunk/Scribus/scribus/ui/customfdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/customfdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/customfdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/customfdialog.cpp	Wed Nov 13 02:55:22 2019
@@ -47,7 +47,6 @@
 #include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scfilewidget.h"
 #include "scimage.h"
 #include "scpreview.h"
@@ -408,7 +407,7 @@
 			optionLabel = new QLabel(this);
 			optionLabel->setText( tr("Encoding:"));
 			Layout1C->addWidget(optionLabel);
-			optionCombo = new ScComboBox(LayoutC);
+			optionCombo = new QComboBox(LayoutC);
 			optionCombo->setEditable(false);
 			QString tmp_txc[] = {"ISO 8859-1", "ISO 8859-2", "ISO 8859-3",
 								"ISO 8859-4", "ISO 8859-5", "ISO 8859-6",
@@ -454,7 +453,7 @@
 			optionLabel = new QLabel(this);
 			optionLabel->setText( tr("Import Option:"));
 			Layout1C->addWidget(optionLabel);
-			optionCombo = new ScComboBox(LayoutC);
+			optionCombo = new QComboBox(LayoutC);
 			optionCombo->setEditable(false);
 			optionCombo->addItem( tr("Keep original size"));
 			optionCombo->addItem( tr("Downscale to page size"));

Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp	Wed Nov 13 02:55:22 2019
@@ -29,7 +29,6 @@
 #include "curvewidget.h"
 #include "iconmanager.h"
 #include "scclocale.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"

Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp	(original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp	Wed Nov 13 02:55:22 2019
@@ -13,6 +13,7 @@
 #include <QTabWidget>
 #include <QLabel>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QPushButton>
 #include <QToolTip>
 #include <QPainter>
@@ -24,7 +25,6 @@
 
 #include "commonstrings.h"
 #include "pageitem.h"
-#include "sccombobox.h"
 #include "scpainter.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
@@ -111,7 +111,7 @@
 		textLabel1 = new QLabel( tab );
 		textLabel1->setText( tr( "Blend Mode:" ) );
 		layout1->addWidget( textLabel1 );
-		blendMode = new ScComboBox( tab );
+		blendMode = new QComboBox( tab );
 		blendMode->clear();
 		blendMode->addItem( tr("Normal"));
 		blendMode->addItem( tr("Darken"));

Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp	Wed Nov 13 02:55:22 2019
@@ -34,7 +34,6 @@
 #include "fontcombo.h"
 #include "iconmanager.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "scribusapp.h"
 #include "scribusdoc.h"
@@ -125,13 +124,13 @@
 		fontComboLayout->setColumnStretch(1,10);
 		col=1;
 	}
-	fontFamily = new ScComboBox(this);
+	fontFamily = new QComboBox(this);
 	fontFamily->setEditable(true);
 	fontFamily->setValidator(new FontComboValidator(fontFamily));
 	fontFamily->setInsertPolicy(QComboBox::NoInsert);
 	fontFamily->setItemDelegate(new FontFamilyDelegate(this));
 	fontComboLayout->addWidget(fontFamily,0,col);
-	fontStyle = new ScComboBox(this);
+	fontStyle = new QComboBox(this);
 	fontComboLayout->addWidget(fontStyle,1,col);
 	isForAnnotation = true;  // this is merely to ensure that the list is rebuilt
 	rebuildList(nullptr);

Modified: trunk/Scribus/scribus/ui/gtdialogs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/gtdialogs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gtdialogs.cpp	(original)
+++ trunk/Scribus/scribus/ui/gtdialogs.cpp	Wed Nov 13 02:55:22 2019
@@ -30,7 +30,6 @@
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "ui/gtfiledialog.h"
 
 #include <QFileInfo>
@@ -73,7 +72,7 @@
 	QBoxLayout* ilayout = new QHBoxLayout;
 	ilayout->setMargin(5);
 	ilayout->setSpacing(5);
-	importerCombo = new ScComboBox(this);
+	importerCombo = new QComboBox(this);
 	importerCombo->setMinimumSize(QSize(150, 0));
 	importerCombo->setToolTip( tr("Choose the importer to use"));
 	importerCombo->addItems(importers);

Modified: trunk/Scribus/scribus/ui/gtfiledialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/gtfiledialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/gtfiledialog.ui	(original)
+++ trunk/Scribus/scribus/ui/gtfiledialog.ui	Wed Nov 13 02:55:22 2019
@@ -1,90 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>gtFileDialog</class>
- <widget class="QDialog" name="gtFileDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>410</width>
-    <height>320</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Open</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
-    <widget class="ScFileWidget" name="fileWidget" native="true"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>&Importer:</string>
-     </property>
-     <property name="buddy">
-      <cstring>importerCombo</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="ScComboBox" name="importerCombo"/>
-   </item>
-   <item row="1" column="2">
-    <widget class="QCheckBox" name="textOnlyCheckBox">
-     <property name="text">
-      <string>Import &Text Only</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>&Encoding:</string>
-     </property>
-     <property name="buddy">
-      <cstring>encodingCombo</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="ScComboBox" name="encodingCombo"/>
-   </item>
-   <item row="2" column="2">
-    <widget class="QCheckBox" name="prefixStylesCheckBox">
-     <property name="text">
-      <string>Prefix Styles with Item Name</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScFileWidget</class>
-   <extends>QWidget</extends>
-   <header>ui/scfilewidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>gtFileDialog</class>
+ <widget class="QDialog" name="gtFileDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>410</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Open</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <widget class="ScFileWidget" name="fileWidget" native="true"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&Importer:</string>
+     </property>
+     <property name="buddy">
+      <cstring>importerCombo</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="importerCombo"/>
+   </item>
+   <item row="1" column="2">
+    <widget class="QCheckBox" name="textOnlyCheckBox">
+     <property name="text">
+      <string>Import &Text Only</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>&Encoding:</string>
+     </property>
+     <property name="buddy">
+      <cstring>encodingCombo</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="encodingCombo"/>
+   </item>
+   <item row="2" column="2">
+    <widget class="QCheckBox" name="prefixStylesCheckBox">
+     <property name="text">
+      <string>Prefix Styles with Item Name</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ScFileWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/scfilewidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp	(original)
+++ trunk/Scribus/scribus/ui/layers.cpp	Wed Nov 13 02:55:22 2019
@@ -17,6 +17,7 @@
 
 #include <QCheckBox>
 #include <QColorDialog>
+#include <QComboBox>
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -32,7 +33,6 @@
 #include <QVBoxLayout>
 
 #include "iconmanager.h"
-#include "sccombobox.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "selection.h"
@@ -54,7 +54,7 @@
 	layout1->setSpacing(2);
 	textLabel1 = new QLabel( this);
 	layout1->addWidget( textLabel1 );
-	blendMode = new ScComboBox( this);
+	blendMode = new QComboBox( this);
 	layout1->addWidget( blendMode );
 	textLabel2 = new QLabel( this);
 	textLabel2->setText( tr( "Opacity:" ) );

Modified: trunk/Scribus/scribus/ui/layers.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/layers.h
==============================================================================
--- trunk/Scribus/scribus/ui/layers.h	(original)
+++ trunk/Scribus/scribus/ui/layers.h	Wed Nov 13 02:55:22 2019
@@ -15,6 +15,7 @@
 #include "sclayer.h"
 
 class CheckBox;
+class QComboBox;
 class QEvent;
 class QHBoxLayout;
 class QHeaderView;
@@ -24,7 +25,6 @@
 class QTableWidgetItem;
 class QToolButton;
 class QVBoxLayout;
-class ScComboBox;
 class ScrSpinBox;
 class ScribusDoc;
 
@@ -76,7 +76,7 @@
 	QHBoxLayout* Layout1;
 	QHBoxLayout* layout1;
 	QLabel* textLabel1;
-	ScComboBox* blendMode;
+	QComboBox* blendMode;
 	QLabel* textLabel2;
 	ScrSpinBox* opacitySpinBox;
 	QHeaderView* Header;

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp	(original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp	Wed Nov 13 02:55:22 2019
@@ -11,13 +11,13 @@
 #include "mergedoc.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scconfig.h"
 #include "scpaths.h"
 #include "ui/customfdialog.h"
 
 #include <QApplication>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QCursor>
 #include <QDir>
 #include <QGridLayout>
@@ -65,7 +65,7 @@
 	if (masterPages)
 	{
 		importPageLabel->setText( tr("&Import Master Page") );
-		masterPageNameData = new ScComboBox(this);
+		masterPageNameData = new QComboBox(this);
 		masterPageNameData->setEnabled(false);
 		importPageLabel->setBuddy( masterPageNameData );
 		fromInfoLayout->addWidget( masterPageNameData, 1, 1, 1, 2);
@@ -85,7 +85,7 @@
 		createPageData = new QCheckBox( this );
 		createPageData->setText( tr("Create Page(s)"));
 		fromInfoLayout->addWidget( createPageData, 2, 0 );
-		importWhereData = new ScComboBox( this );
+		importWhereData = new QComboBox( this );
 		importWhereData->setEnabled(false);
 		importWhereData->addItem( tr("Before Page"));
 		importWhereData->addItem( tr("After Page"));

Modified: trunk/Scribus/scribus/ui/mergedoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/mergedoc.h
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.h	(original)
+++ trunk/Scribus/scribus/ui/mergedoc.h	Wed Nov 13 02:55:22 2019
@@ -9,16 +9,17 @@
 
 #include <QDialog>
 #include "scribusapi.h"
-class QPushButton;
+
+class QCheckBox;
+class QComboBox;
 class QLabel;
 class QLineEdit;
+class QPushButton;
 class QSpinBox;
 class QString;
-class QCheckBox;
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
-class ScComboBox;
 
 
 class SCRIBUS_API MergeDoc : public QDialog
@@ -48,8 +49,8 @@
 	QPushButton* cancelButton;
 	QPushButton* changeButton;
 	QCheckBox* createPageData;
-	ScComboBox* masterPageNameData;
-	ScComboBox* importWhereData;
+	QComboBox* masterPageNameData;
+	QComboBox* importWhereData;
 	QSpinBox* importWherePageData;
 	QVBoxLayout* dialogLayout;
 	QGridLayout* fromInfoLayout;

Modified: trunk/Scribus/scribus/ui/newfile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/newfile.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newfile.cpp	(original)
+++ trunk/Scribus/scribus/ui/newfile.cpp	Wed Nov 13 02:55:22 2019
@@ -13,6 +13,7 @@
 
 #include <QDir>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QFileDialog>
 #include <QFrame>
 #include <QGroupBox>
@@ -39,7 +40,6 @@
 #include "pagestructs.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "filedialogeventcatcher.h"
 #include "scrspinbox.h"
 #include "units.h"
@@ -291,7 +291,7 @@
 
 	layoutLabel1 = new QLabel( optionsGroupBox );
 	layoutLabel1->setText( tr( "First Page is:" ) );
-	firstPage = new ScComboBox( optionsGroupBox );
+	firstPage = new QComboBox( optionsGroupBox );
 	firstPage->clear();
 	selectItem(prefsManager.appPrefs.docSetupPrefs.pagePositioning);
 	optionsGroupBoxLayout->addRow( layoutLabel1, firstPage );

Modified: trunk/Scribus/scribus/ui/newfile.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/newfile.h
==============================================================================
--- trunk/Scribus/scribus/ui/newfile.h	(original)
+++ trunk/Scribus/scribus/ui/newfile.h	Wed Nov 13 02:55:22 2019
@@ -13,17 +13,20 @@
 #include <QDragLeaveEvent>
 #include <QDragMoveEvent>
 #include <QListWidget>
+
+class QCheckBox;
+class QComboBox;
 class QFormLayout;
 class QGridLayout;
 class QHBoxLayout;
 class QVBoxLayout;
 class QFrame;
+class QGroupBox;
+class QLabel;
 class QListWidgetItem;
-class QGroupBox;
+class QPushButton;
 class QSpinBox;
-class QLabel;
-class QCheckBox;
-class QPushButton;
+
 #include "scribusapi.h"
 #include "scribusstructs.h"
 
@@ -33,7 +36,6 @@
 class PrefsManager;
 class MarginWidget;
 class ScrSpinBox;
-class ScComboBox;
 class QFileDialog;
 
 class SCRIBUS_API PageLayoutsWidget : public QListWidget
@@ -75,7 +77,7 @@
 	QFrame* newDocFrame;
 	PageLayoutsWidget* layoutsView;
 	QLabel* layoutLabel1;
-	ScComboBox* firstPage;
+	QComboBox* firstPage;
 	QGroupBox* pageSizeGroupBox;
 	MarginWidget* marginGroup;
 	QGroupBox* optionsGroupBox;

Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp	Wed Nov 13 02:55:22 2019
@@ -6,13 +6,13 @@
 */
 #include "pagelayout.h"
 
+#include <QComboBox>
 #include <QVBoxLayout>
 #include <QListWidgetItem>
 #include <QLabel>
 #include <QPixmap>
 #include <QList>
 
-#include "sccombobox.h"
 #include "commonstrings.h"
 #include "iconmanager.h"
 
@@ -75,12 +75,12 @@
 	layoutGroupLayout->setSpacing( 5 );
 	layoutGroupLayout->setMargin( 10 );
 
-	layoutsCombo = new ScComboBox( this );
+	layoutsCombo = new QComboBox( this );
 	layoutGroupLayout->addWidget( layoutsCombo );
 
 	layoutLabel1 = new QLabel( this );
 	layoutGroupLayout->addWidget( layoutLabel1 );
-	firstPage = new ScComboBox( this );
+	firstPage = new QComboBox( this );
 	layoutGroupLayout->addWidget( firstPage );
 
 	languageChange();
@@ -103,12 +103,12 @@
 	}
 	else
 	{
-		layoutsCombo = new ScComboBox( this );
+		layoutsCombo = new QComboBox( this );
 		layoutGroupLayout->addWidget( layoutsCombo );
 	}
 	layoutLabel1 = new QLabel( this );
 	layoutGroupLayout->addWidget( layoutLabel1 );
-	firstPage = new ScComboBox( this );
+	firstPage = new QComboBox( this );
 	layoutGroupLayout->addWidget( firstPage );
 	languageChange();
 // 	We need change combos width setMaximumWidth(minimumSizeHint().width());

Modified: trunk/Scribus/scribus/ui/pagelayout.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/pagelayout.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.h	(original)
+++ trunk/Scribus/scribus/ui/pagelayout.h	Wed Nov 13 02:55:22 2019
@@ -10,14 +10,14 @@
 #include <QGroupBox>
 #include <QListWidget>
 #include <QList>
+
+class QComboBox;
+class QLabel;
+class QListWidgetItem;
 class QVBoxLayout;
-class QListWidgetItem;
-class QLabel;
 
 #include "scribusapi.h"
 #include "scribusstructs.h"
-class ScComboBox;
-
 
 /*! \brief A widget containing pages layout schema */
 class SCRIBUS_API PageListWidget : public QListWidget
@@ -47,9 +47,9 @@
 	void selectFirstP(int nr);
 	void selectItem(uint nr);
 	PageListWidget* layoutsView;
-	ScComboBox* layoutsCombo;
+	QComboBox* layoutsCombo;
 	QLabel* layoutLabel1;
-	ScComboBox* firstPage;
+	QComboBox* firstPage;
 	QList<PageSet> pageSets;
 
 public slots:

Modified: trunk/Scribus/scribus/ui/pagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/pagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette.cpp	Wed Nov 13 02:55:22 2019
@@ -19,7 +19,6 @@
 #include "pagepalette_masterpages.h"
 #include "pagepalette_pages.h"
 #include "pagepalette_widgets.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"

Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp	Wed Nov 13 02:55:22 2019
@@ -24,7 +24,6 @@
 #include "pagelayout.h"
 #include "pagepalette_pages.h"
 #include "pagepalette_widgets.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"

Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp	Wed Nov 13 02:55:22 2019
@@ -22,7 +22,6 @@
 #include "iconmanager.h"
 #include "pagelayout.h"
 #include "pagepalette_widgets.h"
-#include "sccombobox.h"
 #include "scpage.h"
 #include "ui/scmessagebox.h"
 

Modified: trunk/Scribus/scribus/ui/prefs_fonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/prefs_fonts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_fonts.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_fonts.cpp	Wed Nov 13 02:55:22 2019
@@ -9,6 +9,7 @@
 #include "prefsstructs.h"
 
 
+#include <QComboBox>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QTreeWidget>
@@ -25,7 +26,6 @@
 
 #include "prefscontext.h"
 #include "prefsfile.h"
-#include "sccombobox.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
 #include "prefsmanager.h"
@@ -200,7 +200,7 @@
 		QTableWidgetItem* tWidgetItem = new QTableWidgetItem(itfsu.key());
 		tWidgetItem->setFlags(tWidgetItem->flags() & ~Qt::ItemIsEditable);
 		fontSubstitutionsTableWidget->setItem(a, 0, tWidgetItem);
-		ScComboBox *item = new ScComboBox(fontSubstitutionsTableWidget);
+		auto item = new QComboBox(fontSubstitutionsTableWidget);
 		fontSubstitutionsTableWidget->setCellWidget(a, 1, item);
 		item->setEditable(false);
 		item->addItem(itfsu.value());

Modified: trunk/Scribus/scribus/ui/prefs_fonts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/prefs_fonts.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_fonts.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_fonts.h	Wed Nov 13 02:55:22 2019
@@ -1,61 +1,61 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#ifndef PREFS_FONTS_H
-#define PREFS_FONTS_H
-
-#include <QListWidgetItem>
-#include <QPushButton>
-
-#include "ui_prefs_fontsbase.h"
-#include "prefs_pane.h"
-#include "scribusapi.h"
-
-class ScribusDoc;
-class ScComboBox;
-
-class SCRIBUS_API Prefs_Fonts : public Prefs_Pane, Ui::Prefs_Fonts
-{
-	Q_OBJECT
-
-	public:
-		Prefs_Fonts(QWidget* parent, ScribusDoc* doc=nullptr);
-		~Prefs_Fonts();
-
-		void restoreDefaults(struct ApplicationPrefs *prefsData) override;
-		void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const override;
-		virtual void changeUnit(struct ApplicationPrefs *prefsData) const;
-
-	public slots:
-		void languageChange();
-		void ReplaceSel();
-		void DelEntry();
-		void SelectPath(QListWidgetItem *c);
-		void AddPath();
-		void ChangePath();
-		void DelPath();
-
-	protected:
-		void readPaths();
-		void writePaths() const;
-
-		void updateFontList();
-		void updateRejectedFontList();
-
-		QMap<QString,QString> RList;
-		QList<ScComboBox*> FlagsRepl;
-		//! List of font names of allowed fonts for substitutions
-		QStringList UsedFonts;
-		QString CurrentPath;
-		ScribusDoc* m_doc;
-
-		SCFonts m_availFonts; //! Fonts that Scribus has available to it, or the current document has available to use
-		bool m_askBeforeSubstitute; //! Request that the user confirms a font substitution or not
-		QMap<QString,QString> m_GFontSub;
-};
-
-#endif // PREFS_FONTS_H
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_FONTS_H
+#define PREFS_FONTS_H
+
+#include <QListWidgetItem>
+#include <QPushButton>
+
+#include "ui_prefs_fontsbase.h"
+#include "prefs_pane.h"
+#include "scribusapi.h"
+
+class QComboBox;
+class ScribusDoc;
+
+class SCRIBUS_API Prefs_Fonts : public Prefs_Pane, Ui::Prefs_Fonts
+{
+	Q_OBJECT
+
+	public:
+		Prefs_Fonts(QWidget* parent, ScribusDoc* doc=nullptr);
+		~Prefs_Fonts();
+
+		void restoreDefaults(struct ApplicationPrefs *prefsData) override;
+		void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const override;
+		virtual void changeUnit(struct ApplicationPrefs *prefsData) const;
+
+	public slots:
+		void languageChange();
+		void ReplaceSel();
+		void DelEntry();
+		void SelectPath(QListWidgetItem *c);
+		void AddPath();
+		void ChangePath();
+		void DelPath();
+
+	protected:
+		void readPaths();
+		void writePaths() const;
+
+		void updateFontList();
+		void updateRejectedFontList();
+
+		QMap<QString,QString> RList;
+		QList<QComboBox*> FlagsRepl;
+		//! List of font names of allowed fonts for substitutions
+		QStringList UsedFonts;
+		QString CurrentPath;
+		ScribusDoc* m_doc;
+
+		SCFonts m_availFonts; //! Fonts that Scribus has available to it, or the current document has available to use
+		bool m_askBeforeSubstitute; //! Request that the user confirms a font substitution or not
+		QMap<QString,QString> m_GFontSub;
+};
+
+#endif // PREFS_FONTS_H

Modified: trunk/Scribus/scribus/ui/propertiespalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette.h	Wed Nov 13 02:55:22 2019
@@ -39,7 +39,6 @@
 class PropertiesPalette_Shape;
 class PropertiesPalette_Table;
 class PropertiesPalette_XYZ;
-class ScComboBox;
 class ScribusDoc;
 class ScribusMainWindow;
 class Selection;

Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp	Wed Nov 13 02:55:22 2019
@@ -50,7 +50,6 @@
 #include "appmodes.h"
 #include "commonstrings.h"
 #include "iconmanager.h"
-#include "sccombobox.h"
 #include "scraction.h"
 #include "scribuscore.h"
 #include "scribusview.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp	Wed Nov 13 02:55:22 2019
@@ -18,7 +18,6 @@
 #include "pageitem.h"
 #include "propertiespalette_utils.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "scribuscore.h"
 #include "scraction.h"
 #include "scribusview.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_image.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.h	Wed Nov 13 02:55:22 2019
@@ -16,7 +16,6 @@
 #include "scguardedptr.h"
 
 class PageItem;
-class ScComboBox;
 class ScribusDoc;
 class ScribusMainWindow;
 class Selection;

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp	Wed Nov 13 02:55:22 2019
@@ -20,7 +20,6 @@
 #include "pageitem.h"
 #include "pageitem_textframe.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "scraction.h"
 #include "scribuscore.h"
 #include "selection.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_line.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.h	Wed Nov 13 02:55:22 2019
@@ -16,7 +16,6 @@
 class ArrowChooser;
 class DashEditor;
 class PageItem;
-class ScComboBox;
 class ScribusDoc;
 class ScribusMainWindow;
 

Modified: trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_linebase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_linebase.ui	Wed Nov 13 02:55:22 2019
@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item row="0" column="2" colspan="2">
-    <widget class="ScComboBox" name="lineMode"/>
+    <widget class="QComboBox" name="lineMode"/>
    </item>
    <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="lineTypeLabel">
@@ -123,7 +123,7 @@
     </widget>
    </item>
    <item row="7" column="2" colspan="2">
-    <widget class="ScComboBox" name="lineJoinStyle"/>
+    <widget class="QComboBox" name="lineJoinStyle"/>
    </item>
    <item row="8" column="0">
     <widget class="QLabel" name="lineEndLabel">
@@ -133,7 +133,7 @@
     </widget>
    </item>
    <item row="8" column="2" colspan="2">
-    <widget class="ScComboBox" name="lineEndStyle"/>
+    <widget class="QComboBox" name="lineEndStyle"/>
    </item>
    <item row="9" column="0" colspan="4">
     <widget class="QListWidget" name="lineStyles"/>
@@ -145,11 +145,6 @@
    <class>ScrSpinBox</class>
    <extends>QDoubleSpinBox</extends>
    <header>ui/scrspinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
   </customwidget>
   <customwidget>
    <class>LineCombo</class>

Modified: trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui	Wed Nov 13 02:55:22 2019
@@ -1,251 +1,246 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PropertiesPalette_ShadowBase</class>
- <widget class="QWidget" name="PropertiesPalette_ShadowBase">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>233</width>
-    <height>232</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QCheckBox" name="hasSoftShadow">
-     <property name="text">
-      <string>Object has a drop shadow</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>X-Offset:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowXOffset</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="ScrSpinBox" name="softShadowXOffset"/>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Y-Offset:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowYOffset</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="ScrSpinBox" name="softShadowYOffset"/>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Color:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowColor</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="ColorCombo" name="softShadowColor"/>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Shade:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowShade</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Opacity:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowOpacity</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="ScrSpinBox" name="softShadowOpacity">
-       <property name="suffix">
-        <string> %</string>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="value">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Blendmode:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowBlendMode</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="ScComboBox" name="softShadowBlendMode">
-       <item>
-        <property name="text">
-         <string>Normal</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Darken</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Lighten</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Multiply</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Screen</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Overlay</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Hard Light</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Soft Light</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Difference</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Exclusion</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Color Dodge</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Color Burn</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Hue</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Saturation</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Color</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Luminosity</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Blur:</string>
-       </property>
-       <property name="buddy">
-        <cstring>softShadowBlurRadius</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="ScrSpinBox" name="softShadowBlurRadius">
-       <property name="suffix">
-        <string> px</string>
-       </property>
-       <property name="maximum">
-        <number>20</number>
-       </property>
-       <property name="value">
-        <number>5</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="ScrSpinBox" name="softShadowShade">
-       <property name="suffix">
-        <string> %</string>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="value">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ColorCombo</class>
-   <extends>QComboBox</extends>
-   <header>ui/colorcombo.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PropertiesPalette_ShadowBase</class>
+ <widget class="QWidget" name="PropertiesPalette_ShadowBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>233</width>
+    <height>232</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QCheckBox" name="hasSoftShadow">
+     <property name="text">
+      <string>Object has a drop shadow</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>X-Offset:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowXOffset</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="ScrSpinBox" name="softShadowXOffset"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Y-Offset:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowYOffset</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="ScrSpinBox" name="softShadowYOffset"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Color:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowColor</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="ColorCombo" name="softShadowColor"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Shade:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowShade</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Opacity:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowOpacity</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="ScrSpinBox" name="softShadowOpacity">
+       <property name="suffix">
+        <string> %</string>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="value">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Blendmode:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowBlendMode</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QComboBox" name="softShadowBlendMode">
+       <item>
+        <property name="text">
+         <string>Normal</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Darken</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Lighten</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Multiply</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Screen</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Overlay</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Hard Light</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Soft Light</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Difference</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Exclusion</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Color Dodge</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Color Burn</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Hue</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Saturation</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Color</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Luminosity</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Blur:</string>
+       </property>
+       <property name="buddy">
+        <cstring>softShadowBlurRadius</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="ScrSpinBox" name="softShadowBlurRadius">
+       <property name="suffix">
+        <string> px</string>
+       </property>
+       <property name="maximum">
+        <number>20</number>
+       </property>
+       <property name="value">
+        <number>5</number>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="ScrSpinBox" name="softShadowShade">
+       <property name="suffix">
+        <string> %</string>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="value">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ScrSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>ui/scrspinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ColorCombo</class>
+   <extends>QComboBox</extends>
+   <header>ui/colorcombo.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp	Wed Nov 13 02:55:22 2019
@@ -21,7 +21,6 @@
 #include "pageitem_textframe.h"
 #include "polyprops.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "scraction.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Wed Nov 13 02:55:22 2019
@@ -34,7 +34,6 @@
 #include "propertywidget_pareffect.h"
 #include "propertywidget_pathtext.h"
 #include "propertywidget_textcolor.h"
-#include "sccombobox.h"
 #include "scfonts.h"
 #include "scraction.h"
 #include "scribuscore.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_text.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.h	Wed Nov 13 02:55:22 2019
@@ -27,7 +27,6 @@
 class PropertyWidget_Orphans;
 class PropertyWidget_PathText;
 class PropertyWidget_TextColor;
-class ScComboBox;
 class ScribusDoc;
 class ScribusMainWindow;
 class Selection;

Modified: trunk/Scribus/scribus/ui/propertiespalette_utils.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_utils.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_utils.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_utils.cpp	Wed Nov 13 02:55:22 2019
@@ -29,7 +29,6 @@
 #include <cmath>
 #include "commonstrings.h"
 #include "sccolorengine.h"
-#include "sccombobox.h"
 #include "scraction.h"
 #include "scribusdoc.h"
 #include "selection.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp	Wed Nov 13 02:55:22 2019
@@ -28,7 +28,6 @@
 #include "pageitem_spiral.h"
 #include "pageitem_textframe.h"
 #include "propertiespalette_utils.h"
-#include "sccombobox.h"
 
 #include "scribuscore.h"
 #include "scraction.h"

Modified: trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distancebase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_distancebase.ui	Wed Nov 13 02:55:22 2019
@@ -82,7 +82,7 @@
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="ScComboBox" name="columnGapLabel">
+    <widget class="QComboBox" name="columnGapLabel">
      <property name="toolTip">
       <string>Switches between Gap or Column width</string>
      </property>
@@ -185,11 +185,6 @@
    <extends>QDoubleSpinBox</extends>
    <header>ui/scrspinbox.h</header>
   </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

Modified: trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui	Wed Nov 13 02:55:22 2019
@@ -34,7 +34,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="ScComboBox" name="pathTextType"/>
+    <widget class="QComboBox" name="pathTextType"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="startOffsetLabel">
@@ -78,11 +78,6 @@
    <extends>QDoubleSpinBox</extends>
    <header>ui/scrspinbox.h</header>
   </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

Modified: trunk/Scribus/scribus/ui/proptree.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/proptree.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/proptree.cpp	(original)
+++ trunk/Scribus/scribus/ui/proptree.cpp	Wed Nov 13 02:55:22 2019
@@ -1,484 +1,484 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-/***************************************************************************
-						  proptree.cpp  -  description
-							 -------------------
-	begin                : Mon Feb 3 2014
-	copyright            : (C) 2008 by Franz Schmid
-	email                : Franz.Schmid at altmuehlnet.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <QAbstractItemModel>
-#include <QStyle>
-#include <QPainter>
-#include <QHeaderView>
-#include <QLayout>
-
-#include "proptree.h"
-
-#include "colorcombo.h"
-#include "scrspinbox.h"
-#include "sccombobox.h"
-#include <QCheckBox>
-#include <QApplication>
-#include "units.h"
-#include "util.h"
-
-PropTreeItemDelegate::PropTreeItemDelegate(PropTreeWidget *parent) : QItemDelegate(parent),
-	m_parent(parent)
-{
-}
-
-void PropTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-	QStyleOptionViewItem itemOpts = option;
-	itemOpts.state &= ~QStyle::State_HasFocus;
-	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
-	if ((index.column() == 1) && (item->m_type == PropTreeItem::CheckBox) && !(option.state & QStyle::State_Editing))
-	{
-		QStyleOptionButton buttonOption;
-		buttonOption.rect = option.rect;
-		buttonOption.palette = option.palette;
-		if (index.model()->data(index, Qt::UserRole).toBool())
-			buttonOption.state |= QStyle::State_On;
-		else
-			buttonOption.state |= QStyle::State_Off;
-		QApplication::style()->drawControl(QStyle::CE_CheckBox, &buttonOption, painter);
-	}
-	else if (index.column() == 0)
-	{
-		int i = 9; // ### hardcoded in qcommonstyle.cpp
-		QRect r = option.rect;
-		if (item && (item->childCount() > 0))
-		{
-			painter->save();
-			if (option.state & QStyle::State_Enabled)
-				painter->setBrush(Qt::black);
-			else
-				painter->setBrush(Qt::gray);
-			painter->setPen(Qt::NoPen);
-			QRect rect = QRect(r.left()+6, r.top()+6, r.height()-12, r.height()-12);
-			QPolygon pa(3);
-			if (item->isExpanded())
-			{
-				pa.setPoint(0, rect.left(), rect.top());
-				pa.setPoint(1, rect.right(), rect.top());
-				pa.setPoint(2, rect.center().x(), rect.bottom());
-			}
-			else
-			{
-				pa.setPoint(0, rect.left(), rect.top());
-				pa.setPoint(1, rect.left(), rect.bottom());
-				pa.setPoint(2, rect.right(), rect.center().y());
-			}
-			painter->setRenderHint(QPainter::Antialiasing, true);
-			painter->drawPolygon(pa);
-			painter->restore();
-		}
-		painter->save();
-		if (item && (item->QTreeWidgetItem::parent()))
-			i = 15;
-		if (item && (item->treeWidget()->currentItem() == item))
-		{
-			itemOpts.font.setBold(true);
-			painter->setFont(itemOpts.font);
-		}
-		QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - (i * 2), r.height());
-	//	QString text = itemOpts.fontMetrics.elidedText(index.model()->data(index, Qt::DisplayRole).toString(), Qt::ElideMiddle, itemOpts.rect.width(), Qt::TextShowMnemonic);
-		QString text = index.model()->data(index, Qt::DisplayRole).toString();
-		QApplication::style()->drawItemText(painter, textrect, Qt::AlignVCenter | Qt::AlignLeft | Qt::TextShowMnemonic, itemOpts.palette, (itemOpts.state & QStyle::State_Enabled), text, QPalette::Text);
-		painter->restore();
-	}
-	else
-		QItemDelegate::paint(painter, itemOpts, index);
-	QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option));
-	painter->save();
-	painter->setPen(QPen(color));
-	painter->drawLine(option.rect.x(), option.rect.top(), option.rect.x(), option.rect.bottom());
-	painter->restore();
-}
-
-QWidget *PropTreeItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &index) const
-{
-	QWidget *edito = nullptr;
-	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
-	if (!item)
-		return nullptr;
-
-	if (item->m_type == PropTreeItem::IntSpinBox)
-	{
-		ScrSpinBox *editor = new ScrSpinBox(parent, item->m_unit);
-		int val = index.model()->data(index, Qt::UserRole).toInt();
-		editor->setValues(item->m_min, item->m_max, 0, val);
-		edito = editor;
-		edito->setAutoFillBackground(true);
-		connect(editor, SIGNAL(valueChanged(double)), this, SLOT(valueHasChanged()));
-		connect(editor, SIGNAL(valueChanged(double)), item, SIGNAL(valueChanged(double)));
-	}
-	else if (item->m_type == PropTreeItem::DoubleSpinBox)
-	{
-		ScrSpinBox *editor = new ScrSpinBox(parent, item->m_unit);
-		double val = index.model()->data(index, Qt::UserRole).toDouble();
-		editor->setValues(item->m_fmin, item->m_fmax, item->m_decimals, val);
-		edito = editor;
-		edito->setAutoFillBackground(true);
-		connect(editor, SIGNAL(valueChanged(double)), this, SLOT(valueHasChanged()));
-		connect(editor, SIGNAL(valueChanged(double)), item, SIGNAL(valueChanged(double)));
-	}
-	else if (item->m_type == PropTreeItem::ComboBox)
-	{
-		ScComboBox *editor = new ScComboBox(parent);
-		editor->addItems(index.model()->data(index, Qt::UserRole+1).toStringList());
-		edito = editor;
-		edito->setAutoFillBackground(true);
-		connect(editor, SIGNAL(activated(int)), this, SLOT(valueHasChanged()));
-		connect(editor, SIGNAL(activated(int)), item, SIGNAL(valueChanged(int)));
-		connect(editor, SIGNAL(activated(QString)), item, SIGNAL(valueChanged(QString)));
-	}
-	else if (item->m_type == PropTreeItem::CheckBox)
-	{
-		QCheckBox *editor = new QCheckBox(parent);
-		edito = editor;
-		edito->setAutoFillBackground(true);
-		connect(editor, SIGNAL(clicked(bool)), this, SLOT(valueHasChanged()));
-		connect(editor, SIGNAL(clicked(bool)), item, SIGNAL(valueChanged(bool)));
-	}
-	else if (item->m_type == PropTreeItem::ColorComboBox)
-	{
-		ColorCombo *editor = new ColorCombo(ColorCombo::fancyPixmaps, parent);
-		editor->setColors(item->m_colors, false);
-		edito = editor;
-		edito->setAutoFillBackground(true);
-		connect(editor, SIGNAL(activated(int)), this, SLOT(valueHasChanged()));
-		connect(editor, SIGNAL(activated(int)), item, SIGNAL(valueChanged(int)));
-		connect(editor, SIGNAL(activated(QString)), item, SIGNAL(valueChanged(QString)));
-	}
-	else
-		edito = nullptr;
-	m_edit = edito;
-	if (item && m_edit)
-		emit item->editStarted();
-	return edito;
-}
-
-void PropTreeItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
-{
-	PropTreeItem* item = (PropTreeItem*)m_parent->indexToItem(index);
-	if (item->m_type == PropTreeItem::IntSpinBox)
-	{
-		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
-		spinBox->setValue(index.model()->data(index, Qt::UserRole).toInt());
-	}
-	else if (item->m_type == PropTreeItem::DoubleSpinBox)
-	{
-		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
-		spinBox->setValue(index.model()->data(index, Qt::UserRole).toDouble());
-	}
-	else if (item->m_type == PropTreeItem::ComboBox)
-	{
-		ScComboBox *comboBox = static_cast<ScComboBox*>(editor);
-		setCurrentComboItem(comboBox ,index.model()->data(index, Qt::UserRole).toString());
-	}
-	else if (item->m_type == PropTreeItem::CheckBox)
-	{
-		QCheckBox *checkBox = static_cast<QCheckBox*>(editor);
-		checkBox->setChecked(index.model()->data(index, Qt::UserRole).toBool());
-	}
-	else if (item->m_type == PropTreeItem::ColorComboBox)
-	{
-		ColorCombo *comboBox = static_cast<ColorCombo*>(editor);
-		setCurrentComboItem(comboBox ,index.model()->data(index, Qt::UserRole).toString());
-	}
-}
-
-void PropTreeItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,  const QModelIndex &index) const
-{
-	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
-	if (item->m_type == PropTreeItem::IntSpinBox)
-	{
-		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
-		spinBox->interpretText(); // #12684: interpretText() is explicitly called in Qt spinboxdelegate example
-		QString value = QString("%1 %2").arg(qRound(spinBox->value())).arg(unitGetSuffixFromIndex(item->m_unit));
-		int val = qRound(spinBox->value());
-		model->setData(index, val, Qt::UserRole);
-		model->setData(index, value, Qt::DisplayRole);
-	}
-	else if (item->m_type == PropTreeItem::DoubleSpinBox)
-	{
-		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
-		spinBox->interpretText(); // #12684: interpretText() is explicitly called in Qt spinboxdelegate example
-		QString value = QString("%1 %2").arg(spinBox->value(), 0, 'f', item->m_decimals).arg(unitGetSuffixFromIndex(item->m_unit));
-		double val = spinBox->value();
-		model->setData(index, val, Qt::UserRole);
-		model->setData(index, value, Qt::DisplayRole);
-	}
-	else if (item->m_type == PropTreeItem::ComboBox)
-	{
-		ScComboBox *comboBox = static_cast<ScComboBox*>(editor);
-		QString value = comboBox->currentText();
-		int val = comboBox->currentIndex();
-		item->m_comboIndex = val;
-		model->setData(index, value, Qt::UserRole);
-		model->setData(index, value, Qt::DisplayRole);
-	}
-	else if (item->m_type == PropTreeItem::CheckBox)
-	{
-		QCheckBox *checkBox = static_cast<QCheckBox*>(editor);
-		bool value = checkBox->isChecked();
-		model->setData(index, value, Qt::UserRole);
-		model->setData(index, value, Qt::DisplayRole);
-	}
-	else if (item->m_type == PropTreeItem::ColorComboBox)
-	{
-		ColorCombo *comboBox = static_cast<ColorCombo*>(editor);
-		QString value = comboBox->currentText();
-		int val = comboBox->currentIndex();
-		item->m_comboIndex = val;
-		model->setData(index, value, Qt::UserRole);
-		model->setData(index, value, Qt::DisplayRole);
-	}
-}
-
-void PropTreeItemDelegate::destroyEditor(QWidget * editor, const QModelIndex & index) const
-{
-	m_edit = nullptr;
-	PropTreeItem* item = (PropTreeItem*)m_parent->indexToItem(index);
-	if (item)
-		emit item->editFinished();
-	QAbstractItemDelegate::destroyEditor(editor, index);
-}
-
-void PropTreeItemDelegate::valueHasChanged()
-{
-	emit commitData(m_edit);
-}
-
-void PropTreeItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
-{
-	editor->setGeometry(option.rect);
-}
-
-QSize PropTreeItemDelegate::sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const
-{
-	QSize sz = QItemDelegate::sizeHint(opt, index) + QSize(2, 6);
-	return sz;
-}
-
-PropTreeItem::PropTreeItem(QTreeWidget *parent, int typ, const QString& title) : QObject(parent), QTreeWidgetItem(parent),
-	m_type(typ),
-	m_unit(0),
-	m_decimals(0),
-	m_fmin(0.0),
-	m_fmax(0.0),
-	m_min(0),
-	m_max(0),
-	m_comboIndex(-1)
-{
-	setText(0, title);
-	setData(0, Qt::UserRole, 0);
-	setData(1, Qt::UserRole, 0);
-	if (typ > 0)
-		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-	else
-		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-}
-
-PropTreeItem::PropTreeItem(PropTreeItem *parent, int typ, const QString& title) : QObject(parent), QTreeWidgetItem(parent)
-{
-	setText(0, title);
-	m_type = typ;
-	m_comboIndex = -1;
-	m_unit = 0;
-	m_decimals = 0;
-	setData(0, Qt::UserRole, 0);
-	setData(1, Qt::UserRole, 0);
-	if (typ > 0)
-		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-	else
-		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-}
-
-int PropTreeItem::valueAsInt()
-{
-	int val = 0;
-	val = data(1, Qt::UserRole).toInt();
-	if (m_type == ComboBox)
-	{
-		QStringList vals = data(1, Qt::UserRole + 1).toStringList();
-		if (m_comboIndex < vals.count())
-			val = m_comboIndex;
-	}
-	return val;
-}
-
-double PropTreeItem::valueAsDouble()
-{
-	return data(1, Qt::UserRole).toDouble();
-}
-
-bool PropTreeItem::valueAsBool()
-{
-	return data(1, Qt::UserRole).toBool();
-}
-
-QString PropTreeItem::valueAsString()
-{
-	return data(1, Qt::UserRole).toString();
-}
-
-void PropTreeItem::setIntValue(int value)
-{
-	if (m_type == ComboBox)
-	{
-		m_comboIndex = value;
-		QStringList vals = data(1, Qt::UserRole + 1).toStringList();
-		if (value < vals.count())
-		{
-			setData(1, Qt::UserRole, vals[value]);
-			setData(1, Qt::DisplayRole, vals[value]);
-		}
-	}
-	else
-	{
-		setData(1, Qt::UserRole, value);
-		setData(1, Qt::DisplayRole, QString("%1 %2").arg(value).arg(unitGetSuffixFromIndex(m_unit)));
-	}
-}
-
-void PropTreeItem::setDoubleValue(double value)
-{
-	setData(1, Qt::UserRole, value);
-	setData(1, Qt::DisplayRole, QString("%1 %2").arg(value, 0, 'f', m_decimals).arg(unitGetSuffixFromIndex(m_unit)));
-}
-
-void PropTreeItem::setBoolValue(bool value)
-{
-	setData(1, Qt::UserRole, value);
-	setData(1, Qt::DisplayRole, value);
-}
-
-void PropTreeItem::setStringValue(const QString& value)
-{
-	setData(1, Qt::UserRole, value);
-	setData(1, Qt::DisplayRole, value);
-}
-
-void PropTreeItem::setUnitValue(int unit)
-{
-	int oldUnit = m_unit;
-	m_unit = unit;
-	if (m_type == DoubleSpinBox)
-	{
-		double oldUnitRatio = unitGetRatioFromIndex(oldUnit);
-		double newUnitRatio = unitGetRatioFromIndex(unit);
-		double oldVal = data(1, Qt::UserRole).toDouble() / oldUnitRatio;
-		setDoubleValue(oldVal * newUnitRatio);
-	}
-	else
-		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toString(), unitGetSuffixFromIndex(m_unit)));
-}
-
-void PropTreeItem::setDecimalsValue(int unit)
-{
-	m_decimals = unit;
-	if (m_type == DoubleSpinBox)
-		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toDouble(), 0, 'f', unit).arg(unitGetSuffixFromIndex(m_unit)));
-	else
-		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toString(), unitGetSuffixFromIndex(m_unit)));
-}
-
-void PropTreeItem::setComboStrings(const QStringList& value)
-{
-	setData(1, Qt::UserRole + 1, value);
-}
-
-void PropTreeItem::setMinMaxValues(int min, int max)
-{
-	m_min = min;
-	m_max = max;
-}
-
-void PropTreeItem::setMinMaxValues(double min, double max)
-{
-	m_fmin = min;
-	m_fmax = max;
-}
-
-void PropTreeItem::setColorList(const ColorList& colors)
-{
-	m_colors = colors;
-}
-
-PropTreeWidget::PropTreeWidget(QWidget* pa) : QTreeWidget(pa)
-{
-	setFocusPolicy(Qt::NoFocus);
-	setColumnCount(2);
-	delegate = new PropTreeItemDelegate(this);
-	setItemDelegate(delegate);
-	setRootIsDecorated(false);
-	setIndentation(0);
-	header()->hide();
-	header()->setSectionResizeMode(QHeaderView::Stretch);
-	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::CurrentChanged | QAbstractItemView::SelectedClicked);
-	connect(this, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(handleMousePress(QTreeWidgetItem*)));
-}
-
-void PropTreeWidget::handleMousePress(QTreeWidgetItem *item)
-{
-	if (item == nullptr)
-		return;
-	if (item->parent() == nullptr)
-	{
-		if (!(item->flags() & Qt::ItemIsEditable))
-			item->setExpanded(!item->isExpanded());
-	}
-}
-
-void PropTreeWidget::mousePressEvent(QMouseEvent *event)
-{
-	QTreeWidgetItem *item = itemAt(event->pos());
-	if (!item)
-	{
-		QTreeWidget::mousePressEvent(event);
-		return;
-	}
-	if (!(item->flags() & Qt::ItemIsEditable))
-	{
-		QTreeWidget::mousePressEvent(event);
-		return;
-	}
-	if ((event->button() == Qt::LeftButton) && (header()->logicalIndexAt(event->pos().x()) == 1))
-		QTreeWidget::mousePressEvent(event);
-	else
-		event->ignore();
-}
-
-PropTreeItem* PropTreeWidget::indexToItem(const QModelIndex &index)
-{
-	return dynamic_cast<PropTreeItem*>(itemFromIndex(index));
-}
-
-void PropTreeWidget::drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-	QStyleOptionViewItem opt = option;
-	QTreeWidget::drawRow(painter, opt, index);
-	QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &opt));
-	painter->save();
-	painter->setPen(QPen(color));
-	painter->drawLine(opt.rect.x(), opt.rect.bottom(), opt.rect.right(), opt.rect.bottom());
-	painter->restore();
-}
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+/***************************************************************************
+						  proptree.cpp  -  description
+							 -------------------
+	begin                : Mon Feb 3 2014
+	copyright            : (C) 2008 by Franz Schmid
+	email                : Franz.Schmid at altmuehlnet.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <QAbstractItemModel>
+#include <QComboBox>
+#include <QStyle>
+#include <QPainter>
+#include <QHeaderView>
+#include <QLayout>
+
+#include "proptree.h"
+
+#include "colorcombo.h"
+#include "scrspinbox.h"
+#include <QCheckBox>
+#include <QApplication>
+#include "units.h"
+#include "util.h"
+
+PropTreeItemDelegate::PropTreeItemDelegate(PropTreeWidget *parent) : QItemDelegate(parent),
+	m_parent(parent)
+{
+}
+
+void PropTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+	QStyleOptionViewItem itemOpts = option;
+	itemOpts.state &= ~QStyle::State_HasFocus;
+	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
+	if ((index.column() == 1) && (item->m_type == PropTreeItem::CheckBox) && !(option.state & QStyle::State_Editing))
+	{
+		QStyleOptionButton buttonOption;
+		buttonOption.rect = option.rect;
+		buttonOption.palette = option.palette;
+		if (index.model()->data(index, Qt::UserRole).toBool())
+			buttonOption.state |= QStyle::State_On;
+		else
+			buttonOption.state |= QStyle::State_Off;
+		QApplication::style()->drawControl(QStyle::CE_CheckBox, &buttonOption, painter);
+	}
+	else if (index.column() == 0)
+	{
+		int i = 9; // ### hardcoded in qcommonstyle.cpp
+		QRect r = option.rect;
+		if (item && (item->childCount() > 0))
+		{
+			painter->save();
+			if (option.state & QStyle::State_Enabled)
+				painter->setBrush(Qt::black);
+			else
+				painter->setBrush(Qt::gray);
+			painter->setPen(Qt::NoPen);
+			QRect rect = QRect(r.left()+6, r.top()+6, r.height()-12, r.height()-12);
+			QPolygon pa(3);
+			if (item->isExpanded())
+			{
+				pa.setPoint(0, rect.left(), rect.top());
+				pa.setPoint(1, rect.right(), rect.top());
+				pa.setPoint(2, rect.center().x(), rect.bottom());
+			}
+			else
+			{
+				pa.setPoint(0, rect.left(), rect.top());
+				pa.setPoint(1, rect.left(), rect.bottom());
+				pa.setPoint(2, rect.right(), rect.center().y());
+			}
+			painter->setRenderHint(QPainter::Antialiasing, true);
+			painter->drawPolygon(pa);
+			painter->restore();
+		}
+		painter->save();
+		if (item && (item->QTreeWidgetItem::parent()))
+			i = 15;
+		if (item && (item->treeWidget()->currentItem() == item))
+		{
+			itemOpts.font.setBold(true);
+			painter->setFont(itemOpts.font);
+		}
+		QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - (i * 2), r.height());
+	//	QString text = itemOpts.fontMetrics.elidedText(index.model()->data(index, Qt::DisplayRole).toString(), Qt::ElideMiddle, itemOpts.rect.width(), Qt::TextShowMnemonic);
+		QString text = index.model()->data(index, Qt::DisplayRole).toString();
+		QApplication::style()->drawItemText(painter, textrect, Qt::AlignVCenter | Qt::AlignLeft | Qt::TextShowMnemonic, itemOpts.palette, (itemOpts.state & QStyle::State_Enabled), text, QPalette::Text);
+		painter->restore();
+	}
+	else
+		QItemDelegate::paint(painter, itemOpts, index);
+	QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option));
+	painter->save();
+	painter->setPen(QPen(color));
+	painter->drawLine(option.rect.x(), option.rect.top(), option.rect.x(), option.rect.bottom());
+	painter->restore();
+}
+
+QWidget *PropTreeItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &index) const
+{
+	QWidget *edito = nullptr;
+	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
+	if (!item)
+		return nullptr;
+
+	if (item->m_type == PropTreeItem::IntSpinBox)
+	{
+		ScrSpinBox *editor = new ScrSpinBox(parent, item->m_unit);
+		int val = index.model()->data(index, Qt::UserRole).toInt();
+		editor->setValues(item->m_min, item->m_max, 0, val);
+		edito = editor;
+		edito->setAutoFillBackground(true);
+		connect(editor, SIGNAL(valueChanged(double)), this, SLOT(valueHasChanged()));
+		connect(editor, SIGNAL(valueChanged(double)), item, SIGNAL(valueChanged(double)));
+	}
+	else if (item->m_type == PropTreeItem::DoubleSpinBox)
+	{
+		ScrSpinBox *editor = new ScrSpinBox(parent, item->m_unit);
+		double val = index.model()->data(index, Qt::UserRole).toDouble();
+		editor->setValues(item->m_fmin, item->m_fmax, item->m_decimals, val);
+		edito = editor;
+		edito->setAutoFillBackground(true);
+		connect(editor, SIGNAL(valueChanged(double)), this, SLOT(valueHasChanged()));
+		connect(editor, SIGNAL(valueChanged(double)), item, SIGNAL(valueChanged(double)));
+	}
+	else if (item->m_type == PropTreeItem::ComboBox)
+	{
+		auto editor = new QComboBox(parent);
+		editor->addItems(index.model()->data(index, Qt::UserRole+1).toStringList());
+		edito = editor;
+		edito->setAutoFillBackground(true);
+		connect(editor, SIGNAL(activated(int)), this, SLOT(valueHasChanged()));
+		connect(editor, SIGNAL(activated(int)), item, SIGNAL(valueChanged(int)));
+		connect(editor, SIGNAL(activated(QString)), item, SIGNAL(valueChanged(QString)));
+	}
+	else if (item->m_type == PropTreeItem::CheckBox)
+	{
+		QCheckBox *editor = new QCheckBox(parent);
+		edito = editor;
+		edito->setAutoFillBackground(true);
+		connect(editor, SIGNAL(clicked(bool)), this, SLOT(valueHasChanged()));
+		connect(editor, SIGNAL(clicked(bool)), item, SIGNAL(valueChanged(bool)));
+	}
+	else if (item->m_type == PropTreeItem::ColorComboBox)
+	{
+		ColorCombo *editor = new ColorCombo(ColorCombo::fancyPixmaps, parent);
+		editor->setColors(item->m_colors, false);
+		edito = editor;
+		edito->setAutoFillBackground(true);
+		connect(editor, SIGNAL(activated(int)), this, SLOT(valueHasChanged()));
+		connect(editor, SIGNAL(activated(int)), item, SIGNAL(valueChanged(int)));
+		connect(editor, SIGNAL(activated(QString)), item, SIGNAL(valueChanged(QString)));
+	}
+	else
+		edito = nullptr;
+	m_edit = edito;
+	if (item && m_edit)
+		emit item->editStarted();
+	return edito;
+}
+
+void PropTreeItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
+{
+	PropTreeItem* item = (PropTreeItem*)m_parent->indexToItem(index);
+	if (item->m_type == PropTreeItem::IntSpinBox)
+	{
+		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
+		spinBox->setValue(index.model()->data(index, Qt::UserRole).toInt());
+	}
+	else if (item->m_type == PropTreeItem::DoubleSpinBox)
+	{
+		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
+		spinBox->setValue(index.model()->data(index, Qt::UserRole).toDouble());
+	}
+	else if (item->m_type == PropTreeItem::ComboBox)
+	{
+		auto comboBox = static_cast<QComboBox*>(editor);
+		setCurrentComboItem(comboBox ,index.model()->data(index, Qt::UserRole).toString());
+	}
+	else if (item->m_type == PropTreeItem::CheckBox)
+	{
+		QCheckBox *checkBox = static_cast<QCheckBox*>(editor);
+		checkBox->setChecked(index.model()->data(index, Qt::UserRole).toBool());
+	}
+	else if (item->m_type == PropTreeItem::ColorComboBox)
+	{
+		ColorCombo *comboBox = static_cast<ColorCombo*>(editor);
+		setCurrentComboItem(comboBox ,index.model()->data(index, Qt::UserRole).toString());
+	}
+}
+
+void PropTreeItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,  const QModelIndex &index) const
+{
+	PropTreeItem* item = (PropTreeItem*) m_parent->indexToItem(index);
+	if (item->m_type == PropTreeItem::IntSpinBox)
+	{
+		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
+		spinBox->interpretText(); // #12684: interpretText() is explicitly called in Qt spinboxdelegate example
+		QString value = QString("%1 %2").arg(qRound(spinBox->value())).arg(unitGetSuffixFromIndex(item->m_unit));
+		int val = qRound(spinBox->value());
+		model->setData(index, val, Qt::UserRole);
+		model->setData(index, value, Qt::DisplayRole);
+	}
+	else if (item->m_type == PropTreeItem::DoubleSpinBox)
+	{
+		ScrSpinBox *spinBox = static_cast<ScrSpinBox*>(editor);
+		spinBox->interpretText(); // #12684: interpretText() is explicitly called in Qt spinboxdelegate example
+		QString value = QString("%1 %2").arg(spinBox->value(), 0, 'f', item->m_decimals).arg(unitGetSuffixFromIndex(item->m_unit));
+		double val = spinBox->value();
+		model->setData(index, val, Qt::UserRole);
+		model->setData(index, value, Qt::DisplayRole);
+	}
+	else if (item->m_type == PropTreeItem::ComboBox)
+	{
+		auto comboBox = static_cast<QComboBox*>(editor);
+		QString value = comboBox->currentText();
+		int val = comboBox->currentIndex();
+		item->m_comboIndex = val;
+		model->setData(index, value, Qt::UserRole);
+		model->setData(index, value, Qt::DisplayRole);
+	}
+	else if (item->m_type == PropTreeItem::CheckBox)
+	{
+		QCheckBox *checkBox = static_cast<QCheckBox*>(editor);
+		bool value = checkBox->isChecked();
+		model->setData(index, value, Qt::UserRole);
+		model->setData(index, value, Qt::DisplayRole);
+	}
+	else if (item->m_type == PropTreeItem::ColorComboBox)
+	{
+		ColorCombo *comboBox = static_cast<ColorCombo*>(editor);
+		QString value = comboBox->currentText();
+		int val = comboBox->currentIndex();
+		item->m_comboIndex = val;
+		model->setData(index, value, Qt::UserRole);
+		model->setData(index, value, Qt::DisplayRole);
+	}
+}
+
+void PropTreeItemDelegate::destroyEditor(QWidget * editor, const QModelIndex & index) const
+{
+	m_edit = nullptr;
+	PropTreeItem* item = (PropTreeItem*)m_parent->indexToItem(index);
+	if (item)
+		emit item->editFinished();
+	QAbstractItemDelegate::destroyEditor(editor, index);
+}
+
+void PropTreeItemDelegate::valueHasChanged()
+{
+	emit commitData(m_edit);
+}
+
+void PropTreeItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
+{
+	editor->setGeometry(option.rect);
+}
+
+QSize PropTreeItemDelegate::sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const
+{
+	QSize sz = QItemDelegate::sizeHint(opt, index) + QSize(2, 6);
+	return sz;
+}
+
+PropTreeItem::PropTreeItem(QTreeWidget *parent, int typ, const QString& title) : QObject(parent), QTreeWidgetItem(parent),
+	m_type(typ),
+	m_unit(0),
+	m_decimals(0),
+	m_fmin(0.0),
+	m_fmax(0.0),
+	m_min(0),
+	m_max(0),
+	m_comboIndex(-1)
+{
+	setText(0, title);
+	setData(0, Qt::UserRole, 0);
+	setData(1, Qt::UserRole, 0);
+	if (typ > 0)
+		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+	else
+		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+}
+
+PropTreeItem::PropTreeItem(PropTreeItem *parent, int typ, const QString& title) : QObject(parent), QTreeWidgetItem(parent)
+{
+	setText(0, title);
+	m_type = typ;
+	m_comboIndex = -1;
+	m_unit = 0;
+	m_decimals = 0;
+	setData(0, Qt::UserRole, 0);
+	setData(1, Qt::UserRole, 0);
+	if (typ > 0)
+		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+	else
+		setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+}
+
+int PropTreeItem::valueAsInt()
+{
+	int val = 0;
+	val = data(1, Qt::UserRole).toInt();
+	if (m_type == ComboBox)
+	{
+		QStringList vals = data(1, Qt::UserRole + 1).toStringList();
+		if (m_comboIndex < vals.count())
+			val = m_comboIndex;
+	}
+	return val;
+}
+
+double PropTreeItem::valueAsDouble()
+{
+	return data(1, Qt::UserRole).toDouble();
+}
+
+bool PropTreeItem::valueAsBool()
+{
+	return data(1, Qt::UserRole).toBool();
+}
+
+QString PropTreeItem::valueAsString()
+{
+	return data(1, Qt::UserRole).toString();
+}
+
+void PropTreeItem::setIntValue(int value)
+{
+	if (m_type == ComboBox)
+	{
+		m_comboIndex = value;
+		QStringList vals = data(1, Qt::UserRole + 1).toStringList();
+		if (value < vals.count())
+		{
+			setData(1, Qt::UserRole, vals[value]);
+			setData(1, Qt::DisplayRole, vals[value]);
+		}
+	}
+	else
+	{
+		setData(1, Qt::UserRole, value);
+		setData(1, Qt::DisplayRole, QString("%1 %2").arg(value).arg(unitGetSuffixFromIndex(m_unit)));
+	}
+}
+
+void PropTreeItem::setDoubleValue(double value)
+{
+	setData(1, Qt::UserRole, value);
+	setData(1, Qt::DisplayRole, QString("%1 %2").arg(value, 0, 'f', m_decimals).arg(unitGetSuffixFromIndex(m_unit)));
+}
+
+void PropTreeItem::setBoolValue(bool value)
+{
+	setData(1, Qt::UserRole, value);
+	setData(1, Qt::DisplayRole, value);
+}
+
+void PropTreeItem::setStringValue(const QString& value)
+{
+	setData(1, Qt::UserRole, value);
+	setData(1, Qt::DisplayRole, value);
+}
+
+void PropTreeItem::setUnitValue(int unit)
+{
+	int oldUnit = m_unit;
+	m_unit = unit;
+	if (m_type == DoubleSpinBox)
+	{
+		double oldUnitRatio = unitGetRatioFromIndex(oldUnit);
+		double newUnitRatio = unitGetRatioFromIndex(unit);
+		double oldVal = data(1, Qt::UserRole).toDouble() / oldUnitRatio;
+		setDoubleValue(oldVal * newUnitRatio);
+	}
+	else
+		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toString(), unitGetSuffixFromIndex(m_unit)));
+}
+
+void PropTreeItem::setDecimalsValue(int unit)
+{
+	m_decimals = unit;
+	if (m_type == DoubleSpinBox)
+		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toDouble(), 0, 'f', unit).arg(unitGetSuffixFromIndex(m_unit)));
+	else
+		setData(1, Qt::DisplayRole, QString("%1 %2").arg(data(1, Qt::UserRole).toString(), unitGetSuffixFromIndex(m_unit)));
+}
+
+void PropTreeItem::setComboStrings(const QStringList& value)
+{
+	setData(1, Qt::UserRole + 1, value);
+}
+
+void PropTreeItem::setMinMaxValues(int min, int max)
+{
+	m_min = min;
+	m_max = max;
+}
+
+void PropTreeItem::setMinMaxValues(double min, double max)
+{
+	m_fmin = min;
+	m_fmax = max;
+}
+
+void PropTreeItem::setColorList(const ColorList& colors)
+{
+	m_colors = colors;
+}
+
+PropTreeWidget::PropTreeWidget(QWidget* pa) : QTreeWidget(pa)
+{
+	setFocusPolicy(Qt::NoFocus);
+	setColumnCount(2);
+	delegate = new PropTreeItemDelegate(this);
+	setItemDelegate(delegate);
+	setRootIsDecorated(false);
+	setIndentation(0);
+	header()->hide();
+	header()->setSectionResizeMode(QHeaderView::Stretch);
+	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+	setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::CurrentChanged | QAbstractItemView::SelectedClicked);
+	connect(this, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(handleMousePress(QTreeWidgetItem*)));
+}
+
+void PropTreeWidget::handleMousePress(QTreeWidgetItem *item)
+{
+	if (item == nullptr)
+		return;
+	if (item->parent() == nullptr)
+	{
+		if (!(item->flags() & Qt::ItemIsEditable))
+			item->setExpanded(!item->isExpanded());
+	}
+}
+
+void PropTreeWidget::mousePressEvent(QMouseEvent *event)
+{
+	QTreeWidgetItem *item = itemAt(event->pos());
+	if (!item)
+	{
+		QTreeWidget::mousePressEvent(event);
+		return;
+	}
+	if (!(item->flags() & Qt::ItemIsEditable))
+	{
+		QTreeWidget::mousePressEvent(event);
+		return;
+	}
+	if ((event->button() == Qt::LeftButton) && (header()->logicalIndexAt(event->pos().x()) == 1))
+		QTreeWidget::mousePressEvent(event);
+	else
+		event->ignore();
+}
+
+PropTreeItem* PropTreeWidget::indexToItem(const QModelIndex &index)
+{
+	return dynamic_cast<PropTreeItem*>(itemFromIndex(index));
+}
+
+void PropTreeWidget::drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+	QStyleOptionViewItem opt = option;
+	QTreeWidget::drawRow(painter, opt, index);
+	QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &opt));
+	painter->save();
+	painter->setPen(QPen(color));
+	painter->drawLine(opt.rect.x(), opt.rect.bottom(), opt.rect.right(), opt.rect.bottom());
+	painter->restore();
+}

Modified: trunk/Scribus/scribus/ui/smsccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/smsccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.cpp	(original)
+++ trunk/Scribus/scribus/ui/smsccombobox.cpp	Wed Nov 13 02:55:22 2019
@@ -1,183 +1,183 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#include "smsccombobox.h"
-
-
-SMScComboBox::SMScComboBox(QWidget *parent)
-: ScComboBox(parent),
-  m_hasParent(false),
-  m_useParentValue(false),
-  m_pItem(0)
-{
-	
-}
-
-void SMScComboBox::setCurrentItem(int i)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	setFont(false);
-	m_hasParent = false;
-	m_pItem = 0;
-	ScComboBox::setCurrentIndex(i);
-}
-
-void SMScComboBox::setCurrentItem(int i, bool isParentValue)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	m_hasParent = true;
-	m_pItem = i;
-	setFont(!isParentValue);
-	if (!isParentValue && !m_useParentValue)
-	{
-		m_useParentValue = true;
-		addItem( tr("Use Parent Value"));
-	}
-
-	ScComboBox::setCurrentIndex(i);
-	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-}
-
-void SMScComboBox::setCurrentItemByData(int i)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	setFont(false);
-	m_hasParent = false;
-	m_pItem = 0;
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toInt() == i)
-			ScComboBox::setCurrentIndex(idx);
-	}
-	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-}
-
-void SMScComboBox::setCurrentItemByData(int i, bool isParentValue)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	m_hasParent = true;
-	setFont(!isParentValue);
-	if (!isParentValue && !m_useParentValue)
-	{
-		m_useParentValue = true;
-		addItem( tr("Use Parent Value"));
-	}
-
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toInt() == i)
-		{
-			ScComboBox::setCurrentIndex(idx);
-			m_pItem = idx;
-		}
-	}
-	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-}
-
-void SMScComboBox::setCurrentItemByData(double d)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	setFont(false);
-	m_hasParent = false;
-	m_pItem = 0;
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toDouble() == d)
-			ScComboBox::setCurrentIndex(idx);
-	}
-	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-}
-
-void SMScComboBox::setCurrentItemByData(double d, bool isParentValue)
-{
-	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	m_hasParent = true;
-	setFont(!isParentValue);
-	if (!isParentValue && !m_useParentValue)
-	{
-		m_useParentValue = true;
-		addItem( tr("Use Parent Value"));
-	}
-
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toDouble() == d)
-		{
-			ScComboBox::setCurrentIndex(idx);
-			m_pItem = idx;
-		}
-	}
-	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-}
-
-int SMScComboBox::getItemIndexForData(int i)
-{
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toInt() == i)
-		{
-			return idx;
-		}
-	}
-	return 0;
-}
-
-int SMScComboBox::getItemIndexForData(double d)
-{
-	for (int idx(0); idx < count(); ++idx)
-	{
-		if (itemData(idx).toDouble() == d)
-		{
-			return idx;
-		}
-	}
-	return 0;
-}
-
-
-
-void SMScComboBox::setParentItem(int i)
-{
-	m_hasParent = true;
-	m_pItem = i;
-}
-
-bool SMScComboBox::useParentValue()
-{
-	bool ret = false;
-
-	if (m_useParentValue && m_hasParent)
-	{
-		ret = currentIndex() == (count() - 1);
-		if (ret)
-		{
-			removeItem(count() - 1);
-			setFont(false);
-			setCurrentItem(m_pItem, true);
-			m_useParentValue = false;
-		}
-	}
-
-	return ret;
-}
-
-void SMScComboBox::setFont(bool wantBold)
-{
-	QFont f(font());
-	f.setBold(wantBold);
-	ScComboBox::setFont(f);
-}
-
-void SMScComboBox::currentChanged()
-{
-	if (m_hasParent && !m_useParentValue)
-	{
-		setFont(true);
-		addItem( tr("Use Parent Value"));
-		m_useParentValue = true;
-	}
-}
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#include "smsccombobox.h"
+
+
+SMScComboBox::SMScComboBox(QWidget *parent)
+: QComboBox(parent),
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pItem(0)
+{
+	
+}
+
+void SMScComboBox::setCurrentItem(int i)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	setFont(false);
+	m_hasParent = false;
+	m_pItem = 0;
+	QComboBox::setCurrentIndex(i);
+}
+
+void SMScComboBox::setCurrentItem(int i, bool isParentValue)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	m_hasParent = true;
+	m_pItem = i;
+	setFont(!isParentValue);
+	if (!isParentValue && !m_useParentValue)
+	{
+		m_useParentValue = true;
+		addItem( tr("Use Parent Value"));
+	}
+
+	QComboBox::setCurrentIndex(i);
+	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+}
+
+void SMScComboBox::setCurrentItemByData(int i)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	setFont(false);
+	m_hasParent = false;
+	m_pItem = 0;
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toInt() == i)
+			QComboBox::setCurrentIndex(idx);
+	}
+	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+}
+
+void SMScComboBox::setCurrentItemByData(int i, bool isParentValue)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	m_hasParent = true;
+	setFont(!isParentValue);
+	if (!isParentValue && !m_useParentValue)
+	{
+		m_useParentValue = true;
+		addItem( tr("Use Parent Value"));
+	}
+
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toInt() == i)
+		{
+			QComboBox::setCurrentIndex(idx);
+			m_pItem = idx;
+		}
+	}
+	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+}
+
+void SMScComboBox::setCurrentItemByData(double d)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	setFont(false);
+	m_hasParent = false;
+	m_pItem = 0;
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toDouble() == d)
+			QComboBox::setCurrentIndex(idx);
+	}
+	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+}
+
+void SMScComboBox::setCurrentItemByData(double d, bool isParentValue)
+{
+	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+	m_hasParent = true;
+	setFont(!isParentValue);
+	if (!isParentValue && !m_useParentValue)
+	{
+		m_useParentValue = true;
+		addItem( tr("Use Parent Value"));
+	}
+
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toDouble() == d)
+		{
+			QComboBox::setCurrentIndex(idx);
+			m_pItem = idx;
+		}
+	}
+	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
+}
+
+int SMScComboBox::getItemIndexForData(int i)
+{
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toInt() == i)
+		{
+			return idx;
+		}
+	}
+	return 0;
+}
+
+int SMScComboBox::getItemIndexForData(double d)
+{
+	for (int idx(0); idx < count(); ++idx)
+	{
+		if (itemData(idx).toDouble() == d)
+		{
+			return idx;
+		}
+	}
+	return 0;
+}
+
+
+
+void SMScComboBox::setParentItem(int i)
+{
+	m_hasParent = true;
+	m_pItem = i;
+}
+
+bool SMScComboBox::useParentValue()
+{
+	bool ret = false;
+
+	if (m_useParentValue && m_hasParent)
+	{
+		ret = currentIndex() == (count() - 1);
+		if (ret)
+		{
+			removeItem(count() - 1);
+			setFont(false);
+			setCurrentItem(m_pItem, true);
+			m_useParentValue = false;
+		}
+	}
+
+	return ret;
+}
+
+void SMScComboBox::setFont(bool wantBold)
+{
+	QFont f(font());
+	f.setBold(wantBold);
+	QComboBox::setFont(f);
+}
+
+void SMScComboBox::currentChanged()
+{
+	if (m_hasParent && !m_useParentValue)
+	{
+		setFont(true);
+		addItem( tr("Use Parent Value"));
+		m_useParentValue = true;
+	}
+}

Modified: trunk/Scribus/scribus/ui/smsccombobox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/smsccombobox.h
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.h	(original)
+++ trunk/Scribus/scribus/ui/smsccombobox.h	Wed Nov 13 02:55:22 2019
@@ -1,48 +1,47 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#ifndef SMSCCOMBOBOX_H
-#define SMSCCOMBOBOX_H
-
-#include "sccombobox.h"
-
-
-class SMScComboBox  : public ScComboBox
-{
-	Q_OBJECT
-public:
-	SMScComboBox(QWidget *parent);
-	~SMScComboBox() {};
-
-	void setCurrentItem(int i);
-	void setCurrentItem(int i, bool isParentValue);
-	
-	// Set the current index of a combobox according to the value
-	// stored into the data associated to items. Thus, allowing 
-	// separation between presentation and data.Isn’t that cool? ;-)
-	void setCurrentItemByData(int i);
-	void setCurrentItemByData(int i, bool isParentValue);
-	void setCurrentItemByData(double d);
-	void setCurrentItemByData(double d, bool isParentValue);
-	
-	int getItemIndexForData(int i);
-	int getItemIndexForData(double d);
-	
-	void setParentItem(int i);
-
-	bool useParentValue();
-
-private:
-	bool   m_hasParent;
-	bool   m_useParentValue;
-	int    m_pItem;
-	void setFont(bool wantBold);
-
-private slots:
-	void currentChanged();
-};
-
-#endif
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+#ifndef SMSCCOMBOBOX_H
+#define SMSCCOMBOBOX_H
+
+#include <QComboBox>
+
+class SMScComboBox  : public QComboBox
+{
+	Q_OBJECT
+public:
+	SMScComboBox(QWidget *parent);
+	~SMScComboBox() {};
+
+	void setCurrentItem(int i);
+	void setCurrentItem(int i, bool isParentValue);
+	
+	// Set the current index of a combobox according to the value
+	// stored into the data associated to items. Thus, allowing 
+	// separation between presentation and data.Isn’t that cool? ;-)
+	void setCurrentItemByData(int i);
+	void setCurrentItemByData(int i, bool isParentValue);
+	void setCurrentItemByData(double d);
+	void setCurrentItemByData(double d, bool isParentValue);
+	
+	int getItemIndexForData(int i);
+	int getItemIndexForData(double d);
+	
+	void setParentItem(int i);
+
+	bool useParentValue();
+
+private:
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	int    m_pItem;
+	void setFont(bool wantBold);
+
+private slots:
+	void currentChanged();
+};
+
+#endif

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Wed Nov 13 02:55:22 2019
@@ -16,7 +16,6 @@
 #include "langmgr.h"
 #include "ui/scmwmenumanager.h"
 #include "prefsmanager.h"
-#include "sccombobox.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"

Modified: trunk/Scribus/scribus/ui/transparencypalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/transparencypalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.h	(original)
+++ trunk/Scribus/scribus/ui/transparencypalette.h	Wed Nov 13 02:55:22 2019
@@ -40,7 +40,6 @@
 class PageItem;
 class ColorListBox;
 class ScrSpinBox;
-class ScComboBox;
 class ScPattern;
 class LinkButton;
 

Modified: trunk/Scribus/scribus/ui/transparencypalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/scribus/ui/transparencypalette.ui
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.ui	(original)
+++ trunk/Scribus/scribus/ui/transparencypalette.ui	Wed Nov 13 02:55:22 2019
@@ -1,553 +1,548 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>transparencyPalette</class>
- <widget class="QWidget" name="transparencyPalette">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>236</width>
-    <height>373</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_6">
-   <property name="spacing">
-    <number>2</number>
-   </property>
-   <property name="margin">
-    <number>2</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QToolButton" name="editLineSelector">
-       <property name="toolTip">
-        <string>Edit Line Color Properties</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="autoExclusive">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="editFillSelector">
-       <property name="toolTip">
-        <string>Edit Fill Color Properties</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="autoExclusive">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>2</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QStackedWidget" name="stackedWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="pageS">
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <property name="spacing">
-        <number>2</number>
-       </property>
-       <property name="margin">
-        <number>5</number>
-       </property>
-       <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Opacity:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="ScrSpinBox" name="strokeOpacity">
-           <property name="toolTip">
-            <string>Set the transparency for the color selected</string>
-           </property>
-           <property name="suffix">
-            <string> %</string>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-           <property name="singleStep">
-            <number>10</number>
-           </property>
-           <property name="value">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Blend Mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="ScComboBox" name="blendModeStroke">
-           <item>
-            <property name="text">
-             <string>Normal</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Darken</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Lighten</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Multiply</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Screen</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Overlay</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Hard Light</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Soft Light</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Difference</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Exclusion</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color Dodge</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color Burn</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Hue</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Saturation</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Luminosity</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>240</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page_2">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QTabWidget" name="tabWidget">
-         <property name="currentIndex">
-          <number>0</number>
-         </property>
-         <widget class="QWidget" name="tabSolid">
-          <attribute name="title">
-           <string>Solid</string>
-          </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <property name="margin">
-            <number>5</number>
-           </property>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Opacity:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="ScrSpinBox" name="fillOpacity">
-               <property name="toolTip">
-                <string>Set the transparency for the color selected</string>
-               </property>
-               <property name="suffix">
-                <string> %</string>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-               <property name="singleStep">
-                <number>10</number>
-               </property>
-               <property name="value">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>195</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="tabGradient">
-          <attribute name="title">
-           <string>Gradient</string>
-          </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <property name="margin">
-            <number>5</number>
-           </property>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
-             <item>
-              <widget class="QComboBox" name="gradientType">
-               <item>
-                <property name="text">
-                 <string>Linear</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Radial</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="gradEditButton">
-               <property name="toolTip">
-                <string>Move the start of the gradient vector with the left mouse button pressed and move the end of the gradient vector with the right mouse button pressed</string>
-               </property>
-               <property name="text">
-                <string>Move Vector</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="GradientEditor" name="gradEdit">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>173</height>
-              </size>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="ScComboBox" name="namedGradient"/>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="transpCalcGradient">
-             <property name="text">
-              <string>Use Luminosity as Alpha</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="tabPattern">
-          <attribute name="title">
-           <string>Pattern</string>
-          </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <item>
-            <widget class="QListWidget" name="patternBox">
-             <property name="movement">
-              <enum>QListView::Snap</enum>
-             </property>
-             <property name="flow">
-              <enum>QListView::LeftToRight</enum>
-             </property>
-             <property name="isWrapping" stdset="0">
-              <bool>true</bool>
-             </property>
-             <property name="resizeMode">
-              <enum>QListView::Adjust</enum>
-             </property>
-             <property name="viewMode">
-              <enum>QListView::IconMode</enum>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <property name="spacing">
-              <number>5</number>
-             </property>
-             <item>
-              <widget class="QToolButton" name="editPatternProps">
-               <property name="text">
-                <string>Properties...</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="transpCalcPattern">
-             <property name="text">
-              <string>Use Luminosity as Alpha</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="usePatternInverted">
-             <property name="text">
-              <string>Use inverted Pattern</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Blend Mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="ScComboBox" name="blendModeFill">
-           <item>
-            <property name="text">
-             <string>Normal</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Darken</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Lighten</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Multiply</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Screen</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Overlay</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Hard Light</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Soft Light</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Difference</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Exclusion</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color Dodge</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color Burn</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Hue</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Saturation</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Color</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Luminosity</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">ui/scrspinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ScComboBox</class>
-   <extends>QComboBox</extends>
-   <header>ui/sccombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>GradientEditor</class>
-   <extends>QFrame</extends>
-   <header>ui/gradienteditor.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>transparencyPalette</class>
+ <widget class="QWidget" name="transparencyPalette">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>236</width>
+    <height>373</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_6">
+   <property name="spacing">
+    <number>2</number>
+   </property>
+   <property name="margin">
+    <number>2</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QToolButton" name="editLineSelector">
+       <property name="toolTip">
+        <string>Edit Line Color Properties</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="autoExclusive">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="editFillSelector">
+       <property name="toolTip">
+        <string>Edit Fill Color Properties</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="autoExclusive">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>2</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="pageS">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="spacing">
+        <number>2</number>
+       </property>
+       <property name="margin">
+        <number>5</number>
+       </property>
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Opacity:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="ScrSpinBox" name="strokeOpacity">
+           <property name="toolTip">
+            <string>Set the transparency for the color selected</string>
+           </property>
+           <property name="suffix">
+            <string> %</string>
+           </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
+           <property name="singleStep">
+            <number>10</number>
+           </property>
+           <property name="value">
+            <number>100</number>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Blend Mode:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QComboBox" name="blendModeStroke">
+           <item>
+            <property name="text">
+             <string>Normal</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Darken</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Lighten</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Multiply</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Screen</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Overlay</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Hard Light</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Soft Light</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Difference</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Exclusion</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color Dodge</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color Burn</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Hue</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Saturation</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Luminosity</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>240</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QTabWidget" name="tabWidget">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="tabSolid">
+          <attribute name="title">
+           <string>Solid</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <property name="spacing">
+            <number>2</number>
+           </property>
+           <property name="margin">
+            <number>5</number>
+           </property>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <widget class="QLabel" name="label_4">
+               <property name="text">
+                <string>Opacity:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="ScrSpinBox" name="fillOpacity">
+               <property name="toolTip">
+                <string>Set the transparency for the color selected</string>
+               </property>
+               <property name="suffix">
+                <string> %</string>
+               </property>
+               <property name="maximum">
+                <number>100</number>
+               </property>
+               <property name="singleStep">
+                <number>10</number>
+               </property>
+               <property name="value">
+                <number>100</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>195</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tabGradient">
+          <attribute name="title">
+           <string>Gradient</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <property name="spacing">
+            <number>2</number>
+           </property>
+           <property name="margin">
+            <number>5</number>
+           </property>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <widget class="QComboBox" name="gradientType">
+               <item>
+                <property name="text">
+                 <string>Linear</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>Radial</string>
+                </property>
+               </item>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="gradEditButton">
+               <property name="toolTip">
+                <string>Move the start of the gradient vector with the left mouse button pressed and move the end of the gradient vector with the right mouse button pressed</string>
+               </property>
+               <property name="text">
+                <string>Move Vector</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="GradientEditor" name="gradEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>173</height>
+              </size>
+             </property>
+             <property name="frameShape">
+              <enum>QFrame::NoFrame</enum>
+             </property>
+             <property name="frameShadow">
+              <enum>QFrame::Raised</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="namedGradient"/>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="transpCalcGradient">
+             <property name="text">
+              <string>Use Luminosity as Alpha</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tabPattern">
+          <attribute name="title">
+           <string>Pattern</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QListWidget" name="patternBox">
+             <property name="movement">
+              <enum>QListView::Snap</enum>
+             </property>
+             <property name="flow">
+              <enum>QListView::LeftToRight</enum>
+             </property>
+             <property name="isWrapping" stdset="0">
+              <bool>true</bool>
+             </property>
+             <property name="resizeMode">
+              <enum>QListView::Adjust</enum>
+             </property>
+             <property name="viewMode">
+              <enum>QListView::IconMode</enum>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
+             <property name="spacing">
+              <number>5</number>
+             </property>
+             <item>
+              <widget class="QToolButton" name="editPatternProps">
+               <property name="text">
+                <string>Properties...</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="transpCalcPattern">
+             <property name="text">
+              <string>Use Luminosity as Alpha</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="usePatternInverted">
+             <property name="text">
+              <string>Use inverted Pattern</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Blend Mode:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="blendModeFill">
+           <item>
+            <property name="text">
+             <string>Normal</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Darken</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Lighten</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Multiply</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Screen</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Overlay</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Hard Light</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Soft Light</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Difference</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Exclusion</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color Dodge</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color Burn</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Hue</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Saturation</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Color</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Luminosity</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ScrSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global">ui/scrspinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GradientEditor</class>
+   <extends>QFrame</extends>
+   <header>ui/gradienteditor.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj	Wed Nov 13 02:55:22 2019
@@ -639,7 +639,6 @@
     <ClInclude Include="..\..\..\scribus\sccolor.h" />
     <ClInclude Include="..\..\..\scribus\sccolorengine.h" />
     <ClInclude Include="..\..\..\scribus\sccolorshade.h" />
-    <moc Include="..\..\..\scribus\ui\sccombobox.h" />
     <ClInclude Include="..\..\..\scribus\scconfig.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlmgr.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlthread.h" />
@@ -1318,7 +1317,6 @@
     <ClCompile Include="..\..\..\scribus\sccolorengine.cpp" />
     <ClCompile Include="..\..\..\scribus\sccolorshade.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\sccolorslider.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\sccombobox.cpp" />
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlmgr.cpp" />
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlthread.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\scdockpalette.cpp" />

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters	Wed Nov 13 02:55:22 2019
@@ -800,12 +800,6 @@
     <ClInclude Include="..\..\..\scribus\actionsearch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\contentpalette_page.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\contentpalette_default.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -1703,9 +1697,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\sccolorshade.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\sccombobox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlmgr.cpp">
@@ -4088,9 +4079,6 @@
     <moc Include="..\..\..\scribus\ui\sccolorslider.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\sccombobox.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\scmimedata.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -4134,6 +4122,12 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\contentpalette.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\contentpalette_page.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\contentpalette_default.h">
       <Filter>Header Files</Filter>
     </moc>
   </ItemGroup>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	Wed Nov 13 02:55:22 2019
@@ -639,7 +639,6 @@
     <ClInclude Include="..\..\..\scribus\sccolor.h" />
     <ClInclude Include="..\..\..\scribus\sccolorengine.h" />
     <ClInclude Include="..\..\..\scribus\sccolorshade.h" />
-    <moc Include="..\..\..\scribus\ui\sccombobox.h" />
     <ClInclude Include="..\..\..\scribus\scconfig.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlmgr.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlthread.h" />
@@ -1318,7 +1317,6 @@
     <ClCompile Include="..\..\..\scribus\sccolorengine.cpp" />
     <ClCompile Include="..\..\..\scribus\sccolorshade.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\sccolorslider.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\sccombobox.cpp" />
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlmgr.cpp" />
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlthread.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\scdockpalette.cpp" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23354&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	Wed Nov 13 02:55:22 2019
@@ -800,12 +800,6 @@
     <ClInclude Include="..\..\..\scribus\actionsearch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\contentpalette_page.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\contentpalette_default.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -1703,9 +1697,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\sccolorshade.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\sccombobox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\downloadmanager\scdlmgr.cpp">
@@ -4088,9 +4079,6 @@
     <moc Include="..\..\..\scribus\ui\sccolorslider.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\sccombobox.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\scmimedata.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -4134,6 +4122,12 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\contentpalette.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\contentpalette_page.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\contentpalette_default.h">
       <Filter>Header Files</Filter>
     </moc>
   </ItemGroup>




More information about the scribus-commit mailing list