r17931 by fschmid - Added a common Toolbar Icon for exiting our special edit modes.

[scribus-commit]

Author: fschmid
Date: Sun Dec  2 17:00:24 2012
New Revision: 17931

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17931
Log:
Added a common Toolbar Icon for exiting our special edit modes.

Added:
    trunk/Scribus/resources/icons/16/editdoc.png   (with props)
    trunk/Scribus/resources/icons/16/exit.png   (with props)
    trunk/Scribus/resources/icons/16/radiobutton.png   (with props)
    trunk/Scribus/resources/icons/22/editdoc.png   (with props)
    trunk/Scribus/resources/icons/22/exit.png   (with props)
    trunk/Scribus/resources/icons/22/radiobutton.png   (with props)
Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17931&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Dec  2 17:00:24 2012
@@ -4731,6 +4731,11 @@
 		editInlineEnd();
 		return true;
 	}
+	else if (doc->masterPageMode())
+	{
+		manageMasterPagesEnd();
+		return true;
+	}
 	ScribusWin* tw = ActWin;
 //	ActWin->close();
 	mdiArea->closeActiveSubWindow();
@@ -8738,6 +8743,7 @@
 		scrActions["fileOpen"]->setEnabled(false);
 		scrActions["fileSave"]->setEnabled(false);
 		scrActions["fileClose"]->setToolTip( tr("Click here to leave symbol edit mode."));
+		scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
 		scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
 		scrActions["fileRevert"]->setEnabled(false);
 		scrActions["fileDocSetup150"]->setEnabled(false);
@@ -8791,6 +8797,7 @@
 	scrActions["fileOpen"]->setEnabled(true);
 	scrActions["fileClose"]->setEnabled(true);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
+	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
 	scrActions["fileSave"]->setEnabled(!doc->isConverted);
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrActions["fileRevert"]->setEnabled(true);
@@ -8858,6 +8865,7 @@
 		scrActions["fileOpen"]->setEnabled(false);
 		scrActions["fileSave"]->setEnabled(false);
 		scrActions["fileClose"]->setToolTip( tr("Click here to leave inline frame edit mode."));
+		scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
 		scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
 		scrActions["fileRevert"]->setEnabled(false);
 		scrActions["fileDocSetup150"]->setEnabled(false);
@@ -8896,6 +8904,7 @@
 	scrActions["fileOpen"]->setEnabled(true);
 	scrActions["fileClose"]->setEnabled(true);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
+	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
 	scrActions["fileSave"]->setEnabled(!doc->isConverted);
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrActions["fileRevert"]->setEnabled(true);
@@ -8975,7 +8984,9 @@
 	scrActions["fileNew"]->setEnabled(false);
 	scrActions["fileNewFromTemplate"]->setEnabled(false);
 	scrActions["fileOpen"]->setEnabled(false);
-	scrActions["fileClose"]->setEnabled(false);
+	scrActions["fileClose"]->setEnabled(true);
+	scrActions["fileClose"]->setToolTip( tr("Click here to leave master page edit mode."));
+	scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
 	scrActions["fileRevert"]->setEnabled(false);
 	scrActions["fileDocSetup150"]->setEnabled(false);
@@ -9004,6 +9015,8 @@
 	scrActions["fileNewFromTemplate"]->setEnabled(true);
 	scrActions["fileOpen"]->setEnabled(true);
 	scrActions["fileClose"]->setEnabled(true);
+	scrActions["fileClose"]->setToolTip( tr("Close"));
+	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
 	scrActions["fileSave"]->setEnabled(!doc->isConverted);
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrActions["fileRevert"]->setEnabled(true);

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17931&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Dec  2 17:00:24 2012
@@ -236,8 +236,8 @@
 	editOnPreviewToolbarButton->setAutoRaise(OPTION_FLAT_BUTTON);
 	editOnPreviewToolbarButton->setCheckable(true);
 	QIcon ic3;
-	ic3.addPixmap(loadIcon("16/pointer.png"), QIcon::Normal, QIcon::Off);
-	ic3.addPixmap(loadIcon("16/pointer.png"), QIcon::Normal, QIcon::On);
+	ic3.addPixmap(loadIcon("16/editdoc.png"), QIcon::Normal, QIcon::Off);
+	ic3.addPixmap(loadIcon("16/editdoc.png"), QIcon::Normal, QIcon::On);
 	editOnPreviewToolbarButton->setIcon(ic3);
 #else
 	zoomDefaultToolbarButton = new QPushButton(this);
@@ -274,7 +274,7 @@
 	editOnPreviewToolbarButton->setDefault( false );
 	editOnPreviewToolbarButton->setAutoDefault( false );
 	editOnPreviewToolbarButton->setFlat(OPTION_FLAT_BUTTON);
-	editOnPreviewToolbarButton->setIcon(loadIcon("previewOn.png"));
+	editOnPreviewToolbarButton->setIcon(loadIcon("16/editdoc.png"));
 #endif
 	cmsAdjustMenu = new QMenu();
 	idCmsAdjustMenu = cmsAdjustMenu->addAction( "Configure CMS...", this, SLOT(adjustCMS()));