Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 837 → Rev 838

/branches/Version13x/Scribus/scribus/fileloader.cpp
1,4 → 1,3
#include "fileloader.h"
#include <qfile.h>
#include <qfileinfo.h>
#include <qtl.h>
9,6 → 8,7
#include <cstdlib>
#include <cmath>
#include <qtextstream.h>
#include "fileloader.h"
#include "scribus.h"
#include "scribusXml.h"
#include "missing.h"
/branches/Version13x/Scribus/scribus/pdfopts.cpp
8,6 → 8,9
***************************************************************************/
#include "pdfopts.h"
#include "pdfopts.moc"
 
#include <qpainter.h>
 
#include "customfdialog.h"
#include "prefsfile.h"
#include "units.h"
/branches/Version13x/Scribus/scribus/mpalette.h
23,7 → 23,7
#include "mspinbox.h"
#include "pageitem.h"
#include "page.h"
#include "scribusdoc.h"
class ScribusDoc;
#include "linkbutton.h"
#include "linecombo.h"
#include "spalette.h"
/branches/Version13x/Scribus/scribus/lineformats.cpp
1,10 → 1,14
#include "lineformats.h"
#include "lineformats.moc"
#include "multiline.h"
 
#include <qmessagebox.h>
#include <qpainter.h>
 
#include "customfdialog.h"
#include "scribusXml.h"
#include "prefsfile.h"
#include "multiline.h"
 
extern QPixmap loadIcon(QString nam);
extern PrefsFile* prefsFile;
 
/branches/Version13x/Scribus/scribus/edit1format.h
12,12 → 12,12
#include <qtooltip.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include "scribusstructs.h"
#include "mspinbox.h"
#include "fontcombo.h"
#include "scribusdoc.h"
class ScribusDoc;
#include "alignselect.h"
class StyleSelect;
#include "scribusdoc.h"
#include "shadebutton.h"
class Tabruler;
 
/branches/Version13x/Scribus/scribus/picstatus.h
10,8 → 10,8
#include <qheader.h>
#include <qptrlist.h>
#include <qvaluelist.h>
#include "scribusdoc.h"
#include "scribusview.h"
class ScribusDoc;
class ScribusView;
 
