Author: jghali
Date: Sun Mar 10 12:44:29 2019
New Revision: 22879

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22879
Log:
#15589: Remove old PrefsPanel API

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/scripterprefsgui.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scripterprefsgui.h
    trunk/Scribus/scribus/plugins/scriptplugin/scripterprefsgui.ui
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
    trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
    trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
    trunk/Scribus/scribus/plugins/short-words/shortwords.h
    trunk/Scribus/scribus/plugins/short-words/swprefsgui.cpp
    trunk/Scribus/scribus/plugins/short-words/swprefsgui.h
    trunk/Scribus/scribus/scplugin.cpp
    trunk/Scribus/scribus/scplugin.h
    trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp
    trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h
    trunk/Scribus/scribus/ui/pluginmanagerprefsgui.ui
    trunk/Scribus/scribus/ui/prefs_plugins.cpp
    trunk/Scribus/scribus/ui/prefspanel.cpp
    trunk/Scribus/scribus/ui/prefspanel.h
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj
    trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj.filters
    trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj
    trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
    trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
    trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
    trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters

Modified: trunk/Scribus/Scribus.pro
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro   (original)
+++ trunk/Scribus/Scribus.pro   Sun Mar 10 12:44:29 2019
@@ -518,7 +518,6 @@
            scribus/ui/picsearch.h \
            scribus/ui/picsearchoptions.h \
            scribus/ui/picstatus.h \
-           scribus/ui/pluginmanagerprefsgui.h \
            scribus/ui/polygonwidget.h \
            scribus/ui/polyprops.h \
            scribus/ui/preferencesdialog.h \
@@ -549,7 +548,6 @@
            scribus/ui/prefs_tableofcontents.h \
            scribus/ui/prefs_typography.h \
            scribus/ui/prefs_userinterface.h \
-           scribus/ui/prefspanel.h \
            scribus/ui/preview.h \
            scribus/ui/printdialog.h \
            scribus/ui/propertiespalette.h \
@@ -738,7 +736,6 @@
            scribus/plugins/scriptplugin/prefs_scripter.h \
            scribus/plugins/scriptplugin/runscriptdialog.h \
            scribus/plugins/scriptplugin/scriptercore.h \
-           scribus/plugins/scriptplugin/scripterprefsgui.h \
            scribus/plugins/scriptplugin/scriptplugin.h \
            scribus/plugins/scriptplugin/svgimport.h \
            scribus/plugins/shapes/shapepalette.h \
@@ -748,7 +745,6 @@
            scribus/plugins/short-words/prefs_shortwords.h \
            scribus/plugins/short-words/shortwords.h \
            scribus/plugins/short-words/swdialog.h \
-           scribus/plugins/short-words/swprefsgui.h \
            scribus/plugins/short-words/swsyntaxhighlighter.h \
            scribus/plugins/short-words/version.h \
            scribus/third_party/fparser/fparser.hh \
@@ -1069,7 +1065,6 @@
          scribus/ui/picsearch.ui \
          scribus/ui/picsearchoptions.ui \
          scribus/ui/picstatus.ui \
-         scribus/ui/pluginmanagerprefsgui.ui \
          scribus/ui/polygonwidgetbase.ui \
          scribus/ui/positionsetter.ui \
          scribus/ui/preferencesdialogbase.ui \
@@ -1166,7 +1161,6 @@
          scribus/plugins/scriptplugin/pconsole.ui \
          scribus/plugins/scriptplugin/prefs_scripterbase.ui \
          scribus/plugins/scriptplugin/runscriptdialog.ui \
-         scribus/plugins/scriptplugin/scripterprefsgui.ui \
          scribus/plugins/short-words/prefs_shortwordsbase.ui \
          scribus/plugins/short-words/swdialog.ui \
          scribus/plugins/export/pixmapexport/exportform.ui \
@@ -1640,7 +1634,6 @@
            scribus/ui/picsearch.cpp \
            scribus/ui/picsearchoptions.cpp \
            scribus/ui/picstatus.cpp \
-           scribus/ui/pluginmanagerprefsgui.cpp \
            scribus/ui/polygonwidget.cpp \
            scribus/ui/polyprops.cpp \
            scribus/ui/preferencesdialog.cpp \
@@ -1670,7 +1663,6 @@
            scribus/ui/prefs_tableofcontents.cpp \
            scribus/ui/prefs_typography.cpp \
            scribus/ui/prefs_userinterface.cpp \
