r19067 by craig - Move app mode struct to its own file to reduce recompile time of scribusstructs changes
scribus-commit
scribus-commit at lists.scribus.net
Sun Apr 20 22:07:20 UTC 2014
Author: craig
Date: Sun Apr 20 22:07:20 2014
New Revision: 19067
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19067
Log:
Move app mode struct to its own file to reduce recompile time of scribusstructs changes
Added:
trunk/Scribus/scribus/appmodes.h (with props)
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/canvas.cpp
trunk/Scribus/scribus/canvasgesture_rulermove.cpp
trunk/Scribus/scribus/canvasmode.cpp
trunk/Scribus/scribus/canvasmode_copyproperties.cpp
trunk/Scribus/scribus/canvasmode_create.cpp
trunk/Scribus/scribus/canvasmode_drawbezier.cpp
trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
trunk/Scribus/scribus/canvasmode_edit.cpp
trunk/Scribus/scribus/canvasmode_editarc.cpp
trunk/Scribus/scribus/canvasmode_editgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
trunk/Scribus/scribus/canvasmode_editpolygon.cpp
trunk/Scribus/scribus/canvasmode_editspiral.cpp
trunk/Scribus/scribus/canvasmode_edittable.cpp
trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
trunk/Scribus/scribus/canvasmode_eyedropper.cpp
trunk/Scribus/scribus/canvasmode_framelinks.cpp
trunk/Scribus/scribus/canvasmode_magnifier.cpp
trunk/Scribus/scribus/canvasmode_measurements.cpp
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/canvasmode_objimport.cpp
trunk/Scribus/scribus/canvasmode_rotate.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem_noteframe.cpp
trunk/Scribus/scribus/pageitem_textframe.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
trunk/Scribus/scribus/scpage.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusstructs.h
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/ui/charselect.cpp
trunk/Scribus/scribus/ui/clockwidget.cpp
trunk/Scribus/scribus/ui/contextmenu.cpp
trunk/Scribus/scribus/ui/inlinepalette.cpp
trunk/Scribus/scribus/ui/inserttablecolumnsdialog.cpp
trunk/Scribus/scribus/ui/inserttablerowsdialog.cpp
trunk/Scribus/scribus/ui/loremipsum.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
trunk/Scribus/scribus/ui/propertiespalette.cpp
trunk/Scribus/scribus/ui/propertiespalette_group.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_table.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_distance.cpp
trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
trunk/Scribus/scribus/ui/search.cpp
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Sun Apr 20 22:07:20 2014
@@ -20,6 +20,7 @@
***************************************************************************/
#include "actionmanager.h"
+#include "appmodes.h"
#include "scribus.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Sun Apr 20 22:07:20 2014
@@ -21,6 +21,7 @@
// #include <QDebug>
#include <QToolTip>
+#include "appmodes.h"
#include "canvas.h"
#include "canvasmode.h"
#include "pageitem_textframe.h"
Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sun Apr 20 22:07:20 2014
@@ -19,11 +19,13 @@
#include <QMouseEvent>
#include <QPainter>
-#include "ui/guidemanager.h"
+#include "appmodes.h"
#include "guidemanagercore.h"
#include "scribus.h"
#include "scribusdoc.h"
+#include "ui/guidemanager.h"
#include "util_icon.h"
+
void RulerGesture::drawControls(QPainter* p)
{
Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Sun Apr 20 22:07:20 2014
@@ -16,6 +16,7 @@
#include "canvasmode.h"
+#include "appmodes.h"
#include "canvas.h"
#include "canvasgesture_pan.h"
#include "canvasmode_copyproperties.h"
Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp Sun Apr 20 22:07:20 2014
@@ -24,17 +24,19 @@
#include <QRect>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "selectionrubberband.h"
+#include "ui/contextmenu.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_CopyProperties::CanvasMode_CopyProperties(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Sun Apr 20 22:07:20 2014
@@ -28,35 +28,37 @@
#include <QRect>
#include <QWidgetAction>
-#include "ui/basepointwidget.h"
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
#include "fpointarray.h"
-#include "text/frect.h"
-#include "ui/hruler.h"
-#include "ui/vruler.h"
#include "hyphenator.h"
-#include "ui/insertTable.h"
-#include "ui/oneclick.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scraction.h"
-#include "ui/scrapbookpalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "text/frect.h"
+#include "ui/basepointwidget.h"
+#include "ui/hruler.h"
+#include "ui/insertTable.h"
+#include "ui/oneclick.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
+#include "ui/scrapbookpalette.h"
+#include "ui/vruler.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Sun Apr 20 22:07:20 2014
@@ -29,31 +29,33 @@
#include <QWidgetAction>
+#include "appmodes.h"
#include "canvas.h"
#include "canvasgesture_resize.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
-#include "ui/insertTable.h"
-#include "ui/oneclick.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scraction.h"
-#include "ui/scrapbookpalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/insertTable.h"
+#include "ui/oneclick.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
+#include "ui/scrapbookpalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Sun Apr 20 22:07:20 2014
@@ -22,22 +22,25 @@
#include <QPoint>
#include <QRect>
+
+#include "KarbonCurveFit.h"
+#include "appmodes.h"
#include "canvas.h"
#include "canvasgesture_resize.h"
#include "fpoint.h"
-#include "KarbonCurveFit.h"
-#include "ui/pageselector.h"
#include "prefsmanager.h"
#include "scraction.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
+#include "selection.h"
+#include "ui/pageselector.h"
#include "ui/scrspinbox.h"
-#include "selection.h"
#include "undomanager.h"
#include "util.h"
#include "util_math.h"
+
Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Sun Apr 20 22:07:20 2014
@@ -22,20 +22,22 @@
#include <QPoint>
#include <QRect>
+#include "KarbonCurveFit.h"
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
-#include "KarbonCurveFit.h"
-#include "ui/pageselector.h"
#include "prefsmanager.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
+#include "selection.h"
+#include "ui/pageselector.h"
#include "ui/scrspinbox.h"
-#include "selection.h"
#include "undomanager.h"
#include "util.h"
#include "util_math.h"
+
FreehandMode::FreehandMode(ScribusView* view) : CanvasMode(view)
Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sun Apr 20 22:07:20 2014
@@ -31,9 +31,8 @@
#include <QWidgetAction>
#include <QDebug>
-
+#include "appmodes.h"
#include "canvas.h"
-
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
@@ -45,9 +44,9 @@
#include "sccolorengine.h"
#include "scmimedata.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
#include "ui/aligndistribute.h"
#include "ui/contextmenu.h"
Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.cpp Sun Apr 20 22:07:20 2014
@@ -37,28 +37,30 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
#include "pageitem_arc.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EditArc::CanvasMode_EditArc(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editgradient.cpp Sun Apr 20 22:07:20 2014
@@ -30,28 +30,30 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EditGradient::CanvasMode_EditGradient(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp Sun Apr 20 22:07:20 2014
@@ -37,28 +37,30 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EditMeshGradient::CanvasMode_EditMeshGradient(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp Sun Apr 20 22:07:20 2014
@@ -37,29 +37,31 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "sccolorengine.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EditMeshPatch::CanvasMode_EditMeshPatch(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_editpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editpolygon.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editpolygon.cpp Sun Apr 20 22:07:20 2014
@@ -37,28 +37,30 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "pageitem_regularpolygon.h"
-#include "ui/pageselector.h"
-#include "ui/polygonwidget.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/polygonwidget.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EditPolygon::CanvasMode_EditPolygon(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_editspiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editspiral.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editspiral.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editspiral.cpp Sun Apr 20 22:07:20 2014
@@ -33,17 +33,19 @@
#include <QTimer>
#include <QWidgetAction>
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
#include "pageitem_spiral.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "util.h"
#include "util_math.h"
+
CanvasMode_EditSpiral::CanvasMode_EditSpiral(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Sun Apr 20 22:07:20 2014
@@ -7,12 +7,15 @@
for which a new license (GPL+exception) is in place.
*/
+#include "canvasmode_edittable.h"
+
#include <QCursor>
#include <QDebug>
#include <QPainter>
#include <QPointF>
#include <QTimer>
+#include "appmodes.h"
#include "canvas.h"
#include "canvasgesture_cellselect.h"
#include "canvasgesture_columnresize.h"
@@ -26,10 +29,9 @@
#include "scribusview.h"
#include "selection.h"
#include "tablehandle.h"
+#include "ui/scmwmenumanager.h"
#include "util_icon.h"
-#include "ui/scmwmenumanager.h"
-
-#include "canvasmode_edittable.h"
+
// TODO: We should have a preference for this instead.
#ifdef Q_OS_MAC
Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editweldpoint.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editweldpoint.cpp Sun Apr 20 22:07:20 2014
@@ -37,6 +37,7 @@
#include <QWidgetAction>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
#include "fpointarray.h"
Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Sun Apr 20 22:07:20 2014
@@ -27,17 +27,19 @@
#include <QScreen>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
-#include "ui/propertiespalette.h"
#include "sccolorengine.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/propertiespalette.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_EyeDropper::CanvasMode_EyeDropper(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Sun Apr 20 22:07:20 2014
@@ -30,25 +30,27 @@
#include <QWidgetAction>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_FrameLinks::CanvasMode_FrameLinks(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Sun Apr 20 22:07:20 2014
@@ -30,25 +30,27 @@
#include <QWidgetAction>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_Magnifier::CanvasMode_Magnifier(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_measurements.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_measurements.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_measurements.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_measurements.cpp Sun Apr 20 22:07:20 2014
@@ -19,11 +19,13 @@
#include <QPainter>
#include <QPen>
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/measurements.h"
#include "scribusdoc.h"
#include "scribusview.h"
+#include "ui/measurements.h"
#include "util_math.h"
+
MeasurementsMode::MeasurementsMode(ScribusView* view) : CanvasMode(view), m_start(0,0), m_current(0,0)
{
Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Sun Apr 20 22:07:20 2014
@@ -32,6 +32,7 @@
#include <QDrag>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
#include "canvasgesture_linemove.h"
#include "canvasgesture_resize.h"
@@ -41,24 +42,21 @@
#include "fpointarray.h"
#include "hyphenator.h"
#include "loadsaveplugin.h"
+#include "pageitem_arc.h"
#include "pageitem_line.h"
+#include "pageitem_regularpolygon.h"
#include "pageitem_textframe.h"
-#include "pageitem_regularpolygon.h"
-#include "pageitem_arc.h"
+#include "plugins/formatidlist.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scmimedata.h"
#include "scraction.h"
#include "scribus.h"
+#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
-#include "scribusXml.h"
#include "selection.h"
-#include "undomanager.h"
-#include "util.h"
-#include "util_icon.h"
-#include "util_math.h"
#include "ui/aligndistribute.h"
#include "ui/contextmenu.h"
#include "ui/customfdialog.h"
@@ -69,7 +67,11 @@
#include "ui/propertiespalette_line.h"
#include "ui/propertiespalette_text.h"
#include "ui/propertiespalette_xyz.h"
-#include "plugins/formatidlist.h"
+#include "undomanager.h"
+#include "util.h"
+#include "util_icon.h"
+#include "util_math.h"
+
Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp Sun Apr 20 22:07:20 2014
@@ -26,11 +26,10 @@
#include <QMimeData>
#include <QDebug>
+#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
#include "fpointarray.h"
-#include "ui/pageselector.h"
-#include "ui/scrspinbox.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
@@ -38,10 +37,13 @@
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
#include "undomanager.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_ObjImport::CanvasMode_ObjImport(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
{
Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Sun Apr 20 22:07:20 2014
@@ -19,20 +19,22 @@
#include <QPainter>
#include <QTimer>
+#include "appmodes.h"
#include "canvas.h"
-#include "ui/contextmenu.h"
-#include "ui/scrspinbox.h"
#include "fpoint.h"
#include "pageitem.h"
-#include "ui/pageselector.h"
#include "prefsmanager.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/contextmenu.h"
+#include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
#include "undomanager.h"
#include "util_icon.h"
#include "util_math.h"
+
CanvasMode_Rotate::CanvasMode_Rotate(ScribusView* view) : CanvasMode(view)
{
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Apr 20 22:07:20 2014
@@ -38,23 +38,24 @@
#include <sstream>
#include <QDebug>
+
+
+#include "appmodes.h"
#include "canvas.h"
#include "cmsettings.h"
#include "colorblind.h"
#include "commonstrings.h"
#include "desaxe/saxXML.h"
#include "marks.h"
-
#include "pageitem_arc.h"
#include "pageitem_group.h"
+#include "pageitem_latexframe.h"
#include "pageitem_noteframe.h"
-#include "pageitem_latexframe.h"
#include "pageitem_regularpolygon.h"
-#include "pageitem_textframe.h"
#include "pageitem_spiral.h"
#include "pageitem_table.h"
+#include "pageitem_textframe.h"
#include "prefsmanager.h"
-
#include "resourcecollection.h"
#include "scclocale.h"
#include "sccolorengine.h"
@@ -68,7 +69,6 @@
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
#include "scribuswin.h"
#include "sctextstream.h"
#include "selection.h"
@@ -81,6 +81,7 @@
#include "util_icon.h"
#include "util_math.h"
#include "util_text.h"
+
#include "ui/guidemanager.h"
#include "ui/propertiespalette.h"
Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp Sun Apr 20 22:07:20 2014
@@ -1,11 +1,14 @@
-#include <QMessageBox>
#include "pageitem_noteframe.h"
+
+
+#include "appmodes.h"
+#include "pageitem.h"
#include "pageitem_textframe.h"
-#include "pageitem.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "undomanager.h"
#include "util_text.h"
+
#include <cmath>
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sun Apr 20 22:07:20 2014
@@ -21,6 +21,8 @@
* *
***************************************************************************/
+#include "pageitem_textframe.h"
+
#include <QDebug>
#include <QList>
#include <QTransform>
@@ -28,21 +30,21 @@
#include <QPoint>
#include <QPolygon>
#include <QRegion>
+#include <cairo.h>
#include <cassert>
-#include "scconfig.h"
-
+#include "appmodes.h"
#include "canvas.h"
#include "commonstrings.h"
#include "hyphenator.h"
-#include "numeration.h"
#include "marks.h"
#include "notesstyles.h"
+#include "numeration.h"
#include "pageitem.h"
#include "pageitem_group.h"
-#include "pageitem_textframe.h"
#include "pageitem_noteframe.h"
#include "prefsmanager.h"
+#include "scconfig.h"
#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
@@ -51,14 +53,11 @@
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "selection.h"
+#include "ui/guidemanager.h"
#include "undomanager.h"
#include "undostate.h"
#include "util.h"
#include "util_math.h"
-
-#include "ui/guidemanager.h"
-
-#include <cairo.h>
using namespace std;
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp Sun Apr 20 22:07:20 2014
@@ -5,13 +5,16 @@
for which a new license (GPL+exception) is in place.
*/
#include "cmdobj.h"
+
+#include "appmodes.h"
#include "cmdutil.h"
+#include "commonstrings.h"
+#include "pageitem_table.h"
+#include "scribuscore.h"
+#include "scribusdoc.h"
#include "selection.h"
#include "util_math.h"
-#include "commonstrings.h"
-#include "scribuscore.h"
-#include "scribusdoc.h"
-#include "pageitem_table.h"
+
PyObject *scribus_newrect(PyObject* /* self */, PyObject* args)
{
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Sun Apr 20 22:07:20 2014
@@ -5,14 +5,17 @@
for which a new license (GPL+exception) is in place.
*/
#include "cmdtext.h"
+
+#include "appmodes.h"
#include "cmdutil.h"
+#include "hyphenator.h"
#include "pageitem_textframe.h"
#include "prefsmanager.h"
+#include "scribuscore.h"
+#include "scribusdoc.h"
#include "selection.h"
#include "util.h"
-#include "scribuscore.h"
-#include "scribusdoc.h"
-#include "hyphenator.h"
+
template<typename T>
class ApplyCharstyleHelper {
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp Sun Apr 20 22:07:20 2014
@@ -27,7 +27,7 @@
#include "meshdistortiondialog.h"
#include "meshdistortion.h"
#include "scribuscore.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp Sun Apr 20 22:07:20 2014
@@ -28,7 +28,7 @@
#include "pathalongpath.h"
#include "pageitem_group.h"
#include "scribuscore.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp Sun Apr 20 22:07:20 2014
@@ -31,7 +31,7 @@
#include "flattenpath.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "selection.h"
#include "util.h"
#include <QPainterPath>
Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp Sun Apr 20 22:07:20 2014
@@ -27,7 +27,7 @@
#include "pathcut.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "selection.h"
#include "util.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp Sun Apr 20 22:07:20 2014
@@ -33,7 +33,7 @@
#include "commonstrings.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "selection.h"
#include "util.h"
#include <QPainterPathStroker>
Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp Sun Apr 20 22:07:20 2014
@@ -31,7 +31,7 @@
#include "smoothpath.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "selection.h"
#include "util.h"
#include <QPainterPath>
Modified: trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp Sun Apr 20 22:07:20 2014
@@ -27,7 +27,7 @@
#include "subdivide.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "selection.h"
int subdivide_getPluginAPIVersion()
Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Sun Apr 20 22:07:20 2014
@@ -24,6 +24,7 @@
#include <QDebug>
#include <QPixmap>
+#include "appmodes.h"
#include "scpage.h"
#include "scribus.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Apr 20 22:07:20 2014
@@ -94,6 +94,7 @@
#include "actionmanager.h"
+#include "appmodes.h"
#include "canvasmode.h"
#include "canvasmode_imageimport.h"
#include "commonstrings.h"
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Apr 20 22:07:20 2014
@@ -40,6 +40,7 @@
#include <QTime>
//#include <qtconcurrentmap.h>
+#include "appmodes.h"
#include "canvas.h"
#include "ui/masterpagepalette.h"
#include "colorblind.h"
Modified: trunk/Scribus/scribus/scribusstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/scribusstructs.h
==============================================================================
--- trunk/Scribus/scribus/scribusstructs.h (original)
+++ trunk/Scribus/scribus/scribusstructs.h Sun Apr 20 22:07:20 2014
@@ -285,53 +285,6 @@
typedef QMap<PreflightError, int> errorCodes;
-enum AppMode
-{
- modeNormal,
- modeDrawShapes,
- modeStoryEditor,
- modeDrawImage,
- modeDrawText,
- modeMagnifier,
- modeEdit,
- modeDrawLine,
- modeRotation,
- modeLinkFrames,
- modeImportImage,
- modeUnlinkFrames,
- modeDrawRegularPolygon,
- modeDrawBezierLine,
- modeInsertPDFButton,
- modeInsertPDFTextfield,
- modeInsertPDFCheckbox,
- modeInsertPDFCombobox,
- modeInsertPDFListbox,
- modeInsertPDFTextAnnotation,
- modeInsertPDFLinkAnnotation,
- modeDrawFreehandLine,
- modeDrawTable, // Now deprecated as new tables are working now.
- modeDrawTable2, // Temporary name for new tables.
- modePanning,
- modeMeasurementTool,
- modeEditGradientVectors,
- modeEyeDropper,
- modeCopyProperties,
- modeEditClip,
- modeDrawLatex,
- modeImportObject,
- modeInsertPDF3DAnnotation,
- modeEditMeshGradient,
- modeDrawCalligraphicLine,
- modeDrawArc,
- modeEditArc,
- modeEditPolygon,
- modeDrawSpiral,
- modeEditSpiral,
- modeEditTable,
- modeEditMeshPatch,
- modeEditWeldPoint,
- modeInsertPDFRadioButton
-};
struct AlignObjs
{
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Apr 20 22:07:20 2014
@@ -66,27 +66,29 @@
#include <QDir>
#include <QSizeGrip>
-#include "scribus.h"
-
+#include "appmodes.h"
+#include "actionmanager.h"
#include "canvas.h"
#include "canvasgesture.h"
#include "canvasmode.h"
+#include "canvasmode_imageimport.h"
#include "canvasmode_objimport.h"
-#include "canvasmode_imageimport.h"
-#include "actionmanager.h"
#include "commonstrings.h"
+#include "fileloader.h"
#include "filewatcher.h"
#include "hyphenator.h"
+#include "loadsaveplugin.h"
#include "pageitem.h"
#include "pageitem_group.h"
#include "pageitem_imageframe.h"
+#include "pageitem_latexframe.h"
#include "pageitem_line.h"
#include "pageitem_pathtext.h"
#include "pageitem_polygon.h"
#include "pageitem_polyline.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
-#include "pageitem_latexframe.h"
+#include "plugins/formatidlist.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
@@ -95,9 +97,9 @@
#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
+#include "scribusXml.h"
#include "scribuscore.h"
#include "scribuswin.h"
-#include "scribusXml.h"
#include "selection.h"
#include "selectionrubberband.h"
#include "serializer.h"
@@ -125,9 +127,8 @@
#include "util_formats.h"
#include "util_icon.h"
#include "util_math.h"
-#include "loadsaveplugin.h"
-#include "fileloader.h"
-#include "plugins/formatidlist.h"
+#include "scribus.h"
+
using namespace std;
Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp (original)
+++ trunk/Scribus/scribus/ui/charselect.cpp Sun Apr 20 22:07:20 2014
@@ -8,7 +8,9 @@
#include <QFileDialog>
#include <QMessageBox>
+#include "appmodes.h"
#include "charselect.h"
+#include "charselectenhanced.h"
#include "commonstrings.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
@@ -18,7 +20,7 @@
#include "scribusview.h"
#include "util.h"
#include "util_icon.h"
-#include "charselectenhanced.h"
+
CharSelect::CharSelect(QWidget* parent) : ScrPaletteBase(parent, "CharSelect"), m_doc(0), m_enhanced(0), m_Item(0)
Modified: trunk/Scribus/scribus/ui/clockwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/clockwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/clockwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/clockwidget.cpp Sun Apr 20 22:07:20 2014
@@ -24,6 +24,8 @@
#include "clockwidget.h"
#include <QPainter>
#include <QRect>
+
+#include "appmodes.h"
#include "scribusdoc.h"
ClockWidget::ClockWidget(QWidget *pa, ScribusDoc *doc) : QWidget(pa)
Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Sun Apr 20 22:07:20 2014
@@ -13,7 +13,8 @@
* *
***************************************************************************/
-// #include <QDebug>
+#include "contextmenu.h"
+
#include <QApplication>
#include <QFrame>
#include <QGridLayout>
@@ -22,9 +23,10 @@
#include <QWidget>
#include <QWidgetAction>
-#include "contextmenu.h"
+#include "appmodes.h"
+#include "canvasmode_normal.h"
+#include "pageitem_textframe.h"
#include "prefsmanager.h"
-#include "pageitem_textframe.h"
#include "scmimedata.h"
#include "scraction.h"
#include "scrapbookpalette.h"
@@ -32,7 +34,7 @@
#include "scribusdoc.h"
#include "ui/scmwmenumanager.h"
#include "undomanager.h"
-#include "canvasmode_normal.h"
+
// #include "util.h" //just for tdebug
Modified: trunk/Scribus/scribus/ui/inlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/inlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.cpp Sun Apr 20 22:07:20 2014
@@ -25,6 +25,8 @@
#include <QByteArray>
#include <QDrag>
#include <QMimeData>
+
+#include "appmodes.h"
#include "pageitem.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
Modified: trunk/Scribus/scribus/ui/inserttablecolumnsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/inserttablecolumnsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablecolumnsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/inserttablecolumnsdialog.cpp Sun Apr 20 22:07:20 2014
@@ -6,7 +6,7 @@
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "inserttablecolumnsdialog.h"
Modified: trunk/Scribus/scribus/ui/inserttablerowsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/inserttablerowsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablerowsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/inserttablerowsdialog.cpp Sun Apr 20 22:07:20 2014
@@ -6,7 +6,7 @@
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
-#include "scribusstructs.h"
+#include "appmodes.h"
#include "inserttablerowsdialog.h"
Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Sun Apr 20 22:07:20 2014
@@ -32,21 +32,22 @@
#include <QTreeWidgetItem>
#include <QVBoxLayout>
-
+#include "appmodes.h"
+#include "commonstrings.h"
+#include "hyphenator.h"
#include "langmgr.h"
#include "pageitem.h"
#include "pageitem_table.h"
-#include "pageitem_textframe.h"
-#include "scribus.h"
+//#include "pageitem_textframe.h"
+#include "prefsmanager.h"
+#include "scpaths.h"
+//#include "scribus.h"
#include "scribusdoc.h"
-#include "scribusview.h"
-#include "scpaths.h"
+//#include "scribusview.h"
#include "selection.h"
-#include "prefsmanager.h"
-#include "commonstrings.h"
-#include "hyphenator.h"
+#include "undomanager.h"
#include "util_icon.h"
-#include "undomanager.h"
+
QString getLoremLocation(QString fname)
{
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun Apr 20 22:07:20 2014
@@ -24,21 +24,23 @@
#include <QDebug>
#include "actionmanager.h"
+#include "appmodes.h"
#include "canvasmode.h"
#include "commonstrings.h"
#include "contextmenu.h"
+#include "layers.h"
#include "outlinepalette.h"
#include "propertiespalette.h"
#include "scpage.h"
#include "scribus.h"
#include "selection.h"
-#include "layers.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_color.h"
#include "util_formats.h"
#include "util_icon.h"
+
OutlineTreeItem::OutlineTreeItem(OutlineTreeItem* parent, OutlineTreeItem* after) : QTreeWidgetItem(parent, after)
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Sun Apr 20 22:07:20 2014
@@ -19,6 +19,7 @@
#include <QMessageBox>
#include <QInputDialog>
+#include "appmodes.h"
#include "canvasmode.h"
#include "commonstrings.h"
#include "mergedoc.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sun Apr 20 22:07:20 2014
@@ -29,6 +29,7 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+#include "appmodes.h"
#include "arrowchooser.h"
#include "autoform.h"
#include "basepointwidget.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Sun Apr 20 22:07:20 2014
@@ -44,25 +44,28 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+
+
+#include "appmodes.h"
#include "commonstrings.h"
#include "sccombobox.h"
+#include "scraction.h"
#include "scribus.h"
#include "scribuscore.h"
-#include "scraction.h"
#include "scribusview.h"
#include "selection.h"
-#include "units.h"
-#include "undomanager.h"
-#include "util.h"
-#include "util_icon.h"
-#include "util_math.h"
-
#include "ui/autoform.h"
#include "ui/nodeeditpalette.h"
#include "ui/propertiespalette.h"
#include "ui/propertiespalette_utils.h"
#include "ui/propertiespalette_xyz.h"
#include "ui/transparencypalette.h"
+#include "undomanager.h"
+#include "units.h"
+#include "util.h"
+#include "util_icon.h"
+#include "util_math.h"
+
PropertiesPalette_Group::PropertiesPalette_Group( QWidget* parent) : QWidget(parent)
{
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Sun Apr 20 22:07:20 2014
@@ -11,28 +11,31 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+
+
+#include "appmodes.h"
#include "autoform.h"
#include "commonstrings.h"
+#include "pageitem_arc.h"
+#include "pageitem_regularpolygon.h"
+#include "pageitem_textframe.h"
+#include "polyprops.h"
#include "sccolorengine.h"
-#include "pageitem_arc.h"
-#include "pageitem_textframe.h"
-#include "pageitem_regularpolygon.h"
-#include "polyprops.h"
#include "sccombobox.h"
+#include "scraction.h"
#include "scribus.h"
#include "scribuscore.h"
-#include "scraction.h"
#include "scribusview.h"
#include "selection.h"
+#include "ui/nodeeditpalette.h"
+#include "ui/propertiespalette_utils.h"
+#include "ui/propertiespalette_xyz.h"
+#include "undomanager.h"
#include "units.h"
-#include "undomanager.h"
#include "util.h"
#include "util_icon.h"
#include "util_math.h"
-#include "ui/nodeeditpalette.h"
-#include "ui/propertiespalette_utils.h"
-#include "ui/propertiespalette_xyz.h"
PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent) : QWidget(parent)
{
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Sun Apr 20 22:07:20 2014
@@ -11,9 +11,12 @@
#include <QListWidgetItem>
#include <QWidget>
+
+#include "appmodes.h"
#include "colorcombo.h"
#include "commonstrings.h"
#include "pageitem_table.h"
+#include "propertiespalette_table.h"
#include "sccolorengine.h"
#include "scribus.h"
#include "selection.h"
@@ -23,7 +26,6 @@
#include "util_color.h"
#include "util_icon.h"
-#include "propertiespalette_table.h"
PropertiesPalette_Table::PropertiesPalette_Table(QWidget* parent) : QWidget(parent),
m_mainWindow(0), m_doc(0), m_item(0), m_previousItem(0)
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Sun Apr 20 22:07:20 2014
@@ -12,6 +12,9 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+
+
+#include "appmodes.h"
#include "commonstrings.h"
#include "colorlistbox.h"
#include "pageitem.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Sun Apr 20 22:07:20 2014
@@ -13,6 +13,8 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+
+#include "appmodes.h"
#include "autoform.h"
#include "basepointwidget.h"
#include "commonstrings.h"
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Sun Apr 20 22:07:20 2014
@@ -7,6 +7,7 @@
#include "propertywidget_advanced.h"
+#include "appmodes.h"
#include "pageitem_table.h"
#include "scribus.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp Sun Apr 20 22:07:20 2014
@@ -7,6 +7,7 @@
#include "propertywidget_distance.h"
+#include "appmodes.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
#include "scribus.h"
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp Sun Apr 20 22:07:20 2014
@@ -5,8 +5,10 @@
for which a new license (GPL+exception) is in place.
*/
+#include "propertywidget_optmargins.h"
+
+#include "appmodes.h"
#include "pageitem_table.h"
-#include "propertywidget_optmargins.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "selection.h"
@@ -219,4 +221,4 @@
optMarginRadioLeft->setText( tr("Left Only","optical margins") );
optMarginRadioRight->setText( tr("Right Only","optical margins") );
optMarginResetButton->setText( tr("Reset") );
-}
+}
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Sun Apr 20 22:07:20 2014
@@ -5,16 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
+#include "propertywidget_pareffect.h"
+
+
+#include "appmodes.h"
#include "pageitem.h"
#include "pageitem_table.h"
-#include "propertywidget_pareffect.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "selection.h"
+#include "ui/sctreewidget.h"
#include "units.h"
#include "util.h"
#include "util_icon.h"
-#include "ui/sctreewidget.h"
+
PropertyWidget_ParEffect::PropertyWidget_ParEffect(QWidget *parent) : QFrame(parent), m_enhanced(NULL), m_item(NULL), m_ScMW(NULL)
{
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Sun Apr 20 22:07:20 2014
@@ -7,6 +7,7 @@
#include "propertywidget_textcolor.h"
+#include "appmodes.h"
#include "pageitem_table.h"
#include "scribus.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19067&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Sun Apr 20 22:07:20 2014
@@ -19,6 +19,7 @@
#include <QPixmap>
#include <QMessageBox>
+#include "appmodes.h"
#include "colorcombo.h"
#include "colorlistbox.h"
#include "commonstrings.h"
More information about the scribus-commit
mailing list