r15834 by fschmid - Removed old preferences code from the build process.

scribus-commit scribus-commit at lists.scribus.net
Tue Nov 9 23:31:03 CET 2010


Author: fschmid
Date: Tue Nov  9 22:31:03 2010
New Revision: 15834

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15834
Log:
Removed old preferences code from the build process.

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15834&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Tue Nov  9 22:31:03 2010
@@ -71,14 +71,14 @@
   ui/charselectenhanced.ui
   ui/cmsprefsbase.ui
   ui/colorpalette.ui
-  ui/docitemattrprefs.ui
-  ui/docsections.ui
+#  ui/docitemattrprefs.ui
+#  ui/docsections.ui
   ui/gradientaddedit.ui
   ui/gradienteditor.ui
   ui/gradientvectorbase.ui
   ui/gtfiledialog.ui
   ui/guidemanager.ui
-  ui/hysettingsBase.ui
+#  ui/hysettingsBase.ui
   ui/insertaframe.ui
   ui/latexeditor.ui
   ui/newmarginwidgetbase.ui
@@ -132,14 +132,14 @@
   ui/smreplacedia.ui
   ui/smstyleimport.ui
   ui/stylemanager.ui
-  ui/tabdisplay.ui
-  ui/tabexternaltoolswidget.ui
-  ui/tabgeneral.ui
-  ui/tabkeyboardshortcutswidget.ui
-  ui/tabmiscellaneous.ui
-  ui/tabprinter.ui
-  ui/tabscrapbook.ui
-  ui/tocindexprefs.ui
+#  ui/tabdisplay.ui
+#  ui/tabexternaltoolswidget.ui
+#  ui/tabgeneral.ui
+#  ui/tabkeyboardshortcutswidget.ui
+#  ui/tabmiscellaneous.ui
+#  ui/tabprinter.ui
+#  ui/tabscrapbook.ui
+#  ui/tocindexprefs.ui
   ui/transformdialogbase.ui
   ui/transparencypalette.ui
   ui/copypagetomasterpage.ui
@@ -201,8 +201,8 @@
   deferredtask.h
   ui/delpages.h
   docinfo.h
-  ui/docitemattrprefs.h
-  ui/docsections.h
+#  ui/docitemattrprefs.h
+#  ui/docsections.h
   ui/editor.h
   ui/effectsdialog.h
   ui/extimageprops.h
@@ -212,7 +212,7 @@
   ui/fontcombo.h
   fontlistmodel.h
   ui/fontlistview.h
-  ui/fontprefs.h
+#  ui/fontprefs.h
   ui/fontreplacedialog.h
   ui/gradientaddedit.h
   ui/gradienteditor.h
@@ -228,7 +228,7 @@
   ui/hruler.h
   ui/hyask.h
   hyphenator.h
-  ui/hysettings.h
+#  ui/hysettings.h
   ui/imageinfodialog.h
   ui/insertTable.h
   ui/insertaframe.h
@@ -288,8 +288,8 @@
   ui/pluginmanagerprefsgui.h
   ui/polygonwidget.h
   ui/polyprops.h
-  ui/prefs.h
-  ui/prefsdialogbase.h
+#  ui/prefs.h
+#  ui/prefsdialogbase.h
   ui/preferencesdialog.h
   ui/prefs_colormanagement.h
   ui/prefs_display.h
@@ -324,7 +324,7 @@
   ui/propertiespalette.h
   pslib.h
   ui/query.h
-  ui/reformdoc.h
+#  ui/reformdoc.h
   ui/replacecolors.h
   ui/replaceonecolor.h
   ui/rulermover.h
@@ -386,23 +386,23 @@
   ui/styleview.h
   ui/swatchcombo.h
   ui/symbolpalette.h
-  ui/tabcheckdoc.h
-  ui/tabdisplay.h
-  ui/tabdocument.h
-  ui/tabexternaltoolswidget.h
-  ui/tabgeneral.h
-  ui/tabguides.h
-  ui/tabkeyboardshortcutswidget.h
+#  ui/tabcheckdoc.h
+#  ui/tabdisplay.h
+#  ui/tabdocument.h
+#  ui/tabexternaltoolswidget.h
+#  ui/tabgeneral.h
+#  ui/tabguides.h
+#  ui/tabkeyboardshortcutswidget.h
   ui/tabmanager.h
-  ui/tabmiscellaneous.h
+#  ui/tabmiscellaneous.h
   ui/tabpdfoptions.h
-  ui/tabprinter.h
+#  ui/tabprinter.h
   ui/tabruler.h
