r24589 by jghali - #16470: Clean up unused .ui files (and a few others)

scribus-commit scribus-commit at lists.scribus.net
Fri Mar 26 21:14:39 UTC 2021


Author: jghali
Date: Fri Mar 26 21:14:38 2021
New Revision: 24589

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24589
Log:
#16470: Clean up unused .ui files (and a few others)

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/openpalettemanager.cpp
    trunk/Scribus/scribus/openpalettemanager.h
    trunk/Scribus/scribus/openpalettemodel.cpp
    trunk/Scribus/scribus/openpalettemodel.h
    trunk/Scribus/scribus/pageitemsettersmanager.cpp
    trunk/Scribus/scribus/pageitemsettersmanager.h
    trunk/Scribus/scribus/ui/openpalette.cpp
    trunk/Scribus/scribus/ui/openpalette.h
    trunk/Scribus/scribus/ui/openpaletteview.cpp
    trunk/Scribus/scribus/ui/openpaletteview.h
    trunk/Scribus/scribus/ui/pageitempositionsetter.cpp
    trunk/Scribus/scribus/ui/pageitempositionsetter.h
    trunk/Scribus/scribus/ui/pageitemrotationsetter.cpp
    trunk/Scribus/scribus/ui/pageitemrotationsetter.h
    trunk/Scribus/scribus/ui/pageitemsetterbase.cpp
    trunk/Scribus/scribus/ui/pageitemsetterbase.h
    trunk/Scribus/scribus/ui/positionsetter.ui
    trunk/Scribus/scribus/ui/rotationsetter.ui
    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
    trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro	(original)
+++ trunk/Scribus/Scribus.pro	Fri Mar 26 21:14:38 2021
@@ -112,8 +112,6 @@
            scribus/notesstyles.h \
            scribus/numeration.h \
            scribus/observable.h \
-           scribus/openpalettemanager.h \
-           scribus/openpalettemodel.h \
            scribus/pageitem.h \
            scribus/pageitem_arc.h \
            scribus/pageitem_group.h \
@@ -133,7 +131,6 @@
            scribus/pageitemiterator.h \
            scribus/pageitempointer.h \
            scribus/pageitempreview.h \
-           scribus/pageitemsettersmanager.h \
            scribus/pagesize.h \
            scribus/pagestructs.h \
            scribus/pdf_analyzer.h \
@@ -496,17 +493,12 @@
            scribus/ui/notesstyleseditor.h \
            scribus/ui/numformatcombo.h \
            scribus/ui/oneclick.h \
-           scribus/ui/openpalette.h \
-           scribus/ui/openpaletteview.h \
            scribus/ui/osgeditor.h \
            scribus/ui/outlinepalette.h \
            scribus/ui/outputpreview_pdf.h \
            scribus/ui/outputpreview_ps.h \
            scribus/ui/outputpreviewbase.h \
            scribus/ui/pageitemattributes.h \
-           scribus/ui/pageitempositionsetter.h \
-           scribus/ui/pageitemrotationsetter.h \
-           scribus/ui/pageitemsetterbase.h \
            scribus/ui/pagelayout.h \
            scribus/ui/pagepalette.h \
            scribus/ui/pagepalette_masterpages.h \
@@ -1064,7 +1056,6 @@
          scribus/ui/picsearchoptions.ui \
          scribus/ui/picstatus.ui \
          scribus/ui/polygonwidgetbase.ui \
-         scribus/ui/positionsetter.ui \
          scribus/ui/preferencesdialogbase.ui \
          scribus/ui/prefs_colormanagementbase.ui \
          scribus/ui/prefs_displaybase.ui \
@@ -1118,7 +1109,6 @@
          scribus/ui/replaceonecolor.ui \
          scribus/ui/resourcemanagerbase.ui \
          scribus/ui/resourcemanagerlicensebase.ui \
-         scribus/ui/rotationsetter.ui \
          scribus/ui/selectobjects.ui \
          scribus/ui/shortcutwidget.ui \
          scribus/ui/smcellstylewidget.ui \
@@ -1260,8 +1250,6 @@
            scribus/notesstyles.cpp \
            scribus/numeration.cpp \
            scribus/observable.cpp \
-           scribus/openpalettemanager.cpp \
-           scribus/openpalettemodel.cpp \
            scribus/pageitem.cpp \
            scribus/pageitem_arc.cpp \
            scribus/pageitem_group.cpp \
@@ -1281,7 +1269,6 @@
            scribus/pageitemiterator.cpp \
            scribus/pageitempointer.cpp \
            scribus/pageitempreview.cpp \
-           scribus/pageitemsettersmanager.cpp \
            scribus/pagesize.cpp \
            scribus/pdf_analyzer.cpp \
            scribus/pdflib.cpp \
@@ -1607,17 +1594,12 @@
            scribus/ui/notesstyleseditor.cpp \
            scribus/ui/numformatcombo.cpp \
            scribus/ui/oneclick.cpp \