-           scribus/ui/prefspanel.cpp \
            scribus/ui/preview.cpp \
            scribus/ui/printdialog.cpp \
            scribus/ui/propertiespalette.cpp \
@@ -1856,7 +1848,6 @@
            scribus/plugins/scriptplugin/prefs_scripter.cpp \
            scribus/plugins/scriptplugin/runscriptdialog.cpp \
            scribus/plugins/scriptplugin/scriptercore.cpp \
-           scribus/plugins/scriptplugin/scripterprefsgui.cpp \
            scribus/plugins/scriptplugin/scriptplugin.cpp \
            scribus/plugins/scriptplugin/svgimport.cpp \
            scribus/plugins/shapes/shapepalette.cpp \
@@ -1866,7 +1857,6 @@
            scribus/plugins/short-words/prefs_shortwords.cpp \
            scribus/plugins/short-words/shortwords.cpp \
            scribus/plugins/short-words/swdialog.cpp \
-           scribus/plugins/short-words/swprefsgui.cpp \
            scribus/plugins/short-words/swsyntaxhighlighter.cpp \
            scribus/third_party/fparser/example.cc \
            scribus/third_party/fparser/fparser.cc \

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt   (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt   Sun Mar 10 
12:44:29 2019
@@ -13,7 +13,6 @@
 set(SCRIPTER_PLUGIN_UI_SRC
        pconsole.ui
        runscriptdialog.ui
-       scripterprefsgui.ui
        prefs_scripterbase.ui
 )
 
@@ -21,7 +20,6 @@
        pconsole.h
        scriptplugin.h
        scriptercore.h
-       scripterprefsgui.h
        runscriptdialog.h
        prefs_scripter.h
 )
@@ -51,7 +49,6 @@
        prefs_scripter.cpp
        runscriptdialog.cpp
        scriptercore.cpp
-       scripterprefsgui.cpp
        scriptplugin.cpp
        svgimport.cpp
 )

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sun Mar 10 
12:44:29 2019
@@ -50,7 +50,6 @@
 #include "scribuscore.h"
 #include "scribusstructs.h"
 #include "scriptercore.h"
-#include "scripterprefsgui.h"
 #include "scriptplugin.h"
 #include "svgimport.h"
 #include "ui/customfdialog.h"
@@ -199,17 +198,6 @@
        Py_Finalize();
        return true;
 }
-
-bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel, 
QString& caption, QPixmap& icon)
-{
-       panel = new ScripterPrefsGui(parent);
-       Q_CHECK_PTR(panel);
-       connect(panel, SIGNAL(prefsChanged()), scripterCore, 
SLOT(updateSyntaxHighlighter()));
-       caption = tr("Scripter");
-       icon = IconManager::instance()->loadPixmap("python.png");
-       return true;
-}
-
 
 bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel, 
QString& caption, QPixmap& icon)
 {

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h   (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h   Sun Mar 10 
12:44:29 2019
@@ -17,7 +17,6 @@
 class QString;
 class QPixmap;
 class QWidget;
-class PrefsPanel;
 
 class PLUGIN_API ScriptPlugin : public ScPersistentPlugin
 {
@@ -33,8 +32,6 @@
                virtual const AboutData* getAboutData() const;
                virtual void deleteAboutData(const AboutData* about) const;
                virtual void languageChange();
-               virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& 
panel,
-                                                                               
 QString& caption, QPixmap& icon);
                virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& 
panel,
                                                                                
 QString& caption, QPixmap& icon);
                virtual void addToMainWindowMenu(ScribusMainWindow *);

Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt    (original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt    Sun Mar 10 
12:44:29 2019
@@ -13,7 +13,6 @@
        parse.h
        prefs_shortwords.h
        shortwords.h
-       swprefsgui.h
        swdialog.h
        swsyntaxhighlighter.h
 )
@@ -23,7 +22,6 @@
        parse.cpp
        prefs_shortwords.cpp
        shortwords.cpp
-       swprefsgui.cpp
        swsyntaxhighlighter.cpp
        swdialog.cpp
 )

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.cpp    (original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.cpp    Sun Mar 10 
12:44:29 2019
@@ -35,7 +35,6 @@
 #include "scribusview.h"
 #include "shortwords.h"
 #include "swdialog.h"
-#include "swprefsgui.h"
 #include "version.h"
 
 
@@ -158,15 +157,6 @@
        return true;
 }
 
-bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, PrefsPanel*& 
panel, QString& caption, QPixmap& icon)
-{
-       panel = new SWPrefsGui(parent);
-       Q_CHECK_PTR(panel);
-       caption = tr("Short Words");
-       icon = IconManager::instance()->loadPixmap("shortwords.png");
-       return true;
-}
-
 bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& 
panel, QString& caption, QPixmap& icon)
 {
        panel = new Prefs_ShortWords(parent);

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.h      (original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.h      Sun Mar 10 
12:44:29 2019
@@ -34,8 +34,6 @@
                virtual void languageChange();
                virtual void addToMainWindowMenu(ScribusMainWindow *) {};
                /*! \brief Preference widget */
-               virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& 
panel,
-                                                                               
 QString& caption, QPixmap& icon);
                virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& 
panel,
                                                                                
 QString& caption, QPixmap& icon);
                // Special features (none)

Modified: trunk/Scribus/scribus/scplugin.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/scplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/scplugin.cpp  (original)
+++ trunk/Scribus/scribus/scplugin.cpp  Sun Mar 10 12:44:29 2019
@@ -11,7 +11,6 @@
 #include "scribusdoc.h"
 #include "scribusapp.h"
 #include "selection.h"
-#include "ui/prefspanel.h"
 #include "ui/prefs_pane.h"
 
 //=====================================================//
@@ -25,14 +24,6 @@
 
 ScPlugin::~ScPlugin()
 {
-}
-
-bool ScPlugin::newPrefsPanelWidget( QWidget* /* parent */,
-                                                                       
PrefsPanel*& /* panel */,
-                                                                       
QString& /* caption */,
-                                                                       
QPixmap& /* icon */)
-{
-       return false;
 }
 
 bool ScPlugin::newPrefsPanelWidget( QWidget* /* parent */,

Modified: trunk/Scribus/scribus/scplugin.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/scplugin.h
==============================================================================
--- trunk/Scribus/scribus/scplugin.h    (original)
+++ trunk/Scribus/scribus/scplugin.h    Sun Mar 10 12:44:29 2019
@@ -18,7 +18,6 @@
 class ScribusDoc;
 class ScribusMainWindow;
 class DeferredTask;
-class PrefsPanel;
 class Prefs_Pane;
 
 /**
@@ -157,7 +156,7 @@
                 * the widget will be added to or a child of it, otherwise the 
panel
                 * won't be deleted correctly when the dialog is.
                 *
-                * See prefspanel.h for info on implementing the panel.
+                * See prefs_pane.h for info on implementing the panel.
                 *
                 * This method must return false (the default) if the plugin 
does
                 * not provide a prefs panel. If true is returned, caption, 
panel,
@@ -171,8 +170,6 @@
                 *
                 * By default, returns 0 to indicate no prefs UI.
                */
-               virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& 
panel,
-                                                                               
 QString& caption, QPixmap& icon);
                virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& 
panel,
                                                                 QString& 
caption, QPixmap& icon);
 

Modified: trunk/Scribus/scribus/ui/prefs_plugins.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/scribus/ui/prefs_plugins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_plugins.cpp  (original)
+++ trunk/Scribus/scribus/ui/prefs_plugins.cpp  Sun Mar 10 12:44:29 2019
@@ -10,7 +10,6 @@
 #include <QCheckBox>
 #include <QLabel>
 #include "ui/scmwmenumanager.h"
-#include "pluginmanagerprefsgui.h"
 #include "pluginmanager.h"
 #include "scraction.h"
 #include "scplugin.h"

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&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   Sun Mar 10 
12:44:29 2019
@@ -542,7 +542,6 @@
     <moc Include="..\..\..\scribus\ui\picsearchoptions.h" />
     <moc Include="..\..\..\scribus\ui\picstatus.h" />
     <moc Include="..\..\..\scribus\pluginmanager.h" />
-    <moc Include="..\..\..\scribus\ui\pluginmanagerprefsgui.h" />
     <moc Include="..\..\..\scribus\ui\polygonwidget.h" />
     <moc Include="..\..\..\scribus\ui\polyprops.h" />
     <moc Include="..\..\..\scribus\ui\preferencesdialog.h" />
@@ -576,7 +575,6 @@
     <ClInclude Include="..\..\..\scribus\prefscontext.h" />
     <ClInclude Include="..\..\..\scribus\prefsfile.h" />
     <moc Include="..\..\..\scribus\prefsmanager.h" />
