Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25138 → Rev 25137

/trunk/Scribus/scribus/text/boxes.cpp
11,10 → 11,16
#include "pageitem.h"
#include "boxes.h"
#include "appmodes.h"
#include "qapplication.h"
#include "pageitem_textframe.h"
#include "scribusdoc.h"
#include "prefsmanager.h"
#include "sccolorengine.h"
#include "colorblind.h"
#include "textlayoutpainter.h"
#include "screenpainter.h"
#include "itextcontext.h"
#include "itextsource.h"
 
using namespace icu;
 
/trunk/Scribus/scribus/ui/helpbrowser.cpp
59,7 → 59,9
 
#include "prefsmanager.h"
#include "scribuscore.h"
#include "util_debug.h"
#include "iconmanager.h"
#include "util.h"
 
/*! \brief XML parsed for documentation history.
This is small helper class which reads saved bookmarks configuration
/trunk/Scribus/scribus/ui/modetoolbar.cpp
39,6 → 39,7
 
ModeToolBar::ModeToolBar(ScribusMainWindow* parent) : ScToolBar( tr("Tools"), "Tools", parent, Qt::Vertical)
{
SubMode = 0;
ValCount = 32;
static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
/trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
13,12 → 13,18
#include <cmath>
 
#include "commonstrings.h"
#include "localemgr.h"
#include "pageitem.h"
#include "scribus.h"
#include "propertiespalette_utils.h"
#include "sccolorengine.h"
#include "scraction.h"
#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribuscore.h"
#include "selection.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
PropertiesPalette_Shadow::PropertiesPalette_Shadow( QWidget* parent) : PropTreeWidget(parent)
{
/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
19,6 → 19,7
#include "scribusapp.h"
#include "scribusdoc.h"
#include "selection.h"
#include "ui/sctreewidget.h"
#include "util.h"
 
PropertyWidget_ParEffect::PropertyWidget_ParEffect(QWidget *parent) : QFrame(parent)
/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
14,25 → 14,34
#endif
#include <cmath>
 
 
#include "appmodehelper.h"
#include "appmodes.h"
#include "autoform.h"
#include "basepointwidget.h"
#include "colorlistbox.h"
#include "commonstrings.h"
#include "iconmanager.h"
#include "localemgr.h"
#include "pageitem.h"
#include "pageitem_arc.h"
#include "pageitem_group.h"
#include "pageitem_line.h"
#include "pageitem_spiral.h"
#include "pageitem_textframe.h"
#include "propertiespalette_utils.h"
#include "sccolorengine.h"
#include "scraction.h"
#include "scribus.h"
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "tabmanager.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
//using namespace std;
 
/trunk/Scribus/scribus/ui/hruler.cpp
35,6 → 35,8
 
#include "canvasgesture_rulermove.h"
#include "hruler.h"
#include "scpage.h"
 
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
34,6 → 34,7
 
PagePalette_Pages::PagePalette_Pages(QWidget* parent) : QWidget(parent)
{
currView = nullptr;
m_scMW = ScCore->primaryMainWindow();
setupUi(this);
/trunk/Scribus/scribus/ui/picstatus.cpp
37,8 → 37,10
#include <QScopedPointer>
#include <QToolButton>
 
#include "commonstrings.h"
#include "effectsdialog.h"
#include "extimageprops.h"
#include "filesearch.h"
#include "iconmanager.h"
#include "pageitem.h"
#include "picsearch.h"
/trunk/Scribus/scribus/ui/layers.cpp
41,7 → 41,7
#include "ui/scrspinbox.h"
#include "undomanager.h"
 
LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette(parent, "Layers", Qt::WindowFlags())
LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette(parent, "Layers", Qt::WindowFlags()), m_Doc(nullptr)
{
setObjectName(QString::fromLocal8Bit("Layers"));
setMinimumSize( QSize(220, 240) );
/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
15,15 → 15,20
#include <QLocale>
#include <QSignalBlocker>
 
#include "commonstrings.h"
#include "localemgr.h"
#include "pageitem.h"
#include "propertiespalette_utils.h"
#include "sccolorengine.h"
#include "scribuscore.h"
#include "scraction.h"
#include "scribusapp.h"
#include "scribusview.h"
#include "selection.h"
#include "units.h"
#include "undomanager.h"
#include "util.h"
#include "util_math.h"
 
PropertiesPalette_Image::PropertiesPalette_Image( QWidget* parent) : QWidget(parent)
{
/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
14,17 → 14,22
#include <QSignalBlocker>
 
#include "arrowchooser.h"
#include "commonstrings.h"
#include "dasheditor.h"
#include "iconmanager.h"
#include "localemgr.h"
#include "pageitem.h"
#include "scribus.h"
#include "pageitem_textframe.h"
#include "sccolorengine.h"
#include "scraction.h"
#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribuscore.h"
#include "selection.h"
#include "ui/propertiespalette_utils.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
 
//using namespace std;
/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
24,6 → 24,7
#include "pageitem.h"
#include "pageitem_table.h"
#include "pageitem_textframe.h"
#include "propertiespalette_utils.h"
#include "propertywidget_advanced.h"
#include "propertywidget_distance.h"
#include "propertywidget_flop.h"
34,11 → 35,18
#include "propertywidget_pareffect.h"
#include "propertywidget_pathtext.h"
#include "propertywidget_textcolor.h"
#include "scribus.h"
#include "scfonts.h"
#include "scraction.h"
#include "scribusapp.h"
#include "scribuscore.h"
#include "selection.h"
#include "stylecombos.h"
#include "styleselect.h"
#include "tabmanager.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
#include "langmgr.h"
 
//using namespace std;
47,7 → 55,7
{
setupUi(this);
 
fontSize->setPrefix("");
fontSize->setPrefix( "" );
iconSetChange();
 
/trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
11,6 → 11,7
 
#include "appmodes.h"
#include "pageitem_table.h"
#include "iconmanager.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "selection.h"
/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
19,9 → 19,13
#include <QPainter>
#include <QStringView>
 
#include "commonstrings.h"
#include "iconmanager.h"
#include "pagelayout.h"
#include "pagepalette_widgets.h"
#include "scpage.h"
#include "scribusapp.h"
#include "ui/scmessagebox.h"
 
 
/* IconItems Code */
/trunk/Scribus/scribus/ui/movepage.cpp
103,10 → 103,10
// signals and slots connections
if (move)
{
connect(fromPageData, SIGNAL(valueChanged(double)), this, SLOT(fromChanged()));
connect(toPageData, SIGNAL(valueChanged(double)), this, SLOT(toChanged()));
connect( fromPageData, SIGNAL( valueChanged(double) ), this, SLOT( fromChanged() ) );
connect( toPageData, SIGNAL( valueChanged(double) ), this, SLOT( toChanged() ) );
}
connect(mvWhereData, SIGNAL(activated(int)), this, SLOT(mvWherePageDataDisable(int)));
connect( mvWhereData, SIGNAL( activated(int) ), this, SLOT( mvWherePageDataDisable(int) ) );
connect(buttonBox, &QDialogButtonBox::accepted, this, &MovePages::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &MovePages::reject);
}
/trunk/Scribus/scribus/ui/mergedoc.cpp
12,6 → 12,7
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scconfig.h"
#include "scpaths.h"
#include "ui/customfdialog.h"
 
