r24517 by jghali - #16484: Clean up adjustcmsdialog

scribus-commit scribus-commit at lists.scribus.net
Sat Feb 20 18:12:04 UTC 2021 

Author: jghali
Date: Sat Feb 20 18:12:04 2021
New Revision: 24517

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24517
Log:
#16484: Clean up adjustcmsdialog

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/adjustcmsdialog.cpp
    trunk/Scribus/scribus/ui/adjustcmsdialog.h
    trunk/Scribus/scribus/ui/cmsprefs.cpp
    trunk/Scribus/scribus/ui/cmsprefs.h
    trunk/Scribus/scribus/ui/cmsprefsbase.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=24517&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro	(original)
+++ trunk/Scribus/Scribus.pro	Sat Feb 20 18:12:04 2021
@@ -394,7 +394,6 @@
            scribus/ui/aboutplugins.h \
            scribus/ui/actionsearchdialog.h \
            scribus/ui/AdapterWidget.h \
-           scribus/ui/adjustcmsdialog.h \
            scribus/ui/aligndistribute.h \
            scribus/ui/alignselect.h \
            scribus/ui/annot.h \
@@ -414,7 +413,6 @@
            scribus/ui/charzoom.h \
            scribus/ui/checkDocument.h \
            scribus/ui/clockwidget.h \
-           scribus/ui/cmsprefs.h \
            scribus/ui/cmykfw.h \
            scribus/ui/collectforoutput_ui.h \
            scribus/ui/colorchart.h \
@@ -1023,7 +1021,6 @@
          scribus/ui/arcwidgetbase.ui \
          scribus/ui/charselect.ui \
          scribus/ui/charselectenhanced.ui \
-         scribus/ui/cmsprefsbase.ui \
          scribus/ui/cmykfwbase.ui \
          scribus/ui/colorpalette.ui \
          scribus/ui/colorsandfillsbase.ui \
@@ -1510,7 +1507,6 @@
            scribus/ui/aboutplugins.cpp \
            scribus/ui/actionsearchdialog.cpp \
            scribus/ui/AdapterWidget.cpp \
-           scribus/ui/adjustcmsdialog.cpp \
            scribus/ui/aligndistribute.cpp \
            scribus/ui/alignselect.cpp \
            scribus/ui/annot.cpp \
@@ -1530,7 +1526,6 @@
            scribus/ui/charzoom.cpp \
            scribus/ui/checkDocument.cpp \
            scribus/ui/clockwidget.cpp \
-           scribus/ui/cmsprefs.cpp \
            scribus/ui/cmykfw.cpp \
            scribus/ui/collectforoutput_ui.cpp \
            scribus/ui/colorchart.cpp \

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Sat Feb 20 18:12:04 2021
@@ -339,7 +339,6 @@
 	ui/about.cpp
 	ui/aboutplugins.cpp
 	ui/actionsearchdialog.cpp
-	ui/adjustcmsdialog.cpp
 	ui/aligndistribute.cpp
 	ui/alignselect.cpp
 	ui/directionselect.cpp
@@ -360,7 +359,6 @@
 	ui/charzoom.cpp
 	ui/checkDocument.cpp
 	ui/clockwidget.cpp
-	ui/cmsprefs.cpp
 	ui/cmykfw.cpp
 	ui/collectforoutput_ui.cpp
 	ui/colorchart.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat Feb 20 18:12:04 2021
@@ -162,7 +162,6 @@
 #include "ui/about.h"
 #include "ui/aboutplugins.h"
 #include "ui/actionsearchdialog.h"
-#include "ui/adjustcmsdialog.h"
 #include "ui/aligndistribute.h"
 #include "ui/annot.h"
 #include "ui/annota.h"

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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 Feb 20 18:12:04 2021
@@ -268,7 +268,6 @@
     <moc Include="..\..\..\scribus\ui\about.h" />
     <moc Include="..\..\..\scribus\ui\aboutplugins.h" />
     <moc Include="..\..\..\scribus\actionmanager.h" />
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h" />
     <moc Include="..\..\..\scribus\ui\aligndistribute.h" />
     <moc Include="..\..\..\scribus\ui\alignselect.h" />
     <moc Include="..\..\..\scribus\ui\annot.h" />
@@ -366,7 +365,6 @@
     <moc Include="..\..\..\scribus\ui\clockwidget.h" />
     <ClInclude Include="..\..\..\scribus\cmserrorhandling.h" />
     <ClInclude Include="..\..\..\scribus\cmsettings.h" />
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h" />
     <moc Include="..\..\..\scribus\ui\cmykfw.h" />
     <ClInclude Include="..\..\..\scribus\collapsedtablepainter.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
@@ -928,7 +926,6 @@
     <ClCompile Include="..\..\..\scribus\ui\aboutplugins.cpp" />
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\actionsearchdialog.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\alignselect.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\annot.cpp" />
@@ -991,7 +988,6 @@
     <ClCompile Include="..\..\..\scribus\ui\clockwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\cmserrorhandling.cpp" />
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp" />
     <ClCompile Include="..\..\..\scribus\collapsedtablepainter.cpp" />
     <ClCompile Include="..\..\..\scribus\collect4output.cpp" />
@@ -1566,7 +1562,6 @@
     <uic Include="..\..\..\scribus\ui\arcwidgetbase.ui" />
     <uic Include="..\..\..\scribus\ui\charselect.ui" />
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui" />
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui" />
     <uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
     <uic Include="..\..\..\scribus\ui\colorpalette.ui" />
     <uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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 Feb 20 18:12:04 2021
