r15448 by craig - #9298: Remove style manager from story editor menu, also avoids #9318

[scribus-commit]

Author: craig
Date: Sat Aug 28 21:43:19 2010
New Revision: 15448

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15448
Log:
#9298: Remove style manager from story editor menu, also avoids #9318

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

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15448&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sat Aug 28 21:43:19 2010
@@ -76,7 +76,7 @@
 #include "ui/spalette.h"
 #include "storyeditor.h"
 #include "styleitem.h"
-#include "ui/stylemanager.h"
+//#include "ui/stylemanager.h"
 #include "styleselect.h"
 #include "text/nlsconfig.h"
 #include "units.h"
@@ -145,14 +145,14 @@
 	paraStyleAct = new QWidgetAction(this);
 	paraStyleAct->setDefaultWidget(paraStyleCombo);
 	pmen->addAction(paraStyleAct);
-	pmen->addAction( tr("Edit Styles..."), this, SLOT(editStyles()));
+//	pmen->addAction( tr("Edit Styles..."), this, SLOT(editStyles()));
 	pmen->exec(QCursor::pos());
 }
 
-void SideBar::editStyles()
-{
-	emit sigEditStyles();
-}
+//void SideBar::editStyles()
+//{
+//	emit sigEditStyles();
+//}
 
 void SideBar::setPStyle(const QString& name)
 {
@@ -1641,7 +1641,7 @@
 	connect( seActions["editPaste"], SIGNAL(triggered()), this, SLOT(Do_paste()) );
 	connect( seActions["editClear"], SIGNAL(triggered()), this, SLOT(Do_del()) );
 	connect( seActions["editSearchReplace"], SIGNAL(triggered()), this, SLOT(SearchText()) );
-	connect( seActions["editEditStyle"], SIGNAL(triggered()), this, SLOT(slotEditStyles()) );
+	//connect( seActions["editEditStyle"], SIGNAL(triggered()), this, SLOT(slotEditStyles()) );
 	connect( seActions["editFontPreview"], SIGNAL(triggered()), this, SLOT(Do_fontPrev()) );
 	connect( seActions["editUpdateFrame"], SIGNAL(triggered()), this, SLOT(updateTextFrame()) );
 
@@ -1693,7 +1693,7 @@
 	seMenuMgr->addMenuSeparator("Edit");
 	seMenuMgr->addMenuItem(seActions["editSearchReplace"], "Edit", true);
 	seMenuMgr->addMenuSeparator("Edit");
-	seMenuMgr->addMenuItem(seActions["editEditStyle"], "Edit", true);
+//	seMenuMgr->addMenuItem(seActions["editEditStyle"], "Edit", true);
 	seMenuMgr->addMenuItem(seActions["editFontPreview"], "Edit", true);
 	seMenuMgr->addMenuItem(seActions["editUpdateFrame"], "Edit", false);
 	seMenuMgr->addMenuSeparator("Edit");
@@ -1955,7 +1955,7 @@
 	seActions["editPaste"]->setTexts( tr("&Paste"));
 	seActions["editClear"]->setTexts( tr("C&lear"));
 	seActions["editSearchReplace"]->setTexts( tr("&Search/Replace..."));
-	seActions["editEditStyle"]->setTexts( tr("&Edit Styles..."));
+//	seActions["editEditStyle"]->setTexts( tr("&Edit Styles..."));
 	seActions["editFontPreview"]->setTexts( tr("&Fonts Preview..."));
 	seActions["editUpdateFrame"]->setTexts( tr("&Update Text Frame"));
 
@@ -2016,7 +2016,7 @@
 	// 10/12/2004 - pv - #1203: wrong selection on double click
 //	connect(Editor, SIGNAL(doubleClicked(int, int)), this, SLOT(doubleClick(int, int)));
 	connect(EditorBar, SIGNAL(ChangeStyle(int, const QString& )), this, SLOT(changeStyleSB(int, const QString&)));
-	connect(EditorBar, SIGNAL(sigEditStyles()), this, SLOT(slotEditStyles()));
+//	connect(EditorBar, SIGNAL(sigEditStyles()), this, SLOT(slotEditStyles()));
 	connect(AlignTools, SIGNAL(newParaStyle(const QString&)), this, SLOT(newStyle(const QString&)));
 	connect(AlignTools, SIGNAL(newAlign(int)), this, SLOT(newAlign(int)));
 	connect(FillTools, SIGNAL(NewColor(int, int)), this, SLOT(newTxFill(int, int)));
@@ -2939,10 +2939,10 @@
 	EditorBar->doRepaint();
 }
 
-void StoryEditor::slotEditStyles()
-{
-	ScCore->primaryMainWindow()->styleMgr()->exec(this);
-}
+//void StoryEditor::slotEditStyles()
+//{
+//	ScCore->primaryMainWindow()->styleMgr()->exec(this);
+//}
 
 void StoryEditor::newAlign(int st)
 {

Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15448&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h (original)
+++ trunk/Scribus/scribus/ui/storyeditor.h Sat Aug 28 21:43:19 2010
@@ -24,7 +24,6 @@
 #ifndef STORYEDITOR_H
 #define STORYEDITOR_H
 
-// #include <Q3PopupMenu>
 #include <QTextEdit>
 #include <QAction>
 #include <QCheckBox>
@@ -197,7 +196,7 @@
 signals:
 	void ChangeStyle(int, const QString&);
 	//! signal raised when user ask for style manager
-	void sigEditStyles();
+	//void sigEditStyles();
 
 public slots:
 	void setPStyle(const QString&);
@@ -205,7 +204,7 @@
 	void doRepaint();
 	void setRepaint(bool r);
 	//! slot raising style manager
-	void editStyles();
+	//void editStyles();
 };
 
 class SCRIBUS_API SToolBColorF : public QToolBar