r18556 by craig - Update MenuManager some more. Remove hacky additions to scribus.cpp

scribus-commit scribus-commit at lists.scribus.net
Mon Oct 14 19:59:24 UTC 2013


Author: craig
Date: Mon Oct 14 19:59:23 2013
New Revision: 18556

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18556
Log:
Update MenuManager some more. Remove hacky additions to scribus.cpp

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/actionmanager.h
    trunk/Scribus/scribus/menumanager.cpp
    trunk/Scribus/scribus/menumanager.h
    trunk/Scribus/scribus/pluginmanager.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/undogui.cpp

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Mon Oct 14 19:59:23 2013
@@ -1,147 +1,14 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) Mon Jun 10 18:32:44 2013
+# Automatically generated by qmake (3.0) Thu Sep 19 22:51:13 2013
 ######################################################################
 
+QML_IMPORT_PATH = /Users/craig/Qt/Qt5.1.1/5.1.1/clang_64/qml/QtQuick.2
+QML2_IMPORT_PATH = /Users/craig/Qt/Qt5.1.1/5.1.1/clang_64/qml/QtQuick.2
 TEMPLATE = app
-TARGET = 
-DEPENDPATH += . \
-              scribus \
-              scribus/colormgmt \
-              scribus/desaxe \
-              scribus/designer \
-              scribus/downloadmanager \
-              scribus/fonts \
-              scribus/old \
-              scribus/plugins \
-              scribus/styles \
-              scribus/tests \
-              scribus/text \
-              scribus/ui \
-              win32/vc9 \
-              resources/translations/po \
-              scribus/designer/smwidgets \
-              scribus/plugins/barcodegenerator \
-              scribus/plugins/colorwheel \
-              scribus/plugins/fontpreview \
-              scribus/plugins/imposition \
-              scribus/plugins/myplugin \
-              scribus/plugins/newfromtemplateplugin \
-              scribus/plugins/picbrowser \
-              scribus/plugins/pixmapexport \
-              scribus/plugins/saveastemplateplugin \
-              scribus/plugins/scripter \
-              scribus/plugins/scriptplugin \
-              scribus/plugins/short-words \
-              scribus/plugins/svgexplugin \
-              scribus/third_party/cairo \
-              scribus/third_party/lib2geom \
-              scribus/third_party/pgf \
-              scribus/third_party/prc \
-              scribus/third_party/wpg \
-              scribus/tt/simpletreemodel \
-              win32/vc9/aiimport \
-              win32/vc9/barcodegenerator \
-              win32/vc9/cgmimport \
-              win32/vc9/colorwheel \
-              win32/vc9/cvgimport \
-              win32/vc9/drwimport \
-              win32/vc9/flattenpath \
-              win32/vc9/fontpreview \
-              win32/vc9/gettext-csvim \
-              win32/vc9/gettext-docim \
-              win32/vc9/gettext-htmlim \
-              win32/vc9/gettext-odtim \
-              win32/vc9/gettext-pdbim \
-              win32/vc9/gettext-sxwim \
-              win32/vc9/gettext-textfilter \
-              win32/vc9/gettext-txtim \
-              win32/vc9/gettext-xtgim \
-              win32/vc9/hunspellcheck \
-              win32/vc9/idmlimport \
-              win32/vc9/lenseffects \
-              win32/vc9/meshdistortion \
-              win32/vc9/oodrawimport \
-              win32/vc9/pathalongpath \
-              win32/vc9/pathconnect \
-              win32/vc9/pathcut \
-              win32/vc9/pathfinder \
-              win32/vc9/pathstroker \
-              win32/vc9/pctimport \
-              win32/vc9/pdfimport \
-              win32/vc9/picturebrowser \
-              win32/vc9/pixmapexport \
-              win32/vc9/psimport \
-              win32/vc9/saveastemplate \
-              win32/vc9/scribus-main \
-              win32/vc9/scribus12format \
-              win32/vc9/scribus134format \
-              win32/vc9/scribus13format \
-              win32/vc9/scribus150format \
-              win32/vc9/scriptplugin \
-              win32/vc9/shapeimport \
-              win32/vc9/shortwords \
-              win32/vc9/smlimport \
-              win32/vc9/smoothpath \
-              win32/vc9/subdivide \
-              win32/vc9/svgexport \
-              win32/vc9/svgimport \
-              win32/vc9/transform \
-              win32/vc9/uniconvimport \
-              win32/vc9/wmfimport \
-              win32/vc9/wpgimport \
-              win32/vc9/xarimport \
-              win32/vc9/xfigimport \
-              scribus/plugins/fileloader/oldscribusformat \
-              scribus/plugins/fileloader/scribus12format \
-              scribus/plugins/fileloader/scribus134format \
-              scribus/plugins/fileloader/scribus13format \
-              scribus/plugins/fileloader/scribus150format \
-              scribus/plugins/gettext/csvim \
-              scribus/plugins/gettext/docim \
-              scribus/plugins/gettext/htmlim \
-              scribus/plugins/gettext/odtim \
-              scribus/plugins/gettext/pdbim \
-              scribus/plugins/gettext/sxwim \
-              scribus/plugins/gettext/textfilter \
-              scribus/plugins/gettext/txtim \
-              scribus/plugins/gettext/xtgim \
-              scribus/plugins/import/ai \
-              scribus/plugins/import/cgm \
-              scribus/plugins/import/cvg \
-              scribus/plugins/import/drw \
-              scribus/plugins/import/idml \
-              scribus/plugins/import/idml_old \
-              scribus/plugins/import/oodraw \
-              scribus/plugins/import/pct \
-              scribus/plugins/import/pdf \
-              scribus/plugins/import/ps \
-              scribus/plugins/import/pub \
-              scribus/plugins/import/shape \
-              scribus/plugins/import/sml \
-              scribus/plugins/import/svg \
-              scribus/plugins/import/uniconvertor \
-              scribus/plugins/import/wmf \
-              scribus/plugins/import/wpg \
-              scribus/plugins/import/xar \
-              scribus/plugins/import/xfig \
-              scribus/plugins/scripter/python \
-              scribus/plugins/scriptplugin/scripter2 \
-              scribus/plugins/tools/flattenpath \
-              scribus/plugins/tools/hunspellcheck \
-              scribus/plugins/tools/lenseffects \
-              scribus/plugins/tools/pathconnect \
-              scribus/plugins/tools/pathcut \
-              scribus/plugins/tools/pathfinder \
-              scribus/plugins/tools/pathstroker \
-              scribus/plugins/tools/smoothpath \
-              scribus/plugins/tools/spellcheck \
-              scribus/plugins/tools/subdivide \
-              scribus/plugins/scripter/python/sceditor \
-              scribus/plugins/tools/2geomtools/meshdistortion \
-              scribus/plugins/tools/2geomtools/pathalongpath
+TARGET = Scribus
 INCLUDEPATH += . \
                scribus \
-               win32/vc9 \
+               win32/vc10 \
                scribus/fonts \
                scribus/colormgmt \
                scribus/desaxe \
@@ -173,7 +40,7 @@
                scribus/plugins/short-words \
                scribus/plugins/svgexplugin \
                scribus/third_party/lib2geom \
-               win32/vc9/scribus-main \
+               win32/vc10/scribus-main \
                scribus/plugins/fileloader/oldscribusformat \
                scribus/plugins/fileloader/scribus12format \
                scribus/plugins/fileloader/scribus134format \
@@ -435,6 +302,7 @@
            scribus/scxmlstreamreader.h \
            scribus/scxmlstreamwriter.h \
            scribus/selection.h \
+           scribus/selectionrubberband.h \
            scribus/serializer.h \
            scribus/style.h \
            scribus/styleitem.h \
@@ -786,7 +654,8 @@
            scribus/ui/useprintermarginsdialog.h \
            scribus/ui/vruler.h \
            scribus/ui/weldedit.h \
-           win32/vc9/win-config.h \
+           win32/vc10/win-config.h \
+           win32/vc11/win-config.h \
            scribus/designer/smwidgets/smalignselectplugin.h \
            scribus/designer/smwidgets/smcolorcomboplugin.h \
            scribus/designer/smwidgets/smfontcombohplugin.h \
@@ -1020,8 +889,10 @@
            scribus/third_party/wpg/WPXStream.h \
            scribus/tt/simpletreemodel/treeitem.h \
            scribus/tt/simpletreemodel/treemodel.h \
