r14629 by cbradney - Move scripter prefs GUI to scripter dir

scribus-commit scribus-commit at lists.scribus.net
Tue Feb 2 23:10:47 CET 2010


Revision: 14629
Author: cbradney
Date: 2010-02-02T22:04:54.037710Z
Commit message: Move scripter prefs GUI to scripter dir

Changeset: 
M  /trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
D  /trunk/Scribus/scribus/ui/prefs_scripter.h
M  /trunk/Scribus/scribus/CMakeLists.txt
M  /trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
D  /trunk/Scribus/scribus/ui/prefs_scripterbase.ui
A  /trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.cpp
M  /trunk/Scribus/scribus/ui/preferencesdialog.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
A  /trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h
M  /trunk/Scribus/scribus/ui/preferencesdialog.h
A  /trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripterbase.ui
D  /trunk/Scribus/scribus/ui/prefs_scripter.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Diffs:
Index: scribus/ui/prefs_scripter.cpp
===================================================================
--- scribus/ui/prefs_scripter.cpp	(revision 14628)
+++ scribus/ui/prefs_scripter.cpp	(revision 14629)
@@ -1,20 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#include "prefs_scripter.h"
-
-Prefs_Scripter::Prefs_Scripter(QWidget* parent)
-	: QWidget(parent)
-{
-	setupUi(this);
-
-}
-
-Prefs_Scripter::~Prefs_Scripter()
-{
-}
-
Index: scribus/ui/prefs_scripter.h
===================================================================
--- scribus/ui/prefs_scripter.h	(revision 14628)
+++ scribus/ui/prefs_scripter.h	(revision 14629)
@@ -1,23 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#ifndef PREFS_SCRIPTER_H
-#define PREFS_SCRIPTER_H
-
-#include "ui_prefs_scripterbase.h"
-#include "scribusapi.h"
-
-class SCRIBUS_API Prefs_Scripter : public QWidget, Ui::Prefs_Scripter
-{
-	Q_OBJECT
-
-	public:
-		Prefs_Scripter(QWidget* parent=0);
-		~Prefs_Scripter();
-};
-
-#endif // PREFS_SCRIPTER_H
Index: scribus/ui/prefs_scripterbase.ui
===================================================================
--- scribus/ui/prefs_scripterbase.ui	(revision 14628)
+++ scribus/ui/prefs_scripterbase.ui	(revision 14629)
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Prefs_Scripter</class>
- <widget class="QWidget" name="Prefs_Scripter">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>770</width>
-    <height>608</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <widget class="QLabel" name="titleLabel">
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Scripter</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>742</width>
-        <height>537</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="font">
-          <font>
-           <pointsize>13</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Extensions</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="checkBox">
-         <property name="text">
-          <string>Enable Extension Scripts</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Startup Script:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit"/>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton">
-           <property name="text">
-            <string>Change...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="font">
-          <font>
-           <pointsize>13</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Console</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Line" name="line_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <layout class="QFormLayout" name="formLayout">
-           <property name="formAlignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-           </property>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string>Base Texts:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QPushButton" name="pushButton_2">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_5">
-             <property name="text">
-              <string>Comments:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QPushButton" name="pushButton_3">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_6">
-             <property name="text">
-              <string>Keywords:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QPushButton" name="pushButton_7">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>Signs:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="1">
-            <widget class="QPushButton" name="pushButton_4">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="label_8">
-             <property name="text">
-              <string>Errors:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <widget class="QPushButton" name="pushButton_8">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="0">
-            <widget class="QLabel" name="label_9">
-             <property name="text">
-              <string>Strings:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="1">
-            <widget class="QPushButton" name="pushButton_6">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="0">
-            <widget class="QLabel" name="label_10">
-             <property name="text">
-              <string>Numbers:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="1">
-            <widget class="QPushButton" name="pushButton_5">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::MinimumExpanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
Index: scribus/ui/preferencesdialog.h
===================================================================
--- scribus/ui/preferencesdialog.h	(revision 14628)
+++ scribus/ui/preferencesdialog.h	(revision 14629)
@@ -29,9 +29,7 @@
 #include "ui/prefs_miscellaneous.h"
 #include "ui/prefs_plugins.h"
 #include "ui/prefs_preflightverifier.h"
-#include "ui/prefs_scripter.h"
 #include "ui/prefs_scrapbook.h"
-//#include "ui/prefs_shortwords.h"
 #include "ui/prefs_typography.h"
 #include "ui/prefs_itemtools.h"
 #include "ui/prefs_operatortools.h"