-           scribus/ui/openpalette.cpp \
-           scribus/ui/openpaletteview.cpp \
            scribus/ui/osgeditor.cpp \
            scribus/ui/outlinepalette.cpp \
            scribus/ui/outputpreview_pdf.cpp \
            scribus/ui/outputpreview_ps.cpp \
            scribus/ui/outputpreviewbase.cpp \
            scribus/ui/pageitemattributes.cpp \
-           scribus/ui/pageitempositionsetter.cpp \
-           scribus/ui/pageitemrotationsetter.cpp \
-           scribus/ui/pageitemsetterbase.cpp \
            scribus/ui/pagelayout.cpp \
            scribus/ui/pagepalette.cpp \
            scribus/ui/pagepalette_masterpages.cpp \

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Fri Mar 26 21:14:38 2021
@@ -66,21 +66,6 @@
 else()
 	set(SCRIBUS_GMAGICK_SRC)
 endif()
-
-# We setup something like a group to gather setter related stuff
-# because it could expand into a huge amount of files at some point.
-
-set(SCRIBUS_ITEMSETTERS_SRC
-	openpalettemanager.cpp
-	openpalettemodel.cpp
-	pageitemsettersmanager.cpp
-	ui/openpalette.cpp
-	ui/openpaletteview.cpp
-	ui/pageitemsetterbase.cpp
-	ui/pageitempositionsetter.cpp
-	ui/pageitemrotationsetter.cpp
-)
-
 
 set(SCRIBUS_SOURCES
 	actionmanager.cpp
@@ -593,7 +578,6 @@
 	ui/vruler.cpp
 	ui/useprintermarginsdialog.cpp
 	ui/weldedit.cpp
-#	#{SCRIBUS_ITEMSETTERS_SRC}
 	${SCRIBUS_OSG_SRC}
 	${SCRIBUS_GMAGICK_SRC}
 )

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&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	Fri Mar 26 21:14:38 2021
@@ -1604,7 +1604,6 @@
     <uic Include="..\..\..\scribus\ui\picsearchoptions.ui" />
     <uic Include="..\..\..\scribus\ui\picstatus.ui" />
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui" />
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui" />
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_colormanagementbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_displaybase.ui" />
@@ -1657,7 +1656,6 @@
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerbase.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerlicensebase.ui" />
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui" />
     <uic Include="..\..\..\scribus\ui\selectobjects.ui" />
     <uic Include="..\..\..\scribus\ui\shortcutwidget.ui" />
     <uic Include="..\..\..\scribus\ui\smcellstylewidget.ui" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&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	Fri Mar 26 21:14:38 2021
@@ -2707,9 +2707,6 @@
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -2846,9 +2843,6 @@
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui">
-      <Filter>Form Files</Filter>
-    </uic>
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui">
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\selectobjects.ui">

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&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	Fri Mar 26 21:14:38 2021
@@ -1604,7 +1604,6 @@
     <uic Include="..\..\..\scribus\ui\picsearchoptions.ui" />
     <uic Include="..\..\..\scribus\ui\picstatus.ui" />
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui" />
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui" />
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_colormanagementbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_displaybase.ui" />
@@ -1657,7 +1656,6 @@
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerbase.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerlicensebase.ui" />
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui" />
     <uic Include="..\..\..\scribus\ui\selectobjects.ui" />
     <uic Include="..\..\..\scribus\ui\shortcutwidget.ui" />
     <uic Include="..\..\..\scribus\ui\smcellstylewidget.ui" />

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&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	Fri Mar 26 21:14:38 2021
@@ -2707,9 +2707,6 @@
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -2846,9 +2843,6 @@
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui">
-      <Filter>Form Files</Filter>
-    </uic>
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui">
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\selectobjects.ui">

Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&path=/trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj	Fri Mar 26 21:14:38 2021
@@ -1605,7 +1605,6 @@
     <uic Include="..\..\..\scribus\ui\picsearchoptions.ui" />
     <uic Include="..\..\..\scribus\ui\picstatus.ui" />
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui" />
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui" />
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_colormanagementbase.ui" />
     <uic Include="..\..\..\scribus\ui\prefs_displaybase.ui" />
@@ -1658,7 +1657,6 @@
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerbase.ui" />
     <uic Include="..\..\..\scribus\ui\resourcemanagerlicensebase.ui" />
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui" />
     <uic Include="..\..\..\scribus\ui\selectobjects.ui" />
     <uic Include="..\..\..\scribus\ui\shortcutwidget.ui" />
     <uic Include="..\..\..\scribus\ui\smcellstylewidget.ui" />

Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24589&path=/trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters	Fri Mar 26 21:14:38 2021
@@ -2707,9 +2707,6 @@
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\positionsetter.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -2846,9 +2843,6 @@
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\replaceonecolor.ui">
-      <Filter>Form Files</Filter>
-    </uic>
-    <uic Include="..\..\..\scribus\ui\rotationsetter.ui">
       <Filter>Form Files</Filter>
     </uic>
     <uic Include="..\..\..\scribus\ui\selectobjects.ui">




More information about the scribus-commit mailing list