-  ui/tabscrapbook.h
-  ui/tabtools.h
-  ui/tabtypography.h
+#  ui/tabscrapbook.h
+#  ui/tabtools.h
+#  ui/tabtypography.h
   tocgenerator.h
-  ui/tocindexprefs.h
+#  ui/tocindexprefs.h
   ui/transformdialog.h
   ui/transparencypalette.h
   tt/simpletreemodel/treemodel.h
@@ -493,8 +493,8 @@
   deferredtask.cpp
   ui/delpages.cpp
   docinfo.cpp
-  ui/docitemattrprefs.cpp
-  ui/docsections.cpp
+#  ui/docitemattrprefs.cpp
+#  ui/docsections.cpp
   documentchecker.cpp
   documentinformation.cpp
   ui/editor.cpp
@@ -508,7 +508,7 @@
   ui/fontcombo.cpp
   fontlistmodel.cpp
   ui/fontlistview.cpp
-  ui/fontprefs.cpp
+#  ui/fontprefs.cpp
   ui/fontreplacedialog.cpp
   fparser.cpp
   fpoint.cpp
@@ -539,7 +539,7 @@
   ui/hyask.cpp
   hyphen.c
   hyphenator.cpp
-  ui/hysettings.cpp
+#  ui/hysettings.cpp
   ui/imageinfodialog.cpp
   ui/insertTable.cpp
   ui/insertaframe.cpp
@@ -613,7 +613,7 @@
   ui/pluginmanagerprefsgui.cpp
   ui/polygonwidget.cpp
   ui/polyprops.cpp
-  ui/prefs.cpp
+#  ui/prefs.cpp
   prefscontext.cpp
   ui/preferencesdialog.cpp
   ui/prefs_colormanagement.cpp
@@ -641,7 +641,7 @@
   ui/prefs_pdfexport.cpp
   ui/prefs_tableofcontents.cpp
   ui/prefs_documentitemattributes.cpp
-  ui/prefsdialogbase.cpp
+#  ui/prefsdialogbase.cpp
   prefsfile.cpp
   prefsmanager.cpp
   ui/prefspanel.cpp
@@ -654,7 +654,7 @@
   ui/query.cpp
   rawimage.cpp
   rc4.c
-  ui/reformdoc.cpp
+#  ui/reformdoc.cpp
   ui/replacecolors.cpp
   ui/replaceonecolor.cpp
   ui/rulermover.cpp
@@ -766,24 +766,24 @@
   ui/styleview.cpp
   ui/swatchcombo.cpp
   ui/symbolpalette.cpp
-  ui/tabcheckdoc.cpp
-  ui/tabdisplay.cpp
-  ui/tabdocument.cpp
-  ui/tabexternaltoolswidget.cpp
-  ui/tabgeneral.cpp
-  ui/tabguides.cpp
-  ui/tabkeyboardshortcutswidget.cpp
+#  ui/tabcheckdoc.cpp
+#  ui/tabdisplay.cpp
+#  ui/tabdocument.cpp
+#  ui/tabexternaltoolswidget.cpp
+#  ui/tabgeneral.cpp
+#  ui/tabguides.cpp
+#  ui/tabkeyboardshortcutswidget.cpp
   ui/tabmanager.cpp
-  ui/tabmiscellaneous.cpp
+#  ui/tabmiscellaneous.cpp
   ui/tabpdfoptions.cpp
-  ui/tabprinter.cpp
+#  ui/tabprinter.cpp
   ui/tabruler.cpp
-  ui/tabscrapbook.cpp
-  ui/tabtools.cpp
-  ui/tabtypography.cpp
+#  ui/tabscrapbook.cpp
+#  ui/tabtools.cpp
+#  ui/tabtypography.cpp
   textwriter.cpp
   tocgenerator.cpp
-  ui/tocindexprefs.cpp
+#  ui/tocindexprefs.cpp
   transaction.cpp
   ui/transformdialog.cpp
   ui/transparencypalette.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15834&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Tue Nov  9 22:31:03 2010
@@ -137,13 +137,13 @@
 	name="fileExportAsPDF";
 	scrActions->insert(name, new ScrAction(loadIcon("acroread16.png"), loadIcon("acroread22.png"), "", defaultKey(name), mainWindow));
 	//Rest of File Menu
-	name="fileDocSetup";
-	scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
+//	name="fileDocSetup";
+//	scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
 	name="fileDocSetup150";
 	scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