@@ -868,9 +868,6 @@
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1055,9 +1052,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp">
@@ -2611,9 +2605,6 @@
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\colorpalette.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -3188,9 +3179,6 @@
     <moc Include="..\..\..\scribus\actionmanager.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\ui\aligndistribute.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -3300,9 +3288,6 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\clockwidget.h">
-      <Filter>Header Files</Filter>
-    </moc>
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\cmykfw.h">

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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 Feb 20 18:12:04 2021
@@ -268,7 +268,6 @@
     <moc Include="..\..\..\scribus\ui\about.h" />
     <moc Include="..\..\..\scribus\ui\aboutplugins.h" />
     <moc Include="..\..\..\scribus\actionmanager.h" />
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h" />
     <moc Include="..\..\..\scribus\ui\aligndistribute.h" />
     <moc Include="..\..\..\scribus\ui\alignselect.h" />
     <moc Include="..\..\..\scribus\ui\annot.h" />
@@ -366,7 +365,6 @@
     <moc Include="..\..\..\scribus\ui\clockwidget.h" />
     <ClInclude Include="..\..\..\scribus\cmserrorhandling.h" />
     <ClInclude Include="..\..\..\scribus\cmsettings.h" />
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h" />
     <moc Include="..\..\..\scribus\ui\cmykfw.h" />
     <ClInclude Include="..\..\..\scribus\collapsedtablepainter.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
@@ -928,7 +926,6 @@
     <ClCompile Include="..\..\..\scribus\ui\aboutplugins.cpp" />
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\actionsearchdialog.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\alignselect.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\annot.cpp" />
@@ -991,7 +988,6 @@
     <ClCompile Include="..\..\..\scribus\ui\clockwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\cmserrorhandling.cpp" />
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp" />
     <ClCompile Include="..\..\..\scribus\collapsedtablepainter.cpp" />
     <ClCompile Include="..\..\..\scribus\collect4output.cpp" />
@@ -1566,7 +1562,6 @@
     <uic Include="..\..\..\scribus\ui\arcwidgetbase.ui" />
     <uic Include="..\..\..\scribus\ui\charselect.ui" />
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui" />
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui" />
     <uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
     <uic Include="..\..\..\scribus\ui\colorpalette.ui" />
     <uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />

Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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 Feb 20 18:12:04 2021
@@ -868,9 +868,6 @@
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1055,9 +1052,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp">
@@ -2611,9 +2605,6 @@
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\colorpalette.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -3188,9 +3179,6 @@
     <moc Include="..\..\..\scribus\actionmanager.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\ui\aligndistribute.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -3300,9 +3288,6 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\clockwidget.h">
-      <Filter>Header Files</Filter>
-    </moc>
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\cmykfw.h">

Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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	Sat Feb 20 18:12:04 2021
@@ -269,7 +269,6 @@
     <moc Include="..\..\..\scribus\ui\about.h" />
     <moc Include="..\..\..\scribus\ui\aboutplugins.h" />
     <moc Include="..\..\..\scribus\actionmanager.h" />
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h" />
     <moc Include="..\..\..\scribus\ui\aligndistribute.h" />
     <moc Include="..\..\..\scribus\ui\alignselect.h" />
     <moc Include="..\..\..\scribus\ui\annot.h" />
@@ -367,7 +366,6 @@
     <moc Include="..\..\..\scribus\ui\clockwidget.h" />
     <ClInclude Include="..\..\..\scribus\cmserrorhandling.h" />
     <ClInclude Include="..\..\..\scribus\cmsettings.h" />
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h" />
     <moc Include="..\..\..\scribus\ui\cmykfw.h" />
     <ClInclude Include="..\..\..\scribus\collapsedtablepainter.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
@@ -929,7 +927,6 @@
     <ClCompile Include="..\..\..\scribus\ui\aboutplugins.cpp" />
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\actionsearchdialog.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\alignselect.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\annot.cpp" />
@@ -992,7 +989,6 @@
     <ClCompile Include="..\..\..\scribus\ui\clockwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\cmserrorhandling.cpp" />
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp" />
     <ClCompile Include="..\..\..\scribus\collapsedtablepainter.cpp" />
     <ClCompile Include="..\..\..\scribus\collect4output.cpp" />
@@ -1567,7 +1563,6 @@
     <uic Include="..\..\..\scribus\ui\arcwidgetbase.ui" />
     <uic Include="..\..\..\scribus\ui\charselect.ui" />
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui" />
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui" />
     <uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
     <uic Include="..\..\..\scribus\ui\colorpalette.ui" />
     <uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />

Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24517&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	Sat Feb 20 18:12:04 2021
@@ -868,9 +868,6 @@
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\adjustcmsdialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\aligndistribute.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1055,9 +1052,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\cmsettings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\cmsprefs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\cmykfw.cpp">
@@ -2611,9 +2605,6 @@
     <uic Include="..\..\..\scribus\ui\charselectenhanced.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\cmsprefsbase.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\colorpalette.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -3188,9 +3179,6 @@
     <moc Include="..\..\..\scribus\actionmanager.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\adjustcmsdialog.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\ui\aligndistribute.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -3300,9 +3288,6 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\clockwidget.h">
-      <Filter>Header Files</Filter>
-    </moc>
-    <moc Include="..\..\..\scribus\ui\cmsprefs.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\cmykfw.h">

More information about the scribus-commit mailing list