class PicStatus : public QDialog
{
/branches/Version13x/Scribus/scribus/vruler.cpp
23,6 → 23,7
#include <qrect.h>
#include <qpointarray.h>
#include "scribus.h"
#include "scribusdoc.h"
 
#if QT_VERSION > 0x030102
#define SPLITVC SplitHCursor
/branches/Version13x/Scribus/scribus/page.h
17,7 → 17,13
 
#ifndef PAGE_H
#define PAGE_H
#include "scribusdoc.h"
 
class QString;
#include "qvaluelist.h"
#include "qptrlist.h"
 
#include "scribusstructs.h"
#include "pageitem.h"
/**
*@author Franz Schmid
*/
/branches/Version13x/Scribus/scribus/muster.h
14,7 → 14,7
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include "scribusdoc.h"
class ScribusDoc;
#include "scribusview.h"
 
class MusterSeiten : public QDialog
/branches/Version13x/Scribus/scribus/cmykfw.h
27,7 → 27,7
class CMYKcolor;
#include "colorchart.h"
#include "mspinbox.h"
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class CMYKChoose : public QDialog
{
/branches/Version13x/Scribus/scribus/Makefile.am
7,7 → 7,7
 
SUBDIRS = icons libabout libprefs plugins libpostscript libpdf profiles dicts templates po qm doc
 
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp color.h gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gtmeasure.cpp gtmeasure.h prefsfile.cpp prefsfile.h prefscontext.cpp prefscontext.h prefsreader.cpp prefsreader.h prefstable.cpp prefstable.h langmgr.h langmgr.cpp polygonwidget.cpp polygonwidget.h fileloader.cpp fileloader.h prefsdialogbase.cpp prefsdialogbase.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h tabtypography.cpp tabtypography.h arrowchooser.cpp arrowchooser.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt units.h units.cpp
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp color.h gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gtmeasure.cpp gtmeasure.h prefsfile.cpp prefsfile.h prefscontext.cpp prefscontext.h prefsreader.cpp prefsreader.h prefstable.cpp prefstable.h langmgr.h langmgr.cpp polygonwidget.cpp polygonwidget.h fileloader.cpp fileloader.h prefsdialogbase.cpp prefsdialogbase.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h tabtypography.cpp tabtypography.h arrowchooser.cpp arrowchooser.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt units.h units.cpp scribusstructs.h
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/samples/
78,6 → 78,7
$(INSTALL_DATA) $(srcdir)/prefstable.h $(prefix)/include/scribus/langmgr.h
$(INSTALL_DATA) $(srcdir)/missing.h $(prefix)/include/scribus/missing.h
$(INSTALL_DATA) $(srcdir)/units.h $(prefix)/include/scribus/units.h
$(INSTALL_DATA) $(srcdir)/units.h $(prefix)/include/scribus/scribusstructs.h
 
uninstall-local:
-rm -f $(prefix)/share/scribus/samples/LoremIpsum.txt
142,6 → 143,7
-rm -f $(prefix)/include/scribus/langmgr.h
-rm -f $(prefix)/include/scribus/missing.h
-rm -f $(prefix)/include/scribus/gradienteditor.h
-rm -f $(prefix)/include/scribus/scribusstructs.h
 
scribus_LDADD = $(LIBJPEG) $(LIBART_LIBS) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) $(LIBCUPS) $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
 
/branches/Version13x/Scribus/scribus/navigator.cpp
17,6 → 17,10
 
#include "navigator.h"
#include "navigator.moc"
 
#include <qpainter.h>
#include "scribusview.h"
 
extern QPixmap LoadPDF(QString fn, int Seite, int Size, int *w, int *h);
 
Navigator::Navigator(QWidget *parent, int Size, int Seite, ScribusView* vie, QString fn) : QLabel(parent)
/branches/Version13x/Scribus/scribus/hruler.cpp
22,6 → 22,8
#include <qcolor.h>
#include <qrect.h>
#include <qpointarray.h>
#include "scribusview.h"
#include "scribusdoc.h"
#include "scribus.h"
 
#if QT_VERSION > 0x030102
/branches/Version13x/Scribus/scribus/search.cpp
19,6 → 19,7
#include "shadebutton.h"
#include "story.h"
#include "scribus.h"
 
extern ScribusApp* ScApp;
extern QPixmap loadIcon(QString nam);
 
/branches/Version13x/Scribus/scribus/libprefs/prefs.h
19,9 → 19,11
#include <qslider.h>
#include <qlineedit.h>
#include <qfiledialog.h>
 
#include "scribusstructs.h"
 
#include "linecombo.h"
#include "linkbutton.h"
#include "scribusdoc.h"
#include "scfonts.h"
#include "mspinbox.h"
#include "scribus.h"
/branches/Version13x/Scribus/scribus/fontcombo.h
21,10 → 21,11
#include <qcombobox.h>
#include <qlistbox.h>
 
#include "scribusstructs.h"
class QListBoxItem;
class QFont;
 
#include "scribusdoc.h"
class ScribusDoc;
 
/**
*@author Franz Schmid
/branches/Version13x/Scribus/scribus/navigator.h
20,7 → 20,7
 
#include <qlabel.h>
#include <qpixmap.h>
#include "scribusview.h"
class ScribusView;
 
/**
*@author Franz Schmid
/branches/Version13x/Scribus/scribus/multiline.cpp
1,7 → 1,11
#include "multiline.h"
#include "multiline.moc"
 
#include <qpainter.h>
#include <qmessagebox.h>
 
#include "scribusdoc.h"
 
extern QPixmap loadIcon(QString nam);
 
MultiLine::MultiLine( QWidget* parent, ScribusDoc* doc, multiLine ml, QString nam, QMap<QString,multiLine> *Sty)
/branches/Version13x/Scribus/scribus/scpreview.h
1,9 → 1,12
#ifndef SCPREVIEW_H
#define SCPREVIEW_H
 
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "scpainter.h"
 
class QString;
class CMYKColor;
 
class ScPreview
{
public:
/branches/Version13x/Scribus/scribus/reformdoc.cpp
1,6 → 1,7
#include "reformdoc.h"
#include "reformdoc.moc"
#include <qtooltip.h>
#include <qspinbox.h>
#include <qcolordialog.h>
#include "fontcombo.h"
#include "polygonwidget.h"
9,6 → 10,9
#include "hysettings.h"
#include "cmsprefs.h"
#include "units.h"
#include "mspinbox.h"
#include "linecombo.h"
#include "scribus.h"
 
extern QPixmap loadIcon(QString nam);
extern QPixmap fontSamples(QString da, int s, QString ts, QColor back);
/branches/Version13x/Scribus/scribus/frameedit.cpp
2,6 → 2,7
#include "frameedit.moc"
#include "page.h"
#include "pageitem.h"
#include "scribusview.h"
 
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
/branches/Version13x/Scribus/scribus/tabtypography.h
3,7 → 3,6
 
#include <qvariant.h>
#include <qwidget.h>
#include "scribusdoc.h"
class QGridLayout;
class QGroupBox;
class QLabel;
/branches/Version13x/Scribus/scribus/cpalette.h
18,6 → 18,7
#ifndef CPALETTE_H
#define CPALETTE_H
 
#include "scribusstructs.h"
#include "gradienteditor.h"
 
class QListBox;
32,7 → 33,6
class QComboBox;
class QLabel;
class QSpinBox;
#include "scribusdoc.h"
#include "shadebutton.h"
#include "mspinbox.h"
 
/branches/Version13x/Scribus/scribus/multiline.h
14,10 → 14,14
#include <qwhatsthis.h>
#include <qpixmap.h>
#include <qlineedit.h>
 
#include "scribusstructs.h"
 
#include "linecombo.h"
#include "mspinbox.h"
#include "scribusdoc.h"
 
class ScribusDoc;
 
class MultiLine : public QDialog
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/scribusview.h
34,8 → 34,8
#include "scribusdoc.h"
#include "scpainter.h"
#include "page.h"
#include "hruler.h"
#include "vruler.h"
class Hruler;
class Vruler;
#include "mspinbox.h"
#include "pageselector.h"
 
/branches/Version13x/Scribus/scribus/fontprefs.h
12,7 → 12,7
#include <qwidget.h>
#include <qcombobox.h>
#include <qlistbox.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class FontPrefs : public QDialog
{
/branches/Version13x/Scribus/scribus/gtaction.h
26,7 → 26,7
#include <qvaluelist.h>
#include <qmap.h>
#include <qstring.h>
#include "pageitem.h"
class PageItem;
#include "gtfont.h"
#include "gtframestyle.h"
#include "gtparagraphstyle.h"
/branches/Version13x/Scribus/scribus/docinfo.cpp
11,7 → 11,7
extern QPixmap loadIcon(QString nam);
 
#include <qtooltip.h>
 
#include "scribusdoc.h"
/*
* Constructs a DocInfos which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
/branches/Version13x/Scribus/scribus/editformats.cpp
2,6 → 2,8
#include "editformats.moc"
#include "edit1format.h"
#include <qmessagebox.h>
 
#include "scribusdoc.h"
#include "customfdialog.h"
#include "prefsfile.h"
 
/branches/Version13x/Scribus/scribus/newtemp.h
7,7 → 7,7
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qcombobox.h>
#include "scribusdoc.h"
class ScribusDoc;
 
class NewTm : public QDialog
{
/branches/Version13x/Scribus/scribus/keymanager.h
11,7 → 11,7
#include <qlayout.h>
#include <qtooltip.h>
#include <qevent.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class KeyManager : public QWidget
{
/branches/Version13x/Scribus/scribus/newfile.h
13,8 → 13,9
#include <qlayout.h>
#include <qtooltip.h>
#include "mspinbox.h"
#include "scribusdoc.h"
 
#include "scribusstructs.h"
 
class NewDoc : public QDialog
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/hruler.h
20,9 → 20,10
 
#include <qwidget.h>
#include <qpainter.h>
#include "scribusdoc.h"
 
class ScribusView;
class ScribusDoc;
class ScribusApp;
/**Waagrechtes Lineal
*@author Franz Schmid
*/
/branches/Version13x/Scribus/scribus/cmykcolor.h
18,7 → 18,7
#ifndef CMYKCOLOR_H
#define CMYKCOLOR_H
 
class QColor;
#include <qcolor.h>
class QString;
 
/**
/branches/Version13x/Scribus/scribus/fileloader.h
5,7 → 5,11
#include <qmap.h>
#include <qdom.h>
#include <qprogressbar.h>
#include <scribus.h>
#include "scribusstructs.h"
class ScribusDoc;
class ScribusView;
class ScribusApp;
class SCFonts;
 
class FileLoader
{
/branches/Version13x/Scribus/scribus/edit1format.cpp
6,6 → 6,7
extern double UmReFaktor;
#include <qmessagebox.h>
#include <qtooltip.h>
#include "scribusdoc.h"
#include "styleselect.h"
 
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin, ScribusDoc *doc)
/branches/Version13x/Scribus/scribus/vruler.h
20,7 → 20,8
 
#include <qwidget.h>
#include <qpainter.h>
#include "scribusdoc.h"
class ScribusDoc;
class ScribusView;
/**Vertikales Lineal
*@author Franz Schmid
*/
/branches/Version13x/Scribus/scribus/docinfo.h
14,7 → 14,7
#include <qlayout.h>
#include <qlineedit.h>
#include <qmultilineedit.h>
#include "scribusdoc.h"
class ScribusDoc;
 
class DocInfos : public QTabDialog
{
/branches/Version13x/Scribus/scribus/editformats.h
6,8 → 6,10
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include "scribusdoc.h"
 
#include "scribusstructs.h"
class ScribusDoc;
 
class StilFormate : public QDialog
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/pageitem.h
26,8 → 26,8
#include <qpixmap.h>
#include <qvaluestack.h>
#include <qvaluelist.h>
#include "scribusdoc.h"
#include "scpainter.h"
class ScribusDoc;
/**
*@author Franz Schmid
*/
/branches/Version13x/Scribus/scribus/scribusstructs.h
0,0 → 1,513
#ifndef SCRIBUSSTRUCTS_H
#define SCRIBUSSTRUCTS_H
 
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
 
#include <qvaluestack.h>
#include <qvaluelist.h>
#include <qvaluevector.h>
#include <qstring.h>
 
#include "scfonts.h"
#include "cmykcolor.h"
#include "fpointarray.h"
#include "vgradient.h"
#include "pageitem.h"
 
/* Struktur fuer Pageitem Text */
struct Pti {
QString ch;
double xp;
double yp;
int csize;
QString cfont;
QString ccolor;
QString cstroke;
bool cselect;
double cextra;
int cshade;
int cshade2;
int cstyle;
int cab;
int PtransX;
int PtransY;
int cscale;
double PRot;
};
 
struct CLBuf {
int PType;
double Xpos;
double Ypos;
double Width;
double Height;
double RadRect;
int FrameType;
bool ClipEdited;
double Pwidth;
QString Pcolor;
QString Pcolor2;
int Shade;
int Shade2;
QString GrColor;
QString GrColor2;
int GrShade;
int GrShade2;
VGradient fill_gradient;
int GrType;
double GrStartX;
double GrStartY;
double GrEndX;
double GrEndY;
QString TxtStroke;
QString TxtFill;
int ShTxtStroke;
int ShTxtFill;
int TxtScale;
int TxTStyle;
double Rot;
int PLineArt;
int PLineJoin;
int PLineEnd;
double LineSp;
double ExtraV;
double LocalScX;
double LocalScY;
double LocalX;
double LocalY;
bool PicArt;
int flippedH;
int flippedV;
double BBoxX;
double BBoxH;
bool isPrintable;
bool isBookmark;
int BMnr;
bool isAnnotation;
int AnType;
QString AnAction;
QString An_E_act;
QString An_X_act;
QString An_D_act;
QString An_Fo_act;
QString An_Bl_act;
QString An_K_act;
QString An_F_act;
QString An_V_act;
QString An_C_act;
QString An_Extern;
int AnZiel;
int AnActType;
QString AnName;
QString AnToolTip;
QString AnRollOver;
QString AnDown;
QString AnBColor;
int AnBwid;
int AnBsty;
int AnFeed;
int AnFlag;
int AnMaxChar;
int AnVis;
int AnFont;
int AnChkStil;
int AnFormat;
bool AnIsChk;
bool AnAAact;
bool AnHTML;
bool AnUseIcons;
int AnIPlace;
int AnScaleW;
double Extra;
double TExtra;
double BExtra;
double RExtra;
QString Pfile;
QString Pfile2;
QString Pfile3;
QString IProfile;
QString EmProfile;
int IRender;
bool UseEmbedded;
QString Ptext;
QPointArray Clip;
FPointArray PoLine;
FPointArray ContourLine;
bool PoShow;
double BaseOffs;
bool Textflow;
bool Textflow2;
bool UseContour;
int Ausrich;
QString IFont;
int ISize;
QValueStack<int> Groups;
int LayerNr;
bool ScaleType;
bool AspectRatio;
bool Locked;
bool LockRes;
double Transparency;
double TranspStroke;
bool Reverse;
bool InvPict;
QString NamedLStyle;
QString Language;
QString guiLanguage;
int Cols;
double ColGap;
QValueList<double> TabValues;
QValueList<double> DashValues;
double DashOffset;
bool isTableItem;
bool TopLine;
bool LeftLine;
bool RightLine;
bool BottomLine;
int LeftLinkID;
int RightLinkID;
int TopLinkID;
int BottomLinkID;
int startArrowIndex;
int endArrowIndex;
};
 
/** Seitenraender */
struct Margs {
double Top;
double Left;
double Right;
double Bottom;
};
 
struct StVorL {
QString Vname;
double LineSpa;
int Ausri;
double Indent;
double First;
double Avor;
double Anach;
QString Font;
int FontSize;
QValueList<double> TabValues;
bool Drop;
int DropLin;
int FontEffect;
QString FColor;
int FShade;
QString SColor;
int SShade;
bool BaseAdj;
};
 
struct CMSset {
QString DefaultMonitorProfile;
QString DefaultPrinterProfile;
QString DefaultInputProfile;
QString DefaultInputProfile2;
int ComponentsInput2;
int ComponentsPrinter;
int DefaultIntentMonitor;
int DefaultIntentMonitor2;
int DefaultIntentPrinter;
bool CMSinUse;
bool SoftProofOn;
bool GamutCheck;
bool BlackPoint;
} ;
 
struct UndoData {
PageItem* Item;
uint PageNr;
uint ItemNr;
double Xpos;
double Ypos;
double Width;
double Height;
double Rot;
double Gx;
double Gy;
double Gw;
double Gh;
int UnCode;
};
 
/** Definition der Farbenlisten */
typedef QMap<QString,CMYKColor> CListe;
typedef QMap<QString,QString> ProfilesL;
 
struct singleLine {
double Width;
int Dash;
int LineEnd;
int LineJoin;
QString Color;
int Shade;
};
typedef QValueVector<singleLine> multiLine;
 
struct arrowDesc {
QString name;
bool userArrow;
FPointArray points;
};
 
struct Layer {
int LNr;
int Level;
QString Name;
bool Sichtbar;
bool Drucken;
};
 
struct PreSet {
int EffektLen;
int AnzeigeLen;
int Effekt;
int Dm;
int M;
int Di;
};
 
struct LPIset {
int Frequency;
int Angle;
int SpotFunc;
};
 
struct PDFOpt {
bool Thumbnails;
bool Articles;
bool Compress;
int CompressMethod;
int Quality;
bool RecalcPic;
bool Bookmarks;
int PicRes;
int Version;
int Resolution;
int Binding;
QValueList<QString> EmbedList;
QValueList<QString> SubsetList;
bool MirrorH;
bool MirrorV;
int RotateDeg;
bool PresentMode;
QValueList<PreSet> PresentVals;
QString Datei;
bool UseRGB;
bool UseProfiles;
bool UseProfiles2;
bool UseLPI;
QMap<QString,LPIset> LPISettings;
QString SolidProf;
int SComp;
QString ImageProf;
bool EmbeddedI;
int Intent2;
QString PrintProf;
QString Info;
int Intent;
double BleedTop;
double BleedLeft;
double BleedRight;
double BleedBottom;
bool Encrypt;
QString PassOwner;
QString PassUser;
int Permissions;
};
 
struct Keys {
QString Name;
int MenuID;
int KeyID;
};
 
struct typoStruct {
int valueSuperScript;
int scalingSuperScript;
int valueSubScript;
int scalingSubScript;
int valueSmallCaps;
int autoLineSpacing;
double valueBaseGrid;
double offsetBaseGrid;
};
 
struct preV {
SCFonts AvailFonts;
QValueList<arrowDesc> arrowStyles;
QString DefFont;
int DefSize;
CListe DColors;
int Wheelval;
int AppFontSize;
int GrabRad;
double GuideRad;
double DminGrid;
double DmajGrid;
QColor DminColor;
QColor DmajColor;
QColor DpapColor;
QColor DmargColor;
QColor guideColor;
QColor baseColor;
QString GUI;
typoStruct typographicSetttings;
QString Dpen;
QString Dbrush;
int Dshade;
int Dshade2;
int DLineArt;
double Dwidth;
QString DpenLine;
QString DpenText;
QString DstrokeText;
int DshadeLine;
double DwidthLine;
int DLstyleLine;
int DstartArrow;
int DendArrow;
int MagMin;
int MagMax;
int MagStep;
QString DbrushPict;
int ShadePict;
double ScaleX;
double ScaleY;
bool Before;
int Einheit;
bool Werkv;
bool WerkvP;
bool Mpalv;
int Mpalx;
int Mpaly;
bool Mapalv;
int Mapalx;
int Mapaly;
bool Tpalv;
int Tpalx;
int Tpaly;
int Npalx;
int Npaly;
int MainX;
int MainY;
int MainW;
int MainH;
bool SCpalv;
int SCpalx;
int SCpaly;
int SCpalw;
int SCpalh;
bool Lpalv;
int Lpalx;
int Lpaly;
bool Sepalv;
int Sepalx;
int Sepaly;
bool Bopalv;
int Bopalx;
int Bopaly;
bool SepalT;
bool SepalN;
int PSize;
bool SaveAtQ;
bool RandFarbig;
QStringList RecentDocs;
uint RecentDCount;
CMSset DCMSset;
QMap<int,Keys> KeyActions;
int PolyC;
int PolyFd;
double PolyF;
bool PolyS;
double PolyR;
QString PrinterName;
QString PrinterFile;
QString PrinterCommand;
int PageFormat;
int Ausrichtung;
double PageBreite;
double PageHoehe;
double RandOben;
double RandUnten;
double RandLinks;
double RandRechts;
bool DoppelSeiten;
bool ErsteLinks;
bool ScaleType;
bool AspectRatio;
int MinWordLen;
int HyCount;
QString Language;
QString guiLanguage;
bool Automatic;
bool AutoCheck;
QString DocDir;
QString ProfileDir;
QString ScriptDir;
QString TemplateDir;
QMap<QString,QString> GFontSub;
bool AutoSave;
int AutoSaveTime;
double DisScale;
int DCols;
double DGap;
QString DColorSet;
QStringList CustomColorSets;
bool PrPr_Mode;
bool Gcr_Mode;
bool PrPr_AlphaText;
bool PrPr_AlphaGraphics;
bool PrPr_Transparency;
bool PrPr_C;
bool PrPr_M;
bool PrPr_Y;
bool PrPr_K;
QString gs_exe;
bool gs_antiText;
bool gs_antiGraph;
QString gimp_exe;
bool FramesShown;
bool GuidesShown;
bool MarginsShown;
bool GridShown;
bool BaseShown;
bool linkShown;
bool ShowPic;
bool ClipMargin;
bool GCRMode;
QColor STEcolor;
QString STEfont;
double ScratchLeft;
double ScratchRight;
double ScratchTop;
double ScratchBottom;
};
struct PrintOptions {
QString printer;
QString filename;
bool toFile;
bool useAltPrintCommand;
QString printerCommand;
int PSLevel;
bool outputSeparations;
QString separationName;
bool useColor;
bool mirrorH;
bool mirrorV;
bool useICC;
bool doGCR;
int copies;
std::vector<int> pageNumbers;
QString printerOptions;
};
 
#endif
 
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/picstatus.cpp
===================================================================
--- branches/Version13x/Scribus/scribus/picstatus.cpp (revision 837)
+++ branches/Version13x/Scribus/scribus/picstatus.cpp (revision 838)
@@ -25,6 +25,8 @@
#include <qcursor.h>
#include <cstdio>
#include "picsearch.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
#include "pageitem.h"
extern QPixmap loadIcon(QString nam);
/branches/Version13x/Scribus/scribus/reformdoc.h
12,13 → 12,15
#include <qpushbutton.h>
#include <qtoolbutton.h>
#include <qcolor.h>
 
#include "scribusstructs.h"
#include "linkbutton.h"
#include "linecombo.h"
#include "mspinbox.h"
#include "prefsdialogbase.h"
#include "scfonts.h"
#include "scribusdoc.h"
#include "scribus.h"
 
class QSpinBox;
class ScribusDoc;
class ScribusApp;
class FontCombo;
class PolygonWidget;
class ArrowChooser;
25,7 → 27,10
class TabTypograpy;
class HySettings;
class CMSPrefs;
class MSpinBox;
class LineCombo;
 
 
class ReformDoc : public PrefsDialogBase
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/pageitem.cpp
28,6 → 28,7
#include <cmath>
#include "page.h"
#include "scribus.h"
#include "scribusdoc.h"
 
#ifdef _MSC_VER
#if (_MSC_VER >= 1200)
/branches/Version13x/Scribus/scribus/tabtypography.cpp
6,6 → 6,7
#include <qtooltip.h>
#include <qspinbox.h>
#include "mspinbox.h"
#include "scribusstructs.h"
 
TabTypograpy::TabTypograpy( QWidget* parent, struct typoStruct *prefsData, double unitBase, QString unit) : QWidget( parent, "tabtypo", 0 )
{
/branches/Version13x/Scribus/scribus/scribusview.cpp
58,6 → 58,8
#include "scribusXml.h"
#include "serializer.h"
#include "insertTable.h"
#include "hruler.h"
#include "vruler.h"
#ifdef HAVE_TIFF
#include <tiffio.h>
#endif
/branches/Version13x/Scribus/scribus/scribusdoc.h
24,7 → 24,7
#include <qdict.h>
#include <qcolor.h>
#include <qvaluelist.h>
#include <qvaluestack.h>
//#include <qvaluestack.h>
#include <qvaluevector.h>
#include <qptrlist.h>
#include <qfont.h>
32,11 → 32,14
#include <qpointarray.h>
#include <qstringlist.h>
#include <qtimer.h>
#include "cmykcolor.h"
#include "scfonts.h"
#include "fpointarray.h"
 
#include "scribusstructs.h"
 
//#include "cmykcolor.h"
//#include "scfonts.h"
//#include "fpointarray.h"
#include "hyphenator.h"
#include "vgradient.h"
//#include "vgradient.h"
#ifdef HAVE_CMS
#include CMS_INC
#endif
43,482 → 46,10
 
#include <ft2build.h>
#include FT_FREETYPE_H
#include "pageitem.h"
//#include "pageitem.h"
class Page;
 
/* Struktur fuer Pageitem Text */
struct Pti {
QString ch;
double xp;
double yp;
int csize;
QString cfont;
QString ccolor;
QString cstroke;
bool cselect;
double cextra;
int cshade;
int cshade2;
int cstyle;
int cab;
int PtransX;
int PtransY;
int cscale;
double PRot;
};
 
struct CLBuf {
int PType;
double Xpos;
double Ypos;
double Width;
double Height;
double RadRect;
int FrameType;
bool ClipEdited;
double Pwidth;
QString Pcolor;
QString Pcolor2;
int Shade;
int Shade2;
QString GrColor;
QString GrColor2;
int GrShade;
int GrShade2;
VGradient fill_gradient;
int GrType;
double GrStartX;
double GrStartY;
double GrEndX;
double GrEndY;
QString TxtStroke;
QString TxtFill;
int ShTxtStroke;
int ShTxtFill;
int TxtScale;
int TxTStyle;
double Rot;
int PLineArt;
int PLineJoin;
int PLineEnd;
double LineSp;
double ExtraV;
double LocalScX;
double LocalScY;
double LocalX;
double LocalY;
bool PicArt;
int flippedH;
int flippedV;
double BBoxX;
double BBoxH;
bool isPrintable;
bool isBookmark;
int BMnr;
bool isAnnotation;
int AnType;
QString AnAction;
QString An_E_act;
QString An_X_act;
QString An_D_act;
QString An_Fo_act;
QString An_Bl_act;
QString An_K_act;
QString An_F_act;
QString An_V_act;
QString An_C_act;
QString An_Extern;
int AnZiel;
int AnActType;
QString AnName;
QString AnToolTip;
QString AnRollOver;
QString AnDown;
QString AnBColor;
int AnBwid;
int AnBsty;
int AnFeed;
int AnFlag;
int AnMaxChar;
int AnVis;
int AnFont;
int AnChkStil;
int AnFormat;
bool AnIsChk;
bool AnAAact;
bool AnHTML;
bool AnUseIcons;
int AnIPlace;
int AnScaleW;
double Extra;
double TExtra;
double BExtra;
double RExtra;
QString Pfile;
QString Pfile2;
QString Pfile3;
QString IProfile;
QString EmProfile;
int IRender;
bool UseEmbedded;
QString Ptext;
QPointArray Clip;
FPointArray PoLine;
FPointArray ContourLine;
bool PoShow;
double BaseOffs;
bool Textflow;
bool Textflow2;
bool UseContour;
int Ausrich;
QString IFont;
int ISize;
QValueStack<int> Groups;
int LayerNr;
bool ScaleType;
bool AspectRatio;
bool Locked;
bool LockRes;
double Transparency;
double TranspStroke;
bool Reverse;
bool InvPict;
QString NamedLStyle;
QString Language;
QString guiLanguage;
int Cols;
double ColGap;
QValueList<double> TabValues;
QValueList<double> DashValues;
double DashOffset;
bool isTableItem;
bool TopLine;
bool LeftLine;
bool RightLine;
bool BottomLine;
int LeftLinkID;
int RightLinkID;
int TopLinkID;
int BottomLinkID;
int startArrowIndex;
int endArrowIndex;
};
 
/** Seitenraender */
struct Margs {
double Top;
double Left;
double Right;
double Bottom;
};
 
struct StVorL {
QString Vname;
double LineSpa;
int Ausri;
double Indent;
double First;
double Avor;
double Anach;
QString Font;
int FontSize;
QValueList<double> TabValues;
bool Drop;
int DropLin;
int FontEffect;
QString FColor;
int FShade;
QString SColor;
int SShade;
bool BaseAdj;
};
 
struct CMSset {
QString DefaultMonitorProfile;
QString DefaultPrinterProfile;
QString DefaultInputProfile;
QString DefaultInputProfile2;
int ComponentsInput2;
int ComponentsPrinter;
int DefaultIntentMonitor;
int DefaultIntentMonitor2;
int DefaultIntentPrinter;
bool CMSinUse;
bool SoftProofOn;
bool GamutCheck;
bool BlackPoint;
} ;
 
struct UndoData {
PageItem* Item;
uint PageNr;
uint ItemNr;
double Xpos;
double Ypos;
double Width;
double Height;
double Rot;
double Gx;
double Gy;
double Gw;
double Gh;
int UnCode;
};
 
/** Definition der Farbenlisten */
typedef QMap<QString,CMYKColor> CListe;
typedef QMap<QString,QString> ProfilesL;
 
struct singleLine {
double Width;
int Dash;
int LineEnd;
int LineJoin;
QString Color;
int Shade;
};
typedef QValueVector<singleLine> multiLine;
 
struct arrowDesc {
QString name;
bool userArrow;
FPointArray points;
};
 
struct Layer {
int LNr;
int Level;
QString Name;
bool Sichtbar;
bool Drucken;
};
 
struct PreSet {
int EffektLen;
int AnzeigeLen;
int Effekt;
int Dm;
int M;
int Di;
};
 
struct LPIset {
int Frequency;
int Angle;
int SpotFunc;
};
 
struct PDFOpt {
bool Thumbnails;
bool Articles;
bool Compress;
int CompressMethod;
int Quality;
bool RecalcPic;
bool Bookmarks;
int PicRes;
int Version;
int Resolution;
int Binding;
QValueList<QString> EmbedList;
QValueList<QString> SubsetList;
bool MirrorH;
bool MirrorV;
int RotateDeg;
bool PresentMode;
QValueList<PreSet> PresentVals;
QString Datei;
bool UseRGB;
bool UseProfiles;
bool UseProfiles2;
bool UseLPI;
QMap<QString,LPIset> LPISettings;
QString SolidProf;
int SComp;
QString ImageProf;
bool EmbeddedI;
int Intent2;
QString PrintProf;
QString Info;
int Intent;
double BleedTop;
double BleedLeft;
double BleedRight;
double BleedBottom;
bool Encrypt;
QString PassOwner;
QString PassUser;
int Permissions;
};
 
struct Keys {
QString Name;
int MenuID;
int KeyID;
};
 
struct typoStruct {
int valueSuperScript;
int scalingSuperScript;
int valueSubScript;
int scalingSubScript;
int valueSmallCaps;
int autoLineSpacing;
double valueBaseGrid;
double offsetBaseGrid;
};
 
struct preV {
SCFonts AvailFonts;
QValueList<arrowDesc> arrowStyles;
QString DefFont;
int DefSize;
CListe DColors;
int Wheelval;
int AppFontSize;
int GrabRad;
double GuideRad;
double DminGrid;
double DmajGrid;
QColor DminColor;
QColor DmajColor;
QColor DpapColor;
QColor DmargColor;
QColor guideColor;
QColor baseColor;
QString GUI;
typoStruct typographicSetttings;
QString Dpen;
QString Dbrush;
int Dshade;
int Dshade2;
int DLineArt;
double Dwidth;
QString DpenLine;
QString DpenText;
QString DstrokeText;
int DshadeLine;
double DwidthLine;
int DLstyleLine;
int DstartArrow;
int DendArrow;
int MagMin;
int MagMax;
int MagStep;
QString DbrushPict;
int ShadePict;
double ScaleX;
double ScaleY;
bool Before;
int Einheit;
bool Werkv;
bool WerkvP;
bool Mpalv;
int Mpalx;
int Mpaly;
bool Mapalv;
int Mapalx;
int Mapaly;
bool Tpalv;
int Tpalx;
int Tpaly;
int Npalx;
int Npaly;
int MainX;
int MainY;
int MainW;
int MainH;
bool SCpalv;
int SCpalx;
int SCpaly;
int SCpalw;
int SCpalh;
bool Lpalv;
int Lpalx;
int Lpaly;
bool Sepalv;
int Sepalx;
int Sepaly;
bool Bopalv;
int Bopalx;
int Bopaly;
bool SepalT;
bool SepalN;
int PSize;
bool SaveAtQ;
bool RandFarbig;
QStringList RecentDocs;
uint RecentDCount;
CMSset DCMSset;
QMap<int,Keys> KeyActions;
int PolyC;
int PolyFd;
double PolyF;
bool PolyS;
double PolyR;
QString PrinterName;
QString PrinterFile;
QString PrinterCommand;
int PageFormat;
int Ausrichtung;
double PageBreite;
double PageHoehe;
double RandOben;
double RandUnten;
double RandLinks;
double RandRechts;
bool DoppelSeiten;
bool ErsteLinks;
bool ScaleType;
bool AspectRatio;
int MinWordLen;
int HyCount;
QString Language;
QString guiLanguage;
bool Automatic;
bool AutoCheck;
QString DocDir;
QString ProfileDir;
QString ScriptDir;
QString TemplateDir;
QMap<QString,QString> GFontSub;
bool AutoSave;
int AutoSaveTime;
double DisScale;
int DCols;
double DGap;
QString DColorSet;
QStringList CustomColorSets;
bool PrPr_Mode;
bool Gcr_Mode;
bool PrPr_AlphaText;
bool PrPr_AlphaGraphics;
bool PrPr_Transparency;
bool PrPr_C;
bool PrPr_M;
bool PrPr_Y;
bool PrPr_K;
QString gs_exe;
bool gs_antiText;
bool gs_antiGraph;
QString gimp_exe;
bool FramesShown;
bool GuidesShown;
bool MarginsShown;
bool GridShown;
bool BaseShown;
bool linkShown;
bool ShowPic;
bool ClipMargin;
bool GCRMode;
QColor STEcolor;
QString STEfont;
double ScratchLeft;
double ScratchRight;
double ScratchTop;
double ScratchBottom;
};
/**
* the Document Class
*/
/branches/Version13x/Scribus/scribus/frameedit.h
11,8 → 11,8
#include <qcheckbox.h>
#include <qspinbox.h>
#include "mspinbox.h"
#include "scribusdoc.h"
#include "scribusview.h"
class ScribusDoc;
class ScribusView;
 
class NodePalette : public QDialog
{
/branches/Version13x/Scribus/scribus/missing.cpp
7,6 → 7,8
#include "missing.h"
#include "missing.moc"
 
#include "fontcombo.h"
 
extern QPixmap loadIcon(QString nam);
 
static const char* const image100_data[] =
/branches/Version13x/Scribus/scribus/libpostscript/pslib.h
22,8 → 22,8
#include <qpen.h>
#include <qfile.h>
#include <vector>
#include "scribusdoc.h"
#include "scribusview.h"
class ScribusDoc;
class ScribusView;
#include "page.h"
#include "pageitem.h"
 
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
32,6 → 32,8
#endif
 
#include "pslib.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "scfonts.h"
#include <cmath>
 
/branches/Version13x/Scribus/scribus/cmsprefs.h
8,7 → 8,7
#include <qlabel.h>
#include <qlayout.h>
#include <qtooltip.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class CMSPrefs : public QWidget
{
/branches/Version13x/Scribus/scribus/scribuswin.h
21,7 → 21,7
#include <qmainwindow.h>
#include <qmessagebox.h>
#include "scribusview.h"
#include "scribusdoc.h"
class ScribusDoc;
#include "muster.h"
/**
*@author Franz Schmid
/branches/Version13x/Scribus/scribus/scribus.cpp
97,6 → 97,8
#include "polygonwidget.h"
#include "werktoolb.h"
#include "units.h"
#include "hruler.h"
#include "vruler.h"
 
extern QPixmap loadIcon(QString nam);
extern bool overwrite(QWidget *parent, QString filename);
/branches/Version13x/Scribus/scribus/plugins/gettext/txtim/txtim.cpp
1,4 → 1,4
#include "txtim.h"
#include <qobject.h>
#include <qcstring.h>
#include <qfile.h>
#include <qfileinfo.h>
6,6 → 6,8
#include <qstringlist.h>
#include <qtextcodec.h>
 
#include "txtim.h"
 
QString FileFormatName()
{
return QObject::tr("Text Files");
/branches/Version13x/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
18,11 → 18,12
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qobject.h>
#include "htmlreader.h"
 
#ifdef HAVE_XML
 
#include <gtmeasure.h>
#include "gtmeasure.h"
 
HTMLReader* HTMLReader::hreader = NULL;
 
/branches/Version13x/Scribus/scribus/plugins/gettext/htmlim/htmlim.cpp
19,6 → 19,7
***************************************************************************/
 
#include "htmlim.h"
#include <qobject.h>
#include <qstring.h>
#include <qstringlist.h>
 
/branches/Version13x/Scribus/scribus/scribus.h
70,24 → 70,7
class Measurements;
class StoryEditor;
 
struct PrintOptions {
QString printer;
QString filename;
bool toFile;
bool useAltPrintCommand;
QString printerCommand;
int PSLevel;
bool outputSeparations;
QString separationName;
bool useColor;
bool mirrorH;
bool mirrorV;
bool useICC;
bool doGCR;
int copies;
std::vector<int> pageNumbers;
QString printerOptions;
};
 
/**
* This Class is the base class for your application. It sets up the main
* window and providing a menubar, toolbar
/branches/Version13x/Scribus/scribus/javadocs.h
6,9 → 6,10
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include "scribusdoc.h"
#include "scribusview.h"
 
class ScribusDoc;
class ScribusView;
 
class JavaDocs : public QDialog
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/colorm.h
18,7 → 18,7
#include <qlabel.h>
#include <qpopupmenu.h>
#include <qcolor.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "query.h"
 
class Farbmanager : public QDialog
/branches/Version13x/Scribus/scribus/scpreview.cpp
1,6 → 1,7
#include "scpreview.h"
#include <qtextstream.h>
#include <qdom.h>
#include <qmap.h>
#include <qpainter.h>
#include <qrect.h>
#include <qimage.h>
/branches/Version13x/Scribus/scribus/missing.h
6,8 → 6,8
class QHBoxLayout;
class QGridLayout;
class QPushButton;
#include "scribusdoc.h"
#include "fontcombo.h"
class FontCombo;
#include "scribusstructs.h"
 
class MissingFont : public QDialog
{
/branches/Version13x/Scribus/scribus/search.h
3,9 → 3,8
 
#include <qvariant.h>
#include <qdialog.h>
#include "scribusdoc.h"
#include "pageitem.h"
 
#include "scribusstructs.h"
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
20,6 → 19,9
class ShadeButton;
class QLabel;
 
class ScribusDoc;
class PageItem;
 
class SearchReplace : public QDialog
{
Q_OBJECT
/branches/Version13x/Scribus/scribus/scrap.h
18,7 → 18,7
#include <qtooltip.h>
#include <qpixmap.h>
#include <qdragobject.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class BibView : public QIconView
{
/branches/Version13x/Scribus/scribus/newtemp.cpp
3,6 → 3,7
extern QPixmap loadIcon(QString nam);
 
#include <qtooltip.h>
#include "scribusdoc.h"
 
NewTm::NewTm( QWidget* parent, QString text, QString titel, ScribusDoc *doc)
: QDialog( parent, "newt", true, 0 )
/branches/Version13x/Scribus/scribus/gtgettext.cpp
19,6 → 19,7
***************************************************************************/
 
#include "gtgettext.h"
#include "scribus.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
/branches/Version13x/Scribus/scribus/arrowchooser.h
2,7 → 2,7
#define ARROWCHOOSER_H
 
#include <qcombobox.h>
#include "scribusdoc.h"
#include "scribusstructs.h"
 
class ArrowChooser : public QComboBox
{
/branches/Version13x/Scribus/scribus/lineformats.h
2,12 → 2,16
#define LINEFORMATE_H
 
#include <qdialog.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include "scribusdoc.h"
 
#include "multiline.h"
#include "scribusstructs.h"
 
class QListBox;
class QPushButton;
class QVBoxLayout;
class QHBoxLayout;
class ScribusDoc;
 
class LineFormate : public QDialog
{
Q_OBJECT