@@ -93,9 +91,7 @@
 		Prefs_Miscellaneous *prefs_Miscellaneous;
 		Prefs_Plugins *prefs_Plugins;
 		Prefs_PreflightVerifier *prefs_PreflightVerifier;
-		Prefs_Scripter *prefs_Scripter;
 		Prefs_Scrapbook *prefs_Scrapbook;
-		//Prefs_ShortWords *prefs_ShortWords;
 		Prefs_Typography *prefs_Typography;
 		Prefs_ItemTools *prefs_ItemTools;
 		Prefs_OperatorTools *prefs_OperatorTools;
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp	(revision 14628)
+++ scribus/ui/preferencesdialog.cpp	(revision 14629)
@@ -73,10 +73,6 @@
 	addItem( tr("Miscellaneous"), loadIcon("misc.png"), prefs_Miscellaneous);
 	prefs_Plugins = new Prefs_Plugins(this);
 	addItem( tr("Plugins"), loadIcon("plugins.png"), prefs_Plugins);
-//	prefs_ShortWords = new Prefs_ShortWords(this);
-//	addItem( tr("Short Words"), loadIcon("tools.png"), prefs_ShortWords);
-	prefs_Scripter = new Prefs_Scripter(this);
-	addItem( tr("Scripter"), loadIcon("tools.png"), prefs_Scripter);
 	prefs_ImageCache = new Prefs_ImageCache(this);
 	addItem( tr("Image Cache"), loadIcon("tools.png"), prefs_ImageCache);
 
Index: scribus/plugins/scriptplugin/prefs_scripter.h
===================================================================
--- scribus/plugins/scriptplugin/prefs_scripter.h	(revision 0)
+++ scribus/plugins/scriptplugin/prefs_scripter.h	(revision 14629)
@@ -0,0 +1,31 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_SCRIPTER_H
+#define PREFS_SCRIPTER_H
+
+#include "ui_prefs_scripterbase.h"
+#include "ui/prefs_pane.h"
+#include "scribusapi.h"
+
+class SCRIBUS_API Prefs_Scripter : public Prefs_Pane, Ui::Prefs_Scripter
+{
+	Q_OBJECT
+
+	public:
+		Prefs_Scripter(QWidget* parent=0);
+		~Prefs_Scripter();
+		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
+		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
+
+	public slots:
+		void languageChange();
+		//! \brief Apply changes to prefs. Auto connected.
+		void apply();
+};
+
+#endif // PREFS_SCRIPTER_H
Index: scribus/plugins/scriptplugin/prefs_scripterbase.ui
===================================================================
--- scribus/plugins/scriptplugin/prefs_scripterbase.ui	(revision 0)
+++ scribus/plugins/scriptplugin/prefs_scripterbase.ui	(revision 14629)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Prefs_Scripter</class>
+ <widget class="QWidget" name="Prefs_Scripter">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>770</width>
+    <height>608</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QLabel" name="titleLabel">
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Scripter</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>742</width>
+        <height>537</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Extensions</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="checkBox">
+         <property name="text">
+          <string>Enable Extension Scripts</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Startup Script:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushButton">
+           <property name="text">
+            <string>Change...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Console</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <layout class="QFormLayout" name="formLayout">
+           <property name="formAlignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string>Base Texts:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QPushButton" name="pushButton_2">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string>Comments:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QPushButton" name="pushButton_3">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_6">
+             <property name="text">
+              <string>Keywords:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QPushButton" name="pushButton_7">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_7">
+             <property name="text">
+              <string>Signs:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QPushButton" name="pushButton_4">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_8">
+             <property name="text">
+              <string>Errors:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QPushButton" name="pushButton_8">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_9">
+             <property name="text">
+              <string>Strings:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="QPushButton" name="pushButton_6">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="text">
+              <string>Numbers:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="QPushButton" name="pushButton_5">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/plugins/scriptplugin/scriptplugin.h
===================================================================
--- scribus/plugins/scriptplugin/scriptplugin.h	(revision 14628)
+++ scribus/plugins/scriptplugin/scriptplugin.h	(revision 14629)
@@ -35,6 +35,8 @@
 		virtual void languageChange();
 		virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
 										 QString& caption, QPixmap& icon);
+		virtual bool newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
+										 QString& caption, QPixmap& icon);
 		virtual void addToMainWindowMenu(ScribusMainWindow *);
 
 		// Special features (none)
