r23621 by jghali - Rename spalette.h/.cpp to stylecombos.h/.cpp

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 18 23:31:00 UTC 2020 

Author: jghali
Date: Sat Apr 18 23:31:00 2020
New Revision: 23621

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23621
Log:
Rename spalette.h/.cpp to stylecombos.h/.cpp

Added:
    trunk/Scribus/scribus/ui/stylecombos.cpp
      - copied, changed from r23620, trunk/Scribus/scribus/ui/spalette.cpp
    trunk/Scribus/scribus/ui/stylecombos.h
      - copied, changed from r23620, trunk/Scribus/scribus/ui/spalette.h
Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/ui/notesstyleseditor.h
    trunk/Scribus/scribus/ui/notesstyleseditor.ui
    trunk/Scribus/scribus/ui/propertiespalette.h
    trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
    trunk/Scribus/scribus/ui/propertywidget_dropcapbase.ui
    trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
    trunk/Scribus/scribus/ui/spalette.cpp
    trunk/Scribus/scribus/ui/spalette.h
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro	(original)
+++ trunk/Scribus/Scribus.pro	Sat Apr 18 23:31:00 2020
@@ -632,11 +632,11 @@
            scribus/ui/smtablestylewidget.h \
            scribus/ui/smtabruler.h \
            scribus/ui/smtextstyles.h \
-           scribus/ui/spalette.h \
            scribus/ui/spiralvectordialog.h \
            scribus/ui/spiralwidget.h \
            scribus/ui/splash.h \
            scribus/ui/storyeditor.h \
+           scribus/ui/stylecombos.h \
            scribus/ui/stylemanager.h \
            scribus/ui/styleselect.h \
            scribus/ui/styleview.h \
@@ -1759,11 +1759,11 @@
            scribus/ui/smtablestylewidget.cpp \
            scribus/ui/smtabruler.cpp \
            scribus/ui/smtextstyles.cpp \
-           scribus/ui/spalette.cpp \
            scribus/ui/spiralvectordialog.cpp \
            scribus/ui/spiralwidget.cpp \
            scribus/ui/splash.cpp \
            scribus/ui/storyeditor.cpp \
+           scribus/ui/stylecombos.cpp \
            scribus/ui/stylemanager.cpp \
            scribus/ui/styleselect.cpp \
            scribus/ui/styleview.cpp \

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Sat Apr 18 23:31:00 2020
@@ -532,11 +532,11 @@
 	ui/smtablestyle.h
 	ui/smtabruler.h
 	ui/smtextstyles.h
-	ui/spalette.h
 	ui/spiralvectordialog.h
 	ui/spiralwidget.h
 	ui/splash.h
 	ui/storyeditor.h
+	ui/stylecombos.h
 	ui/stylemanager.h
 	ui/styleselect.h
 	ui/styleview.h
@@ -1036,11 +1036,11 @@
 	ui/smtablestyle.cpp
 	ui/smtabruler.cpp
 	ui/smtextstyles.cpp
-	ui/spalette.cpp
 	ui/spiralvectordialog.cpp
 	ui/spiralwidget.cpp
 	ui/splash.cpp
 	ui/storyeditor.cpp
+	ui/stylecombos.cpp
 	ui/stylemanager.cpp
 	ui/styleselect.cpp
 	ui/styleview.cpp

