Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 843 → Rev 844

/branches/Version13x/Scribus/configure.in
235,6 → 235,7
AC_CONFIG_FILES([ scribus/libpdf/Makefile ])
AC_CONFIG_FILES([ scribus/libpostscript/Makefile ])
AC_CONFIG_FILES([ scribus/libprefs/Makefile ])
AC_CONFIG_FILES([ scribus/manpages/Makefile ])
AC_CONFIG_FILES([ scribus/plugins/Makefile ])
AC_CONFIG_FILES([ scribus/plugins/fileloader/Makefile ])
AC_CONFIG_FILES([ scribus/plugins/fileloader/oodraw/Makefile ])
/branches/Version13x/Scribus/ChangeLogCVS
1,5 → 1,17
Changes since 1.2
 
09.12.2004
* bug # 984: Can Search/Replace dialog remember from last time?
* bug #1135: Page number in TTF font doesn't print
* bug #1344: crash when drawing bezier curves
* bug #1349: Auto Number-Page Bug
 
08.12.2004
* bug #1227: translatable man page
* bug #1287: calendier.py doesn't work
* bug #1366: Remove header class interdependencies
* feature #1367: Polish man page (first version)
 
07.12.2004
* bug #1073: make-dist removes the "po" dir and breaks the build. po removal must not be done
* bug #1258: Missing translation strings
/branches/Version13x/Scribus/scribus/scribusXml.cpp
2883,42 → 2883,42
dc9.setAttribute("EndArrow", Vor->DendArrow);
elem.appendChild(dc9);
QDomElement dc4=docu.createElement("MAINWINDOW");
dc4.setAttribute("XPOS",Vor->MainX);
dc4.setAttribute("YPOS",Vor->MainY);
dc4.setAttribute("WIDTH",Vor->MainW);
dc4.setAttribute("HEIGHT",Vor->MainH);
dc4.setAttribute("XPOS",Vor->mainWinSettings.xPosition);
dc4.setAttribute("YPOS",Vor->mainWinSettings.yPosition);
dc4.setAttribute("WIDTH",Vor->mainWinSettings.width);
dc4.setAttribute("HEIGHT",Vor->mainWinSettings.height);
elem.appendChild(dc4);
QDomElement dc5=docu.createElement("TOOLPALETTE");
dc5.setAttribute("VISIBLE", static_cast<int>(Vor->Werkv));
dc5.setAttribute("PDFVISIBLE", static_cast<int>(Vor->WerkvP));
dc5.setAttribute("VISIBLE", static_cast<int>(Vor->mainToolBarSettings.visible));
dc5.setAttribute("PDFVISIBLE", static_cast<int>(Vor->pdfToolBarSettings.visible));
elem.appendChild(dc5);
QDomElement dc7=docu.createElement("TREEPALETTE");
dc7.setAttribute("VISIBLE", static_cast<int>(Vor->Tpalv));
dc7.setAttribute("XPOS",Vor->Tpalx);
dc7.setAttribute("YPOS",Vor->Tpaly);
dc7.setAttribute("VISIBLE", static_cast<int>(Vor->treePalSettings.visible));
dc7.setAttribute("XPOS",Vor->treePalSettings.xPosition);
dc7.setAttribute("YPOS",Vor->treePalSettings.yPosition);
elem.appendChild(dc7);
QDomElement dc72=docu.createElement("NODEPALETTE");
dc72.setAttribute("XPOS",Vor->Npalx);
dc72.setAttribute("YPOS",Vor->Npaly);
dc72.setAttribute("XPOS",Vor->nodePalSettings.xPosition);
dc72.setAttribute("YPOS",Vor->nodePalSettings.yPosition);
elem.appendChild(dc72);
QDomElement dc73=docu.createElement("SCRAPBOOK");
dc73.setAttribute("VISIBLE", static_cast<int>(Vor->SCpalv));
dc73.setAttribute("XPOS",Vor->SCpalx);
dc73.setAttribute("YPOS",Vor->SCpaly);
dc73.setAttribute("WIDTH",Vor->SCpalw);
dc73.setAttribute("HEIGHT",Vor->SCpalh);
dc73.setAttribute("VISIBLE", static_cast<int>(Vor->scrapPalSettings.visible));
dc73.setAttribute("XPOS",Vor->scrapPalSettings.xPosition);
dc73.setAttribute("YPOS",Vor->scrapPalSettings.yPosition);
dc73.setAttribute("WIDTH",Vor->scrapPalSettings.width);
dc73.setAttribute("HEIGHT",Vor->scrapPalSettings.height);
dc73.setAttribute("PREVIEW",Vor->PSize);
dc73.setAttribute("SAVE", static_cast<int>(Vor->SaveAtQ));
elem.appendChild(dc73);
QDomElement dc74=docu.createElement("LAYERPALETTE");
dc74.setAttribute("VISIBLE", static_cast<int>(Vor->Lpalv));
dc74.setAttribute("XPOS",Vor->Lpalx);
dc74.setAttribute("YPOS",Vor->Lpaly);
dc74.setAttribute("VISIBLE", static_cast<int>(Vor->layerPalSettings.visible));
dc74.setAttribute("XPOS",Vor->layerPalSettings.xPosition);
dc74.setAttribute("YPOS",Vor->layerPalSettings.yPosition);
elem.appendChild(dc74);
QDomElement dc75=docu.createElement("PAGEPALETTE");
dc75.setAttribute("VISIBLE", static_cast<int>(Vor->Sepalv));
dc75.setAttribute("XPOS",Vor->Sepalx);
dc75.setAttribute("YPOS",Vor->Sepaly);
dc75.setAttribute("VISIBLE", static_cast<int>(Vor->pagePalSettings.visible));
dc75.setAttribute("XPOS",Vor->pagePalSettings.xPosition);
dc75.setAttribute("YPOS",Vor->pagePalSettings.yPosition);
dc75.setAttribute("THUMBS", static_cast<int>(Vor->SepalT));
dc75.setAttribute("NAMES", static_cast<int>(Vor->SepalN));
elem.appendChild(dc75);
2937,19 → 2937,19
dc76.setAttribute("AutoSaveTime", Vor->AutoSaveTime);
elem.appendChild(dc76);
QDomElement dc77=docu.createElement("BOOKPALETTE");
dc77.setAttribute("VISIBLE", static_cast<int>(Vor->Bopalv));
dc77.setAttribute("XPOS",Vor->Bopalx);
dc77.setAttribute("YPOS",Vor->Bopaly);
dc77.setAttribute("VISIBLE", static_cast<int>(Vor->bookmPalSettings.visible));
dc77.setAttribute("XPOS",Vor->bookmPalSettings.xPosition);
dc77.setAttribute("YPOS",Vor->bookmPalSettings.yPosition);
elem.appendChild(dc77);
QDomElement dc78=docu.createElement("DISTS");
dc78.setAttribute("VISIBLE", static_cast<int>(Vor->Mapalv));
dc78.setAttribute("XPOS",Vor->Mapalx);
dc78.setAttribute("YPOS",Vor->Mapaly);
dc78.setAttribute("VISIBLE", static_cast<int>(Vor->measurePalSettings.visible));
dc78.setAttribute("XPOS",Vor->measurePalSettings.xPosition);
dc78.setAttribute("YPOS",Vor->measurePalSettings.yPosition);
elem.appendChild(dc78);
QDomElement dc8=docu.createElement("MEASUREMENTS");
dc8.setAttribute("VISIBLE", static_cast<int>(Vor->Mpalv));
dc8.setAttribute("XPOS",Vor->Mpalx);
dc8.setAttribute("YPOS",Vor->Mpaly);
dc8.setAttribute("VISIBLE", static_cast<int>(Vor->mPaletteSettings.visible));
dc8.setAttribute("XPOS",Vor->mPaletteSettings.xPosition);
dc8.setAttribute("YPOS",Vor->mPaletteSettings.yPosition);
elem.appendChild(dc8);
QDomElement dc81=docu.createElement("CMS");
dc81.setAttribute("DPSo", static_cast<int>(Vor->DCMSset.SoftProofOn));
3167,49 → 3167,49
}
if (dc.tagName()=="MAINWINDOW")
{
Vorein->MainX = QStoInt(dc.attribute("XPOS"));
Vorein->MainY = QStoInt(dc.attribute("YPOS"));
Vorein->MainW = QStoInt(dc.attribute("WIDTH"));
Vorein->MainH = QStoInt(dc.attribute("HEIGHT"));
Vorein->mainWinSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->mainWinSettings.yPosition = QStoInt(dc.attribute("YPOS"));
Vorein->mainWinSettings.width = QStoInt(dc.attribute("WIDTH"));
Vorein->mainWinSettings.height = QStoInt(dc.attribute("HEIGHT"));
}
if (dc.tagName()=="TOOLPALETTE")
{
Vorein->Werkv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE","1")));
Vorein->WerkvP = static_cast<bool>(QStoInt(dc.attribute("PDFVISIBLE","1")));
Vorein->mainToolBarSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE","1")));
Vorein->pdfToolBarSettings.visible = static_cast<bool>(QStoInt(dc.attribute("PDFVISIBLE","1")));
}
if (dc.tagName()=="TREEPALETTE")
{
Vorein->Tpalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->Tpalx = QStoInt(dc.attribute("XPOS"));
Vorein->Tpaly = QStoInt(dc.attribute("YPOS"));
Vorein->treePalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->treePalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->treePalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
}
if (dc.tagName()=="LAYERPALETTE")
{
Vorein->Lpalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->Lpalx = QStoInt(dc.attribute("XPOS"));
Vorein->Lpaly = QStoInt(dc.attribute("YPOS"));
Vorein->layerPalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->layerPalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->layerPalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
}
if (dc.tagName()=="BOOKPALETTE")
{
Vorein->Bopalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->Bopalx = QStoInt(dc.attribute("XPOS"));
Vorein->Bopaly = QStoInt(dc.attribute("YPOS"));
Vorein->bookmPalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->bookmPalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->bookmPalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
}
if (dc.tagName()=="PAGEPALETTE")
{
Vorein->Sepalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->Sepalx = QStoInt(dc.attribute("XPOS"));
Vorein->Sepaly = QStoInt(dc.attribute("YPOS"));
Vorein->pagePalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->pagePalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->pagePalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
Vorein->SepalT = static_cast<bool>(QStoInt(dc.attribute("THUMBS")));
Vorein->SepalN = static_cast<bool>(QStoInt(dc.attribute("NAMES")));
}
if (dc.tagName()=="SCRAPBOOK")
{
Vorein->SCpalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->SCpalx = QStoInt(dc.attribute("XPOS"));
Vorein->SCpaly = QStoInt(dc.attribute("YPOS"));
Vorein->SCpalw = QStoInt(dc.attribute("WIDTH"));
Vorein->SCpalh = QStoInt(dc.attribute("HEIGHT"));
Vorein->scrapPalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE")));
Vorein->scrapPalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->scrapPalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
Vorein->scrapPalSettings.width = QStoInt(dc.attribute("WIDTH"));
Vorein->scrapPalSettings.height = QStoInt(dc.attribute("HEIGHT"));
Vorein->PSize = QStoInt(dc.attribute("PREVIEW"));
Vorein->SaveAtQ = static_cast<bool>(QStoInt(dc.attribute("SAVE")));
}
3244,8 → 3244,8
}
if (dc.tagName()=="NODEPALETTE")
{
Vorein->Npalx = QStoInt(dc.attribute("XPOS"));
Vorein->Npaly = QStoInt(dc.attribute("YPOS"));
Vorein->nodePalSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->nodePalSettings.yPosition = QStoInt(dc.attribute("YPOS"));
}
if (dc.tagName()=="SHORTCUT")
Vorein->KeyActions[QStoInt(dc.attribute("NR"))].KeyID = QStoInt(dc.attribute("CODE"));
3253,15 → 3253,15
Vorein->RecentDocs.append(dc.attribute("NAME"));
if (dc.tagName()=="DISTS")
{
Vorein->Mapalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE", "1")));
Vorein->Mapalx = QStoInt(dc.attribute("XPOS", "0"));
Vorein->Mapaly = QStoInt(dc.attribute("YPOS", "0"));
Vorein->measurePalSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE", "1")));
Vorein->measurePalSettings.xPosition = QStoInt(dc.attribute("XPOS", "0"));
Vorein->measurePalSettings.yPosition = QStoInt(dc.attribute("YPOS", "0"));
}
if (dc.tagName()=="MEASUREMENTS")
{
Vorein->Mpalv = static_cast<bool>(QStoInt(dc.attribute("VISIBLE", "1")));
Vorein->Mpalx = QStoInt(dc.attribute("XPOS"));
Vorein->Mpaly = QStoInt(dc.attribute("YPOS"));
Vorein->mPaletteSettings.visible = static_cast<bool>(QStoInt(dc.attribute("VISIBLE", "1")));
Vorein->mPaletteSettings.xPosition = QStoInt(dc.attribute("XPOS"));
Vorein->mPaletteSettings.yPosition = QStoInt(dc.attribute("YPOS"));
}
if (dc.tagName()=="PRINTER")
{
/branches/Version13x/Scribus/scribus/scribusstructs.h
18,480 → 18,483
#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 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;
};
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 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 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 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;
};
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;
};
 
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 arrowDesc {
QString name;
bool userArrow;
FPointArray points;
};
struct Layer
{
int LNr;
int Level;
QString Name;
bool Sichtbar;
bool Drucken;
};
 
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 PreSet {
int EffektLen;
int AnzeigeLen;
int Effekt;
int Dm;
int M;
int Di;
};
struct LPIset
{
int Frequency;
int Angle;
int SpotFunc;
};
 
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 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 Keys {
QString Name;
int MenuID;
int KeyID;
};
/** Definition der Farbenlisten */
typedef QMap<QString,CMYKColor> CListe;
 