-	name="filePreferences";
-	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
-	(*scrActions)[name]->setMenuRole(QAction::NoRole);
+//	name="filePreferences";
+//	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
+//	(*scrActions)[name]->setMenuRole(QAction::NoRole);
 	name="filePreferences150";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
@@ -165,9 +165,9 @@
 	connect( (*scrActions)["PrintPreview"], SIGNAL(triggered()), mainWindow, SLOT(printPreview()) );
 	connect( (*scrActions)["fileSave"], SIGNAL(triggered()), mainWindow, SLOT(slotFileSave()) );
 	connect( (*scrActions)["fileSaveAs"], SIGNAL(triggered()), mainWindow, SLOT(slotFileSaveAs()) );
-	connect( (*scrActions)["fileDocSetup"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup()) );
+//	connect( (*scrActions)["fileDocSetup"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup()) );
 	connect( (*scrActions)["fileDocSetup150"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup150()) );
-	connect( (*scrActions)["filePreferences"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefsOrg()) );
+//	connect( (*scrActions)["filePreferences"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefsOrg()) );
 	connect( (*scrActions)["filePreferences150"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefs150Org()) );
 	connect( (*scrActions)["fileRevert"], SIGNAL(triggered()), mainWindow, SLOT(slotFileRevert()) );
 	connect( (*scrActions)["fileCollect"], SIGNAL(triggered()), mainWindow, SLOT(fileCollect()) );
@@ -1289,9 +1289,9 @@
 	(*scrActions)["fileExportText"]->setTexts( tr("Save &Text..."));
 	(*scrActions)["fileExportAsEPS"]->setTexts( tr("Save as &EPS..."));
 	(*scrActions)["fileExportAsPDF"]->setTexts( tr("Save as P&DF..."));
-	(*scrActions)["fileDocSetup"]->setTexts( tr("Document &Setup (old)..."));
+//	(*scrActions)["fileDocSetup"]->setTexts( tr("Document &Setup (old)..."));
 	(*scrActions)["fileDocSetup150"]->setTexts( tr("Document &Setup..."));
-	(*scrActions)["filePreferences"]->setTexts( tr("P&references (old)..."));
+//	(*scrActions)["filePreferences"]->setTexts( tr("P&references (old)..."));
 	(*scrActions)["filePreferences150"]->setTexts( tr("P&references..."));
 	(*scrActions)["filePrint"]->setTexts( tr("&Print..."));
 	(*scrActions)["PrintPreview"]->setTexts( tr("Print Previe&w"));
@@ -1747,9 +1747,9 @@
 		<< "fileExportText"
 		<< "fileExportAsEPS"
 		<< "fileExportAsPDF"
-		<< "fileDocSetup"
+//		<< "fileDocSetup"
 		<< "fileDocSetup150"
-		<< "filePreferences"
+//		<< "filePreferences"
 		<< "filePreferences150"
 		<< "filePrint"
 		<< "PrintPreview"

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15834&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Tue Nov  9 22:31:03 2010
@@ -38,7 +38,8 @@
 #include "filewatcher.h"
 #include "latexhelpers.h"
 #include "ui/missing.h"
-#include "ui/tabkeyboardshortcutswidget.h"
+//#include "ui/tabkeyboardshortcutswidget.h"
+#include "ui/prefs_keyboardshortcuts.h"
 #include "pagesize.h"
 #include "pagestructs.h"
 #include "pdfoptions.h"
@@ -1625,7 +1626,7 @@
 			continue;
 		QDomElement kscc=docu.createElement("Shortcut");
 		kscc.setAttribute("Action",ksc.value().actionName);
-		kscc.setAttribute("KeySequence",TabKeyboardShortcutsWidget::getKeyText(ksc.value().keySequence));
+		kscc.setAttribute("KeySequence",Prefs_KeyboardShortcuts::getKeyText(ksc.value().keySequence));
 		elem.appendChild(kscc);
 	}
 	QDomElement cosd=docu.createElement("DefaultColorSet");

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15834&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Nov  9 22:31:03 2010
@@ -89,7 +89,7 @@
 #include "canvasmode.h"
 #include "ui/charselect.h"
 #include "ui/checkDocument.h"
-#include "ui/cmsprefs.h"
+//#include "ui/cmsprefs.h"
 #include "ui/collectforoutput_ui.h"
 #include "ui/colorcombo.h"
 #include "commonstrings.h"
@@ -101,14 +101,14 @@
 #include "desaxe/saxXML.h"
 #include "desaxe/simple_actions.h"
 #include "docinfo.h"
