r20204 by craig - #13164: Remove more code related to #12562/r19381

[scribus-commit]

Author: craig
Date: Wed Jun 24 21:23:30 2015
New Revision: 20204

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20204
Log:
#13164: Remove more code related to #12562/r19381

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/upgradechecker.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20204&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Jun 24 21:23:30 2015
@@ -7434,10 +7434,6 @@
 	}
 	slotSelect();
 	appModeHelper->setSymbolEditMode(false, doc);
-	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
-	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
-	scrMenuMgr->setMenuEnabled("FileExport", true);
 
 	if ( ScCore->haveGS() || ScCore->isWinGUI() )
 		scrActions["PrintPreview"]->setEnabled(true);
@@ -7504,10 +7500,6 @@
 	}
 	slotSelect();
 	appModeHelper->setInlineEditMode(false, doc);
-	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
-	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
-	scrMenuMgr->setMenuEnabled("FileExport", true);
 	pagePalette->enablePalette(true);
 	pagePalette->rebuildMasters();
 	view->setScale(storedViewScale);
@@ -7584,9 +7576,6 @@
 	}
 	slotSelect();
 	appModeHelper->setMasterPageEditMode(false, doc);
-	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
-	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	uint pageCount=doc->DocPages.count();
 	for (uint c=0; c<pageCount; ++c)
 		Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);

Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20204&path=/trunk/Scribus/scribus/upgradechecker.cpp
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.cpp (original)
+++ trunk/Scribus/scribus/upgradechecker.cpp Wed Jun 24 21:23:30 2015
@@ -20,7 +20,6 @@
 #include "prefsmanager.h"
 #include "scpaths.h"
 #include "scribuscore.h"
-#include "ui/sctextbrowser.h"
 #include "upgradechecker.h"