Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5214 → Rev 5215

/branches/Version13x/Scribus/scribus/fileloader.cpp
511,7 → 511,7
 
bool FileLoader::ReadPage(const QString & fileName, SCFonts &avail, ScribusDoc *doc, int PageToLoad, bool Mpage, QString renamedPageName)
{
struct ParagraphStyle vg;
ParagraphStyle vg;
struct Layer la;
struct ScribusDoc::BookMa bok;
PageItem *Neu;
908,7 → 908,7
 
bool FileLoader::ReadDoc(const QString & fileName, SCFonts &avail, ScribusDoc *doc, QProgressBar *dia2)
{
struct ParagraphStyle vg;
ParagraphStyle vg;
struct Layer la;
struct ScribusDoc::BookMa bok;
int counter;//, Pgc;
2380,7 → 2380,7
return currItem;
}
 
void FileLoader::GetStyle(QDomElement *pg, struct ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl)
void FileLoader::GetStyle(QDomElement *pg, ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl)
{
bool fou;
QString tmpf, tmf, tmV;
/branches/Version13x/Scribus/scribus/edit1format.h
39,7 → 39,7
Q_OBJECT
 
public:
EditStyle( QWidget* parent, struct ParagraphStyle *vor, QValueList<ParagraphStyle> v, bool neu,
EditStyle( QWidget* parent, ParagraphStyle *vor, QValueList<ParagraphStyle> v, bool neu,
double au, int dEin, ScribusDoc *doc);
~EditStyle();
 
85,7 → 85,7
MSpinBox* DropDist;
QPushButton* Cancel;
QPushButton* OkButton;
struct ParagraphStyle *werte;
ParagraphStyle *werte;
QValueList<ParagraphStyle> allV;
QString OldName;
bool IsNew;
/branches/Version13x/Scribus/scribus/multiprogressdialog.h
27,6 → 27,7
#ifndef MULTIPROGRESSDIALOG_H
#define MULTIPROGRESSDIALOG_H
 
#include "scribusapi.h"
#include "multiprogressdialogbase.h"
 
#include <qprogressbar.h>
38,7 → 39,7
#include <qdialog.h>
#include <qmap.h>
 
class MultiProgressDialog : public MultiProgressDialogBase
class SCRIBUS_API MultiProgressDialog : public MultiProgressDialogBase
{
Q_OBJECT
 
/branches/Version13x/Scribus/scribus/undomanager.h
34,10 → 34,10
#include "scribusapi.h"
#include "undostate.h"
#include "undoobject.h"
#include "undostack.h"
 
class QString;
class QPixmap;
class UndoStack;
class UndoGui;
class PrefsContext;
 
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
221,7 → 221,7
toolSettings.dTextBackGround = prefsData.toolSettings.dTextBackGround;
if (prefsData.toolSettings.dTextLineColor != CommonStrings::None)
PageColors.insert(prefsData.toolSettings.dTextLineColor, prefsData.DColors[prefsData.toolSettings.dTextLineColor]);
struct ParagraphStyle vg;
ParagraphStyle vg;
vg.setName("Normal Internal");
vg.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
vg.setLineSpacing(15);
/branches/Version13x/Scribus/scribus/editformats.cpp
277,7 → 277,7
{
int selectedIndex=ListBox1->currentItem();
int topIndex=ListBox1->topItem();
struct ParagraphStyle sty;
ParagraphStyle sty;
sty.setName(tr("New Style"));
sty.setLineSpacingMode(static_cast<ParagraphStyle::LineSpacingMode>(0));
sty.setLineSpacing(((Docu->toolSettings.defSize / 10.0) *
/branches/Version13x/Scribus/scribus/scribusXml.h
49,7 → 49,7
void GetItemText(QDomElement *it, ScribusDoc *doc, bool VorLFound, bool impo, PageItem* obj = 0);
void SetItemProps(QDomElement *ob, PageItem* item, bool newFormat);
bool ReadLStyles(QString fileName, QMap<QString,multiLine> *Sty);
void GetStyle(QDomElement *pg, struct ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl);
void GetStyle(QDomElement *pg, ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl);
bool ReadStyles(QString fileName, ScribusDoc* doc);
bool ReadColors(QString fileName);
bool ReadPageCount(QString fileName, int *num1, int *num2);
/branches/Version13x/Scribus/scribus/scribusXml.cpp
510,7 → 510,7
return true;
}
 
void ScriXmlDoc::GetStyle(QDomElement *pg, struct ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl)
void ScriXmlDoc::GetStyle(QDomElement *pg, ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl)
{
bool fou;
QString tmpf, tmf, tmV;
779,7 → 779,7
bool ScriXmlDoc::ReadPage(QString fileName, SCFonts &avail, ScribusDoc *doc, ScribusView *view, int PageToLoad, bool Mpage)
{
struct CopyPasteBuffer OB;
struct ParagraphStyle vg;
ParagraphStyle vg;
struct Layer la;
struct ScribusDoc::BookMa bok;
struct Linked Link;
/branches/Version13x/Scribus/scribus/fileloader.h
36,7 → 36,7
bool ReadDoc(const QString & fileName, SCFonts &avail, ScribusDoc *doc, QProgressBar *dia2);
void GetItemText(QDomElement *it, ScribusDoc *doc, PageItem* obj, bool impo=false, bool VorLFound=false);
PageItem* PasteItem(QDomElement *obj, ScribusDoc *doc);
void GetStyle(QDomElement *pg, struct ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl);
void GetStyle(QDomElement *pg, ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl);
bool postLoad();
void informReplacementFonts();
QString FileName;
/branches/Version13x/Scribus/scribus/edit1format.cpp
28,7 → 28,7
#include "sampleitem.h"
 
 
EditStyle::EditStyle( QWidget* parent, struct ParagraphStyle *vor, QValueList<ParagraphStyle> v, bool neu, double au, int dEin, ScribusDoc *doc)
EditStyle::EditStyle( QWidget* parent, ParagraphStyle *vor, QValueList<ParagraphStyle> v, bool neu, double au, int dEin, ScribusDoc *doc)
: QDialog( parent, "EditST", true, 0)
{
qApp->setOverrideCursor(QCursor(waitCursor));
/branches/Version13x/Scribus/scribus/sctextstruct.h
300,7 → 300,7
cshade = NOVALUE;
if (other.cshade2 == cshade2)
cshade2 = NOVALUE;
if (other.cstyle & ScStyle_UserStyles == cstyle & ScStyle_UserStyles)
if ((other.cstyle & ScStyle_UserStyles) == (cstyle & ScStyle_UserStyles))
cstyle = ScStyle_None;
if (other.cscale == cscale)
cscale = NOVALUE;