r21587 by craig - A little cleanup after splitting the text palette out

scribus-commit scribus-commit at lists.scribus.net
Mon Dec 5 19:50:30 UTC 2016


Author: craig
Date: Mon Dec  5 19:50:29 2016
New Revision: 21587

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21587
Log:
A little cleanup after splitting the text palette out

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
    trunk/Scribus/scribus/plugins/scripter/api_page.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/propertiespalette.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Mon Dec  5 19:50:29 2016
@@ -23,21 +23,23 @@
 
 #include "pageitem.h"
 
+#include <QDebug>
+#include <QFileInfo>
+#include <QFont>
+#include <QMessageBox>
 #include <QPainter>
 #include <QPen>
-#include <QFont>
-#include <QRegion>
 #include <QPoint>
 #include <QPointF>
-#include <QFileInfo>
+#include <QPolygon>
+#include <QRegExp>
+#include <QRegion>
+#include <QRegularExpression>
+#include <cairo.h>
+#include <cassert>
 #include <qdrawutil.h>
-#include <QRegExp>
-#include <QRegularExpression>
-#include <QMessageBox>
-#include <QPolygon>
-#include <cassert>
 #include <sstream>
-#include <QDebug>
+
 
 #include "appmodes.h"
 #include "canvas.h"
@@ -74,6 +76,7 @@
 #include "text/storytext.h"
 #include "ui/guidemanager.h"
 #include "ui/propertiespalette.h"
+#include "ui/textpalette.h"
 #include "undomanager.h"
 #include "undostate.h"
 #include "units.h"
@@ -83,7 +86,8 @@
 #include "util_math.h"
 #include "util_text.h"
 
-#include <cairo.h>
+
+
 
 using namespace std;
 
@@ -9200,6 +9204,7 @@
 				efVal += pixm.imgInfo.duotoneColors[cc].Name+"\n";
 			}
 			m_Doc->scMW()->propertiesPalette->updateColorList();
+			m_Doc->scMW()->textPalette->updateColorList();
 			struct ImageEffect ef;
 			if (pixm.imgInfo.duotoneColors.count() == 1)
 			{

Modified: trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp	Mon Dec  5 19:50:29 2016
@@ -19,6 +19,7 @@
 #include "ui/cmykfw.h"
 #include "ui/colorlistbox.h"
 #include "ui/propertiespalette.h"
+#include "ui/textpalette.h"
 #include "util_color.h"
 
 
@@ -342,6 +343,7 @@
 		return;
 	}
 	m_Doc->scMW()->propertiesPalette->updateColorList();
+	m_Doc->scMW()->textPalette->updateColorList();
 	accept();
 }
 
@@ -352,6 +354,7 @@
 		m_Doc->PageColors[it.key()] = it.value();
 	}
 	m_Doc->scMW()->propertiesPalette->updateColorList();
+	m_Doc->scMW()->textPalette->updateColorList();
 	accept();
 }
 

Modified: trunk/Scribus/scribus/plugins/scripter/api_page.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/plugins/scripter/api_page.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_page.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_page.cpp	Mon Dec  5 19:50:29 2016
@@ -14,6 +14,7 @@
 #include "ui/propertiespalette.h"
 #include "ui/propertiespalette_text.h"
 #include "ui/propertiespalette_line.h"
+#include "ui/textpalette.h"
 #include "scribuscore.h"
 #include "scribusview.h"
 #include "api_textitem.h"
@@ -296,8 +297,9 @@
 			    pageXtoDocX(x) - x2, pageYtoDocY(y) - y2);
 			ScCore->primaryMainWindow()->view->endGroupTransaction();
 			ScCore->primaryMainWindow()->propertiesPalette->updateColorList();
-			ScCore->primaryMainWindow()->propertiesPalette->textPal->paraStyleCombo->updateFormatList();
-			ScCore->primaryMainWindow()->propertiesPalette->textPal->charStyleCombo->updateFormatList();
+			ScCore->primaryMainWindow()->textPalette->updateColorList();
+			ScCore->primaryMainWindow()->textPalette->textPal->paraStyleCombo->updateFormatList();
+			ScCore->primaryMainWindow()->textPalette->textPal->charStyleCombo->updateFormatList();
 			ScCore->primaryMainWindow()->propertiesPalette->linePal->updateLineStyles();
 		}
 	}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	Mon Dec  5 19:50:29 2016
@@ -27,6 +27,7 @@
 #include "ui/outlinepalette.h" //TODO Move the calls to this to a signal
 #include "ui/scmessagebox.h"
 #include "ui/scmwmenumanager.h"