Modified: trunk/Scribus/scribus/ui/notesstyleseditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/notesstyleseditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.h	(original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.h	Sat Apr 18 23:31:00 2020
@@ -3,8 +3,9 @@
 
 #include "notesstyles.h"
 #include "ui/scrpalettebase.h"
-#include "ui/spalette.h"
+#include "ui/stylecombos.h"
 #include "ui_notesstyleseditor.h"
+
 class ScribusDoc;
 class ScribusMainWindow;
 

Modified: trunk/Scribus/scribus/ui/notesstyleseditor.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/notesstyleseditor.ui
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.ui	(original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.ui	Sat Apr 18 23:31:00 2020
@@ -335,7 +335,7 @@
   <customwidget>
    <class>CharStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
   <customwidget>
    <class>NumFormatCombo</class>
@@ -345,7 +345,7 @@
   <customwidget>
    <class>ParaStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

Modified: trunk/Scribus/scribus/ui/propertiespalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertiespalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette.h	Sat Apr 18 23:31:00 2020
@@ -17,18 +17,18 @@
 class QVBoxLayout;
 class QWidget;
 
-#include "scribusapi.h"
+#include "pageitem.h"
+#include "linecombo.h"
+#include "linkbutton.h"
 #include "scdockpalette.h"
 #include "scguardedptr.h"
-#include "scrspinbox.h"
-#include "pageitem.h"
-#include "linkbutton.h"
-#include "linecombo.h"
 #include "scguardedptr.h"
 #include "sclistboxpixmap.h"
 #include "scpage.h"
-#include "spalette.h"
+#include "scribusapi.h"
+#include "scrspinbox.h"
 #include "sctreewidget.h"
+#include "stylecombos.h"
 #include "units.h"
 
 class ColorCombo;

Modified: trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui	Sat Apr 18 23:31:00 2020
@@ -511,12 +511,12 @@
   <customwidget>
    <class>TableStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
   <customwidget>
    <class>CellStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Sat Apr 18 23:31:00 2020
@@ -40,7 +40,7 @@
 #include "scribusapp.h"
 #include "scribuscore.h"
 #include "selection.h"
-#include "spalette.h"
+#include "stylecombos.h"
 #include "styleselect.h"
 #include "tabmanager.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	Sat Apr 18 23:31:00 2020
@@ -309,7 +309,7 @@
   <customwidget>
    <class>CharStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
   <customwidget>
    <class>ScTreeWidget</class>
@@ -319,7 +319,7 @@
   <customwidget>
    <class>ParaStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
   <customwidget>
    <class>AlignSelect</class>

Modified: trunk/Scribus/scribus/ui/propertywidget_dropcapbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertywidget_dropcapbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_dropcapbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_dropcapbase.ui	Sat Apr 18 23:31:00 2020
@@ -76,7 +76,7 @@
   <customwidget>
    <class>CharStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui	Sat Apr 18 23:31:00 2020
@@ -348,7 +348,7 @@
   <customwidget>
    <class>CharStyleComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui/spalette.h</header>
+   <header>ui/stylecombos.h</header>
   </customwidget>
   <customwidget>
    <class>NumFormatCombo</class>

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Sat Apr 18 23:31:00 2020
@@ -85,7 +85,7 @@
 #include "ui/charselect.h"
 #include "ui/customfdialog.h"
 #include "ui/scmessagebox.h"
-#include "ui/spalette.h"
+#include "ui/stylecombos.h"
 #include "ui/stylemanager.h"
 #include "units.h"
 #include "util.h"

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&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	Sat Apr 18 23:31:00 2020
@@ -758,7 +758,7 @@
     <moc Include="..\..\..\scribus\ui\smtablestylewidget.h" />
     <moc Include="..\..\..\scribus\ui\smtabruler.h" />
     <moc Include="..\..\..\scribus\ui\smtextstyles.h" />
-    <moc Include="..\..\..\scribus\ui\spalette.h" />
+    <moc Include="..\..\..\scribus\ui\stylecombos.h" />
     <ClInclude Include="..\..\..\scribus\text\specialchars.h" />
     <moc Include="..\..\..\scribus\ui\spiralvectordialog.h" />
     <moc Include="..\..\..\scribus\ui\spiralwidget.h" />
@@ -1444,7 +1444,7 @@
     <ClCompile Include="..\..\..\scribus\ui\smtablestylewidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\smtabruler.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\smtextstyles.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\spalette.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\stylecombos.cpp" />
     <ClCompile Include="..\..\..\scribus\text\specialchars.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\spiralvectordialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\spiralwidget.cpp" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&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	Sat Apr 18 23:31:00 2020
@@ -2035,7 +2035,7 @@
     <ClCompile Include="..\..\..\scribus\ui\smtextstyles.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\spalette.cpp">
+    <ClCompile Include="..\..\..\scribus\ui\stylecombos.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\text\specialchars.cpp">
@@ -3920,7 +3920,7 @@
     <moc Include="..\..\..\scribus\ui\smtextstyles.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\spalette.h">
+    <moc Include="..\..\..\scribus\ui\stylecombos.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\spiralvectordialog.h">

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj	Sat Apr 18 23:31:00 2020
@@ -758,7 +758,7 @@
     <moc Include="..\..\..\scribus\ui\smtablestylewidget.h" />
     <moc Include="..\..\..\scribus\ui\smtabruler.h" />
     <moc Include="..\..\..\scribus\ui\smtextstyles.h" />
-    <moc Include="..\..\..\scribus\ui\spalette.h" />
+    <moc Include="..\..\..\scribus\ui\stylecombos.h" />
     <ClInclude Include="..\..\..\scribus\text\specialchars.h" />
     <moc Include="..\..\..\scribus\ui\spiralvectordialog.h" />
     <moc Include="..\..\..\scribus\ui\spiralwidget.h" />
@@ -1444,7 +1444,7 @@
     <ClCompile Include="..\..\..\scribus\ui\smtablestylewidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\smtabruler.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\smtextstyles.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\spalette.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\stylecombos.cpp" />
     <ClCompile Include="..\..\..\scribus\text\specialchars.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\spiralvectordialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\spiralwidget.cpp" />

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23621&path=/trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters	Sat Apr 18 23:31:00 2020
@@ -2035,7 +2035,7 @@
     <ClCompile Include="..\..\..\scribus\ui\smtextstyles.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\spalette.cpp">
+    <ClCompile Include="..\..\..\scribus\ui\stylecombos.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\text\specialchars.cpp">
@@ -3920,7 +3920,7 @@
     <moc Include="..\..\..\scribus\ui\smtextstyles.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\spalette.h">
+    <moc Include="..\..\..\scribus\ui\stylecombos.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\spiralvectordialog.h">

More information about the scribus-commit mailing list