-           win32/vc9/scribus-main/resource.h \
-           win32/vc9/scribus-main/scribuspch.h \
+           win32/vc10/scribus-main/resource.h \
+           win32/vc10/scribus-main/scribuspch.h \
+           win32/vc11/scribus-main/resource.h \
+           win32/vc11/scribus-main/scribuspch.h \
            scribus/plugins/fileloader/oldscribusformat/oldscribusformat.h \
            scribus/plugins/fileloader/oldscribusformat/oldscribusformatimpl.h \
            scribus/plugins/fileloader/scribus12format/scribus12format.h \
@@ -1462,6 +1333,7 @@
            scribus/sctextstruct.cpp \
            scribus/scxmlstreamreader.cpp \
            scribus/selection.cpp \
+           scribus/selectionrubberband.cpp \
            scribus/serializer.cpp \
            scribus/styleitem.cpp \
            scribus/tableborder.cpp \
@@ -2014,58 +1886,106 @@
            scribus/third_party/wpg/WPGXParser.cpp \
            scribus/tt/simpletreemodel/treeitem.cpp \
            scribus/tt/simpletreemodel/treemodel.cpp \
-           win32/vc9/aiimport/aiimportdll.cpp \
-           win32/vc9/barcodegenerator/barcodegeneratordll.cpp \
-           win32/vc9/cgmimport/cgmimportdll.cpp \
-           win32/vc9/colorwheel/colorwheeldll.cpp \
-           win32/vc9/cvgimport/cvgimportdll.cpp \
-           win32/vc9/drwimport/drwimportdll.cpp \
-           win32/vc9/flattenpath/flattenpathdll.cpp \
-           win32/vc9/fontpreview/fontpreviewdll.cpp \
-           win32/vc9/gettext-csvim/gettext-csvimdll.cpp \
-           win32/vc9/gettext-docim/gettext-docimdll.cpp \
-           win32/vc9/gettext-htmlim/gettext-htmlimdll.cpp \
-           win32/vc9/gettext-odtim/gettext-odtimdll.cpp \
-           win32/vc9/gettext-pdbim/gettext-pdbimdll.cpp \
-           win32/vc9/gettext-sxwim/gettext-sxwimdll.cpp \
-           win32/vc9/gettext-textfilter/gettext-textfilterdll.cpp \
-           win32/vc9/gettext-txtim/gettext-txtimdll.cpp \
-           win32/vc9/gettext-xtgim/gettext-xtgimdll.cpp \
-           win32/vc9/hunspellcheck/hunspellcheckdll.cpp \
-           win32/vc9/idmlimport/idmlimportdll.cpp \
-           win32/vc9/lenseffects/lenseffectsdll.cpp \
-           win32/vc9/meshdistortion/meshdistortiondll.cpp \
-           win32/vc9/oodrawimport/oodrawimportdll.cpp \
-           win32/vc9/pathalongpath/pathalongpathdll.cpp \
-           win32/vc9/pathconnect/pathconnectdll.cpp \
-           win32/vc9/pathcut/pathcutdll.cpp \
-           win32/vc9/pathfinder/pathfinderdll.cpp \
-           win32/vc9/pathstroker/pathstrokerdll.cpp \
-           win32/vc9/pctimport/pctimportdll.cpp \
-           win32/vc9/pdfimport/pdfimportdll.cpp \
-           win32/vc9/picturebrowser/picturebrowserdll.cpp \
-           win32/vc9/pixmapexport/pixmapexportdll.cpp \
-           win32/vc9/psimport/psimportdll.cpp \
-           win32/vc9/saveastemplate/saveastemplatedll.cpp \
-           win32/vc9/scribus-main/scribuspch.cpp \
-           win32/vc9/scribus12format/scribus12formatdll.cpp \
-           win32/vc9/scribus134format/scribus134formatdll.cpp \
-           win32/vc9/scribus13format/scribus13formatdll.cpp \
-           win32/vc9/scribus150format/scribus150formatdll.cpp \
-           win32/vc9/scriptplugin/scriptplugindll.cpp \
-           win32/vc9/shapeimport/shapeimportdll.cpp \
-           win32/vc9/shortwords/shortwordsdll.cpp \
-           win32/vc9/smlimport/smlimportdll.cpp \
-           win32/vc9/smoothpath/smoothpathdll.cpp \
-           win32/vc9/subdivide/subdividedll.cpp \
-           win32/vc9/svgexport/svgexportdll.cpp \
-           win32/vc9/svgimport/svgimportdll.cpp \
-           win32/vc9/transform/transformdll.cpp \
-           win32/vc9/uniconvimport/uniconvimportdll.cpp \
-           win32/vc9/wmfimport/wmfimportdll.cpp \
-           win32/vc9/wpgimport/wpgimportdll.cpp \
-           win32/vc9/xarimport/xarimportdll.cpp \
-           win32/vc9/xfigimport/xfigimportdll.cpp \
+           win32/vc10/aiimport/aiimportdll.cpp \
+           win32/vc10/barcodegenerator/barcodegeneratordll.cpp \
+           win32/vc10/cgmimport/cgmimportdll.cpp \
+           win32/vc10/colorwheel/colorwheeldll.cpp \
+           win32/vc10/cvgimport/cvgimportdll.cpp \
+           win32/vc10/drwimport/drwimportdll.cpp \
+           win32/vc10/flattenpath/flattenpathdll.cpp \
+           win32/vc10/fontpreview/fontpreviewdll.cpp \
+           win32/vc10/gettext-csvim/gettext-csvimdll.cpp \
+           win32/vc10/gettext-docim/gettext-docimdll.cpp \
+           win32/vc10/gettext-htmlim/gettext-htmlimdll.cpp \
+           win32/vc10/gettext-odtim/gettext-odtimdll.cpp \
+           win32/vc10/gettext-pdbim/gettext-pdbimdll.cpp \
+           win32/vc10/gettext-sxwim/gettext-sxwimdll.cpp \
+           win32/vc10/gettext-textfilter/gettext-textfilterdll.cpp \
+           win32/vc10/gettext-txtim/gettext-txtimdll.cpp \
+           win32/vc10/gettext-xtgim/gettext-xtgimdll.cpp \
+           win32/vc10/hunspellcheck/hunspellcheckdll.cpp \
+           win32/vc10/idmlimport/idmlimportdll.cpp \
+           win32/vc10/lenseffects/lenseffectsdll.cpp \
+           win32/vc10/meshdistortion/meshdistortiondll.cpp \
+           win32/vc10/oodrawimport/oodrawimportdll.cpp \
+           win32/vc10/pathalongpath/pathalongpathdll.cpp \
+           win32/vc10/pathconnect/pathconnectdll.cpp \
+           win32/vc10/pathcut/pathcutdll.cpp \
+           win32/vc10/pathfinder/pathfinderdll.cpp \
+           win32/vc10/pathstroker/pathstrokerdll.cpp \
+           win32/vc10/pctimport/pctimportdll.cpp \
+           win32/vc10/pdfimport/pdfimportdll.cpp \
+           win32/vc10/picturebrowser/picturebrowserdll.cpp \
+           win32/vc10/pixmapexport/pixmapexportdll.cpp \
+           win32/vc10/saveastemplate/saveastemplatedll.cpp \
+           win32/vc10/scribus-main/scribuspch.cpp \
+           win32/vc10/scribus12format/scribus12formatdll.cpp \
+           win32/vc10/scribus134format/scribus134formatdll.cpp \
+           win32/vc10/scribus13format/scribus13formatdll.cpp \
+           win32/vc10/scribus150format/scribus150formatdll.cpp \
+           win32/vc10/scriptplugin/scriptplugindll.cpp \
+           win32/vc10/shapeimport/shapeimportdll.cpp \
+           win32/vc10/shortwords/shortwordsdll.cpp \
+           win32/vc10/smlimport/smlimportdll.cpp \
+           win32/vc10/smoothpath/smoothpathdll.cpp \
+           win32/vc10/subdivide/subdividedll.cpp \
+           win32/vc10/svgexport/svgexportdll.cpp \
+           win32/vc10/svgimport/svgimportdll.cpp \
+           win32/vc10/uniconvimport/uniconvimportdll.cpp \
+           win32/vc10/wmfimport/wmfimportdll.cpp \
+           win32/vc10/wpgimport/wpgimportdll.cpp \
+           win32/vc10/xarimport/xarimportdll.cpp \
+           win32/vc10/xfigimport/xfigimportdll.cpp \
+           win32/vc11/aiimport/aiimportdll.cpp \
+           win32/vc11/barcodegenerator/barcodegeneratordll.cpp \
+           win32/vc11/cgmimport/cgmimportdll.cpp \
+           win32/vc11/colorwheel/colorwheeldll.cpp \
+           win32/vc11/cvgimport/cvgimportdll.cpp \
+           win32/vc11/drwimport/drwimportdll.cpp \
+           win32/vc11/flattenpath/flattenpathdll.cpp \
+           win32/vc11/fontpreview/fontpreviewdll.cpp \
+           win32/vc11/gettext-csvim/gettext-csvimdll.cpp \
+           win32/vc11/gettext-docim/gettext-docimdll.cpp \
+           win32/vc11/gettext-htmlim/gettext-htmlimdll.cpp \
+           win32/vc11/gettext-odtim/gettext-odtimdll.cpp \
+           win32/vc11/gettext-pdbim/gettext-pdbimdll.cpp \
+           win32/vc11/gettext-sxwim/gettext-sxwimdll.cpp \
+           win32/vc11/gettext-textfilter/gettext-textfilterdll.cpp \
+           win32/vc11/gettext-txtim/gettext-txtimdll.cpp \
+           win32/vc11/gettext-xtgim/gettext-xtgimdll.cpp \
+           win32/vc11/hunspellcheck/hunspellcheckdll.cpp \
+           win32/vc11/idmlimport/idmlimportdll.cpp \
+           win32/vc11/lenseffects/lenseffectsdll.cpp \
+           win32/vc11/meshdistortion/meshdistortiondll.cpp \
+           win32/vc11/oodrawimport/oodrawimportdll.cpp \
+           win32/vc11/pathalongpath/pathalongpathdll.cpp \
+           win32/vc11/pathconnect/pathconnectdll.cpp \
+           win32/vc11/pathcut/pathcutdll.cpp \
+           win32/vc11/pathfinder/pathfinderdll.cpp \
+           win32/vc11/pathstroker/pathstrokerdll.cpp \
+           win32/vc11/pctimport/pctimportdll.cpp \
+           win32/vc11/pdfimport/pdfimportdll.cpp \
+           win32/vc11/picturebrowser/picturebrowserdll.cpp \
+           win32/vc11/pixmapexport/pixmapexportdll.cpp \
+           win32/vc11/saveastemplate/saveastemplatedll.cpp \
+           win32/vc11/scribus-main/scribuspch.cpp \
+           win32/vc11/scribus12format/scribus12formatdll.cpp \
+           win32/vc11/scribus134format/scribus134formatdll.cpp \
+           win32/vc11/scribus13format/scribus13formatdll.cpp \
+           win32/vc11/scribus150format/scribus150formatdll.cpp \
+           win32/vc11/scriptplugin/scriptplugindll.cpp \
+           win32/vc11/shapeimport/shapeimportdll.cpp \
+           win32/vc11/shortwords/shortwordsdll.cpp \
+           win32/vc11/smlimport/smlimportdll.cpp \
+           win32/vc11/smoothpath/smoothpathdll.cpp \
+           win32/vc11/subdivide/subdividedll.cpp \
+           win32/vc11/svgexport/svgexportdll.cpp \
+           win32/vc11/svgimport/svgimportdll.cpp \
+           win32/vc11/uniconvimport/uniconvimportdll.cpp \
+           win32/vc11/wmfimport/wmfimportdll.cpp \
+           win32/vc11/wpgimport/wpgimportdll.cpp \
+           win32/vc11/xarimport/xarimportdll.cpp \
+           win32/vc11/xfigimport/xfigimportdll.cpp \
            scribus/plugins/fileloader/oldscribusformat/oldscribusformat.cpp \
            scribus/plugins/fileloader/oldscribusformat/oldscribusformatimpl.cpp \
            scribus/plugins/fileloader/scribus12format/scribus12format.cpp \