+#include "ui/textpalette.h"
 #include "pconsole.h"
 #include "scraction.h"
 #include "scribuscore.h"
@@ -161,6 +162,7 @@
 	if (ScMW->HaveDoc)
 	{
 		ScMW->propertiesPalette->setDoc(ScMW->doc);
+		ScMW->textPalette->setDoc(ScMW->doc);
 		ScMW->marksManager->setDoc(ScMW->doc);
 		ScMW->nsEditor->setDoc(ScMW->doc);
 		ScMW->layerPalette->setDoc(ScMW->doc);
@@ -247,6 +249,7 @@
 	if (!inMainInterpreter)
 	{
 		ScCore->primaryMainWindow()->propertiesPalette->unsetDoc();
+		ScCore->primaryMainWindow()->textPalette->unsetDoc();
 		ScCore->primaryMainWindow()->pagePalette->setView(NULL);
 		ScCore->primaryMainWindow()->setScriptRunning(true);
 		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -391,6 +394,7 @@
 	disableMainWindowMenu();
 
 	ScCore->primaryMainWindow()->propertiesPalette->unsetDoc();
+	ScCore->primaryMainWindow()->textPalette->unsetDoc();
 	ScCore->primaryMainWindow()->pagePalette->setView(NULL);
 	ScCore->primaryMainWindow()->setScriptRunning(true);
 	inValue = Script;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Mon Dec  5 19:50:29 2016
@@ -432,6 +432,7 @@
 	ToggleTips();
 	ToggleMouseTips();
 	propertiesPalette->setFontSize();
+	textPalette->setFontSize();
 	if (scrActions["SaveAsDocumentTemplate"])
 		scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
 

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Mon Dec  5 19:50:29 2016
@@ -37,6 +37,7 @@
 #include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
+#include "textpalette.h"
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"
@@ -666,6 +667,7 @@
 					{
 						item->PageItemObject->setItemName(NameNew);
 						m_MainWindow->propertiesPalette->setCurrentItem(item->PageItemObject);
+						m_MainWindow->textPalette->setCurrentItem(item->PageItemObject);
 						currDoc->setModified(true);
 					}
 				}

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21587&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp	Mon Dec  5 19:50:29 2016
@@ -13,7 +13,6 @@
 #include <QEvent>
 #include <QFocusEvent>
 #include <QKeyEvent>
-#include <QTransform>
 #include <QObject>
 #include <QPoint>
 #include <QSpacerItem>
@@ -21,6 +20,7 @@
 #include <QTimer>
 #include <QToolBox>
 #include <QToolTip>
+#include <QTransform>
 #include <QVBoxLayout>
 #include <QValidator>
 #include <QWidget>
@@ -35,12 +35,14 @@
 #include "arrowchooser.h"
 #include "autoform.h"
 #include "basepointwidget.h"
+#include "colorcombo.h"
+#include "colorlistbox.h"
 #include "commonstrings.h"
-#include "colorlistbox.h"
-#include "sccolorengine.h"
 #include "cpalette.h"
+#include "dasheditor.h"
+//#include "fontcombo.h"
 #include "pageitem_table.h"
-#include "pageitem_textframe.h"
+//#include "pageitem_textframe.h"
 #include "propertiespalette_group.h"
 #include "propertiespalette_image.h"
 #include "propertiespalette_line.h"
@@ -49,24 +51,22 @@
 #include "propertiespalette_table.h"
 #include "propertiespalette_utils.h"
 #include "propertiespalette_xyz.h"
-#include "sccombobox.h"
-#include "scfonts.h"
-
-#include "scribuscore.h"
-#include "scraction.h"
+//#include "sccolorengine.h"
+//#include "sccombobox.h"
+//#include "scfonts.h"
+//#include "scraction.h"
+#include "scribus.h"
+//#include "scribuscore.h"
 #include "scribusview.h"
 #include "selection.h"
-#include "spalette.h"
-#include "styleselect.h"
-#include "tabmanager.h"
-#include "transparencypalette.h"
+//#include "spalette.h"
+//#include "styleselect.h"
+//#include "tabmanager.h"
+//#include "transparencypalette.h"
+#include "undomanager.h"
 #include "units.h"
-#include "undomanager.h"
-#include "util.h"
+//#include "util.h"
 #include "util_math.h"
-#include "dasheditor.h"
-#include "fontcombo.h"
-#include "colorcombo.h"
 
 //using namespace std;
 




More information about the scribus-commit mailing list