r18458 by craig - #11666: Move Page Sizes entry in Prefs up the list under Document Setup

[scribus-commit]

Author: craig
Date: Wed Sep  4 20:20:11 2013
New Revision: 18458

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18458
Log:
#11666: Move Page Sizes entry in Prefs up the list under Document Setup

Modified:
    trunk/Scribus/scribus/ui/preferencesdialog.cpp
    trunk/Scribus/scribus/upgradechecker.h

Modified: trunk/Scribus/scribus/ui/preferencesdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18458&path=/trunk/Scribus/scribus/ui/preferencesdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.cpp Wed Sep  4 20:20:11 2013
@@ -110,6 +110,10 @@
 	{
 		addItem( tr("Document Information"), loadIcon("documentinfo.png"), prefs_DocumentInformation);
 	}
+	else
+	{
+		addItem( tr("Page Sizes"), loadIcon("16/page-simple.png"), prefs_PageSizes);
+	}
 	addItem( tr("Guides"), loadIcon("16/edit-guides.png"), prefs_Guides);
 	addItem( tr("Typography"), loadIcon("16/draw-text.png"), prefs_Typography);
 	addItem( tr("Item Tools"), loadIcon("tools_16.png"), prefs_ItemTools);
@@ -137,7 +141,6 @@
 	{
 		addItem( tr("External Tools"), loadIcon("gear_16.png"), prefs_ExternalTools);
 		addItem( tr("Miscellaneous"), loadIcon("misc_16.png"), prefs_Miscellaneous);
-		addItem( tr("Page Sizes"), loadIcon("16/page-simple.png"), prefs_PageSizes);
 		addItem( tr("Plugins"), loadIcon("plugins_16.png"), prefs_Plugins);
 		addItem( tr("Image Cache"), loadIcon("16/image-x-generic.png"), prefs_ImageCache);
 	}

Modified: trunk/Scribus/scribus/upgradechecker.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18458&path=/trunk/Scribus/scribus/upgradechecker.h
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.h (original)
+++ trunk/Scribus/scribus/upgradechecker.h Wed Sep  4 20:20:11 2013
@@ -30,9 +30,6 @@
 	bool process();
 	void show(bool error);
 	QStringList upgradeData();
-	
-public slots:
-	//void abort();
 	
 private slots:
 	void downloadFinished();