-    <moc Include="..\..\..\scribus\ui\prefspanel.h" />
     <ClInclude Include="..\..\..\scribus\prefsreader.h" />
     <ClInclude Include="..\..\..\scribus\prefsstructs.h" />
     <ClInclude Include="..\..\..\scribus\prefstable.h" />
@@ -1212,7 +1210,6 @@
     <ClCompile Include="..\..\..\scribus\ui\picsearchoptions.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\picstatus.cpp" />
     <ClCompile Include="..\..\..\scribus\pluginmanager.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\pluginmanagerprefsgui.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\polygonwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\polyprops.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\preferencesdialog.cpp" />
@@ -1245,7 +1242,6 @@
     <ClCompile Include="..\..\..\scribus\prefscontext.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsfile.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsmanager.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\prefspanel.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsreader.cpp" />
     <ClCompile Include="..\..\..\scribus\prefstable.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\preview.cpp" />
@@ -1573,7 +1569,6 @@
     <uic Include="..\..\..\scribus\ui\picsearch.ui" />
     <uic Include="..\..\..\scribus\ui\picsearchoptions.ui" />
     <uic Include="..\..\..\scribus\ui\picstatus.ui" />
-    <uic Include="..\..\..\scribus\ui\pluginmanagerprefsgui.ui" />
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui" />
     <uic Include="..\..\..\scribus\ui\positionsetter.ui" />
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui" />
@@ -1720,9 +1715,9 @@
   </ImportGroup>
   <Import Project="..\..\..\scribus.install.targets" />
   <Target Name="AfterBuildMessage" AfterTargets="Build" 
BeforeTargets="AfterBuild">
-    <Message Importance="High" Text="Now copying assets to output 
directory..." />
+    <Message Importance="High" Text="Copying assets to output directory..." />
   </Target>
   <Target Name="AfterBuild" AfterTargets="Build" 
DependsOnTargets="$(AfterBuildDependsOn)">
-    <Message Importance="High" Text="Assets have been copied to output 
directory..." />
+    <Message Importance="High" Text="Assets have been to output directory..." 
/>
   </Target>
 </Project>

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&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   Sun Mar 
10 12:44:29 2019
@@ -1498,9 +1498,6 @@
     <ClCompile Include="..\..\..\scribus\pluginmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\pluginmanagerprefsgui.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\polygonwidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1597,9 +1594,6 @@
     <ClCompile Include="..\..\..\scribus\prefsmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\prefspanel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\prefsreader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2398,12 +2392,12 @@
     <ClCompile Include="..\..\..\scribus\fonts\fontfeatures.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\scribus\ui\fontembeddingmodel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\fontembeddingcombo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\fontembeddingmodel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp">
       <Filter>colorMgmt</Filter>
     </ClCompile>
@@ -2458,6 +2452,12 @@
     <ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\scribus\palettes\cxfobject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sce308tables.cpp">
       <Filter>colorMgmt</Filter>
     </ClCompile>
@@ -2474,12 +2474,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\sccolorstructs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\palettes\cxfobject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -2620,9 +2614,6 @@
     <uic Include="..\..\..\scribus\ui\picstatus.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\pluginmanagerprefsgui.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -3024,31 +3015,31 @@
     <lrelease Include="..\..\..\resources\translations\scribus.pt_PT.ts">
       <Filter>Translation Files</Filter>
     </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.ta.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.be.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.es_AR.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.hi_IN.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.hr_HR.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.ml.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.oc.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
+    <lrelease Include="..\..\..\resources\translations\scribus.pms.ts">
+      <Filter>Translation Files</Filter>
+    </lrelease>
     <lrelease Include="..\..\..\resources\translations\scribus.si.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.ta.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.be.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.es_AR.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.hi_IN.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.hr_HR.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.ml.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.oc.ts">
-      <Filter>Translation Files</Filter>
-    </lrelease>
-    <lrelease Include="..\..\..\resources\translations\scribus.pms.ts">
       <Filter>Translation Files</Filter>
     </lrelease>
   </ItemGroup>
@@ -3545,9 +3536,6 @@
     <moc Include="..\..\..\scribus\pluginmanager.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\pluginmanagerprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\ui\polygonwidget.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -3639,9 +3627,6 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\prefsmanager.h">
-      <Filter>Header Files</Filter>
-    </moc>
-    <moc Include="..\..\..\scribus\ui\prefspanel.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\preview.h">

