r19381 by craig - #12562: Hopefully the end of the bad re-use of standard functions

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 28 22:25:14 UTC 2014


Author: craig
Date: Mon Jul 28 22:25:13 2014
New Revision: 19381

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19381
Log:
#12562: Hopefully the end of the bad re-use of standard functions

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19381&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Jul 28 22:25:13 2014
@@ -8157,11 +8157,6 @@
 		doc->stored_maxCanvasCoordinate = doc->maxCanvasCoordinate;
 		view->showSymbolPage(temp);
 		appModeHelper.setSymbolEditMode(true, doc);
-		scrActions["fileClose"]->setToolTip( tr("Click here to leave symbol edit mode."));
-		scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
-		scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
-		scrMenuMgr->setMenuEnabled("FileExport", false);
-
 		pagePalette->enablePalette(false);
 		layerPalette->setEnabled(false);
 		patternsDependingOnThis.clear();
@@ -8244,10 +8239,6 @@
 		doc->stored_maxCanvasCoordinate = doc->maxCanvasCoordinate;
 		view->showInlinePage(id);
 		appModeHelper.setInlineEditMode(true, doc);
-		scrActions["fileClose"]->setToolTip( tr("Click here to leave inline frame edit mode."));
-		scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
-		scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
-		scrMenuMgr->setMenuEnabled("FileExport", false);
 		pagePalette->enablePalette(false);
 		layerPalette->setEnabled(false);
 		inlinePalette->editingStart(id);
@@ -8330,9 +8321,6 @@
 		scrActions["toolsPages"]->setChecked(true);
 	}
 	appModeHelper.setMasterPageEditMode(true, doc);
-	scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
-	scrActions["fileClose"]->setToolTip( tr("Click here to leave master page edit mode."));
-	scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
 }
 
 void ScribusMainWindow::editMasterPagesEnd()




More information about the scribus-commit mailing list