-#include "ui/docitemattrprefs.h"
+//#include "ui/docitemattrprefs.h"
 #include "documentchecker.h"
 #include "documentinformation.h"
 #include "ui/effectsdialog.h"
 #include "fileloader.h"
 #include "filewatcher.h"
 #include "ui/fontcombo.h"
-#include "ui/fontprefs.h"
+//#include "ui/fontprefs.h"
 #include "fpoint.h"
 #include "fpointarray.h"
 #include "gtgettext.h"
@@ -116,7 +116,7 @@
 #include "ui/helpbrowser.h"
 #include "ui/hruler.h"
 #include "hyphenator.h"
-#include "ui/hysettings.h"
+//#include "ui/hysettings.h"
 #include "ui/imageinfodialog.h"
 #include "ui/insertaframe.h"
 #include "ui/inspage.h"
@@ -160,7 +160,7 @@
 #include "plugins/formatidlist.h"
 #include "ui/polygonwidget.h"
 #include "ui/preferencesdialog.h"
-#include "ui/prefs.h"
+//#include "ui/prefs.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -170,7 +170,7 @@
 #include "ui/propertiespalette.h"
 #include "pslib.h"
 #include "ui/query.h"
-#include "ui/reformdoc.h"
+//#include "ui/reformdoc.h"
 #include "ui/replacecolors.h"
 #include "resourcecollection.h"
 #include "sccolorengine.h"
@@ -201,15 +201,15 @@
 #include "ui/storyeditor.h"
 #include "ui/stylemanager.h"
 #include "ui/symbolpalette.h"
-#include "ui/tabcheckdoc.h"
-#include "ui/tabguides.h"
+//#include "ui/tabcheckdoc.h"
+//#include "ui/tabguides.h"
 #include "ui/tabmanager.h"
-#include "ui/tabpdfoptions.h"
-#include "ui/tabtools.h"
-#include "ui/tabtypography.h"
+//#include "ui/tabpdfoptions.h"
+//#include "ui/tabtools.h"
+//#include "ui/tabtypography.h"
 #include "text/nlsconfig.h"
 #include "tocgenerator.h"
-#include "ui/tocindexprefs.h"
+//#include "ui/tocindexprefs.h"
 #include "ui/transformdialog.h"
 #include "ui/copypagetomasterpagedialog.h"
 #include "ui/edittoolbar.h"
@@ -1571,10 +1571,11 @@
 void ScribusMainWindow::closeEvent(QCloseEvent *ce)
 {
 	//Do not quit if Preferences or new doc window is open
-	Preferences *prefsWin = findChild<Preferences *>(QString::fromLocal8Bit("PreferencesWindow"));
+//	Preferences *prefsWin = findChild<Preferences *>(QString::fromLocal8Bit("PreferencesWindow"));
 	PreferencesDialog *prefsDialog = findChild<PreferencesDialog *>(QString::fromLocal8Bit("PreferencesDialog"));
 	NewDoc *newDocWin = findChild<NewDoc *>(QString::fromLocal8Bit("NewDocumentWindow"));
-	if (prefsWin!=NULL || prefsDialog!=NULL || newDocWin!=NULL)
+//	if (prefsWin!=NULL || prefsDialog!=NULL || newDocWin!=NULL)
+	if (prefsDialog!=NULL || newDocWin!=NULL)
 	{
 		ce->ignore();
 		return;
@@ -1724,7 +1725,7 @@
 	delete dia;
 	mainWindowStatusLabel->setText( tr("Ready"));
 	if (docSet)
-		slotDocSetup();
+		slotDocSetup150();
 }
 
 bool ScribusMainWindow::slotFileNew()
@@ -1774,7 +1775,7 @@
 	}
 	delete dia;
 	if (docSet)
-		slotDocSetup();
+		slotDocSetup150();
 	return retVal;
 }
 
@@ -2320,7 +2321,7 @@
 	scrActions["filePrint"]->setEnabled(true);
  	scrActions["fileSave"]->setEnabled(true);
 	scrActions["fileClose"]->setEnabled(true);
-	scrActions["fileDocSetup"]->setEnabled(true);
+//	scrActions["fileDocSetup"]->setEnabled(true);
 	scrActions["fileDocSetup150"]->setEnabled(true);
 	scrActions["fileRevert"]->setEnabled(false);
 	scrActions["fileCollect"]->setEnabled(true);