Modified: trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj      
(original)
+++ trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj      Sun Mar 
10 12:44:29 2019
@@ -238,7 +238,6 @@
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.cpp" />
-    <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\scriptplugin\svgimport.cpp" />
   </ItemGroup>
@@ -269,7 +268,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.h" />
-    <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h" />
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h" />
   </ItemGroup>
@@ -277,7 +275,6 @@
     <uic Include="..\..\..\scribus\plugins\scriptplugin\pconsole.ui" />
     <uic Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripterbase.ui" 
/>
     <uic Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.ui" />
-    <uic Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.ui" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj.filters      
(original)
+++ trunk/Scribus/win32/msvc2013/scriptplugin/scriptplugin.vcxproj.filters      
Sun Mar 10 12:44:29 2019
@@ -85,9 +85,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.cpp">
@@ -181,9 +178,6 @@
     <uic Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.ui">
-      <Filter>Form Files</Filter>
-    </uic>
   </ItemGroup>
   <ItemGroup>
     <moc Include="..\..\..\scribus\plugins\scriptplugin\pconsole.h">
@@ -198,9 +192,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h">
       <Filter>Header Files</Filter>
     </moc>

Modified: trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj  (original)
+++ trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj  Sun Mar 10 
12:44:29 2019
@@ -215,7 +215,6 @@
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\prefs_shortwords.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\short-words\shortwords.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\short-words\swdialog.cpp" />
-    <ClCompile Include="..\..\..\scribus\plugins\short-words\swprefsgui.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -224,7 +223,6 @@
     <moc Include="..\..\..\scribus\plugins\short-words\prefs_shortwords.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\shortwords.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swdialog.h" />
-    <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" 
/>
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h" />

Modified: trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj.filters  
(original)
+++ trunk/Scribus/win32/msvc2013/shortwords/shortwords.vcxproj.filters  Sun Mar 
10 12:44:29 2019
@@ -28,9 +28,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\plugins\short-words\swdialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\plugins\short-words\swprefsgui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.cpp">
@@ -72,9 +69,6 @@
     <moc Include="..\..\..\scribus\plugins\short-words\swdialog.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h">
       <Filter>Header Files</Filter>
     </moc>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&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   Sun Mar 10 
12:44:29 2019
@@ -542,7 +542,6 @@
     <moc Include="..\..\..\scribus\ui\picsearchoptions.h" />
     <moc Include="..\..\..\scribus\ui\picstatus.h" />
     <moc Include="..\..\..\scribus\pluginmanager.h" />
-    <moc Include="..\..\..\scribus\ui\pluginmanagerprefsgui.h" />
     <moc Include="..\..\..\scribus\ui\polygonwidget.h" />
     <moc Include="..\..\..\scribus\ui\polyprops.h" />
     <moc Include="..\..\..\scribus\ui\preferencesdialog.h" />
@@ -576,7 +575,6 @@
     <ClInclude Include="..\..\..\scribus\prefscontext.h" />
     <ClInclude Include="..\..\..\scribus\prefsfile.h" />
     <moc Include="..\..\..\scribus\prefsmanager.h" />
-    <moc Include="..\..\..\scribus\ui\prefspanel.h" />
     <ClInclude Include="..\..\..\scribus\prefsreader.h" />
     <ClInclude Include="..\..\..\scribus\prefsstructs.h" />
     <ClInclude Include="..\..\..\scribus\prefstable.h" />
@@ -1212,7 +1210,6 @@
     <ClCompile Include="..\..\..\scribus\ui\picsearchoptions.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\picstatus.cpp" />
     <ClCompile Include="..\..\..\scribus\pluginmanager.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\pluginmanagerprefsgui.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\polygonwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\polyprops.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\preferencesdialog.cpp" />
@@ -1245,7 +1242,6 @@
     <ClCompile Include="..\..\..\scribus\prefscontext.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsfile.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsmanager.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\prefspanel.cpp" />
     <ClCompile Include="..\..\..\scribus\prefsreader.cpp" />
     <ClCompile Include="..\..\..\scribus\prefstable.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\preview.cpp" />
@@ -1573,7 +1569,6 @@
     <uic Include="..\..\..\scribus\ui\picsearch.ui" />
     <uic Include="..\..\..\scribus\ui\picsearchoptions.ui" />
     <uic Include="..\..\..\scribus\ui\picstatus.ui" />
