r14657 by cbradney - Minor updates for prefs dialog

[scribus-commit]

Revision: 14657
Author: cbradney
Date: 2010-02-07T22:37:57.837759Z
Commit message: Minor updates for prefs dialog

Changeset: 
M  /trunk/Scribus/scribus/scplugin.h
M  /trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
M  /trunk/Scribus/scribus/ui/preferencesdialog.cpp
M  /trunk/Scribus/scribus/plugins/short-words/shortwords.h
M  /trunk/Scribus/scribus/scplugin.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Diffs:
Index: scribus/scplugin.h
===================================================================
--- scribus/scplugin.h	(revision 14656)
+++ scribus/scplugin.h	(revision 14657)
@@ -19,6 +19,7 @@
 class ScribusMainWindow;
 class DeferredTask;
 class PrefsPanel;
+class Prefs_Pane;
 
 /**
  * \brief Abstract super class for all Scribus plug-ins
@@ -172,7 +173,7 @@
 		*/
 		virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
 										 QString& caption, QPixmap& icon);
-		virtual bool newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
+		virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel,
 								 QString& caption, QPixmap& icon);
 
 		/*! @brief Return descriptive information about the plug-in
Index: scribus/scplugin.cpp
===================================================================
--- scribus/scplugin.cpp	(revision 14656)
+++ scribus/scplugin.cpp	(revision 14657)
@@ -11,6 +11,7 @@
 #include "scribusapp.h"
 #include "selection.h"
 #include "ui/prefspanel.h"
+#include "ui/prefs_pane.h"
 
 //=====================================================//
 //                        ScPlugin                     //
@@ -34,7 +35,7 @@
 }
 
 bool ScPlugin::newPrefsPanelWidget( QWidget* /* parent */,
-									QWidget*& /* panel */,
+									Prefs_Pane*& /* panel */,
 									QString& /* caption */,
 									QPixmap& /* icon */)
 {
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp	(revision 14656)
+++ scribus/ui/preferencesdialog.cpp	(revision 14657)
@@ -252,7 +252,7 @@
 	// prefs dialog.
 	// For each plugin, enabled or not:
 	ScPlugin* plugin = 0;
-	QWidget* panel = 0;
+	Prefs_Pane* panel = 0;
 	QString panelCaption;
 	QPixmap panelIcon;
 
Index: scribus/plugins/scriptplugin/scriptplugin.h
===================================================================
--- scribus/plugins/scriptplugin/scriptplugin.h	(revision 14656)
+++ scribus/plugins/scriptplugin/scriptplugin.h	(revision 14657)
@@ -35,7 +35,7 @@
 		virtual void languageChange();
 		virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
 										 QString& caption, QPixmap& icon);
-		virtual bool newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
+		virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel,
 										 QString& caption, QPixmap& icon);
 		virtual void addToMainWindowMenu(ScribusMainWindow *);
 
Index: scribus/plugins/scriptplugin/scriptplugin.cpp
===================================================================
--- scribus/plugins/scriptplugin/scriptplugin.cpp	(revision 14656)
+++ scribus/plugins/scriptplugin/scriptplugin.cpp	(revision 14657)
@@ -198,8 +198,7 @@
 	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);
@@ -209,8 +208,7 @@
 }
 
 
-bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
-										   QString& caption, QPixmap& icon)
+bool ScriptPlugin::newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel, QString& caption, QPixmap& icon)
 {
 	panel = new Prefs_Scripter(parent);
 	Q_CHECK_PTR(panel);
Index: scribus/plugins/short-words/shortwords.cpp
===================================================================
--- scribus/plugins/short-words/shortwords.cpp	(revision 14656)
+++ scribus/plugins/short-words/shortwords.cpp	(revision 14657)
@@ -154,8 +154,7 @@
 	return true;
 }
 
-bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
-										   QString& caption, QPixmap& icon)
+bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel, QString& caption, QPixmap& icon)
 {
 	panel = new SWPrefsGui(parent);
 	Q_CHECK_PTR(panel);
@@ -164,8 +163,7 @@
 	return true;
 }
 
-bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
-										   QString& caption, QPixmap& icon)
+bool ShortWordsPlugin::newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel, QString& caption, QPixmap& icon)
 {
 	panel = new Prefs_ShortWords(parent);
 	Q_CHECK_PTR(panel);
Index: scribus/plugins/short-words/shortwords.h
===================================================================
--- scribus/plugins/short-words/shortwords.h	(revision 14656)
+++ scribus/plugins/short-words/shortwords.h	(revision 14657)
@@ -10,7 +10,6 @@
 #include "scconfig.h"
 #include "pluginapi.h"
 #include "scplugin.h"
-//Added by qt3to4:
 #include <QPixmap>
 
 /*! \brief This is the Scribus Short Words plugin interface specification.
@@ -37,7 +36,7 @@
 		/*! \brief Preference widget */
 		virtual bool newPrefsPanelWidget(QWidget* parent, PrefsPanel*& panel,
 										 QString& caption, QPixmap& icon);
-		virtual bool newPrefsPanelWidget(QWidget* parent, QWidget*& panel,
+		virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel,
 										 QString& caption, QPixmap& icon);
 		// Special features (none)
 };