r16100 by jghali - - first bits on new frame properties palette
scribus-commit
scribus-commit at lists.scribus.net
Fri Dec 17 23:25:14 CET 2010
Author: jghali
Date: Fri Dec 17 22:25:14 2010
New Revision: 16100
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16100
Log:
- first bits on new frame properties palette
- cleanup Qt includes used in scribus.h
Added:
branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
branches/ScribusOIF/scribus/ui/propertywidget_pos.h
Modified:
branches/ScribusOIF/scribus/CMakeLists.txt
branches/ScribusOIF/scribus/actionmanager.cpp
branches/ScribusOIF/scribus/canvasmode.cpp
branches/ScribusOIF/scribus/collect4output.cpp
branches/ScribusOIF/scribus/gtaction.cpp
branches/ScribusOIF/scribus/hyphenator.cpp
branches/ScribusOIF/scribus/loadsaveplugin.cpp
branches/ScribusOIF/scribus/main_win32.cpp
branches/ScribusOIF/scribus/pageitem_imageframe.cpp
branches/ScribusOIF/scribus/pageitem_latexframe.cpp
branches/ScribusOIF/scribus/pageitem_symbol.cpp
branches/ScribusOIF/scribus/pluginmanager.cpp
branches/ScribusOIF/scribus/plugins/colorwheel/cwdialog.cpp
branches/ScribusOIF/scribus/plugins/gettext/pdbim/pdbim.cpp
branches/ScribusOIF/scribus/plugins/import/ai/importaiplugin.cpp
branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp
branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp
branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
branches/ScribusOIF/scribus/plugins/import/wmf/wmfimportplugin.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/cmddoc.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/cmdpage.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/guiapp.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/scriptercore.cpp
branches/ScribusOIF/scribus/plugins/short-words/parse.cpp
branches/ScribusOIF/scribus/scguardedptr.h
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribus.h
branches/ScribusOIF/scribus/scribuscore.cpp
branches/ScribusOIF/scribus/scribuswin.cpp
branches/ScribusOIF/scribus/ui/collectforoutput_ui.cpp
branches/ScribusOIF/scribus/ui/contextmenu.cpp
branches/ScribusOIF/scribus/ui/masterpagepalette.cpp
branches/ScribusOIF/scribus/ui/propertiespalette.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
branches/ScribusOIF/scribus/ui/smtextstyles.cpp
branches/ScribusOIF/scribus/upgradechecker.cpp
branches/ScribusOIF/scribus/util.cpp
branches/ScribusOIF/scribus/util_ghostscript.cpp
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Fri Dec 17 22:25:14 2010
@@ -358,6 +358,7 @@
ui/preview.h
ui/printdialog.h
ui/propertiespalette.h
+ ui/propertiespalette_frame.h
ui/propertiespalette_group.h
ui/propertiespalette_image.h
ui/propertiespalette_line.h
@@ -370,6 +371,7 @@
ui/propertywidget_flop.h
ui/propertywidget_optmargins.h
ui/propertywidget_pathtext.h
+ ui/propertywidget_pos.h
ui/propertywidget_textcolor.h
ui/query.h
# ui/reformdoc.h
@@ -769,6 +771,7 @@
ui/preview.cpp
ui/printdialog.cpp
ui/propertiespalette.cpp
+ ui/propertiespalette_frame.cpp
ui/propertiespalette_image.cpp
ui/propertiespalette_group.cpp
ui/propertiespalette_line.cpp
@@ -781,6 +784,7 @@
ui/propertywidget_flop.cpp
ui/propertywidget_optmargins.cpp
ui/propertywidget_pathtext.cpp
+ ui/propertywidget_pos.cpp
ui/propertywidget_textcolor.cpp
ui/propertywidgetbase.cpp
ui/query.cpp
Modified: branches/ScribusOIF/scribus/actionmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/actionmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/actionmanager.cpp (original)
+++ branches/ScribusOIF/scribus/actionmanager.cpp Fri Dec 17 22:25:14 2010
@@ -664,6 +664,8 @@
{
QString name;
//Tool menu
+ name="toolsFrameProperties";
+ scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="toolsProperties";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="toolsOutline";
@@ -755,6 +757,7 @@
scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/annot3d.png"), loadIcon("22/annot3d.png"), "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
#endif
//Set the applicaton wide palette shortcuts
+ (*scrActions)["toolsFrameProperties"]->setShortcutContext(Qt::ApplicationShortcut);
(*scrActions)["toolsProperties"]->setShortcutContext(Qt::ApplicationShortcut);
(*scrActions)["toolsScrapbook"]->setShortcutContext(Qt::ApplicationShortcut);
(*scrActions)["toolsLayers"]->setShortcutContext(Qt::ApplicationShortcut);
@@ -766,6 +769,7 @@
(*scrActions)["toolsSymbols"]->setShortcutContext(Qt::ApplicationShortcut);
+ (*scrActions)["toolsFrameProperties"]->setToggleAction(true);
(*scrActions)["toolsProperties"]->setToggleAction(true);
(*scrActions)["toolsOutline"]->setToggleAction(true);
(*scrActions)["toolsScrapbook"]->setToggleAction(true);
@@ -1439,6 +1443,7 @@
// (*scrActions)["viewNewView"]->setTexts( tr("New View"));
//Tool menu
+ (*scrActions)["toolsFrameProperties"]->setTexts( tr("&Properties (Frame)"));
(*scrActions)["toolsProperties"]->setTexts( tr("&Properties"));
(*scrActions)["toolsOutline"]->setTexts( tr("&Outline", "Document Outline Palette"));
(*scrActions)["toolsScrapbook"]->setTexts( tr("&Scrapbook"));
@@ -1992,6 +1997,7 @@
<< "windowsCascade"
<< "windowsTile"
<< "toolsProperties"
+ << "toolsFrameProperties"
<< "toolsOutline"
<< "toolsScrapbook"
<< "toolsLayers"
Modified: branches/ScribusOIF/scribus/canvasmode.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/canvasmode.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode.cpp Fri Dec 17 22:25:14 2010
@@ -56,6 +56,8 @@
#include "units.h"
#include "util_icon.h"
+#include <QMdiArea>
+#include <QMdiSubWindow>
#include <QPainter>
Modified: branches/ScribusOIF/scribus/collect4output.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/collect4output.cpp
==============================================================================
--- branches/ScribusOIF/scribus/collect4output.cpp (original)
+++ branches/ScribusOIF/scribus/collect4output.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,7 @@
#include "util_file.h"
#include <QMessageBox>
+#include <QProgressBar>
#include <QString>
#include <QMap>
#include <QDir>
Modified: branches/ScribusOIF/scribus/gtaction.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/gtaction.cpp
==============================================================================
--- branches/ScribusOIF/scribus/gtaction.cpp (original)
+++ branches/ScribusOIF/scribus/gtaction.cpp Fri Dec 17 22:25:14 2010
@@ -26,6 +26,7 @@
#include <QCursor>
#include <QList>
+#include <QProgressBar>
#include <QStringList>
#include "gtaction.h"
Modified: branches/ScribusOIF/scribus/hyphenator.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/hyphenator.cpp
==============================================================================
--- branches/ScribusOIF/scribus/hyphenator.cpp (original)
+++ branches/ScribusOIF/scribus/hyphenator.cpp Fri Dec 17 22:25:14 2010
@@ -25,11 +25,11 @@
#include "scconfig.h"
+#include <QApplication>
#include <QRegExp>
#include <QCursor>
#include <QDir>
#include <QCheckBox>
-//Added by qt3to4:
#include <QByteArray>
#include <cstdlib>
#include <string>
Modified: branches/ScribusOIF/scribus/loadsaveplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/loadsaveplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/loadsaveplugin.cpp (original)
+++ branches/ScribusOIF/scribus/loadsaveplugin.cpp Fri Dec 17 22:25:14 2010
@@ -8,7 +8,9 @@
#include "commonstrings.h"
#include "scribuscore.h"
#include "plugins/formatidlist.h"
+
#include <QList>
+#include <QMessageBox>
QList<FileFormat> LoadSavePlugin::formats;
Modified: branches/ScribusOIF/scribus/main_win32.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/main_win32.cpp
==============================================================================
--- branches/ScribusOIF/scribus/main_win32.cpp (original)
+++ branches/ScribusOIF/scribus/main_win32.cpp Fri Dec 17 22:25:14 2010
@@ -37,6 +37,7 @@
#include <io.h>
#include <QApplication>
+#include <QMessageBox>
#include <exception>
using namespace std;
Modified: branches/ScribusOIF/scribus/pageitem_imageframe.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/pageitem_imageframe.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pageitem_imageframe.cpp (original)
+++ branches/ScribusOIF/scribus/pageitem_imageframe.cpp Fri Dec 17 22:25:14 2010
@@ -22,6 +22,7 @@
***************************************************************************/
// #include <QDebug>
+#include <QApplication>
#include <QGridLayout>
#include <QKeyEvent>
Modified: branches/ScribusOIF/scribus/pageitem_latexframe.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/pageitem_latexframe.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pageitem_latexframe.cpp (original)
+++ branches/ScribusOIF/scribus/pageitem_latexframe.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,7 @@
#include "pageitem_latexframe.h"
#include <QDebug>
+#include <QMessageBox>
#include <QTemporaryFile>
#include "prefsmanager.h"
Modified: branches/ScribusOIF/scribus/pageitem_symbol.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/pageitem_symbol.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pageitem_symbol.cpp (original)
+++ branches/ScribusOIF/scribus/pageitem_symbol.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,8 @@
#include <cmath>
#include <cassert>
+#include <QApplication>
+
#include "commonstrings.h"
#include "page.h"
#include "pageitem.h"
Modified: branches/ScribusOIF/scribus/pluginmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/pluginmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pluginmanager.cpp (original)
+++ branches/ScribusOIF/scribus/pluginmanager.cpp Fri Dec 17 22:25:14 2010
@@ -10,6 +10,7 @@
#include <QDir>
#include <QEvent>
+#include <QMessageBox>
#include "scconfig.h"
Modified: branches/ScribusOIF/scribus/plugins/colorwheel/cwdialog.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/colorwheel/cwdialog.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/colorwheel/cwdialog.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/colorwheel/cwdialog.cpp Fri Dec 17 22:25:14 2010
@@ -6,6 +6,7 @@
*/
#include <QHeaderView>
+#include <QMessageBox>
#include "ui/cmykfw.h"
#include "colorblind.h"
Modified: branches/ScribusOIF/scribus/plugins/gettext/pdbim/pdbim.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/gettext/pdbim/pdbim.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/gettext/pdbim/pdbim.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/gettext/pdbim/pdbim.cpp Fri Dec 17 22:25:14 2010
@@ -4,8 +4,11 @@
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 <QApplication>
#include <QFile>
#include <QFileInfo>
+#include <QMessageBox>
+#include <QProgressBar>
#include <QString>
#include <QStringList>
#include <QTextCodec>
Modified: branches/ScribusOIF/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/ai/importaiplugin.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/ai/importaiplugin.cpp Fri Dec 17 22:25:14 2010
@@ -18,6 +18,7 @@
#include "undomanager.h"
#include "util_formats.h"
+#include <QMessageBox>
int importai_getPluginAPIVersion()
{
Modified: branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp Fri Dec 17 22:25:14 2010
@@ -4,15 +4,17 @@
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 <QWidget>
-#include <QFile>
-#include <QRegExp>
+
#include <QCursor>
#include <QDir>
+#include <QDrag>
+#include <QDomElement>
+#include <QFile>
+#include <QMessageBox>
+#include <QMimeData>
#include <QString>
-#include <QDomElement>
-#include <QDrag>
-#include <QMimeData>
+#include <QRegExp>
+#include <QWidget>
#include "oodrawimp.h"
Modified: branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp Fri Dec 17 22:25:14 2010
@@ -11,6 +11,7 @@
#include <QDrag>
#include <QFile>
#include <QList>
+#include <QMessageBox>
#include <QMimeData>
#include <QRegExp>
#include <QStack>
Modified: branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp Fri Dec 17 22:25:14 2010
@@ -10,6 +10,7 @@
#include <QDrag>
#include <QFile>
#include <QList>
+#include <QMessageBox>
#include <QMimeData>
#include <QPainterPath>
#include <QRegExp>
Modified: branches/ScribusOIF/scribus/plugins/import/wmf/wmfimportplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/import/wmf/wmfimportplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/wmf/wmfimportplugin.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/wmf/wmfimportplugin.cpp Fri Dec 17 22:25:14 2010
@@ -7,9 +7,10 @@
#include "scconfig.h"
#include "wmfimportplugin.h"
+#include <QCursor>
#include <QFile>
+#include <QMessageBox>
#include <QRegExp>
-#include <QCursor>
#include "ui/customfdialog.h"
#include "scribus.h"
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/cmddoc.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/cmddoc.cpp Fri Dec 17 22:25:14 2010
@@ -11,6 +11,8 @@
#include "scribuscore.h"
#include "scribusdoc.h"
+#include <QApplication>
+
/*
newDocument(size, margins, orientation, firstPageNumber,
unit, pagesType, firstPageOrder)*/
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/cmdpage.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/cmdpage.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/cmdpage.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/cmdpage.cpp Fri Dec 17 22:25:14 2010
@@ -10,6 +10,8 @@
#include "scribuscore.h"
#include "commonstrings.h"
#include "scribusdoc.h"
+
+#include <QApplication>
PyObject *scribus_actualpage(PyObject* /* self */)
{
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/guiapp.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/guiapp.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/guiapp.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/guiapp.cpp Fri Dec 17 22:25:14 2010
@@ -7,8 +7,11 @@
#include "guiapp.h"
#include "cmdutil.h"
#include "scribuscore.h"
+
+#include <QApplication>
+#include <QCursor>
+#include <QProgressBar>
#include <QString>
-#include <QCursor>
PyObject *scribus_messagebartext(PyObject* /* self */, PyObject* args)
{
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/scriptercore.cpp Fri Dec 17 22:25:14 2010
@@ -19,6 +19,7 @@
#include "runscriptdialog.h"
#include "ui/helpbrowser.h"
#include "ui/propertiespalette.h" //TODO Move the calls to this to a signal
+#include "ui/propertiespalette_frame.h" //TODO Move the calls to this to a signal
#include "ui/pagepalette.h" //TODO Move the calls to this to a signal
#include "ui/layers.h" //TODO Move the calls to this to a signal
#include "ui/outlinepalette.h" //TODO Move the calls to this to a signal
@@ -150,6 +151,7 @@
ScribusMainWindow* ScMW=ScCore->primaryMainWindow();
if (ScMW->HaveDoc)
{
+ ScMW->framePropsPalette->setDoc(ScMW->doc);
ScMW->propertiesPalette->setDoc(ScMW->doc);
ScMW->layerPalette->setDoc(ScMW->doc);
ScMW->outlinePalette->setDoc(ScMW->doc);
@@ -265,6 +267,7 @@
// Set up a sub-interpreter if needed:
if (!inMainInterpreter)
{
+ ScCore->primaryMainWindow()->framePropsPalette->setDoc(0);
ScCore->primaryMainWindow()->propertiesPalette->unsetDoc();
ScCore->primaryMainWindow()->pagePalette->setView(NULL);
ScCore->primaryMainWindow()->setScriptRunning(true);
@@ -378,6 +381,7 @@
void ScripterCore::slotRunScript(const QString Script)
{
+ ScCore->primaryMainWindow()->framePropsPalette->setDoc(0);
ScCore->primaryMainWindow()->propertiesPalette->unsetDoc();
ScCore->primaryMainWindow()->pagePalette->setView(NULL);
ScCore->primaryMainWindow()->setScriptRunning(true);
Modified: branches/ScribusOIF/scribus/plugins/short-words/parse.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/plugins/short-words/parse.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/short-words/parse.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/short-words/parse.cpp Fri Dec 17 22:25:14 2010
@@ -16,6 +16,7 @@
or documentation
*/
+#include <QProgressBar>
#include <QRegExp>
#include "shortwords.h"
Modified: branches/ScribusOIF/scribus/scguardedptr.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/scguardedptr.h
==============================================================================
--- branches/ScribusOIF/scribus/scguardedptr.h (original)
+++ branches/ScribusOIF/scribus/scguardedptr.h Fri Dec 17 22:25:14 2010
@@ -22,7 +22,7 @@
int refs;
T* pointer;
- ScGuardedPtrData(void) { pointer = NULL; refs = 0; }
+ ScGuardedPtrData(void) { pointer = 0; refs = 0; }
ScGuardedPtrData(T* ptr) { pointer = ptr; refs = 0; }
};
@@ -109,7 +109,7 @@
bool ScGuardedPtr<T>::isNull(void)
{
if (data)
- return (data->pointer == NULL);
+ return (data->pointer == 0);
return true;
};
@@ -119,7 +119,7 @@
if (data && --(data->refs) == 0)
{
delete data;
- data = NULL;
+ data = 0;
}
};
@@ -131,7 +131,7 @@
template<typename T>
ScGuardedObject<T>::ScGuardedObject(const ScGuardedObject& other)
{
- this->data=NULL;
+ this->data = 0;
// Must never be used
assert(false);
};
@@ -148,7 +148,7 @@
void ScGuardedObject<T>::nullify(void)
{
if (this->data)
- this->data->pointer = NULL;
+ this->data->pointer = 0;
};
template<typename T>
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Fri Dec 17 22:25:14 2010
@@ -21,6 +21,7 @@
* *
***************************************************************************/
+#include <QAction>
#include <QApplication>
#include <QByteArray>
#include <QCloseEvent>
@@ -34,6 +35,7 @@
#include <QEventLoop>
#include <QFileDialog>
#include <QFrame>
+#include <QFont>
#include <QIcon>
#include <QInputDialog>
#include <QKeyEvent>
@@ -41,12 +43,17 @@
#include <QLabel>
#include <QList>
#include <QLocale>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMessageBox>
#include <QMouseEvent>
#include <QPixmap>
+#include <QProgressBar>
#include <QRegExp>
#include <QStyleFactory>
#include <QTableWidget>
#include <QTextCodec>
+#include <QToolButton>
#include <QTranslator>
#include <QWheelEvent>
@@ -187,6 +194,7 @@
#include "ui/preview.h"
#include "ui/printdialog.h"
#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_frame.h"
#include "ui/propertiespalette_image.h"
#include "ui/propertiespalette_line.h"
#include "ui/propertiespalette_shape.h"
@@ -502,15 +510,21 @@
outlinePalette->setMainWindow(this);
connect( scrActions["toolsOutline"], SIGNAL(toggled(bool)) , outlinePalette, SLOT(setPaletteShown(bool)) );
connect( outlinePalette, SIGNAL(paletteShown(bool)), scrActions["toolsOutline"], SLOT(setChecked(bool)));
+
propertiesPalette = new PropertiesPalette(this);
propertiesPalette->setMainWindow(this);
connect( scrActions["toolsProperties"], SIGNAL(toggled(bool)) , propertiesPalette, SLOT(setPaletteShown(bool)) );
connect( propertiesPalette, SIGNAL(paletteShown(bool)), scrActions["toolsProperties"], SLOT(setChecked(bool)));
-
//CB dont need this until we have a doc...
//propertiesPalette->Cpal->setColors(prefsManager->colorSet());
propertiesPalette->textPal->fonts->RebuildList(0);
propertiesPalette->installEventFilter(this);
+
+ framePropsPalette = new PropertiesPalette_Frame(this);
+ framePropsPalette->setMainWindow(this);
+ connect( scrActions["toolsFrameProperties"], SIGNAL(toggled(bool)) , framePropsPalette, SLOT(setPaletteShown(bool)) );
+ connect( framePropsPalette, SIGNAL(paletteShown(bool)), scrActions["toolsFrameProperties"], SLOT(setChecked(bool)));
+
nodePalette = new NodePalette(this);
nodePalette->installEventFilter(this);
layerPalette = new LayerPalette(this);
@@ -1015,6 +1029,7 @@
scrMenuMgr->addMenuSeparator("Windows");
scrMenuMgr->addMenuItem(scrActions["toolsProperties"], "Windows", true);
+ scrMenuMgr->addMenuItem(scrActions["toolsFrameProperties"], "Windows", true);
scrMenuMgr->addMenuItem(scrActions["toolsOutline"], "Windows", true);
scrMenuMgr->addMenuItem(scrActions["toolsScrapbook"], "Windows", true);
scrMenuMgr->addMenuItem(scrActions["toolsLayers"], "Windows", true);
@@ -1634,6 +1649,7 @@
editToolBar->connectPrefsSlot(false);
modeToolBar->connectPrefsSlot(false);
pdfToolBar->connectPrefsSlot(false);
+ framePropsPalette->hide();
propertiesPalette->hide();
outlinePalette->hide();
scrapbookPalette->hide();
@@ -2282,6 +2298,7 @@
{
updateActiveWindowCaption(doc->DocName);
// scrActions["shade100"]->setChecked(true);
+ framePropsPalette->setDoc(doc);
propertiesPalette->setDoc(doc);
//propertiesPalette->Cpal->displayGradient(0);
pagePalette->setView(view);
@@ -2485,6 +2502,7 @@
//Update palettes
updateActiveWindowCaption(doc->DocName);
// scrActions["shade100"]->setChecked(true);
+ framePropsPalette->setDoc(doc);
propertiesPalette->setDoc(doc);
symbolPalette->setDoc(doc);
// propertiesPalette->Cpal->displayGradient(0);
@@ -4485,6 +4503,7 @@
if (ScCore->haveCMS())
doc->CloseCMSProfiles();
//<<Palettes
+ framePropsPalette->setDoc(0);
propertiesPalette->unsetDoc();
symbolPalette->unsetDoc();
pagePalette->setView(0);
@@ -4813,6 +4832,7 @@
void ScribusMainWindow::slotFileQuit()
{
+ framePropsPalette->setDoc(0);
propertiesPalette->unsetDoc();
symbolPalette->unsetDoc();
ScCore->pluginManager->savePreferences();
@@ -5070,6 +5090,7 @@
// update style lists:
styleManager->setDoc(doc);
+ framePropsPalette->setDoc(doc);
propertiesPalette->unsetDoc();
propertiesPalette->setDoc(doc);
symbolPalette->unsetDoc();
@@ -5176,6 +5197,7 @@
// update style lists:
styleManager->setDoc(doc);
+ framePropsPalette->setDoc(doc);
propertiesPalette->unsetDoc();
propertiesPalette->setDoc(doc);
symbolPalette->unsetDoc();
@@ -7863,6 +7885,7 @@
msgBox.exec();
}
+ framePropsPalette->startup();
propertiesPalette->startup();
outlinePalette->startup();
scrapbookPalette->startup();
@@ -8434,6 +8457,7 @@
doc->setUnitIndex(unitIndex);
setCurrentComboItem(view->unitSwitcher, unitGetStrFromIndex(doc->unitIndex()));
+ framePropsPalette->unitChange();
propertiesPalette->unitChange();
nodePalette->unitChange();
alignDistributePalette->unitChange();
Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Fri Dec 17 22:25:14 2010
@@ -30,39 +30,28 @@
#include <vector>
// include files for QT
-#include <QAction>
+
#include <QActionGroup>
-#include <QApplication>
#include <QClipboard>
-#include <QCloseEvent>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QEvent>
-#include <QFont>
#include <QKeyEvent>
-#include <QLabel>
#include <QMainWindow>
#include <QMap>
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QMouseEvent>
#include <QMultiHash>
-#include <QPainter>
#include <QPixmap>
#include <QPointer>
#include <QProcess>
-#include <QProgressBar>
-#include <QProgressDialog>
-#include <QStatusBar>
#include <QString>
-#include <QTimer>
-#include <QToolButton>
-#include <QToolTip>
-#include <QWheelEvent>
-#include <QMdiArea>
-#include <QMdiSubWindow>
-
+
+class QCloseEvent;
+class QDragEnterEvent;
+class QDropEvent;
+class QEvent;
+class QKeyEvent;
+class QLabel;
+class QMdiArea;
+class QMdiSubWindow;
+class QProgressBar;
+class QToolButton;
// application specific includes
#include "scribusapi.h"
@@ -98,6 +87,7 @@
class PrefsContext;
class PrefsManager;
class PropertiesPalette;
+class PropertiesPalette_Frame;
//class ReformDoc;
class ScToolBar;
class ScrAction;
@@ -220,6 +210,7 @@
GuideManager *guidePalette;
CharSelect *charPalette;
PropertiesPalette *propertiesPalette;
+ PropertiesPalette_Frame *framePropsPalette;
NodePalette *nodePalette;
OutlinePalette *outlinePalette;
Biblio *scrapbookPalette;
Modified: branches/ScribusOIF/scribus/scribuscore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/scribuscore.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribuscore.cpp (original)
+++ branches/ScribusOIF/scribus/scribuscore.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,7 @@
#include <QByteArray>
#include <QDebug>
#include <QGlobalStatic>
+#include <QMessageBox>
#include "commonstrings.h"
#include "filewatcher.h"
Modified: branches/ScribusOIF/scribus/scribuswin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/scribuswin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribuswin.cpp (original)
+++ branches/ScribusOIF/scribus/scribuswin.cpp Fri Dec 17 22:25:14 2010
@@ -33,6 +33,7 @@
#include "util_file.h"
#include "util_icon.h"
+#include <QApplication>
#include <QCloseEvent>
#include <QDir>
#include <QFileInfo>
Modified: branches/ScribusOIF/scribus/ui/collectforoutput_ui.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/collectforoutput_ui.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/collectforoutput_ui.cpp (original)
+++ branches/ScribusOIF/scribus/ui/collectforoutput_ui.cpp Fri Dec 17 22:25:14 2010
@@ -14,6 +14,8 @@
#include "scribuscore.h"
#include "scraction.h"
#include "scribusapp.h"
+
+#include <QMessageBox>
CollectForOutput_UI::CollectForOutput_UI(QWidget* parent, ScribusDoc* doc, QString outputDirectory, bool withFonts, bool withProfiles, bool compressDoc) :
CollectForOutput(doc, outputDirectory, withFonts, withProfiles, compressDoc)
Modified: branches/ScribusOIF/scribus/ui/contextmenu.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/contextmenu.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/contextmenu.cpp (original)
+++ branches/ScribusOIF/scribus/ui/contextmenu.cpp Fri Dec 17 22:25:14 2010
@@ -14,6 +14,7 @@
***************************************************************************/
// #include <QDebug>
+#include <QApplication>
#include <QFrame>
#include <QGridLayout>
#include <QLabel>
@@ -414,6 +415,7 @@
//<-- Add Properties
addSeparator();
addAction(m_AP->scrActions["toolsProperties"]);
+ addAction(m_AP->scrActions["toolsFrameProperties"]);
//-->
}
Modified: branches/ScribusOIF/scribus/ui/masterpagepalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/masterpagepalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/masterpagepalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/masterpagepalette.cpp Fri Dec 17 22:25:14 2010
@@ -6,6 +6,7 @@
*/
#include "masterpagepalette.h"
+#include <QApplication>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QSpacerItem>
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Fri Dec 17 22:25:14 2010
@@ -91,12 +91,14 @@
m_haveItem = false;
m_unitRatio = 1.0;
+ //setObjectName(QString::fromLocal8Bit("PropertiesPalette"));
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
- MpalLayout = new QVBoxLayout( this );
+ MpalLayout = new QVBoxLayout();
MpalLayout->setMargin(5);
MpalLayout->setSpacing(1);
- //setOrientation(Qt::Vertical);
+ setLayout(MpalLayout);
+
QFont f(font());
f.setPointSize(f.pointSize()-1);
setFont(f);
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp Fri Dec 17 22:25:14 2010
@@ -6,6 +6,8 @@
*/
#include "propertiespalette_xyz.h"
+
+#include <QMessageBox>
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
@@ -72,6 +74,7 @@
rotationSpin->setWrapping( true );
installSniffer(rotationSpin);
+ rotationSpin->setNewUnit(6);
rotationLabel->setBuddy(rotationSpin);
levelUp->setIcon(QIcon(loadIcon("16/go-up.png")));
@@ -79,7 +82,6 @@
levelTop->setIcon(QIcon(loadIcon("16/go-top.png")));
levelBottom->setIcon(QIcon(loadIcon("16/go-bottom.png")));
levelLabel->setAlignment( Qt::AlignCenter );
-
doGroup->setIcon(QIcon(loadIcon("group.png")));
doUnGroup->setIcon(QIcon(loadIcon("ungroup.png")));
Modified: branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui Fri Dec 17 22:25:14 2010
@@ -114,7 +114,7 @@
</widget>
</item>
<item row="2" column="0">
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="rotationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -142,7 +142,7 @@
<widget class="ScrSpinBox" name="rotationSpin"/>
</item>
<item row="2" column="2">
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="levelLabel">
<property name="text">
<string>Level</string>
</property>
@@ -152,9 +152,9 @@
<widget class="QSpinBox" name="levelSpin"/>
</item>
<item row="2" column="4">
- <widget class="QLabel" name="levelLabel">
- <property name="text">
- <string>/100</string>
+ <widget class="QLabel" name="numObjsLabel">
+ <property name="text">
+ <string notr="true">/0</string>
</property>
</widget>
</item>
@@ -246,7 +246,7 @@
</spacer>
</item>
<item row="0" column="0" rowspan="2">
- <widget class="QWidget" name="widget" native="true">
+ <widget class="BasePointWidget" name="basePointWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -282,6 +282,12 @@
<extends>QToolButton</extends>
<header>ui/linkbutton.h</header>
</customwidget>
+ <customwidget>
+ <class>BasePointWidget</class>
+ <extends>QWidget</extends>
+ <header>ui/basepointwidget.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
Modified: branches/ScribusOIF/scribus/ui/smtextstyles.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/ui/smtextstyles.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/smtextstyles.cpp (original)
+++ branches/ScribusOIF/scribus/ui/smtextstyles.cpp Fri Dec 17 22:25:14 2010
@@ -6,6 +6,7 @@
*/
#include <QEvent>
+#include <QMessageBox>
#include <QTabWidget>
#include "alignselect.h"
Modified: branches/ScribusOIF/scribus/upgradechecker.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/upgradechecker.cpp
==============================================================================
--- branches/ScribusOIF/scribus/upgradechecker.cpp (original)
+++ branches/ScribusOIF/scribus/upgradechecker.cpp Fri Dec 17 22:25:14 2010
@@ -5,6 +5,7 @@
for which a new license (GPL+exception) is in place.
*/
+#include <QApplication>
#include <QDebug>
#include <QDir>
#include <QDomDocument>
Modified: branches/ScribusOIF/scribus/util.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/util.cpp
==============================================================================
--- branches/ScribusOIF/scribus/util.cpp (original)
+++ branches/ScribusOIF/scribus/util.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,7 @@
#include <algorithm>
#include "util.h"
#include <zlib.h>
+#include <QApplication>
#include <QCryptographicHash>
#include <QDomElement>
#include <QProcess>
Modified: branches/ScribusOIF/scribus/util_ghostscript.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/scribus/util_ghostscript.cpp
==============================================================================
--- branches/ScribusOIF/scribus/util_ghostscript.cpp (original)
+++ branches/ScribusOIF/scribus/util_ghostscript.cpp Fri Dec 17 22:25:14 2010
@@ -24,6 +24,7 @@
#include "util_ghostscript.h"
+#include <QApplication>
#include <QDebug>
#include <QDir>
#include <QFile>
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16100&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Fri Dec 17 22:25:14 2010
@@ -1487,6 +1487,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_frame.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_group.cpp"
>
</File>
@@ -1532,6 +1536,10 @@
</File>
<File
RelativePath="..\..\scribus\ui\propertywidget_pathtext.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\scribus\ui\propertywidget_pos.cpp"
>
</File>
<File
@@ -8104,6 +8112,38 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_frame.h"
+ >
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_group.h"
>
<FileConfiguration
@@ -8457,6 +8497,38 @@
</File>
<File
RelativePath="..\..\scribus\ui\propertywidget_pathtext.h"
+ >
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\scribus\ui\propertywidget_pos.h"
>
<FileConfiguration
Name="Debug-cairo|Win32"
@@ -11977,6 +12049,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\ui_propertywidget_posbase.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\ui_propertywidget_textcolorbase.h"
>
</File>
@@ -12706,6 +12782,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\moc_propertiespalette_frame.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\moc_propertiespalette_group.cpp"
>
</File>
@@ -12751,6 +12831,10 @@
</File>
<File
RelativePath="..\..\scribus\ui\moc_propertywidget_pathtext.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\scribus\ui\moc_propertywidget_pos.cpp"
>
</File>
<File
@@ -13359,6 +13443,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertywidget_posbase.ui"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertywidget_textcolorbase.ui"
>
</File>
More information about the scribus-commit
mailing list