@@ -2179,47 +2099,47 @@
            scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp \
            scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp
 RESOURCES += scribus/plugins/scripter/python/sceditor/dockwidget_icons.qrc
-TRANSLATIONS += resources/translations/po/scribus.af.ts \
-                resources/translations/po/scribus.ar.ts \
-                resources/translations/po/scribus.bg.ts \
-                resources/translations/po/scribus.br.ts \
-                resources/translations/po/scribus.ca.ts \
-                resources/translations/po/scribus.cs_CZ.ts \
-                resources/translations/po/scribus.cy.ts \
-                resources/translations/po/scribus.da_DK.ts \
-                resources/translations/po/scribus.de.ts \
-                resources/translations/po/scribus.de_1901.ts \
-                resources/translations/po/scribus.de_CH.ts \
-                resources/translations/po/scribus.el.ts \
-                resources/translations/po/scribus.en_AU.ts \
-                resources/translations/po/scribus.en_GB.ts \
-                resources/translations/po/scribus.en_US.ts \
-                resources/translations/po/scribus.es_ES.ts \
-                resources/translations/po/scribus.et.ts \
-                resources/translations/po/scribus.eu.ts \
-                resources/translations/po/scribus.fi.ts \
-                resources/translations/po/scribus.fr.ts \
-                resources/translations/po/scribus.gl.ts \
-                resources/translations/po/scribus.hu.ts \
-                resources/translations/po/scribus.id.ts \
-                resources/translations/po/scribus.it.ts \
-                resources/translations/po/scribus.ja.ts \
-                resources/translations/po/scribus.ko.ts \
-                resources/translations/po/scribus.lt_LT.ts \
-                resources/translations/po/scribus.nb_NO.ts \
-                resources/translations/po/scribus.nl.ts \
-                resources/translations/po/scribus.pl_PL.ts \
-                resources/translations/po/scribus.pt.ts \
-                resources/translations/po/scribus.pt_BR.ts \
-                resources/translations/po/scribus.ru.ts \
-                resources/translations/po/scribus.sa.ts \
-                resources/translations/po/scribus.sk_SK.ts \
-                resources/translations/po/scribus.sl.ts \
-                resources/translations/po/scribus.sq.ts \
-                resources/translations/po/scribus.sr.ts \
-                resources/translations/po/scribus.sv.ts \
-                resources/translations/po/scribus.th_TH.ts \
-                resources/translations/po/scribus.tr.ts \
-                resources/translations/po/scribus.uk.ts \
-                resources/translations/po/scribus.zh_CN.ts \
-                resources/translations/po/scribus.zh_TW.ts
+TRANSLATIONS += resources/translations/scribus.af.ts \
+                resources/translations/scribus.ar.ts \
+                resources/translations/scribus.bg.ts \
+                resources/translations/scribus.br.ts \
+                resources/translations/scribus.ca.ts \
+                resources/translations/scribus.cs_CZ.ts \
+                resources/translations/scribus.cy.ts \
+                resources/translations/scribus.da_DK.ts \
+                resources/translations/scribus.de.ts \
+                resources/translations/scribus.de_1901.ts \
+                resources/translations/scribus.de_CH.ts \
+                resources/translations/scribus.el.ts \
+                resources/translations/scribus.en_AU.ts \
+                resources/translations/scribus.en_GB.ts \
+                resources/translations/scribus.en_US.ts \
+                resources/translations/scribus.es_ES.ts \
+                resources/translations/scribus.et.ts \
+                resources/translations/scribus.eu.ts \
+                resources/translations/scribus.fi.ts \
+                resources/translations/scribus.fr.ts \
+                resources/translations/scribus.gl.ts \
+                resources/translations/scribus.hu.ts \
+                resources/translations/scribus.id.ts \
+                resources/translations/scribus.it.ts \
+                resources/translations/scribus.ja.ts \
+                resources/translations/scribus.ko.ts \
+                resources/translations/scribus.lt_LT.ts \
+                resources/translations/scribus.nb_NO.ts \
+                resources/translations/scribus.nl.ts \
+                resources/translations/scribus.pl_PL.ts \
+                resources/translations/scribus.pt.ts \
+                resources/translations/scribus.pt_BR.ts \
+                resources/translations/scribus.ru.ts \
+                resources/translations/scribus.sa.ts \
+                resources/translations/scribus.sk_SK.ts \
+                resources/translations/scribus.sl.ts \
+                resources/translations/scribus.sq.ts \
+                resources/translations/scribus.sr.ts \
+                resources/translations/scribus.sv.ts \
+                resources/translations/scribus.th_TH.ts \
+                resources/translations/scribus.tr.ts \
+                resources/translations/scribus.uk.ts \
+                resources/translations/scribus.zh_CN.ts \
+                resources/translations/scribus.zh_TW.ts

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Mon Oct 14 19:59:23 2013
@@ -2462,3 +2462,123 @@
 	}
 	return QString::null;
 }