-    <uic Include="..\..\..\scribus\ui\pluginmanagerprefsgui.ui" />
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui" />
     <uic Include="..\..\..\scribus\ui\positionsetter.ui" />
     <uic Include="..\..\..\scribus\ui\preferencesdialogbase.ui" />
@@ -1720,9 +1715,9 @@
   </ImportGroup>
   <Import Project="..\..\..\scribus.install.targets" />
   <Target Name="AfterBuildMessage" AfterTargets="Build" 
BeforeTargets="AfterBuild">
-    <Message Importance="High" Text="Now copying assets to output 
directory..." />
+    <Message Importance="High" Text="Copying assets to output directory..." />
   </Target>
   <Target Name="AfterBuild" AfterTargets="Build" 
DependsOnTargets="$(AfterBuildDependsOn)">
-    <Message Importance="High" Text="Assets have been copied to output 
directory..." />
+    <Message Importance="High" Text="Assets have been to output directory..." 
/>
   </Target>
 </Project>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&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   Sun Mar 
10 12:44:29 2019
@@ -1498,9 +1498,6 @@
     <ClCompile Include="..\..\..\scribus\pluginmanager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\pluginmanagerprefsgui.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\polygonwidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1595,9 +1592,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\prefsmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\prefspanel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\prefsreader.cpp">
@@ -2620,9 +2614,6 @@
     <uic Include="..\..\..\scribus\ui\picstatus.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\ui\pluginmanagerprefsgui.ui">
-      <Filter>Form Files</Filter>
-    </uic>
     <uic Include="..\..\..\scribus\ui\polygonwidgetbase.ui">
       <Filter>Form Files</Filter>
     </uic>
@@ -3545,9 +3536,6 @@
     <moc Include="..\..\..\scribus\pluginmanager.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\pluginmanagerprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\ui\polygonwidget.h">
       <Filter>Header Files</Filter>
     </moc>
@@ -3639,9 +3627,6 @@
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\prefsmanager.h">
-      <Filter>Header Files</Filter>
-    </moc>
-    <moc Include="..\..\..\scribus\ui\prefspanel.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\preview.h">

Modified: trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj      
(original)
+++ trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj      Sun Mar 
10 12:44:29 2019
@@ -238,7 +238,6 @@
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.cpp" />
-    <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\scriptplugin\svgimport.cpp" />
   </ItemGroup>
@@ -269,7 +268,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.h" />
-    <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h" />
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h" />
   </ItemGroup>
@@ -277,7 +275,6 @@
     <uic Include="..\..\..\scribus\plugins\scriptplugin\pconsole.ui" />
     <uic Include="..\..\..\scribus\plugins\scriptplugin\prefs_scripterbase.ui" 
/>
     <uic Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.ui" />
-    <uic Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.ui" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters      
(original)
+++ trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters      
Sun Mar 10 12:44:29 2019
@@ -85,9 +85,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.cpp">
@@ -181,9 +178,6 @@
     <uic Include="..\..\..\scribus\plugins\scriptplugin\runscriptdialog.ui">
       <Filter>Form Files</Filter>
     </uic>
-    <uic Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.ui">
-      <Filter>Form Files</Filter>
-    </uic>
   </ItemGroup>
   <ItemGroup>
     <moc Include="..\..\..\scribus\plugins\scriptplugin\pconsole.h">
@@ -198,9 +192,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptercore.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h">
       <Filter>Header Files</Filter>
     </moc>

Modified: trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj  (original)
+++ trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj  Sun Mar 10 
12:44:29 2019
@@ -215,7 +215,6 @@
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\prefs_shortwords.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\short-words\shortwords.cpp" />
     <ClCompile Include="..\..\..\scribus\plugins\short-words\swdialog.cpp" />
-    <ClCompile Include="..\..\..\scribus\plugins\short-words\swprefsgui.cpp" />
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -224,7 +223,6 @@
     <moc Include="..\..\..\scribus\plugins\short-words\prefs_shortwords.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\shortwords.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swdialog.h" />
-    <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" 
/>
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h" />

Modified: trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22879&path=/trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters  
(original)
+++ trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters  Sun Mar 
10 12:44:29 2019
@@ -28,9 +28,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\plugins\short-words\swdialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\plugins\short-words\swprefsgui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile 
Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.cpp">
@@ -72,9 +69,6 @@
     <moc Include="..\..\..\scribus\plugins\short-words\swdialog.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h">
-      <Filter>Header Files</Filter>
-    </moc>
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h">
       <Filter>Header Files</Filter>
     </moc>


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to