Index: scribus/plugins/scriptplugin/prefs_scripter.cpp
===================================================================
--- scribus/plugins/scriptplugin/prefs_scripter.cpp	(revision 0)
+++ scribus/plugins/scriptplugin/prefs_scripter.cpp	(revision 14629)
@@ -0,0 +1,37 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#include "prefs_scripter.h"
+#include "prefsstructs.h"
+
+Prefs_Scripter::Prefs_Scripter(QWidget* parent)
+	: Prefs_Pane(parent)
+{
+	setupUi(this);
+
+}
+
+Prefs_Scripter::~Prefs_Scripter()
+{
+}
+
+void Prefs_Scripter::languageChange()
+{
+}
+
+void Prefs_Scripter::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+}
+
+void Prefs_Scripter::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+{
+}
+
+void Prefs_Scripter::apply()
+{
+
+}
Index: scribus/plugins/scriptplugin/CMakeLists.txt
===================================================================
--- scribus/plugins/scriptplugin/CMakeLists.txt	(revision 14628)
+++ scribus/plugins/scriptplugin/CMakeLists.txt	(revision 14629)
@@ -10,6 +10,7 @@
   pconsole.ui
   runscriptdialog.ui
   scripterprefsgui.ui
+  prefs_scripterbase.ui
 )
 
 SET(SCRIPTER_PLUGIN_MOC_CLASSES
@@ -18,6 +19,7 @@
   scriptercore.h
   scripterprefsgui.h
   runscriptdialog.h
+  prefs_scripter.h
 )
 
 SET(SCRIPTER_PLUGIN_SOURCES
@@ -39,6 +41,7 @@
   objpdffile.cpp
   objprinter.cpp
   pconsole.cpp
+  prefs_scripter.cpp
   runscriptdialog.cpp
   scriptercore.cpp
   scripterprefsgui.cpp
Index: scribus/plugins/scriptplugin/scriptplugin.cpp
===================================================================
--- scribus/plugins/scriptplugin/scriptplugin.cpp	(revision 14628)
+++ scribus/plugins/scriptplugin/scriptplugin.cpp	(revision 14629)
@@ -23,7 +23,6 @@
 
 // include cmdvar.h first, as it pulls in <Python.h>
 #include "cmdvar.h"
-
 #include "cmdcolor.h"
 #include "cmddialog.h"
 #include "cmddoc.h"
@@ -44,6 +43,7 @@
 #include "objimageexport.h"
 #include "objpdffile.h"
 #include "objprinter.h"
+#include "prefs_scripter.h"
 #include "ui/propertiespalette.h"
 #include "scconfig.h"
 #include "scpaths.h"
@@ -198,10 +198,8 @@
 	return true;
 }
 
-bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent,
-									   PrefsPanel*& panel,
-									   QString& caption,
-									   QPixmap& icon)
+bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
+										   QString& caption, QPixmap& icon)
 {
 	panel = new ScripterPrefsGui(parent);
 	Q_CHECK_PTR(panel);
@@ -210,6 +208,17 @@
 	return true;
 }
 
+
+bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
+										   QString& caption, QPixmap& icon)
+{
+	panel = new Prefs_Scripter(parent);
+	Q_CHECK_PTR(panel);
+	caption = tr("Scripter");
+	icon = loadIcon("python.png");
+	return true;
+}
+
 /*  TEMPORARILY DISABLED
 void run()
 {
Index: scribus/plugins/short-words/shortwords.cpp
===================================================================
--- scribus/plugins/short-words/shortwords.cpp	(revision 14628)
+++ scribus/plugins/short-words/shortwords.cpp	(revision 14629)
@@ -22,7 +22,6 @@
 #include <QMessageBox>
 #include <QProgressBar>
 #include <QTextCodec>
-//Added by qt3to4:
 #include <QPixmap>
 
 #include "shortwords.h"
Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt	(revision 14628)
+++ scribus/CMakeLists.txt	(revision 14629)
@@ -112,7 +112,6 @@
   ui/prefs_pluginsbase.ui
   ui/prefs_preflightverifierbase.ui
   ui/prefs_printerbase.ui
-  ui/prefs_scripterbase.ui
   ui/prefs_scrapbookbase.ui
   ui/prefs_typographybase.ui
   ui/prefs_userinterfacebase.ui
@@ -305,7 +304,6 @@
   ui/prefs_preflightverifier.h
   ui/prefs_printer.h
   ui/prefs_scrapbook.h
-  ui/prefs_scripter.h
   ui/prefs_typography.h
   ui/prefs_userinterface.h
   ui/prefs_itemtools.h
@@ -621,7 +619,6 @@
   ui/prefs_preflightverifier.cpp
   ui/prefs_printer.cpp
   ui/prefs_scrapbook.cpp
-  ui/prefs_scripter.cpp
   ui/prefs_typography.cpp
   ui/prefs_userinterface.cpp
   ui/prefs_itemtools.cpp




More information about the scribus-commit mailing list