+
+void ActionManager::setStartupActionsEnabled(bool enabled)
+{
+	(*scrActions)["fileDocSetup150"]->setEnabled(false);
+	(*scrActions)["filePrint"]->setEnabled(false);
+	(*scrActions)["fileSave"]->setEnabled(false);
+	(*scrActions)["fileSaveAs"]->setEnabled(false);
+	(*scrActions)["fileRevert"]->setEnabled(false);
+	(*scrActions)["fileCollect"]->setEnabled(false);
+	(*scrActions)["fileClose"]->setEnabled(false);
+	(*scrActions)["PrintPreview"]->setEnabled(false);
+	(*scrActions)["SaveAsDocumentTemplate"]->setEnabled(false);
+//	scrMenuMgr->setMenuEnabled("FileImport", false);
+//	scrMenuMgr->setMenuEnabled("FileExport", false);
+	(*scrActions)["fileExportAsPDF"]->setEnabled(false);
+	(*scrActions)["fileExportText"]->setEnabled(false);
+	(*scrActions)["fileExportAsEPS"]->setEnabled(false);
+	(*scrActions)["fileImportText"]->setEnabled(false);
+	(*scrActions)["fileImportText2"]->setEnabled(false);
+	(*scrActions)["fileImportImage"]->setEnabled(false);
+	(*scrActions)["fileImportAppendText"]->setEnabled(false);
+	(*scrActions)["pageInsert"]->setEnabled(false);
+	(*scrActions)["pageImport"]->setEnabled(false);
+	(*scrActions)["pageDelete"]->setEnabled(false);
+	(*scrActions)["pageImport"]->setEnabled(false);
+	(*scrActions)["pageMove"]->setEnabled(false);
+	(*scrActions)["pageCopy"]->setEnabled(false);
+	(*scrActions)["pageApplyMasterPage"]->setEnabled(false);
+	(*scrActions)["pageCopyToMasterPage"]->setEnabled(false);
+	(*scrActions)["pageManageGuides"]->setEnabled(false);
+	(*scrActions)["pageManageMargins"]->setEnabled(false);
+	(*scrActions)["editUndoAction"]->setEnabled(false);
+	(*scrActions)["editRedoAction"]->setEnabled(false);
+	(*scrActions)["editCut"]->setEnabled(false);
+	(*scrActions)["editCopy"]->setEnabled(false);
+	(*scrActions)["editPaste"]->setEnabled(false);
+//	scrMenuMgr->setMenuEnabled("EditPasteRecent", false);
+	(*scrActions)["editClearContents"]->setEnabled(false);
+	(*scrActions)["editSelectAll"]->setEnabled(false);
+	(*scrActions)["editSelectAllOnLayer"]->setEnabled(false);
+	(*scrActions)["editDeselectAll"]->setEnabled(false);
+	(*scrActions)["editReplaceColors"]->setEnabled(false);
+	(*scrActions)["editStyles"]->setEnabled(false);
+	(*scrActions)["editMarks"]->setEnabled(false);
+	(*scrActions)["editNotesStyles"]->setEnabled(false);
+	(*scrActions)["editSearchReplace"]->setEnabled(false);
+	(*scrActions)["editMasterPages"]->setEnabled(false);
+	(*scrActions)["editJavascripts"]->setEnabled(false);
+	(*scrActions)["toolsPreflightVerifier"]->setEnabled(false);
+	(*scrActions)["extrasHyphenateText"]->setEnabled(false);
+	(*scrActions)["extrasDeHyphenateText"]->setEnabled(false);
+	(*scrActions)["viewFitInWindow"]->setEnabled(false);
+	(*scrActions)["viewFitWidth"]->setEnabled(false);
+	(*scrActions)["viewFit50"]->setEnabled(false);
+	(*scrActions)["viewFit75"]->setEnabled(false);
+	(*scrActions)["viewFit100"]->setEnabled(false);
+	(*scrActions)["viewFit200"]->setEnabled(false);
+	(*scrActions)["viewFit400"]->setEnabled(false);
+	(*scrActions)["viewSnapToGuides"]->setChecked(false);
+	(*scrActions)["viewSnapToElements"]->setChecked(false);
+	(*scrActions)["viewSnapToGrid"]->setChecked(false);
+	(*scrActions)["viewShowRulers"]->setEnabled(false);
+//	scrMenuMgr->setMenuEnabled("Insert", false);
+	(*scrActions)["insertFrame"]->setEnabled(false);
+	(*scrActions)["itemDuplicate"]->setEnabled(false);
+	(*scrActions)["itemMulDuplicate"]->setEnabled(false);
+	(*scrActions)["itemTransform"]->setEnabled(false);
+	(*scrActions)["itemDelete"]->setEnabled(false);
+	(*scrActions)["itemRaise"]->setEnabled(false);
+	(*scrActions)["itemLower"]->setEnabled(false);
+	(*scrActions)["itemRaiseToTop"]->setEnabled(false);
+	(*scrActions)["itemLowerToBottom"]->setEnabled(false);
+//	scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
+	(*scrActions)["itemSendToPattern"]->setEnabled(false);
+	(*scrActions)["itemSendToInline"]->setEnabled(false);
+	(*scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
+	(*scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
+	(*scrActions)["itemExtendedImageProperties"]->setEnabled(false);
+	(*scrActions)["itemUpdateImage"]->setEnabled(false);
+	(*scrActions)["itemPreviewLow"]->setEnabled(false);
+	(*scrActions)["itemPreviewNormal"]->setEnabled(false);
+	(*scrActions)["itemPreviewFull"]->setEnabled(false);
+	(*scrActions)["itemAttributes"]->setEnabled(false);
+	(*scrActions)["toolsSelect"]->setEnabled(false);
+	(*scrActions)["toolsRotate"]->setEnabled(false);
+	(*scrActions)["toolsEditContents"]->setEnabled(false);
+	(*scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
+	(*scrActions)["toolsZoom"]->setEnabled(false);
+	(*scrActions)["toolsInsertTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsInsertImageFrame"]->setEnabled(false);
+	(*scrActions)["toolsInsertShape"]->setEnabled(false);
+	(*scrActions)["toolsInsertLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertBezier"]->setEnabled(false);
+	(*scrActions)["toolsInsertFreehandLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertCalligraphicLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertPolygon"]->setEnabled(false);
+	(*scrActions)["toolsInsertArc"]->setEnabled(false);
+	(*scrActions)["toolsInsertSpiral"]->setEnabled(false);
+	(*scrActions)["toolsInsertRenderFrame"]->setEnabled(false);
+	(*scrActions)["toolsInsertTable"]->setEnabled(false);
+	(*scrActions)["toolsLinkTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+	(*scrActions)["toolsMeasurements"]->setEnabled(false);
+	(*scrActions)["toolsCopyProperties"]->setEnabled(false);
+	(*scrActions)["toolsEyeDropper"]->setEnabled(false);
+	(*scrActions)["toolsPDFPushButton"]->setEnabled(false);
+	(*scrActions)["toolsPDFRadioButton"]->setEnabled(false);
+	(*scrActions)["toolsPDFTextField"]->setEnabled(false);
+	(*scrActions)["toolsPDFCheckBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFComboBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFListBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFAnnotText"]->setEnabled(false);
+	(*scrActions)["toolsPDFAnnotLink"]->setEnabled(false);
+#ifdef HAVE_OSG
+	(*scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
+#endif
+}
+

Modified: trunk/Scribus/scribus/actionmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/actionmanager.h
==============================================================================
--- trunk/Scribus/scribus/actionmanager.h (original)
+++ trunk/Scribus/scribus/actionmanager.h Mon Oct 14 19:59:23 2013
@@ -84,6 +84,7 @@
 		void enableUnicodeActions(QMap<QString, QPointer<ScrAction> > *actionMap, bool enabled, const QString& fontName=QString::null);
 		void setPDFActions(ScribusView *);
 		
+		void setStartupActionsEnabled(bool enabled);
 	public slots:
 		void languageChange();
 		void handleMultipleSelections(bool isMultiple);

Modified: trunk/Scribus/scribus/menumanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp (original)
+++ trunk/Scribus/scribus/menumanager.cpp Mon Oct 14 19:59:23 2013
@@ -36,10 +36,14 @@
 	itemLayerMenu=NULL;
 	itemSendtoScrapbookMenu=NULL;
 	windowsMenu=NULL;
+	m_undoMenu=new QMenu("undo");
+	m_redoMenu=new QMenu("redo");
 }
 
 MenuManager::~MenuManager()
 {
+	m_undoMenu->deleteLater();
+	m_redoMenu->deleteLater();
 }
 
 bool MenuManager::createMenu(const QString &menuName, const QString &menuText, const QString parent, bool checkable)
@@ -58,31 +62,10 @@
 	return retVal;
 }
 
-//bool MenuManager::addMenuToMenu(const QString &child, const QString &parent)
-//{
-//	bool retVal=false;
-//	if (child==parent)
-//	{
-//		qDebug("%s", QString("Cannot add %1 menu to %2 menu (itself)").arg(child, parent).toLatin1().constData());
-//		return false;
-//	}
-//	if ((menuList.contains(child) && menuList[child]!=NULL) &&
-//		(menuList.contains(parent) && menuList[parent]!=NULL))
-//	{
-//		menuList.insert(child, menuList[child]);
-//		retVal=menuList[parent]->insertSubMenu(menuList[child]);
-//	}
-//	return retVal;
-//}
 
 bool MenuManager::clearMenu(const QString &menuName)
 {
 	bool retVal=false;
-	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-	{
-		menuList[menuName]->clear();
-		retVal=true;
-	}
 	if (menuBarMenus.contains(menuName))
 		menuBarMenus[menuName]->clear();
 	return retVal;
@@ -90,64 +73,30 @@
 
 void MenuManager::setText(const QString &menuName, const QString &menuText)
 {
-	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-	{
-		menuList[menuName]->setText(menuText);
-		QString parent=menuList[menuName]->getParentMenuName();
-		if (!parent.isNull())
-			menuList[parent]->repopulateLocalMenu();
-	}
-}
-
-void MenuManager::setMenuIcon(const QString &menuName, const QIcon &menuIcon)
-{
-	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-	{
-		menuList[menuName]->setMenuIcon(menuIcon);
-		QString parent=menuList[menuName]->getParentMenuName();
-		if (!parent.isNull())
-			menuList[parent]->repopulateLocalMenu();
-	}
-}
-
-QMenu *MenuManager::getLocalPopupMenu(const QString &menuName)
-{
-	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-		return menuList[menuName]->getLocalPopupMenu();
-	return NULL;
-}
-
-//bool MenuManager::deleteMenu(const QString &menuName, const QString &parent)
-//{
-//	if (!parent.isNull())
-//	{
-//		if (menuList[parent] && menuList[parent]->hasSubMenu(menuList[menuName]))
-//			menuList[parent]->removeSubMenu(menuList[menuName]);
-//	}
-//	menuList.remove(menuName);
-//	return true;
-//}
-
-void MenuManager::setMenuEnabled(const QString &menuName, const bool enabled)
-{
-	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-		menuList[menuName]->setEnabled(enabled);
-}
-
-//bool MenuManager::addMenuToMenuBar(const QString &menuName)
-//{
-//	bool retVal=false;
+	if (menuStringTexts.contains(menuName))
+		menuStringTexts.insert(menuName, menuText);
+	//TODO rebuild all menus
 //	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
 //	{
-//		QAction* t=scribusMenuBar->addMenu(menuList[menuName]->getLocalPopupMenu());
-//		if (t!=NULL)
-//		{
-//			t->setText(menuList[menuName]->getMenuText());
-//			retVal=true;
-//		}
+//		menuList[menuName]->setText(menuText);
+//		QString parent=menuList[menuName]->getParentMenuName();
+//		if (!parent.isNull())
+//			menuList[parent]->repopulateLocalMenu();
 //	}
-//	return retVal;
-//}
+}
+
+QMenu *MenuManager::getLocalPopupMenu(const QString &menuName)
+{
+	if (menuBarMenus.contains(menuName) && menuBarMenus.value(menuName)!=NULL)
+		return menuBarMenus.value(menuName);
+	return NULL;
+}
+
+void MenuManager::setMenuEnabled(const QString &menuName, const bool enabled)
+{
+	if (menuBarMenus.contains(menuName) && menuBarMenus.value(menuName)!=NULL)
+		menuBarMenus.value(menuName)->setEnabled(enabled);
+}
 
 bool MenuManager::addMenuStringToMenuBar(const QString &menuName)
 {
@@ -184,34 +133,6 @@
 	return retVal;
 }
 
-//bool MenuManager::addMenuToMenuBarBefore(const QString &menuName, const QString &beforeMenuName)
-//{
-//	bool retVal=false;
-//	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-//	{
-//		if (menuList[beforeMenuName])
-//		{
-//			QAction* t=scribusMenuBar->insertMenu(menuList[beforeMenuName]->getLocalPopupMenu()->menuAction(), menuList[menuName]->getLocalPopupMenu());
-//			if (t!=NULL)
-//			{
-//				t->setText(menuList[menuName]->getMenuText());
-//				retVal=true;
-//			}
-//		}
-//	}
-//	return retVal;
-//}
-//bool MenuManager::removeMenuFromMenuBar(const QString &menuName)
-//{
-//	bool retVal=false;
-//	if (menuList.contains(menuName) && menuList[menuName]!=NULL)
-//	{
-//		if (menuList[menuName]->getLocalPopupMenu()->menuAction())
-//			scribusMenuBar->removeAction(menuList[menuName]->getLocalPopupMenu()->menuAction());
-//		retVal=true;
-//	}
-//	return retVal;
-//}
 
 void MenuManager::addMenuItemStringstoMenuBar(const QString &menuName, const QMap<QString, QPointer<ScrAction> > &menuActions)
 {
@@ -382,18 +303,6 @@
 	return retVal;
 }
 
-bool MenuManager::addMenuItem(ScrAction *menuAction, const QString &parent, bool enabled)
-{
-	bool retVal=false;
-	if (menuList.contains(parent) && menuList[parent]!=NULL)
-	{
-		retVal=menuList[parent]->insertMenuItem(menuAction);
-		if (retVal)
-			menuAction->setEnabled(enabled);
-	}
-	return retVal;
-}
-
 void MenuManager::addMenuItemString(const QString& s, const QString &parent)
 {
 	if (menuStrings.contains(parent))
@@ -408,56 +317,6 @@
 		int i=menuStrings[parent].indexOf(after);
 		menuStrings[parent].insert(i+1, s);
 	}
-}
-
-/* Qt4
-bool MenuManager::addMenuItem(QWidget *widget, const QString &parent)
-{
-	bool retVal=false;
-	if (menuList.contains(parent) && menuList[parent]!=NULL)
-		retVal=menuList[parent]->insertMenuItem(widget);
-	return retVal;
-}
-*/
-
-bool MenuManager::addMenuItemAfter(ScrAction *menuAction, const QString &parent, bool enabled, ScrAction *afterMenuAction)
-{
-	bool retVal=false;
-	if (menuList.contains(parent) && menuList[parent]!=NULL)
-	{
-		retVal=menuList[parent]->insertMenuItemAfter(menuAction, afterMenuAction);
-		if (retVal)
-			menuAction->setEnabled(enabled);
-	}
-	return retVal;
-}
-
-// bool MenuManager::addMenuItemAfter(ScrAction *menuAction, const QString &parent, const QString &afterMenuName)
-// {
-// 	ScrAction *actionFromName=NULL;
-// 	//quick hack to make this work for existing plugins for now
-// // 	if (parent=="File" && afterMenuName=="New")
-// // 		actionFromName=m_ScMW->scrActions["fileNew"];
-// // 	if (parent=="File" && afterMenuName=="Print")
-// // 		actionFromName=m_ScMW->scrActions["filePrint"];
-// // 	if (parent=="File" && afterMenuName=="SaveAs")
-// // 		actionFromName=m_ScMW->scrActions["fileSaveAs"];
-// // 	if (parent=="Help" && afterMenuName=="Manual")
-// // 		actionFromName=m_ScMW->scrActions["helpManual"];
-// 	bool retVal=false;
-// 	if (menuList.contains(parent) && menuList[parent]!=NULL)
-// 		retVal=menuList[parent]->insertMenuItemAfter(menuAction, actionFromName);
-// 	return retVal;
-// }
-
-
-bool MenuManager::addMenuSeparator(const QString &parent)
-{
-	bool retVal=false;
-	if (menuList.contains(parent) && menuList[parent]!=NULL)
-		retVal=menuList[parent]->insertMenuSeparator();
-	return retVal;
-	
 }
 
 bool MenuManager::removeMenuItem(ScrAction *menuAction, const QString &parent)
@@ -514,12 +373,12 @@
 
 bool MenuManager::empty()
 {
-	return menuList.empty();
+	return menuStrings.empty();
 }
 
 bool MenuManager::menuExists(const QString &menuName)
 {
-	return menuList.contains(menuName);
+	return menuStrings.contains(menuName);
 }
 
 void MenuManager::dumpMenuStrings()

Modified: trunk/Scribus/scribus/menumanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/menumanager.h
==============================================================================
--- trunk/Scribus/scribus/menumanager.h (original)
+++ trunk/Scribus/scribus/menumanager.h Mon Oct 14 19:59:23 2013
@@ -50,39 +50,32 @@
 
 		enum MenuType {Normal, DLL};
 
+		bool addMenuToWidgetOfAction(const QString &menuName, ScrAction *action);
 		bool createMenu(const QString &menuName, const QString &menuText = QString::null, const QString parent = QString::null, bool checkable = false);
-//		bool addMenuToMenu(const QString & child, const QString &parent);
-//		bool deleteMenu(const QString &menuName, const QString &parent = QString::null);
+		bool removeMenuItem(ScrAction *menuAction, const QString &parent);
+		void generateKeyManList(QStringList *actionNames);
+		void runMenuAtPos(const QString &, const QPoint);
+		void setMenuEnabled(const QString &menuName, const bool enabled);
+		void setText(const QString &menuName, const QString &menuText);
+
+
+
+		QMenu *getLocalPopupMenu(const QString &menuName);
+		bool addMenuStringToMenuBar(const QString &menuName);
+		bool addMenuStringToMenuBarBefore(const QString &, const QString &beforeMenuName);
 		bool clearMenu(const QString &menuName);
-		void setText(const QString &menuName, const QString &menuText);
-		void setMenuIcon(const QString &menuName, const QIcon &menuIcon);
-		QMenu *getLocalPopupMenu(const QString &menuName);
-		void setMenuEnabled(const QString &menuName, const bool enabled);
-//		bool addMenuToMenuBar(const QString &menuName);
-		bool addMenuStringToMenuBar(const QString &menuName);
-//		bool addMenuToMenuBarBefore(const QString &, const QString &beforeMenuName);
-		bool addMenuStringToMenuBarBefore(const QString &, const QString &beforeMenuName);
-//		bool removeMenuFromMenuBar(const QString &menuName);
-		bool addMenuToWidgetOfAction(const QString &menuName, ScrAction *action);
-
-		bool addMenuItem(ScrAction *menuAction, const QString &parent, bool enabled);
-		bool addMenuItemAfter(ScrAction *menuAction, const QString &parent, bool enabled, ScrAction *afterMenuAction);
-		bool addMenuSeparator(const QString &parent);
-
-		bool removeMenuItem(ScrAction *menuAction, const QString &parent);
-
-		void runMenuAtPos(const QString &, const QPoint);
-
-		void generateKeyManList(QStringList *actionNames);
 		bool empty();
 		bool menuExists(const QString &menuName);
-		void dumpMenuStrings();
 		void addMenuItemString(const QString& s, const QString &parent);
+		void addMenuItemStringAfter(const QString &s, const QString &after, const QString &parent);
+		void addMenuItemStringstoMenu(const QString &menuName, QMenu *menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions);
 		void addMenuItemStringstoMenuBar(const QString &menuName, const QMap<QString, QPointer<ScrAction> > &menuActions);
-		void addMenuItemStringstoMenu(const QString &menuName, QMenu *menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions);
 		void addMenuItemStringstoSpecialMenu(const QString &menuName, const QMap<QString, QPointer<ScrAction> > &menuActions);
 		void clearMenuStrings(const QString &menuName);
-		void addMenuItemStringAfter(const QString &s, const QString &after, const QString &parent);
+		void dumpMenuStrings();
+		QMenu *undoMenu() {return m_undoMenu;}
+		QMenu *redoMenu() {return m_redoMenu;}
+
 	public slots:
 		void languageChange() {};
 
@@ -98,6 +91,9 @@
 	QMenu *itemLayerMenu;
 	QMenu *itemSendtoScrapbookMenu;
 	QMenu *windowsMenu;
+	//some hacks to keep undo menu functioning for now
+	QMenu *m_undoMenu;
+	QMenu *m_redoMenu;
 };
 
 #endif

Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Mon Oct 14 19:59:23 2013
@@ -285,7 +285,7 @@
 	Q_CHECK_PTR(mw);
 	ScActionPlugin* plugin = 0;
 
-	mw->scrMenuMgr->addMenuSeparator("Extras");
+	mw->scrMenuMgr->addMenuItemString("SEPARATOR", "Extras");
 	for (PluginMap::Iterator it = pluginMap.begin(); it != pluginMap.end(); ++it)
 	{
 		if (it.value().plugin->inherits("ScActionPlugin"))

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Mon Oct 14 19:59:23 2013
@@ -138,9 +138,7 @@
 
 void ScripterCore::rebuildRecentScriptsMenu()
 {
-	for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrRecentScriptActions.begin(); it!=scrRecentScriptActions.end(); ++it )
-		menuMgr->removeMenuItem((*it), "RecentScripts");
-
+	menuMgr->clearMenu("RecentScripts");
 	scrRecentScriptActions.clear();
 	uint max = qMin(PrefsManager::instance()->appPrefs.uiPrefs.recentDocCount, RecentScripts.count());
 	for (uint m = 0; m < max; ++m)
@@ -149,7 +147,6 @@
 		strippedName.remove(QDir::separator());
 		scrRecentScriptActions.insert(strippedName, new ScrAction( ScrAction::RecentScript, RecentScripts[m], QKeySequence(), this));
 		connect( scrRecentScriptActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(RecentScript(QString)) );
-//		menuMgr->addMenuItem(scrRecentScriptActions[strippedName], "RecentScripts", true);
 		menuMgr->addMenuItemString(strippedName, "RecentScripts");
 	}
 }