#include <QApplication>
/trunk/Scribus/scribus/ui/inspage.cpp
21,6 → 21,7
#include "scpage.h"
#include "scribusdoc.h"
#include "scrspinbox.h"
#include "units.h"
#include "util.h"
 
InsPage::InsPage( QWidget* parent, ScribusDoc* currentDoc, int currentPage, int maxPages)
/trunk/Scribus/scribus/ui/newdocdialog.cpp
35,10 → 35,12
#include "fileloader.h"
#include "iconmanager.h"
#include "marginwidget.h"
#include "pagelayout.h"
#include "pagesize.h"
#include "pagestructs.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scribuscore.h"
#include "scrspinbox.h"
#include "units.h"
 
/trunk/Scribus/scribus/ui/preferencesdialog.cpp
12,6 → 12,7
#include <QListWidget>
#include <QVBoxLayout>
 
#include "commonstrings.h"
#include "iconmanager.h"
#include "pluginmanager.h"
#include "prefs_pane.h"
/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
44,8 → 44,22
#endif
#include <cmath>
 
#include "scribus.h"
#include "appmodes.h"
#include "commonstrings.h"
#include "iconmanager.h"
#include "scraction.h"
#include "scribuscore.h"
#include "scribusview.h"
#include "selection.h"
#include "ui/autoform.h"
#include "ui/nodeeditpalette.h"
#include "ui/propertiespalette.h"
#include "ui/propertiespalette_utils.h"
#include "ui/propertiespalette_xyz.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
PropertiesPalette_Group::PropertiesPalette_Group( QWidget* parent)
: QWidget(parent)
/trunk/Scribus/scribus/ui/propertiespalette_utils.cpp
26,9 → 26,14
#define _USE_MATH_DEFINES
#endif
#include <cmath>
#include "commonstrings.h"
#include "sccolorengine.h"
#include "scraction.h"
#include "scribusdoc.h"
#include "selection.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
//using namespace std;
 