struct typoStruct {
int valueSuperScript;
int scalingSuperScript;
int valueSubScript;
int scalingSubScript;
int valueSmallCaps;
int autoLineSpacing;
double valueBaseGrid;
double offsetBaseGrid;
};
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 {
struct windowStruct
{
int xPosition;
int yPosition;
int width;
int height;
bool visible;
bool docked;
};
 
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;
windowStruct mainToolBarSettings;
windowStruct pdfToolBarSettings;
windowStruct mPaletteSettings;
windowStruct measurePalSettings;
windowStruct treePalSettings;
windowStruct nodePalSettings;
windowStruct mainWinSettings;
windowStruct scrapPalSettings;
windowStruct layerPalSettings;
windowStruct pagePalSettings;
windowStruct bookmPalSettings;
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;
510,5 → 513,8
QString printerOptions;
};
 
typedef QMap<QString,QString> ProfilesL;
typedef QValueVector<singleLine> multiLine;
 
#endif
 
/branches/Version13x/Scribus/scribus/scribusview.cpp
2603,10 → 2603,20
{
b = SelItem.at(0);
b->PoLine.resize(b->PoLine.size()-2);
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
b->ContourLine = b->PoLine.copy();
if (b->PoLine.size() < 4)
{
// emit DelObj(Doc->ActPage->PageNr, b->ItemNr);
Doc->Items.remove(b->ItemNr);
SelItem.removeFirst();
emit HaveSel(-1);
}
else
{
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
b->ContourLine = b->PoLine.copy();
}
Doc->AppMode = 1;
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
emit PaintingDone();
6781,9 → 6791,9
else
{
EmitValues(b);
emit HaveSel(b->PType);
if (b->PType == 5)
emit ItemGeom(b->Width, b->Height);
emit HaveSel(b->PType);
}
p.end();
if (!b->ChangedMasterItem)
6917,9 → 6927,9
else
{
EmitValues(b);
emit HaveSel(b->PType);
if (b->PType == 5)
emit ItemGeom(b->Width, b->Height);
emit HaveSel(b->PType);
}
tx = p.xForm(QRect(static_cast<int>(b->Width-6), static_cast<int>(b->Height-6), 6, 6));
if (tx.contains(mpo))
10542,6 → 10552,7
updateGradientVectors(b);
}
setRedrawBounding(b);
b->OwnPage = OnPage(b);
if (!loading)
{
b->Select = true;
/branches/Version13x/Scribus/scribus/scribusdoc.h
24,7 → 24,6
#include <qdict.h>
#include <qcolor.h>
#include <qvaluelist.h>
//#include <qvaluestack.h>
#include <qvaluevector.h>
#include <qptrlist.h>
#include <qfont.h>
34,12 → 33,7
#include <qtimer.h>
 
#include "scribusstructs.h"
 
//#include "cmykcolor.h"
//#include "scfonts.h"
//#include "fpointarray.h"
#include "hyphenator.h"
//#include "vgradient.h"
#ifdef HAVE_CMS
#include CMS_INC
#endif
46,7 → 40,6
 
#include <ft2build.h>
#include FT_FREETYPE_H
//#include "pageitem.h"
class Page;
 
 
/branches/Version13x/Scribus/scribus/libabout/about.cpp
65,7 → 65,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("07").arg("December").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("08").arg("December").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
401,30 → 401,29
Prefs.PolyS = false;
Prefs.PolyFd = 0;
Prefs.PolyR = 0;
Prefs.Werkv = true;
Prefs.WerkvP = true;
Prefs.Mpalv = false;
Prefs.Mapalv = false;
Prefs.Tpalv = false;
Prefs.SCpalv = false;
Prefs.Lpalv = false;
Prefs.Bopalv = false;
Prefs.Mpalx = 0;
Prefs.Mpaly = 0;
Prefs.Mapalx = 0;
Prefs.Mapaly = 0;
Prefs.Tpalx = 0;
Prefs.Tpaly = 0;
Prefs.SCpalx = 0;
Prefs.SCpaly = 0;
Prefs.SCpalw = 100;
Prefs.SCpalh = 200;
Prefs.Sepalx = 0;
Prefs.Sepaly = 0;
Prefs.Bopalx = 0;
Prefs.Bopaly = 0;
Prefs.Lpalx = 0;
Prefs.Lpaly = 0;
Prefs.mainToolBarSettings.visible = true;
Prefs.pdfToolBarSettings.visible = true;
Prefs.mPaletteSettings.visible = false;
Prefs.measurePalSettings.visible = false;
Prefs.treePalSettings.visible = false;
Prefs.scrapPalSettings.visible = false;
Prefs.layerPalSettings.visible = false;
Prefs.bookmPalSettings.visible = false;
Prefs.pagePalSettings.visible = false;
Prefs.measurePalSettings.xPosition = 0;
Prefs.measurePalSettings.yPosition = 0;
Prefs.treePalSettings.xPosition = 0;
Prefs.treePalSettings.yPosition = 0;
Prefs.scrapPalSettings.xPosition = 0;
Prefs.scrapPalSettings.yPosition = 0;
Prefs.scrapPalSettings.width = 100;
Prefs.scrapPalSettings.height = 200;
Prefs.pagePalSettings.xPosition = 0;
Prefs.pagePalSettings.yPosition = 0;
Prefs.bookmPalSettings.xPosition = 0;
Prefs.bookmPalSettings.yPosition = 0;
Prefs.layerPalSettings.xPosition = 0;
Prefs.layerPalSettings.yPosition = 0;
Prefs.PSize = 40;
Prefs.SaveAtQ = true;
Prefs.FramesShown = true;
4985,12 → 4984,12
if (visible)
{
MaPal->show();
MaPal->move(Prefs.Mapalx, Prefs.Mapaly);
MaPal->move(Prefs.measurePalSettings.xPosition, Prefs.measurePalSettings.yPosition);
}
else
{
Prefs.Mapalx = MaPal->pos().x();
Prefs.Mapaly = MaPal->pos().y();
Prefs.measurePalSettings.xPosition = MaPal->pos().x();
Prefs.measurePalSettings.yPosition = MaPal->pos().y();
MaPal->hide();
}
}
5000,13 → 4999,12
if (visible)
{
Mpal->show();
// Mpal->TabStack->raiseWidget(0);
Mpal->move(Prefs.Mpalx, Prefs.Mpaly);
Mpal->move(Prefs.mPaletteSettings.xPosition, Prefs.mPaletteSettings.yPosition);
}
else
{
Prefs.Mpalx = Mpal->pos().x();
Prefs.Mpaly = Mpal->pos().y();
Prefs.mPaletteSettings.xPosition = Mpal->pos().x();
Prefs.mPaletteSettings.yPosition = Mpal->pos().y();
Mpal->hide();
}
toolMenu->setItemChecked(viewMpal, visible);
5023,12 → 5021,12
if (visible)
{
Tpal->show();
Tpal->move(Prefs.Tpalx, Prefs.Tpaly);
Tpal->move(Prefs.treePalSettings.xPosition, Prefs.treePalSettings.yPosition);
}
else
{
Prefs.Tpalx = Tpal->pos().x();
Prefs.Tpaly = Tpal->pos().y();
Prefs.treePalSettings.xPosition = Tpal->pos().x();
Prefs.treePalSettings.yPosition = Tpal->pos().y();
Tpal->hide();
}
toolMenu->setItemChecked(viewTpal, visible);
5045,15 → 5043,15
if (visible)
{
ScBook->show();
ScBook->move(Prefs.SCpalx, Prefs.SCpaly);
ScBook->resize(Prefs.SCpalw, Prefs.SCpalh);
ScBook->move(Prefs.scrapPalSettings.xPosition, Prefs.scrapPalSettings.yPosition);
ScBook->resize(Prefs.scrapPalSettings.width, Prefs.scrapPalSettings.height);
}
else
{
Prefs.SCpalx = ScBook->pos().x();
Prefs.SCpaly = ScBook->pos().y();
Prefs.SCpalw = ScBook->size().width();
Prefs.SCpalh = ScBook->size().height();
Prefs.scrapPalSettings.xPosition = ScBook->pos().x();
Prefs.scrapPalSettings.yPosition = ScBook->pos().y();
Prefs.scrapPalSettings.width = ScBook->size().width();
Prefs.scrapPalSettings.height = ScBook->size().height();
ScBook->hide();
}
toolMenu->setItemChecked(viewBpal, visible);
5072,12 → 5070,12
if (HaveDoc)
Lpal->setLayers(&doc->Layers, &doc->ActiveLayer);
Lpal->show();
Lpal->move(Prefs.Lpalx, Prefs.Lpaly);
Lpal->move(Prefs.layerPalSettings.xPosition, Prefs.layerPalSettings.yPosition);
}
else
{
Prefs.Lpalx = Lpal->pos().x();
Prefs.Lpaly = Lpal->pos().y();
Prefs.layerPalSettings.xPosition = Lpal->pos().x();
Prefs.layerPalSettings.yPosition = Lpal->pos().y();
Lpal->hide();
}
toolMenu->setItemChecked(viewLpal, visible);
5094,12 → 5092,12
if (visible)
{
Sepal->show();
Sepal->move(Prefs.Sepalx, Prefs.Sepaly);
Sepal->move(Prefs.pagePalSettings.xPosition, Prefs.pagePalSettings.yPosition);
}
else
{
Prefs.Sepalx = Sepal->pos().x();
Prefs.Sepaly = Sepal->pos().y();
Prefs.pagePalSettings.xPosition = Sepal->pos().x();
Prefs.pagePalSettings.yPosition = Sepal->pos().y();
Prefs.SepalT = Sepal->TemplList->Thumb;
Prefs.SepalN = Sepal->PageView->Namen;
Sepal->hide();
5118,12 → 5116,12
if (visible)
{
BookPal->show();
BookPal->move(Prefs.Bopalx, Prefs.Bopaly);
BookPal->move(Prefs.bookmPalSettings.xPosition, Prefs.bookmPalSettings.yPosition);
}
else
{
Prefs.Bopalx = BookPal->pos().x();
Prefs.Bopaly = BookPal->pos().y();
Prefs.bookmPalSettings.xPosition = BookPal->pos().x();
Prefs.bookmPalSettings.yPosition = BookPal->pos().y();
BookPal->hide();
}
toolMenu->setItemChecked(viewBopal, visible);
5303,7 → 5301,7
Npal->HaveNode(false, false);
Npal->MoveNode->setOn(true);
Npal->show();
Npal->move(Prefs.Npalx, Prefs.Npaly);
Npal->move(Prefs.nodePalSettings.xPosition, Prefs.nodePalSettings.yPosition);
doc->EditClipMode = 0;
doc->EditClip = true;
WerkTools->Select->setEnabled(false);
5340,8 → 5338,8
 
void ScribusApp::NoFrameEdit()
{
Prefs.Npalx = Npal->pos().x();
Prefs.Npaly = Npal->pos().y();
Prefs.nodePalSettings.xPosition = Npal->pos().x();
Prefs.nodePalSettings.yPosition = Npal->pos().y();
Npal->hide();
WerkTools->Select->setEnabled(true);
WerkTools->Select->setOn(true);
7069,58 → 7067,58
 
void ScribusApp::SavePrefs()
{
Prefs.MainX = abs(pos().x());
Prefs.MainY = abs(pos().y());
Prefs.MainW = size().width();
Prefs.MainH = size().height();
Prefs.Werkv = WerkTools->isVisible();
Prefs.WerkvP = WerkToolsP->isVisible();
Prefs.Mpalv = Mpal->isVisible();
Prefs.Tpalv = Tpal->isVisible();
Prefs.SCpalv = ScBook->isVisible();
Prefs.Lpalv = Lpal->isVisible();
Prefs.Sepalv = Sepal->isVisible();
Prefs.Bopalv = BookPal->isVisible();
if ((Prefs.Npalx > QApplication::desktop()->width()-100) || (Prefs.Npalx < 0))
Prefs.Npalx = 0;
if ((Prefs.Npaly > QApplication::desktop()->height()-100) || (Prefs.Npaly < 0))
Prefs.Npaly = 0;
Prefs.mainWinSettings.xPosition = abs(pos().x());
Prefs.mainWinSettings.yPosition = abs(pos().y());
Prefs.mainWinSettings.width = size().width();
Prefs.mainWinSettings.height = size().height();
Prefs.mainToolBarSettings.visible = WerkTools->isVisible();
Prefs.pdfToolBarSettings.visible = WerkToolsP->isVisible();
Prefs.mPaletteSettings.visible = Mpal->isVisible();
Prefs.treePalSettings.visible = Tpal->isVisible();
Prefs.scrapPalSettings.visible = ScBook->isVisible();
Prefs.layerPalSettings.visible = Lpal->isVisible();
Prefs.pagePalSettings.visible = Sepal->isVisible();
Prefs.bookmPalSettings.visible = BookPal->isVisible();
if ((Prefs.nodePalSettings.xPosition > QApplication::desktop()->width()-100) || (Prefs.nodePalSettings.xPosition < 0))
Prefs.nodePalSettings.xPosition = 0;
if ((Prefs.nodePalSettings.yPosition > QApplication::desktop()->height()-100) || (Prefs.nodePalSettings.yPosition < 0))
Prefs.nodePalSettings.yPosition = 0;
if (MaPal->isVisible())
{
Prefs.Mapalx = abs(MaPal->pos().x());
Prefs.Mapaly = abs(MaPal->pos().y());
Prefs.measurePalSettings.xPosition = abs(MaPal->pos().x());
Prefs.measurePalSettings.yPosition = abs(MaPal->pos().y());
}
if (Mpal->isVisible())
{
Prefs.Mpalx = abs(Mpal->pos().x());
Prefs.Mpaly = abs(Mpal->pos().y());
Prefs.mPaletteSettings.xPosition = abs(Mpal->pos().x());
Prefs.mPaletteSettings.yPosition = abs(Mpal->pos().y());
}
if (Tpal->isVisible())
{
Prefs.Tpalx = abs(Tpal->pos().x());
Prefs.Tpaly = abs(Tpal->pos().y());
Prefs.treePalSettings.xPosition = abs(Tpal->pos().x());
Prefs.treePalSettings.yPosition = abs(Tpal->pos().y());
}
if (ScBook->isVisible())
{
Prefs.SCpalx = abs(ScBook->pos().x());
Prefs.SCpaly = abs(ScBook->pos().y());
Prefs.SCpalw = abs(ScBook->size().width());
Prefs.SCpalh = abs(ScBook->size().height());
Prefs.scrapPalSettings.xPosition = abs(ScBook->pos().x());
Prefs.scrapPalSettings.yPosition = abs(ScBook->pos().y());
Prefs.scrapPalSettings.width = abs(ScBook->size().width());
Prefs.scrapPalSettings.height = abs(ScBook->size().height());
}
if (Sepal->isVisible())
{
Prefs.Sepalx = abs(Sepal->pos().x());
Prefs.Sepaly = abs(Sepal->pos().y());
Prefs.pagePalSettings.xPosition = abs(Sepal->pos().x());
Prefs.pagePalSettings.yPosition = abs(Sepal->pos().y());
}
if (BookPal->isVisible())
{
Prefs.Bopalx = abs(BookPal->pos().x());
Prefs.Bopaly = abs(BookPal->pos().y());
Prefs.bookmPalSettings.xPosition = abs(BookPal->pos().x());
Prefs.bookmPalSettings.yPosition = abs(BookPal->pos().y());
}
if (Lpal->isVisible())
{
Prefs.Lpalx = abs(Lpal->pos().x());
Prefs.Lpaly = abs(Lpal->pos().y());
Prefs.layerPalSettings.xPosition = abs(Lpal->pos().x());
Prefs.layerPalSettings.yPosition = abs(Lpal->pos().y());
}
Prefs.RecentDocs.clear();
uint max = QMIN(Prefs.RecentDCount, RecentDocs.count());
7173,17 → 7171,17
recentMenu->insertItem(QString::fromUtf8(Prefs.RecentDocs[m]));
}
}
MaPal->move(Prefs.Mapalx, Prefs.Mapaly);
Mpal->move(Prefs.Mpalx, Prefs.Mpaly);
Tpal->move(Prefs.Tpalx, Prefs.Tpaly);
Lpal->move(Prefs.Lpalx, Prefs.Lpaly);
Sepal->move(Prefs.Sepalx, Prefs.Sepaly);
BookPal->move(Prefs.Bopalx, Prefs.Bopaly);
ScBook->move(Prefs.SCpalx, Prefs.SCpaly);
ScBook->resize(Prefs.SCpalw, Prefs.SCpalh);
Npal->move(Prefs.Npalx, Prefs.Npaly);
move(Prefs.MainX, Prefs.MainY);
resize(Prefs.MainW, Prefs.MainH);
MaPal->move(Prefs.measurePalSettings.xPosition, Prefs.measurePalSettings.yPosition);
Mpal->move(Prefs.mPaletteSettings.xPosition, Prefs.mPaletteSettings.yPosition);
Tpal->move(Prefs.treePalSettings.xPosition, Prefs.treePalSettings.yPosition);
Lpal->move(Prefs.layerPalSettings.xPosition, Prefs.layerPalSettings.yPosition);
Sepal->move(Prefs.pagePalSettings.xPosition, Prefs.pagePalSettings.yPosition);
BookPal->move(Prefs.bookmPalSettings.xPosition, Prefs.bookmPalSettings.yPosition);
ScBook->move(Prefs.scrapPalSettings.xPosition, Prefs.scrapPalSettings.yPosition);
ScBook->resize(Prefs.scrapPalSettings.width, Prefs.scrapPalSettings.height);
Npal->move(Prefs.nodePalSettings.xPosition, Prefs.nodePalSettings.yPosition);
move(Prefs.mainWinSettings.xPosition, Prefs.mainWinSettings.yPosition);
resize(Prefs.mainWinSettings.width, Prefs.mainWinSettings.height);
ReadPrefsXML();
}
 