@@ -170,7 +167,7 @@
 				strippedName.remove(QDir::separator());
 				scrRecentScriptActions.insert(strippedName, new ScrAction( ScrAction::RecentScript, SavedRecentScripts[m], QKeySequence(), this));
 				connect( scrRecentScriptActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(RecentScript(QString)) );
-				menuMgr->addMenuItem(scrRecentScriptActions[strippedName], "RecentScripts", true);
+				menuMgr->addMenuItemString(strippedName, "RecentScripts");
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Oct 14 19:59:23 2013
@@ -444,121 +444,8 @@
 			csm.loadPalette(Cpfad, m_doc, prefsManager->appPrefs.colorPrefs.DColors, prefsManager->appPrefs.defaultGradients, prefsManager->appPrefs.defaultPatterns, false);
 		}
 	}
-	scrActions["fileDocSetup150"]->setEnabled(false);
-	scrActions["filePrint"]->setEnabled(false);
-	scrActions["fileSave"]->setEnabled(false);
-	scrActions["fileSaveAs"]->setEnabled(false);
-	scrActions["fileRevert"]->setEnabled(false);
-	scrActions["fileCollect"]->setEnabled(false);
-	scrActions["fileClose"]->setEnabled(false);
-	scrActions["PrintPreview"]->setEnabled(false);
-	scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
-	scrMenuMgr->setMenuEnabled("FileImport", false);
-	scrMenuMgr->setMenuEnabled("FileExport", false);
-	scrActions["fileExportAsPDF"]->setEnabled(false);
-	scrActions["fileExportText"]->setEnabled(false);
-	scrActions["fileExportAsEPS"]->setEnabled(false);
-	scrActions["fileImportText"]->setEnabled(false);
-	scrActions["fileImportText2"]->setEnabled(false);
-	scrActions["fileImportImage"]->setEnabled(false);
-	scrActions["fileImportAppendText"]->setEnabled(false);
-	scrActions["pageInsert"]->setEnabled(false);
-	scrActions["pageImport"]->setEnabled(false);
-	scrActions["pageDelete"]->setEnabled(false);
-	scrActions["pageImport"]->setEnabled(false);
-	scrActions["pageMove"]->setEnabled(false);
-	scrActions["pageCopy"]->setEnabled(false);
-	scrActions["pageApplyMasterPage"]->setEnabled(false);
-	scrActions["pageCopyToMasterPage"]->setEnabled(false);
-	scrActions["pageManageGuides"]->setEnabled(false);
-	scrActions["pageManageMargins"]->setEnabled(false);
-	scrActions["editUndoAction"]->setEnabled(false);
-	scrActions["editRedoAction"]->setEnabled(false);
-	scrActions["editCut"]->setEnabled(false);
-	scrActions["editCopy"]->setEnabled(false);
-	scrActions["editPaste"]->setEnabled(false);
-	scrMenuMgr->setMenuEnabled("EditPasteRecent", false);
-	scrActions["editClearContents"]->setEnabled(false);
-	scrActions["editSelectAll"]->setEnabled(false);
-	scrActions["editSelectAllOnLayer"]->setEnabled(false);
-	scrActions["editDeselectAll"]->setEnabled(false);
-	scrActions["editReplaceColors"]->setEnabled(false);
-	scrActions["editStyles"]->setEnabled(false);
-	scrActions["editMarks"]->setEnabled(false);
-	scrActions["editNotesStyles"]->setEnabled(false);
-	scrActions["editSearchReplace"]->setEnabled(false);
-	scrActions["editMasterPages"]->setEnabled(false);
-	scrActions["editJavascripts"]->setEnabled(false);
-	scrActions["toolsPreflightVerifier"]->setEnabled(false);
-	scrActions["extrasHyphenateText"]->setEnabled(false);
-	scrActions["extrasDeHyphenateText"]->setEnabled(false);
-	scrActions["viewFitInWindow"]->setEnabled(false);
-	scrActions["viewFitWidth"]->setEnabled(false);
-	scrActions["viewFit50"]->setEnabled(false);
-	scrActions["viewFit75"]->setEnabled(false);
-	scrActions["viewFit100"]->setEnabled(false);
-	scrActions["viewFit200"]->setEnabled(false);
-	scrActions["viewFit400"]->setEnabled(false);
-	scrActions["viewSnapToGuides"]->setChecked(false);
-	scrActions["viewSnapToElements"]->setChecked(false);
-	scrActions["viewSnapToGrid"]->setChecked(false);
-	scrActions["viewShowRulers"]->setEnabled(false);
-	scrMenuMgr->setMenuEnabled("Insert", false);
-	scrActions["insertFrame"]->setEnabled(false);
-	scrActions["itemDuplicate"]->setEnabled(false);
-	scrActions["itemMulDuplicate"]->setEnabled(false);
-	scrActions["itemTransform"]->setEnabled(false);
-	scrActions["itemDelete"]->setEnabled(false);
-	scrActions["itemRaise"]->setEnabled(false);
-	scrActions["itemLower"]->setEnabled(false);
-	scrActions["itemRaiseToTop"]->setEnabled(false);
-	scrActions["itemLowerToBottom"]->setEnabled(false);
-	scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
-	scrActions["itemSendToPattern"]->setEnabled(false);
-	scrActions["itemSendToInline"]->setEnabled(false);
-	scrActions["itemAdjustFrameToImage"]->setEnabled(false);
-	scrActions["itemAdjustImageToFrame"]->setEnabled(false);
-	scrActions["itemExtendedImageProperties"]->setEnabled(false);
-	scrActions["itemUpdateImage"]->setEnabled(false);
-	scrActions["itemPreviewLow"]->setEnabled(false);
-	scrActions["itemPreviewNormal"]->setEnabled(false);
-	scrActions["itemPreviewFull"]->setEnabled(false);
-	scrActions["itemAttributes"]->setEnabled(false);
-	scrActions["toolsSelect"]->setEnabled(false);
-	scrActions["toolsRotate"]->setEnabled(false);
-	scrActions["toolsEditContents"]->setEnabled(false);
-	scrActions["toolsEditWithStoryEditor"]->setEnabled(false);
-	scrActions["toolsZoom"]->setEnabled(false);
-	scrActions["toolsInsertTextFrame"]->setEnabled(false);
-	scrActions["toolsInsertImageFrame"]->setEnabled(false);
-	scrActions["toolsInsertShape"]->setEnabled(false);
-	scrActions["toolsInsertLine"]->setEnabled(false);
-	scrActions["toolsInsertBezier"]->setEnabled(false);
-	scrActions["toolsInsertFreehandLine"]->setEnabled(false);
-	scrActions["toolsInsertCalligraphicLine"]->setEnabled(false);
-	scrActions["toolsInsertPolygon"]->setEnabled(false);
-	scrActions["toolsInsertArc"]->setEnabled(false);
-	scrActions["toolsInsertSpiral"]->setEnabled(false);
-	scrActions["toolsInsertRenderFrame"]->setEnabled(false);
-	scrActions["toolsInsertTable"]->setEnabled(false);
-	scrActions["toolsLinkTextFrame"]->setEnabled(false);
-	scrActions["toolsUnlinkTextFrame"]->setEnabled(false);
-	scrActions["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
-	scrActions["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
-	scrActions["toolsMeasurements"]->setEnabled(false);
-	scrActions["toolsCopyProperties"]->setEnabled(false);
-	scrActions["toolsEyeDropper"]->setEnabled(false);
-	scrActions["toolsPDFPushButton"]->setEnabled(false);
-	scrActions["toolsPDFRadioButton"]->setEnabled(false);
-	scrActions["toolsPDFTextField"]->setEnabled(false);
-	scrActions["toolsPDFCheckBox"]->setEnabled(false);
-	scrActions["toolsPDFComboBox"]->setEnabled(false);
-	scrActions["toolsPDFListBox"]->setEnabled(false);
-	scrActions["toolsPDFAnnotText"]->setEnabled(false);
-	scrActions["toolsPDFAnnotLink"]->setEnabled(false);
-#ifdef HAVE_OSG
-	scrActions["toolsPDFAnnot3D"]->setEnabled(false);
-#endif
+	actionManager->setStartupActionsEnabled(false);
+
 	return retVal;
 }
 
@@ -1019,7 +906,6 @@
 	scrMenuMgr->addMenuItemString("toolsInsertCalligraphicLine", "Insert");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Insert");
 	scrMenuMgr->addMenuItemString("stickyTools", "Insert");
-	scrMenuMgr->addMenuSeparator("Insert");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Insert");
 	scrMenuMgr->addMenuItemString("insertGlyph", "Insert");
 
@@ -1172,13 +1058,11 @@
 	scrMenuMgr->addMenuItemString("SEPARATOR", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableMergeCells", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableSplitCells", "ItemTable");
-	scrMenuMgr->addMenuSeparator("ItemTable");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableSetRowHeights", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableSetColumnWidths", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableDistributeRowsEvenly", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableDistributeColumnsEvenly", "ItemTable");
-	scrMenuMgr->addMenuSeparator("ItemTable");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableAdjustFrameToTable", "ItemTable");
 	scrMenuMgr->addMenuItemString("tableAdjustTableToFrame", "ItemTable");
