r14835 by cbradney - Add the smart text selection back to the edit menu of SE, for one off setting while the window is open

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 28 18:00:25 CET 2010


Revision: 14835
Author: cbradney
Date: 2010-02-28T16:59:45.426564Z
Commit message: Add the smart text selection back to the edit menu of SE, for one off setting while the window is open

Changeset: 
M  /trunk/Scribus/scribus/ui/storyeditor.h
M  /trunk/Scribus/scribus/ui/storyeditor.cpp

Diffs:
Index: scribus/ui/storyeditor.h
===================================================================
--- scribus/ui/storyeditor.h	(revision 14834)
+++ scribus/ui/storyeditor.h	(revision 14835)
@@ -381,7 +381,7 @@
 	StoryEditor( QWidget* parent );
 // 	StoryEditor( QWidget* parent, ScribusDoc *docc, PageItem* ite );
 	~StoryEditor();
-	
+
 	virtual void changeEvent(QEvent *e);
 
 	void setCurrentDocumentAndItem(ScribusDoc *doc=NULL, PageItem *item=NULL);
Index: scribus/ui/storyeditor.cpp
===================================================================
--- scribus/ui/storyeditor.cpp	(revision 14834)
+++ scribus/ui/storyeditor.cpp	(revision 14835)
@@ -1528,12 +1528,12 @@
 void StoryEditor::showEvent(QShowEvent *)
 {
 	charSelect = new CharSelect(this);
-	charSelect->userTableModel()->setCharacters(
-			ScCore->primaryMainWindow()->charPalette->userTableModel()->characters());
-	connect(charSelect, SIGNAL(insertSpecialChar()),
-			 this, SLOT(slot_insertSpecialChar()));
-	connect(charSelect, SIGNAL(insertUserSpecialChar(QChar)),
-			 this, SLOT(slot_insertUserSpecialChar(QChar)));
+	charSelect->userTableModel()->setCharacters(ScCore->primaryMainWindow()->charPalette->userTableModel()->characters());
+	connect(charSelect, SIGNAL(insertSpecialChar()), this, SLOT(slot_insertSpecialChar()));
+	connect(charSelect, SIGNAL(insertUserSpecialChar(QChar)), this, SLOT(slot_insertUserSpecialChar(QChar)));
+
+	smartSelection=prefsManager->appPrefs.storyEditorPrefs.smartTextSelection;
+	seActions["settingsSmartTextSelection"]->setChecked(smartSelection);
 }
 
 void StoryEditor::hideEvent(QHideEvent *)
@@ -1541,10 +1541,7 @@
 	if (charSelect)
 	{
 		if (charSelectUsed)
-		{
-			ScCore->primaryMainWindow()->charPalette->userTableModel()->setCharacters(
-					charSelect->userTableModel()->characters());
-		}
+			ScCore->primaryMainWindow()->charPalette->userTableModel()->setCharacters(charSelect->userTableModel()->characters());
 		if (charSelect->isVisible())
 			charSelect->close();
 		disconnect(charSelect, SIGNAL(insertSpecialChar()),
@@ -1699,6 +1696,8 @@
 	seMenuMgr->addMenuItem(seActions["editEditStyle"], "Edit", true);
 	seMenuMgr->addMenuItem(seActions["editFontPreview"], "Edit", true);
 	seMenuMgr->addMenuItem(seActions["editUpdateFrame"], "Edit", false);
+	seMenuMgr->addMenuSeparator("Edit");
+	seMenuMgr->addMenuItem(seActions["settingsSmartTextSelection"], "Edit", true);
 	seMenuMgr->createMenu("Insert", tr("&Insert"));
 	seMenuMgr->addMenuItem(seActions["insertGlyph"], "Insert", true);
 	seMenuMgr->addMenuItem(seActions["insertSampleText"], "Insert", true);
@@ -1972,7 +1971,7 @@
 	seMenuMgr->setText("Settings", tr("&Settings"));
 	seActions["settingsBackground"]->setTexts( tr("&Background..."));
 	seActions["settingsDisplayFont"]->setTexts( tr("&Display Font..."));
-	seActions["settingsSmartTextSelection"]->setTexts( tr("&Smart text selection"));
+	seActions["settingsSmartTextSelection"]->setTexts( tr("&Smart Text Selection"));
 
 	//Unicode Actions
 	ActionManager::languageChangeUnicodeActions(&seActions);




More information about the scribus-commit mailing list