7210,15 → 7208,15
mess += tr("Ghostscript : You cannot use EPS Images")+"\n\n";
QMessageBox::warning(this, tr("Warning"), mess, 1, 0, 0);
}
setTools(Prefs.Werkv);
setPDFTools(Prefs.WerkvP);
setMapal(Prefs.Mapalv);
setMpal(Prefs.Mpalv);
setTpal(Prefs.Tpalv);
setBpal(Prefs.SCpalv);
setLpal(Prefs.Lpalv);
setSepal(Prefs.Sepalv);
setBookpal(Prefs.Bopalv);
setTools(Prefs.mainToolBarSettings.visible);
setPDFTools(Prefs.pdfToolBarSettings.visible);
setMapal(Prefs.measurePalSettings.visible);
setMpal(Prefs.mPaletteSettings.visible);
setTpal(Prefs.treePalSettings.visible);
setBpal(Prefs.scrapPalSettings.visible);
setLpal(Prefs.layerPalSettings.visible);
setSepal(Prefs.pagePalSettings.visible);
setBookpal(Prefs.bookmPalSettings.visible);
setActiveWindow();
raise();
}
9181,6 → 9179,18
chx = chx.upper();
chr = chx[0].unicode();
}
if (chr == 30)
{
for (uint numco = 0x30; numco < 0x39; ++numco)
{
if ((*doc->AllFonts)[it->Ptext.at(e)->cfont]->CharWidth.contains(numco))
{
gly = (*doc->AllFonts)[it->Ptext.at(e)->cfont]->GlyphArray[numco].Outlines.copy();
(*doc->AllFonts)[it->Ptext.at(e)->cfont]->RealGlyphs.insert(numco, gly);
}
}
continue;
}
if ((*doc->AllFonts)[it->Ptext.at(e)->cfont]->CharWidth.contains(chr))
{
gly = (*doc->AllFonts)[it->Ptext.at(e)->cfont]->GlyphArray[chr].Outlines.copy();