@@ -1249,27 +1133,22 @@
 	scrMenuMgr->clearMenu("Windows");
 	scrMenuMgr->addMenuItemString("windowsCascade", "Windows");
 	scrMenuMgr->addMenuItemString("windowsTile", "Windows");
-	scrMenuMgr->addMenuSeparator("Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsProperties", "Windows");
 	scrMenuMgr->addMenuItemString("toolsActionHistory", "Windows");
 	scrMenuMgr->addMenuItemString("toolsAlignDistribute", "Windows");
-	scrMenuMgr->addMenuSeparator("Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsOutline", "Windows");
 	scrMenuMgr->addMenuItemString("toolsPages", "Windows");
 	scrMenuMgr->addMenuItemString("toolsLayers", "Windows");
 	scrMenuMgr->addMenuItemString("toolsBookmarks", "Windows");
-	scrMenuMgr->addMenuSeparator("Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsScrapbook", "Windows");
 	scrMenuMgr->addMenuItemString("toolsSymbols", "Windows");
 	scrMenuMgr->addMenuItemString("toolsInline", "Windows");
-	scrMenuMgr->addMenuSeparator("Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsMeasurements", "Windows");
 	scrMenuMgr->addMenuItemString("toolsPreflightVerifier", "Windows");
-	scrMenuMgr->addMenuSeparator("Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsToolbarTools", "Windows");
 	scrMenuMgr->addMenuItemString("toolsToolbarPDF", "Windows");