/trunk/Scribus/scribus/ui/guidemanager.cpp
25,6 → 25,8
#include <QSignalBlocker>
 
#include "guidemanager.h"
 
#include "commonstrings.h"
#include "guidesdelegate.h"
#include "guidesmodel.h"
#include "scpage.h"
34,6 → 36,7
#include "selection.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
 
 
GuideManager::GuideManager(QWidget* parent) :
/trunk/Scribus/scribus/ui/outlinepalette.cpp
25,6 → 25,7
#include <QVariant>
#include <QWidgetAction>
 
#include "actionmanager.h"
#include "appmodes.h"
#include "canvasmode.h"
#include "commonstrings.h"
40,7 → 41,11
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_color.h"
#include "util_formats.h"
 
OutlineTreeItem::OutlineTreeItem(OutlineTreeItem* parent, OutlineTreeItem* after) : QTreeWidgetItem(parent, after)
{
/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
14,17 → 14,27
 
#include "appmodes.h"
#include "autoform.h"
#include "commonstrings.h"
#include "iconmanager.h"
#include "localemgr.h"
#include "ui/nodeeditpalette.h"
#include "pageitem_arc.h"
#include "pageitem_regularpolygon.h"
#include "scribus.h"
#include "pageitem_textframe.h"
#include "polyprops.h"
#include "sccolorengine.h"
#include "scraction.h"
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "ui/nodeeditpalette.h"
#include "ui/propertiespalette_utils.h"
#include "ui/propertiespalette_xyz.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent)
: QWidget(parent)
/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
13,8 → 13,8
#include "scribus.h"
#include "scribusdoc.h"
#include "selection.h"
#include "units.h"
 
 
PropertyWidget_OptMargins::PropertyWidget_OptMargins(QWidget* parent) : QFrame(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/missing.cpp
17,7 → 17,9
#include "fontcombo.h"
#include "iconmanager.h"
#include "prefsmanager.h"
#include "scpage.h"
#include "scribusdoc.h"
#include "util.h"
 
MissingFont::MissingFont( QWidget* parent, const QString& fon, ScribusDoc* doc ) : QDialog( parent )
{
/trunk/Scribus/scribus/ui/prefs_spelling.cpp
23,6 → 23,9
#include "scpaths.h"
#include "scribusapp.h"
#include "scribusdoc.h"
#include "third_party/zip/scribus_zip.h"
#include "util.h"
#include "util_file.h"
 
Prefs_Spelling::Prefs_Spelling(QWidget* parent, ScribusDoc* /*doc*/)
: Prefs_Pane(parent)
/trunk/Scribus/scribus/ui/insertaframe.cpp
28,6 → 28,7
#include "pageitem.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scpaths.h"
#include "scribusdoc.h"
#include "ui/createrange.h"
#include "ui/customfdialog.h"
34,6 → 35,7
#include "ui/insertaframe.h"
#include "ui/scrspinbox.h"
#include "units.h"
#include "util.h"
#include "util_formats.h"
 
 
/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
26,6 → 26,8
QSize maxButtonSize = QSize(16777215, buttonSize.height());
QSizePolicy::Policy buttonSizePolicy = static_cast<QSizePolicy::Policy>(QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag);
 
m_doc = nullptr;
m_unitRatio = 1.0;
vboxLayout = new QVBoxLayout(this);
vboxLayout->setSpacing(6);
vboxLayout->setContentsMargins(6, 6, 6, 6);
/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
40,8 → 40,10
#include "scpaths.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "ui/customfdialog.h"
#include "ui/scmessagebox.h"
#include "ui/scrspinbox.h"
#include "units.h"
#include "util.h"