@@ -4453,7 +4454,7 @@
 	{
 		PluginManager& pluginManager(PluginManager::instance());
 		pluginManager.enableOnlyStartupPluginActions(this);
-		scrActions["fileDocSetup"]->setEnabled(false);
+//		scrActions["fileDocSetup"]->setEnabled(false);
 		scrActions["fileDocSetup150"]->setEnabled(false);
 		scrActions["filePrint"]->setEnabled(false);
 		scrActions["fileSave"]->setEnabled(false);
@@ -7483,7 +7484,7 @@
 		return;
 	view->GotoPage(Page);
 }
-
+/*
 void ScribusMainWindow::prefsOrg(Preferences *dia)
 {
 	//reset the appMode so we restore our tools shortcuts
@@ -7592,7 +7593,7 @@
 	if (dia.exec()==QDialog::Accepted)
 		prefsOrg(&dia);
 }
-
+*/
 void ScribusMainWindow::slotPrefs150Org()
 {
 	QString oldMonitorProfile(ScCore->monitorProfile.productDescription());
@@ -7692,7 +7693,7 @@
 	}
 }
 
-
+/*
 void ScribusMainWindow::docSetup(ReformDoc* dia)
 {
 	slotChangeUnit(dia->getSelectedUnit(), false);
@@ -7731,11 +7732,11 @@
 	doc->setMasterPageMode(true);
 	view->reformPages();
 	doc->setMasterPageMode(false);
-/*	doc->setLoading(true);
-	uint pageCount=doc->DocPages.count();
-	for (uint c=0; c<pageCount; ++c)
-		Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);
-	doc->setLoading(false); */
+//	doc->setLoading(true);
+//	uint pageCount=doc->DocPages.count();
+//	for (uint c=0; c<pageCount; ++c)
+//		Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);
+//	doc->setLoading(false);
 	view->reformPages();
 	view->GotoPage(doc->currentPage()->pageNr());
 	view->DrawNew();
@@ -7756,7 +7757,7 @@
 	delete dia;
 	return ret;
 }
-
+*/
 void ScribusMainWindow::slotDocSetup150()
 {
 	if (!doc)
@@ -8462,7 +8463,7 @@
 			scrActions["fileClose"]->setEnabled(false);
 			scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
 			scrActions["fileRevert"]->setEnabled(false);
-			scrActions["fileDocSetup"]->setEnabled(false);
+//			scrActions["fileDocSetup"]->setEnabled(false);
 			scrActions["fileDocSetup150"]->setEnabled(false);
 			scrActions["filePrint"]->setEnabled(false);
 			scrActions["PrintPreview"]->setEnabled(false);
@@ -8495,7 +8496,7 @@
 	scrActions["fileSave"]->setEnabled(true);
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrActions["fileRevert"]->setEnabled(true);
-	scrActions["fileDocSetup"]->setEnabled(true);
+//	scrActions["fileDocSetup"]->setEnabled(true);
 	scrActions["fileDocSetup150"]->setEnabled(true);
 	scrActions["filePrint"]->setEnabled(true);
 	if ( ScCore->haveGS() || ScCore->isWinGUI() )

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15834&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Tue Nov  9 22:31:03 2010
@@ -94,11 +94,11 @@
 class PSLib;
 class PageItem;
 class PagePalette;
-class Preferences;
+//class Preferences;
 class PrefsContext;
 class PrefsManager;
 class PropertiesPalette;
-class ReformDoc;
+//class ReformDoc;
 class ScToolBar;
 class ScrAction;
 class ScribusDoc;
@@ -535,18 +535,18 @@
 	/*! \brief Apply changes from ReformDoc dialog.
 	It's called from this->slotDocSetup() or from ReformDoc directly.
 	\param dia a reference to the ReformDoc dialog */
-	void docSetup(ReformDoc* dia);
+//	void docSetup(ReformDoc* dia);
 	/*! \brief Apply changes from Preferences dialog.
 	It's called from this->slotPrefsOrg() or from Preferences directly.
 	\param dia a reference to the Preferences dialog */
-	void prefsOrg(Preferences* dia);
+//	void prefsOrg(Preferences* dia);
 	/*! \brief Change Preferences dialog.
 	See prefsOrg for more info. It's very similar to docSetup/slotDocSetup. */
-	void slotPrefsOrg();
+//	void slotPrefsOrg();
 	void slotPrefs150Org();
 	/** \brief Refromat the document when user click "OK" in ReformDoc dialog.
 	See docSetup() for more info. */
-	bool slotDocSetup();
+//	bool slotDocSetup();
 	void slotDocSetup150();
 	//! \brief Insert a frame friendly dialog
 	void slotInsertFrame();




More information about the scribus-commit mailing list