@@ -2076,121 +1955,7 @@
 	}
 	else
 	{
-		scrActions["fileDocSetup150"]->setEnabled(false);
-		scrActions["filePrint"]->setEnabled(false);
-		scrActions["fileSave"]->setEnabled(false);
-		scrActions["fileSaveAs"]->setEnabled(false);
-		scrActions["fileRevert"]->setEnabled(false);
-		scrActions["fileCollect"]->setEnabled(false);
-		scrActions["fileClose"]->setEnabled(false);
-		scrActions["PrintPreview"]->setEnabled(false);
-		scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
-		scrMenuMgr->setMenuEnabled("FileImport", false);
-		scrMenuMgr->setMenuEnabled("FileExport", false);
-		scrActions["fileExportAsPDF"]->setEnabled(false);
-		scrActions["fileExportText"]->setEnabled(false);
-		scrActions["fileExportAsEPS"]->setEnabled(false);
-		scrActions["fileImportText"]->setEnabled(false);
-		scrActions["fileImportText2"]->setEnabled(false);
-		scrActions["fileImportImage"]->setEnabled(false);
-		scrActions["fileImportAppendText"]->setEnabled(false);
-		scrActions["pageInsert"]->setEnabled(false);
-		scrActions["pageImport"]->setEnabled(false);
-		scrActions["pageDelete"]->setEnabled(false);
-		scrActions["pageImport"]->setEnabled(false);
-		scrActions["pageMove"]->setEnabled(false);
-		scrActions["pageCopy"]->setEnabled(false);
-		scrActions["pageApplyMasterPage"]->setEnabled(false);
-		scrActions["pageCopyToMasterPage"]->setEnabled(false);
-		scrActions["pageManageGuides"]->setEnabled(false);
-		scrActions["pageManageMargins"]->setEnabled(false);
-		scrActions["editUndoAction"]->setEnabled(false);
-		scrActions["editRedoAction"]->setEnabled(false);
-		scrActions["editCut"]->setEnabled(false);
-		scrActions["editCopy"]->setEnabled(false);
-		scrActions["editPaste"]->setEnabled(false);
-		scrMenuMgr->setMenuEnabled("EditPasteRecent", false);
-		scrActions["editClearContents"]->setEnabled(false);
-		scrActions["editSelectAll"]->setEnabled(false);
-		scrActions["editSelectAllOnLayer"]->setEnabled(false);
-		scrActions["editDeselectAll"]->setEnabled(false);
-		scrActions["editReplaceColors"]->setEnabled(false);
-		scrActions["editStyles"]->setEnabled(false);
-		scrActions["editMarks"]->setEnabled(false);
-		scrActions["editNotesStyles"]->setEnabled(false);
-		scrActions["editSearchReplace"]->setEnabled(false);
-		scrActions["editMasterPages"]->setEnabled(false);
-		scrActions["editJavascripts"]->setEnabled(false);
-		scrActions["toolsPreflightVerifier"]->setEnabled(false);
-		scrActions["extrasHyphenateText"]->setEnabled(false);
-		scrActions["extrasDeHyphenateText"]->setEnabled(false);
-		scrActions["viewFitInWindow"]->setEnabled(false);
-		scrActions["viewFitWidth"]->setEnabled(false);
-		scrActions["viewFit50"]->setEnabled(false);
-		scrActions["viewFit75"]->setEnabled(false);
-		scrActions["viewFit100"]->setEnabled(false);
-		scrActions["viewFit200"]->setEnabled(false);
-		scrActions["viewFit400"]->setEnabled(false);
-		scrActions["viewSnapToGuides"]->setChecked(false);
-		scrActions["viewSnapToElements"]->setChecked(false);
-		scrActions["viewSnapToGrid"]->setChecked(false);
-		scrActions["viewShowRulers"]->setEnabled(false);
-		scrMenuMgr->setMenuEnabled("Insert", false);
-		scrActions["insertFrame"]->setEnabled(false);
-		scrActions["itemDuplicate"]->setEnabled(false);
-		scrActions["itemMulDuplicate"]->setEnabled(false);
-		scrActions["itemTransform"]->setEnabled(false);
-		scrActions["itemDelete"]->setEnabled(false);
-		scrActions["itemRaise"]->setEnabled(false);
-		scrActions["itemLower"]->setEnabled(false);
-		scrActions["itemRaiseToTop"]->setEnabled(false);
-		scrActions["itemLowerToBottom"]->setEnabled(false);
-		scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
-		scrActions["itemSendToPattern"]->setEnabled(false);
-		scrActions["itemSendToInline"]->setEnabled(false);
-		scrActions["itemAdjustFrameToImage"]->setEnabled(false);
-		scrActions["itemAdjustImageToFrame"]->setEnabled(false);
-		scrActions["itemExtendedImageProperties"]->setEnabled(false);
-		scrActions["itemUpdateImage"]->setEnabled(false);
-		scrActions["itemPreviewLow"]->setEnabled(false);
-		scrActions["itemPreviewNormal"]->setEnabled(false);
-		scrActions["itemPreviewFull"]->setEnabled(false);
-		scrActions["itemAttributes"]->setEnabled(false);
-		scrActions["toolsSelect"]->setEnabled(false);
-		scrActions["toolsRotate"]->setEnabled(false);
-		scrActions["toolsEditContents"]->setEnabled(false);
-		scrActions["toolsEditWithStoryEditor"]->setEnabled(false);
-		scrActions["toolsZoom"]->setEnabled(false);
-		scrActions["toolsInsertTextFrame"]->setEnabled(false);
-		scrActions["toolsInsertImageFrame"]->setEnabled(false);
-		scrActions["toolsInsertShape"]->setEnabled(false);
-		scrActions["toolsInsertLine"]->setEnabled(false);
-		scrActions["toolsInsertBezier"]->setEnabled(false);
-		scrActions["toolsInsertFreehandLine"]->setEnabled(false);
-		scrActions["toolsInsertCalligraphicLine"]->setEnabled(false);
-		scrActions["toolsInsertPolygon"]->setEnabled(false);
-		scrActions["toolsInsertArc"]->setEnabled(false);
-		scrActions["toolsInsertSpiral"]->setEnabled(false);
-		scrActions["toolsInsertRenderFrame"]->setEnabled(false);
-		scrActions["toolsInsertTable"]->setEnabled(false);
-		scrActions["toolsLinkTextFrame"]->setEnabled(false);
-		scrActions["toolsUnlinkTextFrame"]->setEnabled(false);
-		scrActions["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
-		scrActions["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
-		scrActions["toolsMeasurements"]->setEnabled(false);
-		scrActions["toolsCopyProperties"]->setEnabled(false);
-		scrActions["toolsEyeDropper"]->setEnabled(false);
-		scrActions["toolsPDFPushButton"]->setEnabled(false);
-		scrActions["toolsPDFRadioButton"]->setEnabled(false);
-		scrActions["toolsPDFTextField"]->setEnabled(false);
-		scrActions["toolsPDFCheckBox"]->setEnabled(false);
-		scrActions["toolsPDFComboBox"]->setEnabled(false);
-		scrActions["toolsPDFListBox"]->setEnabled(false);
-		scrActions["toolsPDFAnnotText"]->setEnabled(false);
-		scrActions["toolsPDFAnnotLink"]->setEnabled(false);
-#ifdef HAVE_OSG
-		scrActions["toolsPDFAnnot3D"]->setEnabled(false);
-#endif
+		actionManager->setStartupActionsEnabled(false);
 	}
 	prefsManager->setShowStartupDialog(!dia->startUpDialog->isChecked());
 	delete dia;

Modified: trunk/Scribus/scribus/undogui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18556&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Mon Oct 14 19:59:23 2013
@@ -75,8 +75,10 @@
 	parent->addAction(ScCore->primaryMainWindow()->scrActions["editRedoAction"]);
 	ScCore->primaryMainWindow()->scrMenuMgr->createMenu("undoButtonMenu", "undoButtonMenu");
 	ScCore->primaryMainWindow()->scrMenuMgr->createMenu("redoButtonMenu", "redoButtonMenu");
-	undoMenu=ScCore->primaryMainWindow()->scrMenuMgr->getLocalPopupMenu("undoButtonMenu");
-	redoMenu=ScCore->primaryMainWindow()->scrMenuMgr->getLocalPopupMenu("redoButtonMenu");
+	//undoMenu=ScCore->primaryMainWindow()->scrMenuMgr->getLocalPopupMenu("undoButtonMenu");
+	//redoMenu=ScCore->primaryMainWindow()->scrMenuMgr->getLocalPopupMenu("redoButtonMenu");
+	undoMenu=ScCore->primaryMainWindow()->scrMenuMgr->undoMenu();
+	redoMenu=ScCore->primaryMainWindow()->scrMenuMgr->redoMenu();
 	ScCore->primaryMainWindow()->scrMenuMgr->addMenuToWidgetOfAction("undoButtonMenu", ScCore->primaryMainWindow()->scrActions["editUndoAction"]);
 	ScCore->primaryMainWindow()->scrMenuMgr->addMenuToWidgetOfAction("redoButton/*Menu*/", ScCore->primaryMainWindow()->scrActions["editRedoAction"]);
 




More information about the scribus-commit mailing list