r20553 by craig -

[scribus-commit]

Author: craig
Date: Fri Nov 13 19:08:28 2015
New Revision: 20553

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20553
Log:
#11772: Fix Story Editor not using font/background preferences correctly. Add tooltip

Modified:
    trunk/Scribus/scribus/ui/prefs_userinterface.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/scribus/ui/storyeditor.h

Modified: trunk/Scribus/scribus/ui/prefs_userinterface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20553&path=/trunk/Scribus/scribus/ui/prefs_userinterface.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_userinterface.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_userinterface.cpp	Fri Nov 13 19:08:28 2015
@@ -61,6 +61,7 @@
 	wheelJumpSpinBox->setToolTip( "<qt>" + tr( "Number of lines Scribus will scroll for each move of the mouse wheel" ) + "</qt>");
 	//showSplashCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>");
 	//showStartupDialogCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>");
+	storyEditorUseSmartSelectionCheckBox->setToolTip( "<qt>" + tr( "The default behavior when double-clicking on a word is to select the word and the first aftercoming space. Smart selection will select only the word, without the aftercoming space." ) + "</qt>");
 }
 
 void Prefs_UserInterface::restoreDefaults(struct ApplicationPrefs *prefsData)

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20553&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Fri Nov 13 19:08:28 2015
@@ -1569,6 +1569,7 @@
 
 void StoryEditor::showEvent(QShowEvent *)
 {
+	loadPrefs();
 	charSelect = new CharSelect(this);
 	charSelect->userTableModel()->setCharactersAndFonts(ScCore->primaryMainWindow()->charPalette->userTableModel()->characters(), ScCore->primaryMainWindow()->charPalette->userTableModel()->fonts());
 	connect(charSelect, SIGNAL(insertSpecialChar()), this, SLOT(slot_insertSpecialChar()));
@@ -1593,6 +1594,7 @@
 		delete charSelect;
 		charSelect = NULL;
 	}
+	savePrefs();
 }
 
 void StoryEditor::savePrefs()
@@ -1645,6 +1647,7 @@
 		splitted.append(txtarea);
 		EdSplit->setSizes(splitted);
 	}
+	setupEditorGUI();
 }
 
 void StoryEditor::initActions()
@@ -1965,7 +1968,14 @@
 	if (prefsManager==NULL)
 		sDebug(QString("%1").arg("prefsmgr null"));
 
-//	Editor->setPaper(prefsManager->appPrefs.STEcolor);
+	EditorBar->editor = Editor;
+	Editor->installEventFilter(this);
+	languageChange();
+	ActionManager::setActionTooltips(&seActions);
+}
+
+void StoryEditor::setupEditorGUI()
+{
 	QFont fo;
 	fo.fromString(prefsManager->appPrefs.storyEditorPrefs.guiFont);
 	Editor->setFont(fo);
@@ -1977,10 +1987,6 @@
 	Editor->setPalette(pal);
 	EditorBar->setFrameStyle(Editor->frameStyle());
 	EditorBar->setLineWidth(Editor->lineWidth());
-	EditorBar->editor = Editor;
-	Editor->installEventFilter(this);
-	languageChange();
-	ActionManager::setActionTooltips(&seActions);
 }
 
 void StoryEditor::changeEvent(QEvent *e)

Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20553&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.h	Fri Nov 13 19:08:28 2015
@@ -486,6 +486,7 @@
 	void updateUnicodeActions();
 	void buildMenus();
 	void buildGUI();
+	void setupEditorGUI();
 	void connectSignals();
 	void disconnectSignals();
 	/*! \brief Loading the preferences (position).