r14756 by cbradney - Add new default shortcuts file, scribus15.xml. Apply changed shortcuts when leaving new prefs dialog

[scribus-commit]

Revision: 14756
Author: cbradney
Date: 2010-02-17T23:02:33.190671Z
Commit message: Add new default shortcuts file, scribus15.xml. Apply changed shortcuts when leaving new prefs dialog

Changeset: 
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
M  /trunk/Scribus/scribus/ui/tabkeyboardshortcutswidget.cpp

Diffs:
Index: scribus/ui/tabkeyboardshortcutswidget.cpp
===================================================================
--- scribus/ui/tabkeyboardshortcutswidget.cpp	(revision 14755)
+++ scribus/ui/tabkeyboardshortcutswidget.cpp	(revision 14756)
@@ -264,7 +264,7 @@
 void TabKeyboardShortcutsWidget::resetKeySet()
 {
 	QString location=ScPaths::instance().shareDir();
-	QString defaultKeySetFileName=QDir::convertSeparators(location+"keysets/scribus13.xml");
+	QString defaultKeySetFileName=QDir::convertSeparators(location+"keysets/scribus15.xml");
 	importKeySet(defaultKeySetFileName);	
 }
 
Index: scribus/ui/prefs_keyboardshortcuts.cpp
===================================================================
--- scribus/ui/prefs_keyboardshortcuts.cpp	(revision 14755)
+++ scribus/ui/prefs_keyboardshortcuts.cpp	(revision 14756)
@@ -242,7 +242,7 @@
 void Prefs_KeyboardShortcuts::resetKeySet()
 {
 	QString location=ScPaths::instance().shareDir();
-	QString defaultKeySetFileName=QDir::convertSeparators(location+"keysets/scribus13.xml");
+	QString defaultKeySetFileName=QDir::convertSeparators(location+"keysets/scribus15.xml");
 	importKeySet(defaultKeySetFileName);
 }
 
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 14755)
+++ scribus/scribus.cpp	(revision 14756)
@@ -7500,7 +7500,7 @@
 	{
 		struct ApplicationPrefs newPrefs(prefsDialog.prefs());
 		prefsManager->setNewPrefs(newPrefs);
-
+		prefsManager->applyLoadedShortCuts();
 		// TODO:
 		// CB: Hoping to clean this into a nicer function
 		//
@@ -8876,13 +8876,10 @@
 
 void ScribusMainWindow::ImageEffects()
 {
-	qDebug()<<"void ScribusMainWindow::ImageEffects()";
 	if (HaveDoc)
 	{
-		qDebug()<<"void ScribusMainWindow::ImageEffects():HaveDoc";
 		if (doc->m_Selection->count() != 0)
 		{
-			qDebug()<<"void ScribusMainWindow::ImageEffects():(doc->m_Selection->count() != 0)";
 			PageItem *currItem = doc->m_Selection->itemAt(0);
 			EffectsDialog* dia = new EffectsDialog(this, currItem, doc);
 			if (dia->exec())