Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 198 → Rev 199

/trunk/Scribus/configure.in
13,7 → 13,7
AC_ARG_PROGRAM
 
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(scribus,1.1.5)
AM_INIT_AUTOMAKE(scribus,1.2cvs)
 
dnl KDE_SET_PREFIX
 
/trunk/Scribus/ChangeLogCVS
1,2 → 1,8
Changes since Version 1.1.5
15.02.2004 Fixed some mismatches in the German Translation.
Updated the Czech Translation.
Fixed Bug #268
Fixed Problem with changing Fontsizes in Textframes with no Styles when editing Styles.
Fixed Bug #223
 
 
/trunk/Scribus/Scribus.pro
75,6 → 75,7
scribus/page.cpp \
scribus/pageback.cpp \
scribus/pageitem.cpp \
scribus/pageselector.cpp \
scribus/pdfopts.cpp \
scribus/picsearch.cpp \
scribus/picstatus.cpp \
/trunk/Scribus/scribus/pageselector.h
0,0 → 1,54
#ifndef PAGESELECTOR_H
#define PAGESELECTOR_H
 
#include <qvariant.h>
#include <qpixmap.h>
#include <qwidget.h>
#include <qvalidator.h>
 
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QComboBox;
class QLabel;
class QPushButton;
 
class PageSelector : public QWidget
{
Q_OBJECT
 
public:
PageSelector( QWidget* parent, int maxPg );
~PageSelector() {};
 
QPushButton* Start;
QPushButton* Back;
QLabel* Label1;
QComboBox* PageCombo;
QLabel* Label2;
QPushButton* Forward;
QPushButton* Last;
QIntValidator *v;
int LastPG;
int APage;
 
public slots:
virtual void GotoPg(int);
virtual void setMaxValue(int);
 
private slots:
virtual void GotoPgE(int);
virtual void ToStart();
virtual void ToEnd();
virtual void goBk();
virtual void goFw();
 
protected:
QHBoxLayout* PageSelectorLayout;
 
signals:
void GotoPage(int);
 
};
 
#endif // PAGESELECTOR_H
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: Scribus/scribus/alignselect.cpp
===================================================================
--- Scribus/scribus/alignselect.cpp (revision 198)
+++ Scribus/scribus/alignselect.cpp (revision 199)
@@ -55,24 +55,6 @@
void AlignSelect::setStyle(int s)
{
setButton(s == 1 ? 2 : s == 2 ? 1 : s);
-/* switch (s)
- {
- case 0:
- setButton(0);
- break;
- case 2:
- setButton(1);
- break;
- case 1:
- setButton(2);
- break;
- case 3:
- setButton(3);
- break;
- case 4:
- setButton(4);
- break;
- }*/
}
int AlignSelect::getStyle()
@@ -94,22 +76,4 @@
void AlignSelect::setTypeStyle(int a)
{
emit State(a == 1 ? 2 : a == 2 ? 1 : a);
- /*switch (a)
- {
- case 0:
- emit State(0);
- break;
- case 1:
- emit State(2);
- break;
- case 2:
- emit State(1);
- break;
- case 3:
- emit State(3);
- break;
- case 4:
- emit State(4);
- break;
- }*/
}
/trunk/Scribus/scribus/scribusview.cpp
68,11 → 68,7
SB2 = new QPushButton(this);
SB2->setFocusPolicy(QWidget::NoFocus);
SB2->setPixmap(loadIcon("Gross.xpm"));
PGS = new QSpinBox(this);
PGS->setMinValue(1);
PGS->setMaxValue(1);
PGS->setPrefix( tr("Page "));
PGS->setSuffix( tr( " of %1").arg(1) );
PGS = new PageSelector(this, 1);
PGS->setFont(fo);
PGS->setFocusPolicy(QWidget::ClickFocus);
LY = new QPushButton(this);
115,7 → 111,7
connect(SB1, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
connect(SB2, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
connect(LE, SIGNAL(valueChanged(int)), this, SLOT(Zval()));
connect(PGS, SIGNAL(valueChanged(int)), this, SLOT(GotoPa(int)));
connect(PGS, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));
connect(Laymen, SIGNAL(activated(int)), this, SLOT(GotoLa(int)));
connect(Unitmen, SIGNAL(activated(int)), this, SLOT(ChgUnit(int)));
connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(setRulerPos(int, int)));
150,8 → 146,8
LE->setGeometry(x, y, 60+sadj, h);
SB1->setGeometry(x+60+sadj, y, 15, h);
SB2->setGeometry(x+75+sadj, y, 15, h);
PGS->setGeometry(x+90+sadj, y, 80, h);
LY->setGeometry(x+170+sadj, y, 110, h);
PGS->setGeometry(x+90+sadj, y, 215, h);
LY->setGeometry(x+305+sadj, y, 110, h);
HR->setGeometry(25, 1, w-24, 25);
}
}
185,7 → 181,7
setFocus();
}
 
/** Fügt eine Seite hinzu */
/** Fgt eine Seite hinzu */
Page* ScribusView::addPage(int nr)
{
int z;
221,12 → 217,8
Doc->FirstAuto->Dirty = true;
}
PGS->setMaxValue(Doc->PageC);
if (!ScApp->ScriptRunning)
{
PGS->setPrefix( tr("Page "));
PGS->setSuffix( tr( " of %1").arg(Doc->PageC) );
PGS->setValue(nr+1);
}
if ((!ScApp->ScriptRunning) && (!Doc->loading))
PGS->GotoPg(nr);
fe->setMouseTracking(true);
connect(fe, SIGNAL(Hrule(int)), HR, SLOT(Draw(int)));
connect(fe, SIGNAL(Vrule(int)), VR, SLOT(Draw(int)));
239,13 → 231,13
return fe;
}
 
/** Löscht eine Seite */
/** Lscht eine Seite */
void ScribusView::delPage(int Nr)
{
if (Doc->PageC == 1)
{ return; }
return;
if (Doc->PageC < Nr-1)
{ return; }
return;
removeChild(Pages.at(Nr)->parentWidget());
delete Pages.at(Nr)->parentWidget();
Pages.remove(Nr);
253,9 → 245,7
Doc->PageC -= 1;
Doc->ActPage = Pages.at(0);
PGS->setMaxValue(Doc->PageC);
PGS->setPrefix( tr("Page "));
PGS->setSuffix( tr( " of %1").arg(Doc->PageC) );
PGS->setValue(1);
PGS->GotoPg(0);
}
 
void ScribusView::movePage(int from, int to, int ziel, int art)
416,12 → 406,11
{
if (ScApp->ScriptRunning)
return;
disconnect(PGS, SIGNAL(valueChanged(int)), this, SLOT(GotoPa(int)));
PGS->setPrefix( tr("Page "));
PGS->setSuffix( tr( " of %1").arg(Doc->PageC) );
disconnect(PGS, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));
PGS->setMaxValue(Doc->PageC);
PGS->setValue(Seite+1);
connect(PGS, SIGNAL(valueChanged(int)), this, SLOT(GotoPa(int)));
if (!Doc->loading)
PGS->GotoPg(Seite);
connect(PGS, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));
}
 
void ScribusView::setLayMenTxt(int l)
564,10 → 553,11
return;
setContentsPos(static_cast<int>(childX(Doc->ActPage->parentWidget())-10*Doc->Scale), static_cast<int>(childY(Doc->ActPage->parentWidget())-10*Doc->Scale));
PGS->setMaxValue(Doc->PageC);
PGS->setValue(Seite+1);
if (!Doc->loading)
PGS->GotoPg(Seite);
}
 
/** Vergrößert die Ansicht */
/** Vergr�rt die Ansicht */
void ScribusView::slotZoomIn()
{
Doc->Scale *= 2;
583,7 → 573,7
slotDoZoom();
}
 
/** Vergrößert die Ansicht */
/** Vergr�rt die Ansicht */
void ScribusView::slotZoomIn2()
{
Doc->Scale += static_cast<double>(Doc->MagStep)/100;
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(14).arg("February").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(15).arg("February").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/Makefile.am
1,13 → 1,13
bin_PROGRAMS = scribus
 
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
INTERFACES =
TRANSLATIONS =
 
SUBDIRS = icons libabout libprefs plugins libpostscript libpdf profiles dicts po qm
 
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.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 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 rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.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.hpageselector.cpp pageselector.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 rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/
/trunk/Scribus/scribus/newfile.cpp
341,6 → 341,11
ein = units[u];
int decimals;
 
double AltUmrech = Umrech;
double oldB = Breite->minValue() / AltUmrech;
double oldBM = Breite->maxValue() / AltUmrech;
double oldH = Hoehe->minValue() / AltUmrech;
double oldHM = Hoehe->maxValue() / AltUmrech;
switch (u)
{
case 0:
376,6 → 381,10
disconnect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
disconnect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
disconnect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
Breite->setMinValue(oldB * Umrech);
Breite->setMaxValue(oldBM * Umrech);
Hoehe->setMinValue(oldH * Umrech);
Hoehe->setMaxValue(oldHM * Umrech);
Breite->setValue(Pagebr * Umrech);
Hoehe->setValue(Pageho * Umrech);
RightR->setMaxValue(Breite->value() - Left * Umrech);
/trunk/Scribus/scribus/mspinbox.h
33,6 → 33,8
void setMinValue(double val);
void setValue(double val);
double value();
double minValue();
double maxValue();
QString mapValueToText(int value);
int mapTextToValue(bool *ok);
int Decimals;
/trunk/Scribus/scribus/scribus.cpp
2057,7 → 2057,7
doc->CurrentABStil = 0;
slotChangeUnit(doc->Einheit);
doc->Trenner = new Hyphenator(this, doc, this);
BuildFontMenu();
BuildFontMenu();
connect(view, SIGNAL(changeUN(int)), this, SLOT(slotChangeUnit(int)));
connect(view, SIGNAL(changeLA(int)), Lpal, SLOT(MarkActiveLayer(int)));
doc->PDF_Optionen.BleedBottom = doc->PageM.Bottom;
4785,7 → 4785,7
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
// ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
4821,7 → 4821,7
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
// ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
4876,13 → 4876,6
{
AliMenu->setItemChecked(AliMenu->idAt(b), false);
}
/* if (a < 5)
{
Mpal->Spal->setCurrentItem(0);
AliMenu->setItemChecked(AliMenu->idAt(a), true);
}
else
Mpal->Spal->setCurrentItem(a-4); */
}
 
void ScribusApp::slotEditColors()
/trunk/Scribus/scribus/libprefs/prefs.cpp
18,7 → 18,7
 
extern "C" void* Run(QWidget *d, preV *Vor);
 
/*!
/*!
\fn void* Run(QWidget *d, preV *Vor)
\author Franz Schmid
\date
33,7 → 33,7
return dia;
}
 
/*!
/*!
\fn Preferences::Preferences( QWidget* parent, preV *Vor)
\author Franz Schmid
\date
42,13 → 42,13
\retval Preferences dialog
*/
Preferences::Preferences( QWidget* parent, preV *Vor)
: QDialog( parent, "pref", true, 0 )
: QDialog( parent, "pref", true, 0 )
{
int decimals;
fon = &Vor->AvailFonts;
fon = &Vor->AvailFonts;
ap = (ScribusApp*)parent;
Umrech = 1.0;
Einheit = ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit;
Umrech = 1.0;
Einheit = ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit;
int f[] = {100, 1000, 10000};
if (Einheit == 3)
decimals = f[0];
55,15 → 55,15
else
decimals = f[Einheit];
DisScale = Vor->DisScale;
KKC = Vor->KeyActions;
setCaption( tr( "Preferences" ) );
setIcon(loadIcon("AppIcon.png"));
setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
PrefsLayout = new QVBoxLayout( this );
PrefsLayout->setSpacing( 6 );
PrefsLayout->setMargin( 11 );
KKC = Vor->KeyActions;
setCaption( tr( "Preferences" ) );
setIcon(loadIcon("AppIcon.png"));
setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
PrefsLayout = new QVBoxLayout( this );
PrefsLayout->setSpacing( 6 );
PrefsLayout->setMargin( 11 );
 
PrefsLayout2 = new QHBoxLayout(0, 0, 6);
PrefsLayout2 = new QHBoxLayout(0, 0, 6);
 
TabListe = new QListBox(this, "StyledL");
QString ar_tab[] = { tr("General"), tr("Document"), tr("Guides"), tr("Typography"), tr("Tools"), tr("Scrapbook"), tr("Display")};
72,453 → 72,453
TabListe->insertItem(ar_tab[s]);
PrefsLayout2->addWidget(TabListe);
 
TabWidget3 = new QWidgetStack( this, "TabWidget3" );
TabWidget3->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
TabWidget3->setFrameShape( QWidgetStack::StyledPanel );
TabWidget3->setFrameShadow( QWidgetStack::Sunken );
tab = new QWidget( TabWidget3, "tab" );
tabLayout = new QGridLayout( tab );
tabLayout->setSpacing( 6 );
tabLayout->setMargin( 10 );
ButtonGroup1 = new QButtonGroup( tab, "ButtonGroup1" );
ButtonGroup1->setTitle( tr( "GUI" ) );
ButtonGroup1->setColumnLayout(0, Qt::Vertical );
ButtonGroup1->layout()->setSpacing( 0 );
ButtonGroup1->layout()->setMargin( 0 );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
ButtonGroup1Layout->setSpacing( 6 );
ButtonGroup1Layout->setMargin( 10 );
TextGstil = new QLabel(ButtonGroup1, "dd");
TextGstil->setText( tr("Theme"));
ButtonGroup1Layout->addWidget( TextGstil, 0, 0 );
GUICombo = new QComboBox( true, ButtonGroup1, "GUICombo" );
TabWidget3 = new QWidgetStack( this, "TabWidget3" );
TabWidget3->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
TabWidget3->setFrameShape( QWidgetStack::StyledPanel );
TabWidget3->setFrameShadow( QWidgetStack::Sunken );
tab = new QWidget( TabWidget3, "tab" );
tabLayout = new QGridLayout( tab );
tabLayout->setSpacing( 6 );
tabLayout->setMargin( 10 );
ButtonGroup1 = new QButtonGroup( tab, "ButtonGroup1" );
ButtonGroup1->setTitle( tr( "GUI" ) );
ButtonGroup1->setColumnLayout(0, Qt::Vertical );
ButtonGroup1->layout()->setSpacing( 0 );
ButtonGroup1->layout()->setMargin( 0 );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
ButtonGroup1Layout->setSpacing( 6 );
ButtonGroup1Layout->setMargin( 10 );
TextGstil = new QLabel(ButtonGroup1, "dd");
TextGstil->setText( tr("Theme"));
ButtonGroup1Layout->addWidget( TextGstil, 0, 0 );
GUICombo = new QComboBox( true, ButtonGroup1, "GUICombo" );
QStringList STtest;
STtest = QStyleFactory::keys();
for (uint stt = 0; stt < STtest.count(); ++stt)
GUICombo->insertItem(STtest[stt]);
GUICombo->setEditable(false);
GUICombo->setCurrentText(Vor->GUI);
ButtonGroup1Layout->addWidget( GUICombo, 0, 1, Qt::AlignRight );
TextGstil2 = new QLabel(ButtonGroup1, "dd");
TextGstil2->setText( tr("Font Size:"));
ButtonGroup1Layout->addWidget( TextGstil2, 1, 0 );
GFsize = new QSpinBox(ButtonGroup1, "gfs" );
GFsize->setSuffix( tr( " pts" ) );
GFsize->setMaxValue( 22 );
GFsize->setMinValue( 8 );
GFsize->setValue( Vor->AppFontSize );
ButtonGroup1Layout->addWidget( GFsize, 1, 1, Qt::AlignRight );
tabLayout->addWidget( ButtonGroup1, 0, 0 );
GroupBox20 = new QGroupBox( tab, "GroupBox20" );
GroupBox20->setTitle( tr( "Units" ) );
GroupBox20->setColumnLayout(0, Qt::Vertical );
GroupBox20->layout()->setSpacing( 0 );
GroupBox20->layout()->setMargin( 0 );
GroupBox20Layout = new QHBoxLayout( GroupBox20->layout() );
GroupBox20Layout->setAlignment( Qt::AlignTop );
GroupBox20Layout->setSpacing( 0 );
GroupBox20Layout->setMargin( 25 );
UnitCombo = new QComboBox( true, GroupBox20, "UnitCombo" );
UnitCombo->insertItem( tr( "Points (pt)" ) );
UnitCombo->insertItem( tr( "Millimetres (mm)" ) );
UnitCombo->insertItem( tr( "Inches (in)" ) );
UnitCombo->insertItem( tr( "Picas (p)" ) );
UnitCombo->setEditable(false);
UnitCombo->setCurrentItem(ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit);
GroupBox20Layout->addWidget( UnitCombo );
tabLayout->addWidget( GroupBox20, 1, 0 );
Mouse = new QGroupBox( tab, "Mouse" );
Mouse->setTitle( tr( "Mouse-Settings" ) );
Mouse->setColumnLayout(0, Qt::Vertical );
Mouse->layout()->setSpacing( 0 );
Mouse->layout()->setMargin( 0 );
MouseLayout = new QHBoxLayout( Mouse->layout() );
MouseLayout->setAlignment( Qt::AlignTop );
MouseLayout->setSpacing( 6 );
MouseLayout->setMargin( 10 );
Layout5 = new QGridLayout;
Layout5->setSpacing( 6 );
Layout5->setMargin( 0 );
TextLabel1_2 = new QLabel( Mouse, "TextLabel1_2" );
TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
GUICombo->setEditable(false);
GUICombo->setCurrentText(Vor->GUI);
ButtonGroup1Layout->addWidget( GUICombo, 0, 1, Qt::AlignRight );
TextGstil2 = new QLabel(ButtonGroup1, "dd");
TextGstil2->setText( tr("Font Size:"));
ButtonGroup1Layout->addWidget( TextGstil2, 1, 0 );
GFsize = new QSpinBox(ButtonGroup1, "gfs" );
GFsize->setSuffix( tr( " pts" ) );
GFsize->setMaxValue( 22 );
GFsize->setMinValue( 8 );
GFsize->setValue( Vor->AppFontSize );
ButtonGroup1Layout->addWidget( GFsize, 1, 1, Qt::AlignRight );
tabLayout->addWidget( ButtonGroup1, 0, 0 );
GroupBox20 = new QGroupBox( tab, "GroupBox20" );
GroupBox20->setTitle( tr( "Units" ) );
GroupBox20->setColumnLayout(0, Qt::Vertical );
GroupBox20->layout()->setSpacing( 0 );
GroupBox20->layout()->setMargin( 0 );
GroupBox20Layout = new QHBoxLayout( GroupBox20->layout() );
GroupBox20Layout->setAlignment( Qt::AlignTop );
GroupBox20Layout->setSpacing( 0 );
GroupBox20Layout->setMargin( 25 );
UnitCombo = new QComboBox( true, GroupBox20, "UnitCombo" );
UnitCombo->insertItem( tr( "Points (pt)" ) );
UnitCombo->insertItem( tr( "Millimetres (mm)" ) );
UnitCombo->insertItem( tr( "Inches (in)" ) );
UnitCombo->insertItem( tr( "Picas (p)" ) );
UnitCombo->setEditable(false);
UnitCombo->setCurrentItem(ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit);
GroupBox20Layout->addWidget( UnitCombo );
tabLayout->addWidget( GroupBox20, 1, 0 );
Mouse = new QGroupBox( tab, "Mouse" );
Mouse->setTitle( tr( "Mouse-Settings" ) );
Mouse->setColumnLayout(0, Qt::Vertical );
Mouse->layout()->setSpacing( 0 );
Mouse->layout()->setMargin( 0 );
MouseLayout = new QHBoxLayout( Mouse->layout() );
MouseLayout->setAlignment( Qt::AlignTop );
MouseLayout->setSpacing( 6 );
MouseLayout->setMargin( 10 );
Layout5 = new QGridLayout;
Layout5->setSpacing( 6 );
Layout5->setMargin( 0 );
TextLabel1_2 = new QLabel( Mouse, "TextLabel1_2" );
TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2->setText( tr( "Wheel-Jump" ) );
Layout5->addWidget( TextLabel1_2, 0, 0 );
SpinBox3 = new QSpinBox( Mouse, "SpinBox3" );
SpinBox3->setMaxValue( 1000 );
SpinBox3->setMinValue( 0 );
SpinBox3->setLineStep( 10 );
SpinBox3->setValue( Vor->Wheelval );
Layout5->addWidget( SpinBox3, 0, 1 );
TextLabel1_2_2 = new QLabel( Mouse, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setText( tr( "Grab-Radius" ) );
Layout5->addWidget( TextLabel1_2_2, 1, 0 );
SpinBox3_2 = new QSpinBox( Mouse, "SpinBox3_2" );
SpinBox3_2->setMaxValue( 1000 );
SpinBox3_2->setMinValue( 1 );
SpinBox3_2->setLineStep( 1 );
SpinBox3_2->setValue(ap->HaveDoc ? ap->doc->GrabRad : Vor->GrabRad );
Layout5->addWidget( SpinBox3_2, 1, 1 );
MouseLayout->addLayout( Layout5 );
tabLayout->addWidget( Mouse, 0, 1 );
Layout5->addWidget( TextLabel1_2, 0, 0 );
SpinBox3 = new QSpinBox( Mouse, "SpinBox3" );
SpinBox3->setMaxValue( 1000 );
SpinBox3->setMinValue( 0 );
SpinBox3->setLineStep( 10 );
SpinBox3->setValue( Vor->Wheelval );
Layout5->addWidget( SpinBox3, 0, 1 );
TextLabel1_2_2 = new QLabel( Mouse, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setText( tr( "Grab-Radius" ) );
Layout5->addWidget( TextLabel1_2_2, 1, 0 );
SpinBox3_2 = new QSpinBox( Mouse, "SpinBox3_2" );
SpinBox3_2->setMaxValue( 1000 );
SpinBox3_2->setMinValue( 1 );
SpinBox3_2->setLineStep( 1 );
SpinBox3_2->setValue(ap->HaveDoc ? ap->doc->GrabRad : Vor->GrabRad );
Layout5->addWidget( SpinBox3_2, 1, 1 );
MouseLayout->addLayout( Layout5 );
tabLayout->addWidget( Mouse, 0, 1 );
 
GroupBox20b = new QGroupBox( tab, "GroupBox20b" );
GroupBox20b->setTitle( tr( "Menus" ) );
GroupBox20b->setColumnLayout(0, Qt::Vertical );
GroupBox20b->layout()->setSpacing( 0 );
GroupBox20b->layout()->setMargin( 0 );
GroupBox20bLayout = new QGridLayout( GroupBox20b->layout() );
GroupBox20bLayout->setAlignment( Qt::AlignTop );
GroupBox20bLayout->setSpacing( 5 );
GroupBox20bLayout->setMargin( 10 );
TextLabel4c = new QLabel( GroupBox20b, "TextLabel4c" );
TextLabel4c->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4c->sizePolicy().hasHeightForWidth() ) );
TextLabel4c->setText( tr( "Recent Documents:" ) );
GroupBox20bLayout->addWidget( TextLabel4c, 0, 0);
Recen = new QSpinBox( GroupBox20b, "Recen" );
Recen->setMaxValue( 30 );
Recen->setMinValue( 1 );
Recen->setValue( Vor->RecentDCount );
GroupBox20bLayout->addWidget( Recen, 0, 1 );
Shorty = new QPushButton(GroupBox20b, "SH");
Shorty->setText( tr("Keyboard Shortcuts..."));
GroupBox20bLayout->addMultiCellWidget( Shorty, 1, 1, 0, 1 );
tabLayout->addWidget( GroupBox20b, 1, 1 );
GroupBox20b = new QGroupBox( tab, "GroupBox20b" );
GroupBox20b->setTitle( tr( "Menus" ) );
GroupBox20b->setColumnLayout(0, Qt::Vertical );
GroupBox20b->layout()->setSpacing( 0 );
GroupBox20b->layout()->setMargin( 0 );
GroupBox20bLayout = new QGridLayout( GroupBox20b->layout() );
GroupBox20bLayout->setAlignment( Qt::AlignTop );
GroupBox20bLayout->setSpacing( 5 );
GroupBox20bLayout->setMargin( 10 );
TextLabel4c = new QLabel( GroupBox20b, "TextLabel4c" );
TextLabel4c->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4c->sizePolicy().hasHeightForWidth() ) );
TextLabel4c->setText( tr( "Recent Documents:" ) );
GroupBox20bLayout->addWidget( TextLabel4c, 0, 0);
Recen = new QSpinBox( GroupBox20b, "Recen" );
Recen->setMaxValue( 30 );
Recen->setMinValue( 1 );
Recen->setValue( Vor->RecentDCount );
GroupBox20bLayout->addWidget( Recen, 0, 1 );
Shorty = new QPushButton(GroupBox20b, "SH");
Shorty->setText( tr("Keyboard Shortcuts..."));
GroupBox20bLayout->addMultiCellWidget( Shorty, 1, 1, 0, 1 );
tabLayout->addWidget( GroupBox20b, 1, 1 );
 
GroupBox200 = new QGroupBox( tab, "GroupBox200" );
GroupBox200->setTitle( tr( "Paths" ) );
GroupBox200->setColumnLayout(0, Qt::Horizontal );
GroupBox200->layout()->setSpacing( 0 );
GroupBox200->layout()->setMargin( 0 );
GroupBox200Layout = new QGridLayout( GroupBox200->layout() );
GroupBox200Layout->setAlignment( Qt::AlignTop );
GroupBox200Layout->setSpacing( 0 );
GroupBox200Layout->setMargin( 5 );
GroupBox200 = new QGroupBox( tab, "GroupBox200" );
GroupBox200->setTitle( tr( "Paths" ) );
GroupBox200->setColumnLayout(0, Qt::Horizontal );
GroupBox200->layout()->setSpacing( 0 );
GroupBox200->layout()->setMargin( 0 );
GroupBox200Layout = new QGridLayout( GroupBox200->layout() );
GroupBox200Layout->setAlignment( Qt::AlignTop );
GroupBox200Layout->setSpacing( 0 );
GroupBox200Layout->setMargin( 5 );
PfadText = new QLabel( GroupBox200, "Pfadtext" );
PfadText->setText( tr("Documents:"));
GroupBox200Layout->addWidget( PfadText, 0, 0 );
Docs = new QLineEdit( GroupBox200, "Datei" );
Docs->setMinimumSize( QSize( 268, 22 ) );
GroupBox200Layout->addWidget( PfadText, 0, 0 );
Docs = new QLineEdit( GroupBox200, "Datei" );
Docs->setMinimumSize( QSize( 268, 22 ) );
Docs->setText(Vor->DocDir);
GroupBox200Layout->addWidget( Docs, 0, 1 );
FileC = new QToolButton( GroupBox200, "FileC" );
FileC->setMinimumSize( QSize( 88, 24 ) );
FileC->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC, 0, 2 );
GroupBox200Layout->addWidget( Docs, 0, 1 );
FileC = new QToolButton( GroupBox200, "FileC" );
FileC->setMinimumSize( QSize( 88, 24 ) );
FileC->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC, 0, 2 );
PfadText2 = new QLabel( GroupBox200, "Pfadtext1" );
PfadText2->setText( tr("ICC-Profiles:"));
GroupBox200Layout->addWidget( PfadText2, 1, 0 );
ProPfad = new QLineEdit( GroupBox200, "Datei1" );
ProPfad->setMinimumSize( QSize( 268, 22 ) );
GroupBox200Layout->addWidget( PfadText2, 1, 0 );
ProPfad = new QLineEdit( GroupBox200, "Datei1" );
ProPfad->setMinimumSize( QSize( 268, 22 ) );
ProPfad->setText(Vor->ProfileDir);
GroupBox200Layout->addWidget( ProPfad, 1, 1 );
FileC2 = new QToolButton( GroupBox200, "FileC1" );
FileC2->setMinimumSize( QSize( 88, 24 ) );
FileC2->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC2, 1, 2 );
GroupBox200Layout->addWidget( ProPfad, 1, 1 );
FileC2 = new QToolButton( GroupBox200, "FileC1" );
FileC2->setMinimumSize( QSize( 88, 24 ) );
FileC2->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC2, 1, 2 );
 
PfadText3 = new QLabel( GroupBox200, "Pfadtext1" );
PfadText3->setText( tr("Scripts:"));
GroupBox200Layout->addWidget( PfadText3, 2, 0 );
ScriptPfad = new QLineEdit( GroupBox200, "Datei1" );
ScriptPfad->setMinimumSize( QSize( 268, 22 ) );
GroupBox200Layout->addWidget( PfadText3, 2, 0 );
ScriptPfad = new QLineEdit( GroupBox200, "Datei1" );
ScriptPfad->setMinimumSize( QSize( 268, 22 ) );
ScriptPfad->setText(Vor->ScriptDir);
GroupBox200Layout->addWidget( ScriptPfad, 2, 1 );
FileC3 = new QToolButton( GroupBox200, "FileC3" );
FileC3->setMinimumSize( QSize( 88, 24 ) );
FileC3->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC3, 2, 2 );
GroupBox200Layout->addWidget( ScriptPfad, 2, 1 );
FileC3 = new QToolButton( GroupBox200, "FileC3" );
FileC3->setMinimumSize( QSize( 88, 24 ) );
FileC3->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC3, 2, 2 );
 
tabLayout->addMultiCellWidget( GroupBox200, 2, 2, 0, 1 );
tabLayout->addMultiCellWidget( GroupBox200, 2, 2, 0, 1 );
 
TabWidget3->addWidget( tab, 0 );
TabWidget3->addWidget( tab, 0 );
 
tab_7 = new QWidget( TabWidget3, "tab_7" );
tabLayout_7 = new QHBoxLayout( tab_7, 11, 6, "tabLayout_7");
Layout21 = new QVBoxLayout( 0, 0, 6, "Layout21");
GroupSize = new QButtonGroup( tab_7, "GroupSize" );
GroupSize->setTitle( tr( "Page Size" ) );
GroupSize->setColumnLayout(0, Qt::Vertical );
GroupSize->layout()->setSpacing( 6 );
GroupSize->layout()->setMargin( 10 );
GroupSizeLayout = new QVBoxLayout( GroupSize->layout() );
GroupSizeLayout->setAlignment( Qt::AlignTop );
Layout6 = new QGridLayout( 0, 1, 1, 0, 6, "Layout6");
GZText2 = new QLabel( GroupSize, "GZText2" );
GZText2->setText( tr( "Orientation:" ) );
Layout6->addWidget( GZText2, 1, 0 );
GZComboF = new QComboBox( true, GroupSize, "GZComboF" );
tab_7 = new QWidget( TabWidget3, "tab_7" );
tabLayout_7 = new QHBoxLayout( tab_7, 11, 6, "tabLayout_7");
Layout21 = new QVBoxLayout( 0, 0, 6, "Layout21");
GroupSize = new QButtonGroup( tab_7, "GroupSize" );
GroupSize->setTitle( tr( "Page Size" ) );
GroupSize->setColumnLayout(0, Qt::Vertical );
GroupSize->layout()->setSpacing( 6 );
GroupSize->layout()->setMargin( 10 );
GroupSizeLayout = new QVBoxLayout( GroupSize->layout() );
GroupSizeLayout->setAlignment( Qt::AlignTop );
Layout6 = new QGridLayout( 0, 1, 1, 0, 6, "Layout6");
GZText2 = new QLabel( GroupSize, "GZText2" );
GZText2->setText( tr( "Orientation:" ) );
Layout6->addWidget( GZText2, 1, 0 );
GZComboF = new QComboBox( true, GroupSize, "GZComboF" );
char *ar_size[] = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "B0", "B1", "B2", "B3",
"B4", "B5", "B6", "B7", "B8", "B9", "B10", "C5E", "Comm10E", "DLE", "Executive",
"Folio", "Ledger", "Legal", "Letter", "Tabloid"};
"B4", "B5", "B6", "B7", "B8", "B9", "B10", "C5E", "Comm10E", "DLE", "Executive",
"Folio", "Ledger", "Legal", "Letter", "Tabloid"};
size_t ar_s = sizeof(ar_size) / sizeof(*ar_size);
for (uint s = 0; s < ar_s; ++s)
GZComboF->insertItem(ar_size[s]);
GZComboF->insertItem( tr( "Custom" ) );
GZComboF->insertItem(ar_size[s]);
GZComboF->insertItem( tr( "Custom" ) );
GZComboF->setEditable(false);
GZComboF->setCurrentItem(Vor->PageFormat);
Layout6->addWidget( GZComboF, 0, 1 );
Layout6->addWidget( GZComboF, 0, 1 );
 
GZComboO = new QComboBox( true, GroupSize, "GZComboO" );
GZComboO->insertItem( tr( "Portrait" ) );
GZComboO->insertItem( tr( "Landscape" ) );
GZComboO = new QComboBox( true, GroupSize, "GZComboO" );
GZComboO->insertItem( tr( "Portrait" ) );
GZComboO->insertItem( tr( "Landscape" ) );
GZComboO->setEditable(false);
GZComboO->setCurrentItem(Vor->Ausrichtung);
 
Layout6->addWidget( GZComboO, 1, 1 );
Layout6->addWidget( GZComboO, 1, 1 );
 
GZText1 = new QLabel( GroupSize, "GZText1" );
GZText1->setText( tr( "Size:" ) );
GZText1 = new QLabel( GroupSize, "GZText1" );
GZText1->setText( tr( "Size:" ) );
 
Layout6->addWidget( GZText1, 0, 0 );
GroupSizeLayout->addLayout( Layout6 );
Layout6->addWidget( GZText1, 0, 0 );
GroupSizeLayout->addLayout( Layout6 );
 
Layout5_2 = new QHBoxLayout( 0, 0, 6, "Layout5_2");
Layout5_2 = new QHBoxLayout( 0, 0, 6, "Layout5_2");
 
GZText3 = new QLabel( GroupSize, "GZText3" );
GZText3->setText( tr( "Width:" ) );
Layout5_2->addWidget( GZText3 );
GZText3 = new QLabel( GroupSize, "GZText3" );
GZText3->setText( tr( "Width:" ) );
Layout5_2->addWidget( GZText3 );
 
Breite = new MSpinBox( GroupSize, 4 );
Breite->setEnabled( false );
Breite->setMinimumSize( QSize( 70, 20 ) );
Breite->setEnabled( false );
Breite->setMinimumSize( QSize( 70, 20 ) );
Breite->setDecimals( decimals );
Breite->setMaxValue( 10000 );
Breite->setMinValue( 1 );
Layout5_2->addWidget( Breite );
Breite->setMaxValue( 10000 );
Breite->setMinValue( 1 );
Layout5_2->addWidget( Breite );
 
GZText4 = new QLabel( GroupSize, "GZText4" );
GZText4->setText( tr( "Height:" ) );
Layout5_2->addWidget( GZText4 );
GZText4 = new QLabel( GroupSize, "GZText4" );
GZText4->setText( tr( "Height:" ) );
Layout5_2->addWidget( GZText4 );
 
Hoehe = new MSpinBox( GroupSize, 4 );
Hoehe->setEnabled( false );
Hoehe->setMinimumSize( QSize( 70, 20 ) );
Hoehe->setEnabled( false );
Hoehe->setMinimumSize( QSize( 70, 20 ) );
Hoehe->setDecimals( decimals );
Hoehe->setMaxValue( 10000 );
Hoehe->setMinValue( 1 );
Layout5_2->addWidget( Hoehe );
GroupSizeLayout->addLayout( Layout5_2 );
Breite->setValue(Vor->PageBreite * Umrech);
Hoehe->setValue(Vor->PageHoehe * Umrech);
Hoehe->setMaxValue( 10000 );
Hoehe->setMinValue( 1 );
Layout5_2->addWidget( Hoehe );
GroupSizeLayout->addLayout( Layout5_2 );
Breite->setValue(Vor->PageBreite * Umrech);
Hoehe->setValue(Vor->PageHoehe * Umrech);
 
Layout8 = new QHBoxLayout( 0, 0, 6, "Layout8");
Layout8 = new QHBoxLayout( 0, 0, 6, "Layout8");
 
Doppelseiten = new QCheckBox( GroupSize, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Doppelseiten = new QCheckBox( GroupSize, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Doppelseiten->setChecked(Vor->DoppelSeiten);
Layout8->addWidget( Doppelseiten );
Layout8->addWidget( Doppelseiten );
 
Linkszuerst = new QCheckBox( GroupSize, "Linkszuerst" );
Linkszuerst->setText( tr( "Left Page First" ) );
Linkszuerst = new QCheckBox( GroupSize, "Linkszuerst" );
Linkszuerst->setText( tr( "Left Page First" ) );
Linkszuerst->setChecked(Vor->ErsteLinks);
if (!Doppelseiten->isChecked())
Linkszuerst->setEnabled(false);
Layout8->addWidget( Linkszuerst );
GroupSizeLayout->addLayout( Layout8 );
Layout21->addWidget( GroupSize );
Layout8->addWidget( Linkszuerst );
GroupSizeLayout->addLayout( Layout8 );
Layout21->addWidget( GroupSize );
 
GroupRand = new QGroupBox( tab_7, "GroupRand" );
GroupRand->setTitle( tr( "Margin Guides" ) );
GroupRand->setColumnLayout(0, Qt::Vertical );
GroupRand->layout()->setSpacing( 5 );
GroupRand->layout()->setMargin( 10 );
GroupRandLayout = new QGridLayout( GroupRand->layout() );
GroupRandLayout->setAlignment( Qt::AlignTop );
GroupRand = new QGroupBox( tab_7, "GroupRand" );
GroupRand->setTitle( tr( "Margin Guides" ) );
GroupRand->setColumnLayout(0, Qt::Vertical );
GroupRand->layout()->setSpacing( 5 );
GroupRand->layout()->setMargin( 10 );
GroupRandLayout = new QGridLayout( GroupRand->layout() );
GroupRandLayout->setAlignment( Qt::AlignTop );
 
TopR = new MSpinBox( GroupRand, 4 );
TopR->setMinimumSize( QSize( 70, 20 ) );
TopR->setMinimumSize( QSize( 70, 20 ) );
TopR->setDecimals( decimals );
TopR->setMaxValue( 1000 );
TopR->setMinValue( 0 );
TopR->setValue(Vor->RandOben * Umrech);
TopR->setMaxValue( 1000 );
TopR->setMinValue( 0 );
TopR->setValue(Vor->RandOben * Umrech);
RandT = Vor->RandOben;
GroupRandLayout->addWidget( TopR, 0, 1 );
BottomR = new MSpinBox( GroupRand, 4 );
BottomR->setMinimumSize( QSize( 70, 20 ) );
GroupRandLayout->addWidget( TopR, 0, 1 );
BottomR = new MSpinBox( GroupRand, 4 );
BottomR->setMinimumSize( QSize( 70, 20 ) );
BottomR->setDecimals( decimals );
BottomR->setMaxValue( 1000 );
BottomR->setMinValue( 0 );
BottomR->setValue(Vor->RandUnten * Umrech);
BottomR->setMaxValue( 1000 );
BottomR->setMinValue( 0 );
BottomR->setValue(Vor->RandUnten * Umrech);
RandB = Vor->RandUnten;
GroupRandLayout->addWidget( BottomR, 1, 1 );
RightR = new MSpinBox( GroupRand, 4 );
RightR->setMinimumSize( QSize( 70, 20 ) );
GroupRandLayout->addWidget( BottomR, 1, 1 );
RightR = new MSpinBox( GroupRand, 4 );
RightR->setMinimumSize( QSize( 70, 20 ) );
RightR->setDecimals( decimals );
RightR->setMaxValue( 1000 );
RightR->setMinValue( 0 );
RightR->setValue(Vor->RandRechts * Umrech);
RightR->setMaxValue( 1000 );
RightR->setMinValue( 0 );
RightR->setValue(Vor->RandRechts * Umrech);
RandR = Vor->RandRechts;
GroupRandLayout->addWidget( RightR, 1, 3 );
LeftR = new MSpinBox( GroupRand, 4 );
LeftR->setMinimumSize( QSize( 70, 20 ) );
GroupRandLayout->addWidget( RightR, 1, 3 );
LeftR = new MSpinBox( GroupRand, 4 );
LeftR->setMinimumSize( QSize( 70, 20 ) );
LeftR->setDecimals( decimals );
LeftR->setMaxValue( 1000 );
LeftR->setMinValue( 0 );
LeftR->setValue(Vor->RandLinks * Umrech);
LeftR->setMaxValue( 1000 );
LeftR->setMinValue( 0 );
LeftR->setValue(Vor->RandLinks * Umrech);
RandL = Vor->RandLinks;
GroupRandLayout->addWidget( LeftR, 0, 3 );
GroupRandLayout->addWidget( LeftR, 0, 3 );
 
GRText2 = new QLabel( GroupRand, "GRText2" );
GRText2->setText( tr( "Bottom:" ) );
GroupRandLayout->addWidget( GRText2, 1, 0 );
GRText1 = new QLabel( GroupRand, "GRText1" );
GRText1->setText( tr( "Top:" ) );
GroupRandLayout->addWidget( GRText1, 0, 0 );
GRText4 = new QLabel( GroupRand, "GRText4" );
GRText4->setText( tr( "Right:" ) );
GroupRandLayout->addWidget( GRText4, 1, 2 );
GRText3 = new QLabel( GroupRand, "GRText3" );
GRText3->setText( tr( "Left:" ) );
GroupRandLayout->addWidget( GRText3, 0, 2 );
GRText2 = new QLabel( GroupRand, "GRText2" );
GRText2->setText( tr( "Bottom:" ) );
GroupRandLayout->addWidget( GRText2, 1, 0 );
GRText1 = new QLabel( GroupRand, "GRText1" );
GRText1->setText( tr( "Top:" ) );
GroupRandLayout->addWidget( GRText1, 0, 0 );
GRText4 = new QLabel( GroupRand, "GRText4" );
GRText4->setText( tr( "Right:" ) );
GroupRandLayout->addWidget( GRText4, 1, 2 );
GRText3 = new QLabel( GroupRand, "GRText3" );
GRText3->setText( tr( "Left:" ) );
GroupRandLayout->addWidget( GRText3, 0, 2 );
 
Layout21->addWidget( GroupRand );
tabLayout_7->addLayout( Layout21 );
Layout21->addWidget( GroupRand );
tabLayout_7->addLayout( Layout21 );
 
Layout21b = new QVBoxLayout( 0, 0, 6, "Layout21b");
GroupAS = new QGroupBox( tab_7, "GroupAS" );
GroupAS->setTitle( tr( "Autosave" ) );
GroupAS->setColumnLayout(0, Qt::Vertical );
GroupAS->layout()->setSpacing( 5 );
GroupAS->layout()->setMargin( 10 );
GroupASLayout = new QGridLayout( GroupAS->layout() );
GroupASLayout->setAlignment( Qt::AlignTop );
ASon = new QCheckBox( GroupAS, "Enable Autosave" );
ASon->setText( tr( "Enabled" ) );
ASon->setChecked(ap->HaveDoc ? ap->doc->AutoSave : Vor->AutoSave);
GroupASLayout->addMultiCellWidget( ASon, 0, 0, 0, 1 );
ASText = new QLabel( GroupAS, "ASText" );
ASText->setText( tr( "Interval:" ) );
GroupASLayout->addWidget( ASText, 1, 0 );
ASTime = new QSpinBox( GroupAS, "Time" );
ASTime->setMaxValue( 60 );
ASTime->setMinValue( 1 );
ASTime->setSuffix( " " + tr("min") );
Layout21b = new QVBoxLayout( 0, 0, 6, "Layout21b");
GroupAS = new QGroupBox( tab_7, "GroupAS" );
GroupAS->setTitle( tr( "Autosave" ) );
GroupAS->setColumnLayout(0, Qt::Vertical );
GroupAS->layout()->setSpacing( 5 );
GroupAS->layout()->setMargin( 10 );
GroupASLayout = new QGridLayout( GroupAS->layout() );
GroupASLayout->setAlignment( Qt::AlignTop );
ASon = new QCheckBox( GroupAS, "Enable Autosave" );
ASon->setText( tr( "Enabled" ) );
ASon->setChecked(ap->HaveDoc ? ap->doc->AutoSave : Vor->AutoSave);
GroupASLayout->addMultiCellWidget( ASon, 0, 0, 0, 1 );
ASText = new QLabel( GroupAS, "ASText" );
ASText->setText( tr( "Interval:" ) );
GroupASLayout->addWidget( ASText, 1, 0 );
ASTime = new QSpinBox( GroupAS, "Time" );
ASTime->setMaxValue( 60 );
ASTime->setMinValue( 1 );
ASTime->setSuffix( " " + tr("min") );
ASTime->setValue(Vor->AutoSaveTime / 1000 / 60);
GroupASLayout->addWidget( ASTime, 1, 1 );
Layout21b->addWidget( GroupAS );
QSpacerItem* spacerDocb = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout21b->addItem( spacerDocb );
tabLayout_7->addLayout( Layout21b );
TabWidget3->addWidget( tab_7, 1 );
GroupASLayout->addWidget( ASTime, 1, 1 );
Layout21b->addWidget( GroupAS );
QSpacerItem* spacerDocb = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout21b->addItem( spacerDocb );
tabLayout_7->addLayout( Layout21b );
TabWidget3->addWidget( tab_7, 1 );
 
tab_2 = new QWidget( TabWidget3, "tab_2" );
tabLayout_2 = new QGridLayout( tab_2 );
tabLayout_2->setSpacing( 6 );
tabLayout_2->setMargin( 11 );
GroupBox1 = new QGroupBox( tab_2, "GroupBox1" );
GroupBox1->setTitle( tr( "Grid Layout" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
GroupBox1Layout = new QHBoxLayout( GroupBox1->layout() );
GroupBox1Layout->setAlignment( Qt::AlignTop );
GroupBox1Layout->setSpacing( 0 );
GroupBox1Layout->setMargin( 10 );
Layout10 = new QGridLayout;
Layout10->setSpacing( 6 );
Layout10->setMargin( 0 );
TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1->sizePolicy().hasHeightForWidth() ) );
TextLabel1->setText( tr( "Minor Grid Spacing:" ) );
Layout10->addWidget( TextLabel1, 0, 0 );
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2->setText( tr( "Major Grid Spacing:" ) );
Layout10->addWidget( TextLabel2, 1, 0 );
SpinBox1 = new MSpinBox( GroupBox1, 4 );
tab_2 = new QWidget( TabWidget3, "tab_2" );
tabLayout_2 = new QGridLayout( tab_2 );
tabLayout_2->setSpacing( 6 );
tabLayout_2->setMargin( 11 );
GroupBox1 = new QGroupBox( tab_2, "GroupBox1" );
GroupBox1->setTitle( tr( "Grid Layout" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
GroupBox1Layout = new QHBoxLayout( GroupBox1->layout() );
GroupBox1Layout->setAlignment( Qt::AlignTop );
GroupBox1Layout->setSpacing( 0 );
GroupBox1Layout->setMargin( 10 );
Layout10 = new QGridLayout;
Layout10->setSpacing( 6 );
Layout10->setMargin( 0 );
TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1->sizePolicy().hasHeightForWidth() ) );
TextLabel1->setText( tr( "Minor Grid Spacing:" ) );
Layout10->addWidget( TextLabel1, 0, 0 );
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2->setText( tr( "Major Grid Spacing:" ) );
Layout10->addWidget( TextLabel2, 1, 0 );
SpinBox1 = new MSpinBox( GroupBox1, 4 );
SpinBox1->setDecimals( decimals );
SpinBox1->setMaxValue( 1000 );
SpinBox1->setMinValue( 1 );
Layout10->addWidget( SpinBox1, 0, 1 );
SpinBox2 = new MSpinBox( GroupBox1, 4 );
SpinBox1->setMaxValue( 1000 * Umrech );
SpinBox1->setMinValue( 1 * Umrech );
Layout10->addWidget( SpinBox1, 0, 1 );
SpinBox2 = new MSpinBox( GroupBox1, 4 );
SpinBox2->setDecimals( decimals );
SpinBox2->setMaxValue( 1000 );
SpinBox2->setMinValue( 10 );
Layout10->addWidget( SpinBox2, 1, 1 );
TextLabel2g = new QLabel( GroupBox1, "TextLabel2" );
TextLabel2g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2g->setText( tr( "Guide Snap Distance:" ) );
Layout10->addWidget( TextLabel2g, 2, 0 );
SpinBox2g = new MSpinBox( GroupBox1, 4 );
SpinBox2->setMaxValue( 1000 * Umrech );
SpinBox2->setMinValue( 10 * Umrech);
Layout10->addWidget( SpinBox2, 1, 1 );
TextLabel2g = new QLabel( GroupBox1, "TextLabel2" );
TextLabel2g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2g->setText( tr( "Guide Snap Distance:" ) );
Layout10->addWidget( TextLabel2g, 2, 0 );
SpinBox2g = new MSpinBox( GroupBox1, 4 );
SpinBox2g->setDecimals( decimals );
SpinBox2g->setMaxValue( 1000 );
SpinBox2g->setMinValue( 1 );
Layout10->addWidget( SpinBox2g, 2, 1 );
SpinBox2g->setMaxValue( 1000 * Umrech );
SpinBox2g->setMinValue( 1 * Umrech );
Layout10->addWidget( SpinBox2g, 2, 1 );
SpinBox2->setValue(ap->HaveDoc ? ap->doc->majorGrid * Umrech : Vor->DmajGrid * Umrech);
SpinBox1->setValue(ap->HaveDoc ? ap->doc->minorGrid * Umrech : Vor->DminGrid * Umrech);
SpinBox2g->setValue(ap->HaveDoc ? ap->doc->GuideRad * Umrech : Vor->GuideRad * Umrech);
GroupBox1Layout->addLayout( Layout10 );
tabLayout_2->addWidget( GroupBox1, 0, 0 );
GroupBox2 = new QGroupBox( tab_2, "GroupBox2" );
GroupBox2->setTitle( tr( "Grid Colors" ) );
GroupBox2->setColumnLayout(0, Qt::Vertical );
GroupBox2->layout()->setSpacing( 0 );
GroupBox2->layout()->setMargin( 0 );
GroupBox2Layout = new QHBoxLayout( GroupBox2->layout() );
GroupBox2Layout->setAlignment( Qt::AlignTop );
GroupBox2Layout->setSpacing( 6 );
GroupBox2Layout->setMargin( 11 );
Layout11 = new QGridLayout;
Layout11->setSpacing( 6 );
Layout11->setMargin( 0 );
TextLabel3 = new QLabel( GroupBox2, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel3->sizePolicy().hasHeightForWidth() ) );
TextLabel3->setText( tr( "Minor Grid Color:" ) );
Layout11->addWidget( TextLabel3, 0, 0 );
TextLabel4 = new QLabel( GroupBox2, "TextLabel4" );
TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4->setText( tr( "Major Grid Color:" ) );
Layout11->addWidget( TextLabel4, 1, 0 );
GroupBox1Layout->addLayout( Layout10 );
tabLayout_2->addWidget( GroupBox1, 0, 0 );
GroupBox2 = new QGroupBox( tab_2, "GroupBox2" );
GroupBox2->setTitle( tr( "Grid Colors" ) );
GroupBox2->setColumnLayout(0, Qt::Vertical );
GroupBox2->layout()->setSpacing( 0 );
GroupBox2->layout()->setMargin( 0 );
GroupBox2Layout = new QHBoxLayout( GroupBox2->layout() );
GroupBox2Layout->setAlignment( Qt::AlignTop );
GroupBox2Layout->setSpacing( 6 );
GroupBox2Layout->setMargin( 11 );
Layout11 = new QGridLayout;
Layout11->setSpacing( 6 );
Layout11->setMargin( 0 );
TextLabel3 = new QLabel( GroupBox2, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel3->sizePolicy().hasHeightForWidth() ) );
TextLabel3->setText( tr( "Minor Grid Color:" ) );
Layout11->addWidget( TextLabel3, 0, 0 );
TextLabel4 = new QLabel( GroupBox2, "TextLabel4" );
TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4->setText( tr( "Major Grid Color:" ) );
Layout11->addWidget( TextLabel4, 1, 0 );
minColor = new QPushButton( GroupBox2, "minColor" );
minColor->setText( tr( "" ) );
minColor->setAutoDefault( false );
QPixmap pm = QPixmap(40, 20);
minColor->setAutoDefault( false );
QPixmap pm = QPixmap(40, 20);
pm.fill(ap->HaveDoc ? ap->doc->minorColor : Vor->DminColor);
Cmin = ap->HaveDoc ? ap->doc->minorColor : Vor->DminColor;
minColor->setPixmap(pm);
Layout11->addWidget( minColor, 0, 1 );
MaxColor = new QPushButton( GroupBox2, "MaxColor" );
MaxColor->setText( tr( "" ) );
MaxColor->setAutoDefault( false );
QPixmap pm1 = QPixmap(40, 20);
minColor->setPixmap(pm);
Layout11->addWidget( minColor, 0, 1 );
MaxColor = new QPushButton( GroupBox2, "MaxColor" );
MaxColor->setText( tr( "" ) );
MaxColor->setAutoDefault( false );
QPixmap pm1 = QPixmap(40, 20);
pm1.fill(ap->HaveDoc ? ap->doc->majorColor : Vor->DmajColor);
Cmax = ap->HaveDoc ? ap->doc->majorColor : Vor->DmajColor;
MaxColor->setPixmap(pm1);
Layout11->addWidget( MaxColor, 1, 1 );
TextLabel4g = new QLabel( GroupBox2, "TextLabel4g" );
TextLabel4g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4g->setText( tr( "User Guides Color:" ) );
Layout11->addWidget( TextLabel4g, 2, 0 );
GuideColor = new QPushButton( GroupBox2, "GuideColor" );
GuideColor->setText( tr( "" ) );
GuideColor->setAutoDefault( false );
QPixmap pm12 = QPixmap(40, 20);
MaxColor->setPixmap(pm1);
Layout11->addWidget( MaxColor, 1, 1 );
TextLabel4g = new QLabel( GroupBox2, "TextLabel4g" );
TextLabel4g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4g->setText( tr( "User Guides Color:" ) );
Layout11->addWidget( TextLabel4g, 2, 0 );
GuideColor = new QPushButton( GroupBox2, "GuideColor" );
GuideColor->setText( tr( "" ) );
GuideColor->setAutoDefault( false );
QPixmap pm12 = QPixmap(40, 20);
pm12.fill(ap->HaveDoc ? ap->doc->guideColor : Vor->guideColor);
Cgui = ap->HaveDoc ? ap->doc->guideColor : Vor->guideColor;
GuideColor->setPixmap(pm12);
Layout11->addWidget( GuideColor, 2, 1 );
GroupBox2Layout->addLayout( Layout11 );
tabLayout_2->addWidget( GroupBox2, 1, 0 );
ButtonGroup5 = new QButtonGroup( tab_2, "ButtonGroup5" );
ButtonGroup5->setTitle( tr( "Placing" ) );
ButtonGroup5->setExclusive( true );
ButtonGroup5->setColumnLayout(0, Qt::Vertical );
ButtonGroup5->layout()->setSpacing( 0 );
GuideColor->setPixmap(pm12);
Layout11->addWidget( GuideColor, 2, 1 );
GroupBox2Layout->addLayout( Layout11 );
tabLayout_2->addWidget( GroupBox2, 1, 0 );
ButtonGroup5 = new QButtonGroup( tab_2, "ButtonGroup5" );
ButtonGroup5->setTitle( tr( "Placing" ) );
ButtonGroup5->setExclusive( true );
ButtonGroup5->setColumnLayout(0, Qt::Vertical );
ButtonGroup5->layout()->setSpacing( 0 );
ButtonGroup5->layout()->setMargin( 0 );
ButtonGroup5Layout = new QHBoxLayout( ButtonGroup5->layout() );
ButtonGroup5Layout->setAlignment( Qt::AlignTop );
ButtonGroup5Layout->setSpacing( 6 );
ButtonGroup5Layout->setAlignment( Qt::AlignTop );
ButtonGroup5Layout->setSpacing( 6 );
ButtonGroup5Layout->setMargin( 11 );
Layout7 = new QVBoxLayout;
Layout7->setSpacing( 6 );
554,12 → 554,12
Layout12->setMargin( 0 );
TextLabel2_3_2 = new QLabel( GroupBox4_2, "TextLabel2_3_2" );
TextLabel2_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_3_2->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_2->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_2->setText( tr( "Scaling:" ) );
Layout12->addWidget( TextLabel2_3_2, 1, 0 );
TextLabel1_5_2 = new QLabel( GroupBox4_2, "TextLabel1_5_2" );
TextLabel1_5_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_5_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_5_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_5_2->setText( tr( "Disp.:" ) );
Layout12->addWidget( TextLabel1_5_2, 0, 0 );
VTiefW = new QSpinBox( GroupBox4_2, "VTiefW" );
590,12 → 590,12
Layout13->setMargin( 0 );
TextLabel2_3 = new QLabel( GroupBox4, "TextLabel2_3" );
TextLabel2_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_3->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3->setText( tr( "Scaling:" ) );
Layout13->addWidget( TextLabel2_3, 1, 0 );
TextLabel1_5 = new QLabel( GroupBox4, "TextLabel1_5" );
TextLabel1_5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_5->sizePolicy().hasHeightForWidth() ) );
TextLabel1_5->sizePolicy().hasHeightForWidth() ) );
TextLabel1_5->setText( tr( "Disp.:" ) );
Layout13->addWidget( TextLabel1_5, 0, 0 );
VHochW = new QSpinBox( GroupBox4, "VHochW" );
626,7 → 626,7
Layout14->setMargin( 0 );
TextLabel2_3_3 = new QLabel( GroupBox4_3, "TextLabel2_3_3" );
TextLabel2_3_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_3_3->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_3->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_3->setText( tr( "Scaling:" ) );
Layout14->addWidget( TextLabel2_3_3 );
SmallCaps = new QSpinBox( GroupBox4_3, "SmallCaps" );
652,7 → 652,7
Layout14a->setMargin( 0 );
TextLabel2_3_3a = new QLabel( GroupBox4_3a, "TextLabel2_3_3" );
TextLabel2_3_3a->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_3_3a->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_3a->sizePolicy().hasHeightForWidth() ) );
TextLabel2_3_3a->setText( tr( "Automatic Line Spacing:" ) );
Layout14a->addWidget( TextLabel2_3_3a );
AutoLineV = new QSpinBox( GroupBox4_3a, "LineS" );
663,9 → 663,9
Layout14a->addWidget( AutoLineV );
GroupBox4_3aLayout->addLayout( Layout14a );
tabLayout_3->addWidget( GroupBox4_3a, 1, 1 );
 
TabWidget3->addWidget( tab_4, 3 );
 
tab_3 = new QWidget( TabWidget3, "tab_3" );
tabLayout_4 = new QHBoxLayout( tab_3 );
tabLayout_4->setSpacing( 0 );
728,10 → 728,10
Layout16->addWidget( PolyButton, 3, 0 );
ButtonGroup2Layout->addLayout( Layout16 );
tabLayout_4->addWidget( ButtonGroup2 );
 
Fram = new QWidgetStack(tab_3);
tabLayout_4->addWidget( Fram );
 
ToolFrame = new QFrame( this, "ToolFrame" );
ToolFrame->setFrameShape( QFrame::Box );
ToolFrame->setFrameShadow( QFrame::Sunken );
743,42 → 743,42
Layout15a->setMargin( 0 );
TextLabel2_2 = new QLabel( ToolFrame, "TextLabel2_2" );
TextLabel2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel2_2->setText( tr( "Default Size:" ) );
Layout15a->addWidget( TextLabel2_2, 1, 0 );
TextLabel1_3 = new QLabel( ToolFrame, "TextLabel1_3" );
TextLabel1_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_3->sizePolicy().hasHeightForWidth() ) );
TextLabel1_3->sizePolicy().hasHeightForWidth() ) );
TextLabel1_3->setText( tr( "Default Font:" ) );
Layout15a->addWidget( TextLabel1_3, 0, 0 );
FontComb = new FontCombo(ToolFrame, Vor);
if (ap->HaveDoc)
{
for (int fc=0; fc<FontComb->count(); ++fc)
{
if (FontComb->text(fc) == ap->doc->Dfont)
{
FontComb->setCurrentItem(fc);
break;
}
}
for (int fc=0; fc<FontComb->count(); ++fc)
{
if (FontComb->text(fc) == ap->doc->Dfont)
{
FontComb->setCurrentItem(fc);
break;
}
}
}
else
{
for (int fc=0; fc<FontComb->count(); ++fc)
{
if (FontComb->text(fc) == Vor->DefFont)
{
FontComb->setCurrentItem(fc);
break;
}
}
for (int fc=0; fc<FontComb->count(); ++fc)
{
if (FontComb->text(fc) == Vor->DefFont)
{
FontComb->setCurrentItem(fc);
break;
}
}
}
Layout15a->addWidget( FontComb, 0, 1 );
SizeCombo = new QComboBox( true, ToolFrame, "SizeCombo" );
SizeCombo->setEditable(false);
char *ar_sizes[] = {" 7 pt", " 9 pt", "10 pt", "12 pt", "14 pt", "18 pt", "24 pt", "36 pt", "48 pt",
"60 pt", "72 pt"};
"60 pt", "72 pt"};
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes);
for (uint s = 0; s < f_size; ++s)
SizeCombo->insertItem(ar_sizes[s]);
788,7 → 788,7
for (a = 0; a < SizeCombo->count(); ++a)
{
if (SizeCombo->text(a).left(2).toInt() == ap->doc->Dsize / 10)
SizeCombo->setCurrentItem(a);
SizeCombo->setCurrentItem(a);
}
}
else
801,8 → 801,8
}
Layout15a->addWidget( SizeCombo, 1, 1 );
TextLabelT1 = new QLabel( ToolFrame, "TextLabel1_3_2" );
TextLabelT1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT1->sizePolicy().hasHeightForWidth() ) );
TextLabelT1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT1->sizePolicy().hasHeightForWidth() ) );
TextLabelT1->setText( tr( "Text Color:" ) );
Layout15a->addWidget( TextLabelT1, 2, 0 );
ForegroundT = new QComboBox( true, ToolFrame, "Foreground" );
814,10 → 814,10
{
pm2.fill(Vor->DColors[itc.key()].getRGBColor());
ForegroundT->insertItem(pm2, itc.key());
if (itc.key() == Vor->DpenText)
ForegroundT->setCurrentItem(ForegroundT->count()-1);
if (itc.key() == Vor->DpenText)
ForegroundT->setCurrentItem(ForegroundT->count()-1);
}
Layout15a->addWidget( ForegroundT, 2, 1 );
Layout15a->addWidget( ForegroundT, 2, 1 );
TextCol = new QLabel(ToolFrame, "TextCol");
TextCol->setText( tr("Columns:") );
Layout15a->addWidget( TextCol, 3, 0 );
860,46 → 860,46
Layout15b->setSpacing( 6 );
Layout15b->setMargin( 0 );
TextLabelT21 = new QLabel( ToolFrame2, "TextLabel1_3_2" );
TextLabelT21->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT21->sizePolicy().hasHeightForWidth() ) );
TextLabelT21->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT21->sizePolicy().hasHeightForWidth() ) );
TextLabelT21->setText( tr( "Line Color:" ) );
Layout15b->addWidget(TextLabelT21, 0, 0);
TextLabelT22 = new QLabel( ToolFrame2, "TextLabel2_2" );
TextLabelT22->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT22->sizePolicy().hasHeightForWidth() ) );
TextLabelT22->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT22->sizePolicy().hasHeightForWidth() ) );
TextLabelT22->setText( tr( "Shading:" ) );
Layout15b->addWidget(TextLabelT22, 1, 0);
TextLabelT23 = new QLabel( ToolFrame2, "TextLabel1_3" );
TextLabelT23->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT23->sizePolicy().hasHeightForWidth() ) );
TextLabelT23->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT23->sizePolicy().hasHeightForWidth() ) );
TextLabelT23->setText( tr( "Fill Color:" ) );
Layout15b->addWidget(TextLabelT23, 2, 0);
TextLabelT24 = new QLabel( ToolFrame2, "TextLabel2_2_2" );
TextLabelT24->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT24->sizePolicy().hasHeightForWidth() ) );
TextLabelT24->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT24->sizePolicy().hasHeightForWidth() ) );
TextLabelT24->setText( tr( "Shading:" ) );
Layout15b->addWidget(TextLabelT24, 3, 0);
TextLabelT25 = new QLabel( ToolFrame2, "TextLabel1_3_3" );
TextLabelT25->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT25->sizePolicy().hasHeightForWidth() ) );
TextLabelT25->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT25->sizePolicy().hasHeightForWidth() ) );
TextLabelT25->setText( tr( "Linestyle:" ) );
Layout15b->addWidget(TextLabelT25, 4, 0);
TextLabelT26 = new QLabel( ToolFrame2, "TextLabel2_3_4" );
TextLabelT26->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT26->sizePolicy().hasHeightForWidth() ) );
TextLabelT26->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT26->sizePolicy().hasHeightForWidth() ) );
TextLabelT26->setText( tr( "Line Width:" ) );
Layout15b->addWidget(TextLabelT26, 5, 0);
Foreground = new QComboBox( true, ToolFrame2, "Foreground" );
Foreground->setEditable(false);
Foreground->insertItem( tr("None"));
if (Vor->Dpen == "None")
Foreground->setCurrentItem(Foreground->count()-1);
pm2 = QPixmap(15, 15);
Foreground->insertItem( tr("None"));
if (Vor->Dpen == "None")
Foreground->setCurrentItem(Foreground->count()-1);
pm2 = QPixmap(15, 15);
for (itc = Vor->DColors.begin(); itc != Vor->DColors.end(); ++itc)
{
pm2.fill(Vor->DColors[itc.key()].getRGBColor());
Foreground->insertItem(pm2, itc.key());
if (itc.key() == Vor->Dpen)
if (itc.key() == Vor->Dpen)
Foreground->setCurrentItem(Foreground->count()-1);
}
Layout15b->addWidget(Foreground, 0, 1);
911,15 → 911,15
Layout15b->addWidget(Shade2, 1, 1);
Background = new QComboBox( true, ToolFrame2, "Background" );
Background->setEditable(false);
Background->insertItem( tr("None"));
if (Vor->Dbrush == "None")
Background->setCurrentItem(Background->count()-1);
Background->insertItem( tr("None"));
if (Vor->Dbrush == "None")
Background->setCurrentItem(Background->count()-1);
for (itc = Vor->DColors.begin(); itc != Vor->DColors.end(); ++itc)
{
pm2.fill(Vor->DColors[itc.key()].getRGBColor());
Background->insertItem(pm2, itc.key());
if (itc.key() == Vor->Dbrush)
Background->setCurrentItem(Background->count()-1);
if (itc.key() == Vor->Dbrush)
Background->setCurrentItem(Background->count()-1);
}
Layout15b->addWidget(Background, 2, 1);
Shade = new QSpinBox( ToolFrame2, "Shade" );
933,24 → 933,24
int dla = ap->HaveDoc ? ap->doc->DLineArt : Vor->DLineArt;
switch (dla)
{
case SolidLine:
Linestyle->setCurrentItem(0);
break;
case DashLine:
Linestyle->setCurrentItem(1);
break;
case DotLine:
Linestyle->setCurrentItem(2);
break;
case DashDotLine:
Linestyle->setCurrentItem(3);
break;
case DashDotDotLine:
Linestyle->setCurrentItem(4);
break;
default:
Linestyle->setCurrentItem(0);
break;
case SolidLine:
Linestyle->setCurrentItem(0);
break;
case DashLine:
Linestyle->setCurrentItem(1);
break;
case DotLine:
Linestyle->setCurrentItem(2);
break;
case DashDotLine:
Linestyle->setCurrentItem(3);
break;
case DashDotDotLine:
Linestyle->setCurrentItem(4);
break;
default:
Linestyle->setCurrentItem(0);
break;
}
Layout15b->addWidget(Linestyle, 4, 1);
LineW = new MSpinBox( ToolFrame2, 1 );
976,23 → 976,23
Layout15c->setSpacing( 6 );
Layout15c->setMargin( 0 );
TextLabelT31 = new QLabel( ToolFrame3, "TextLabel1_3_2" );
TextLabelT31->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT31->sizePolicy().hasHeightForWidth() ) );
TextLabelT31->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT31->sizePolicy().hasHeightForWidth() ) );
TextLabelT31->setText( tr( "Line Color:" ) );
Layout15c->addWidget(TextLabelT31, 0, 0);
TextLabelT32 = new QLabel( ToolFrame3, "TextLabel2_2" );
TextLabelT32->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT32->sizePolicy().hasHeightForWidth() ) );
TextLabelT32->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT32->sizePolicy().hasHeightForWidth() ) );
TextLabelT32->setText( tr( "Shading:" ) );
Layout15c->addWidget(TextLabelT32, 1, 0);
TextLabelT35 = new QLabel( ToolFrame3, "TextLabel1_3_3" );
TextLabelT35->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT35->sizePolicy().hasHeightForWidth() ) );
TextLabelT35->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT35->sizePolicy().hasHeightForWidth() ) );
TextLabelT35->setText( tr( "Line Style:" ) );
Layout15c->addWidget(TextLabelT35, 2, 0);
TextLabelT36 = new QLabel( ToolFrame3, "TextLabel2_3_4" );
TextLabelT36->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT36->sizePolicy().hasHeightForWidth() ) );
TextLabelT36->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT36->sizePolicy().hasHeightForWidth() ) );
TextLabelT36->setText( tr( "Line Width:" ) );
Layout15c->addWidget(TextLabelT36, 3, 0);
Foreground2 = new QComboBox( true, ToolFrame3, "Foreground" );
1004,8 → 1004,8
{
pm3.fill(Vor->DColors[itc2.key()].getRGBColor());
Foreground2->insertItem(pm3, itc2.key());
if (itc2.key() == Vor->DpenLine)
Foreground2->setCurrentItem(Foreground2->count()-1);
if (itc2.key() == Vor->DpenLine)
Foreground2->setCurrentItem(Foreground2->count()-1);
}
Layout15c->addWidget(Foreground2, 0, 1);
Shade22 = new QSpinBox( ToolFrame3, "Shade2" );
1019,24 → 1019,24
dla = ap->HaveDoc ? ap->doc->DLstyleLine : Vor->DLstyleLine;
switch (dla)
{
case SolidLine:
Linestyle2->setCurrentItem(0);
break;
case DashLine:
Linestyle2->setCurrentItem(1);
break;
case DotLine:
Linestyle2->setCurrentItem(2);
break;
case DashDotLine:
Linestyle2->setCurrentItem(3);
break;
case DashDotDotLine:
Linestyle2->setCurrentItem(4);
break;
default:
Linestyle2->setCurrentItem(0);
break;
case SolidLine:
Linestyle2->setCurrentItem(0);
break;
case DashLine:
Linestyle2->setCurrentItem(1);
break;
case DotLine:
Linestyle2->setCurrentItem(2);
break;
case DashDotLine:
Linestyle2->setCurrentItem(3);
break;
case DashDotDotLine:
Linestyle2->setCurrentItem(4);
break;
default:
Linestyle2->setCurrentItem(0);
break;
}
Layout15c->addWidget(Linestyle2, 2, 1);
LineW2 = new MSpinBox( ToolFrame3, 1 );
1051,7 → 1051,7
QSpacerItem* sp06 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
ToolFrame3Layout->addItem( sp06 );
Fram->addWidget(ToolFrame3, 3);
 
ToolFrame4 = new QFrame( this, "ToolFrame" );
ToolFrame4->setFrameShape( QFrame::Box );
ToolFrame4->setFrameShadow( QFrame::Sunken );
1062,18 → 1062,18
Layout15d->setSpacing( 6 );
Layout15d->setMargin( 0 );
TextLabelT42 = new QLabel( ToolFrame4, "TextLabel2_2" );
TextLabelT42->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT42->sizePolicy().hasHeightForWidth() ) );
TextLabelT42->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT42->sizePolicy().hasHeightForWidth() ) );
TextLabelT42->setText( tr( "Minimum:" ) );
Layout15d->addWidget(TextLabelT42, 0, 0);
TextLabelT43 = new QLabel( ToolFrame4, "TextLabel2_2_3" );
TextLabelT43->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT43->sizePolicy().hasHeightForWidth() ) );
TextLabelT43->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT43->sizePolicy().hasHeightForWidth() ) );
TextLabelT43->setText( tr( "Maximum:" ) );
Layout15d->addWidget(TextLabelT43, 1, 0);
TextLabelT44 = new QLabel( ToolFrame4, "TextLabel2_3_4" );
TextLabelT44->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT44->sizePolicy().hasHeightForWidth() ) );
TextLabelT44->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT44->sizePolicy().hasHeightForWidth() ) );
TextLabelT44->setText( tr( "Stepping:" ) );
Layout15d->addWidget(TextLabelT44, 2, 0);
MinMag = new QSpinBox( ToolFrame4, "Shade2" );
1103,7 → 1103,7
QSpacerItem* sp04 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
ToolFrame4Layout->addItem( sp04 );
Fram->addWidget(ToolFrame4, 4);
 
ToolFrame5 = new QButtonGroup( this, "ToolFrame5" );
ToolFrame5->setFrameShape( QFrame::Box );
ToolFrame5->setFrameShadow( QFrame::Sunken );
1119,23 → 1119,23
FreeScale->setText( tr( "Free Scaling" ) );
Layout15->addMultiCellWidget( FreeScale, 0, 0, 0, 3 );
TextLabelT51 = new QLabel( ToolFrame5, "TextLabelT51" );
TextLabelT51->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT51->sizePolicy().hasHeightForWidth() ) );
TextLabelT51->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT51->sizePolicy().hasHeightForWidth() ) );
TextLabelT51->setText( tr( "Horizontal Scaling" ) );
Layout15->addWidget( TextLabelT51, 1, 1 );
TextLabelT52 = new QLabel( ToolFrame5, "TextLabelT52" );
TextLabelT52->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT52->sizePolicy().hasHeightForWidth() ) );
TextLabelT52->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT52->sizePolicy().hasHeightForWidth() ) );
TextLabelT52->setText( tr( "Vertical Scaling" ) );
Layout15->addWidget( TextLabelT52, 2, 1 );
TextLabelT53 = new QLabel( ToolFrame5, "TextLabelT53" );
TextLabelT53->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT53->sizePolicy().hasHeightForWidth() ) );
TextLabelT53->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT53->sizePolicy().hasHeightForWidth() ) );
TextLabelT53->setText( tr( "Fill Color:" ) );
Layout15->addWidget( TextLabelT53, 5, 0 );
TextLabelT54 = new QLabel( ToolFrame5, "TextLabelT54" );
TextLabelT54->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT54->sizePolicy().hasHeightForWidth() ) );
TextLabelT54->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT54->sizePolicy().hasHeightForWidth() ) );
TextLabelT54->setText( tr( "Shading:" ) );
Layout15->addWidget( TextLabelT54, 6, 0 );
XScale = new QSpinBox( ToolFrame5, "XScale" );
1169,14 → 1169,14
BackgroundP = new QComboBox( true, ToolFrame5, "BackgroundP" );
BackgroundP->setEditable(false);
BackgroundP->insertItem( tr("None"));
if (Vor->DbrushPict == "None")
BackgroundP->setCurrentItem(BackgroundP->count()-1);
if (Vor->DbrushPict == "None")
BackgroundP->setCurrentItem(BackgroundP->count()-1);
for (itc = Vor->DColors.begin(); itc != Vor->DColors.end(); ++itc)
{
pm2.fill(Vor->DColors[itc.key()].getRGBColor());
BackgroundP->insertItem(pm2, itc.key());
if (itc.key() == Vor->DbrushPict)
BackgroundP->setCurrentItem(BackgroundP->count()-1);
if (itc.key() == Vor->DbrushPict)
BackgroundP->setCurrentItem(BackgroundP->count()-1);
}
Layout15->addMultiCellWidget( BackgroundP, 5, 5, 1, 3 );
QSpacerItem* sp01 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
1190,7 → 1190,7
FrameScale->setChecked(sct ? false : true);
ChangeScaling();
Fram->addWidget(ToolFrame5, 5);
 
ToolFrame6 = new QFrame( this, "ToolFrame6" );
ToolFrame6->setFrameShape( QFrame::Box );
ToolFrame6->setFrameShadow( QFrame::Sunken );
1216,7 → 1216,7
T6_Text2_2->setText( tr( "Rotation:" ) );
T6_Layout7_2->addWidget( T6_Text2_2 );
T6_Faktor2 = new QSpinBox( ToolFrame6, "Faktor_2" );
T6_Faktor2->setSuffix(" °");
T6_Faktor2->setSuffix(" ");
T6_Faktor2->setMaxValue( 180 );
T6_Faktor2->setMinValue( -180 );
T6_Faktor2->setValue(static_cast<int>(Vor->PolyR));
1278,12 → 1278,12
Fram->addWidget(ToolFrame6, 6);
 
TabWidget3->addWidget( tab_3, 4 );
 
tab_5 = new QWidget( TabWidget3, "tab_5" );
tabLayout_5 = new QGridLayout( tab_5 );
tabLayout_5->setSpacing( 6 );
tabLayout_5->setMargin( 11 );
 
Saving = new QGroupBox( tab_5, "Saving" );
Saving->setTitle( tr( "Other Options" ) );
Saving->setColumnLayout(0, Qt::Vertical );
1293,14 → 1293,14
SavingLayout->setAlignment( Qt::AlignTop );
SavingLayout->setSpacing( 6 );
SavingLayout->setMargin( 25 );
 
SaveAtQuit = new QCheckBox( Saving, "SaveAtQuit" );
SaveAtQuit->setText( tr( "Save Contents on Exit" ) );
SaveAtQuit->setChecked(Vor->SaveAtQ);
SavingLayout->addWidget( SaveAtQuit );
 
tabLayout_5->addWidget( Saving, 1, 0 );
 
Preview = new QGroupBox( tab_5, "Preview" );
Preview->setTitle( tr( "Preview" ) );
Preview->setColumnLayout(0, Qt::Vertical );
1310,11 → 1310,11
PreviewLayout->setAlignment( Qt::AlignTop );
PreviewLayout->setSpacing( 10 );
PreviewLayout->setMargin( 24 );
 
TextLabelP = new QLabel( Preview, "TextLabel1_3" );
TextLabelP->setText( tr( "Size:" ) );
PreviewLayout->addWidget( TextLabelP );
 
PreviewSize = new QComboBox( true, Preview, "PreviewSize" );
PreviewSize->insertItem( tr( "Small" ) );
PreviewSize->insertItem( tr( "Medium" ) );
1323,17 → 1323,17
int sci = Vor->PSize == 40 ? 0 : Vor->PSize == 60 ? 1 : 2;
PreviewSize->setCurrentItem(sci);
PreviewLayout->addWidget( PreviewSize );
 
tabLayout_5->addWidget( Preview, 0, 0 );
 
Frame6 = new QFrame( tab_5, "Frame6" );
Frame6->setFrameShape( QFrame::NoFrame );
Frame6->setFrameShadow( QFrame::Plain );
Frame6->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
 
tabLayout_5->addMultiCellWidget( Frame6, 0, 1, 1, 1 );
TabWidget3->addWidget( tab_5, 5 );
 
tab_6 = new QWidget( TabWidget3, "tab_6" );
tabLayout_6 = new QHBoxLayout( tab_6 );
tabLayout_6->setSpacing( 6 );
1369,8 → 1369,8
GroupBox20aLayout->setSpacing( 10 );
GroupBox20aLayout->setMargin( 5 );
TextLabel4a = new QLabel( GroupBox20a, "TextLabel4" );
TextLabel4a->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4a->sizePolicy().hasHeightForWidth() ) );
TextLabel4a->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4a->sizePolicy().hasHeightForWidth() ) );
TextLabel4a->setText( tr( "Background:" ) );
GroupBox20aLayout->addWidget( TextLabel4a);
PapColor = new QPushButton( GroupBox20a, "PapColor" );
1382,8 → 1382,8
PapColor->setPixmap(pm1a);
GroupBox20aLayout->addWidget( PapColor );
TextLabel4b = new QLabel( GroupBox20a, "TextLabel4" );
TextLabel4b->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4b->sizePolicy().hasHeightForWidth() ) );
TextLabel4b->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel4b->sizePolicy().hasHeightForWidth() ) );
TextLabel4b->setText( tr( "Margins:" ) );
GroupBox20aLayout->addWidget( TextLabel4b);
RandColor = new QPushButton( GroupBox20a, "RColor" );
1436,9 → 1436,9
CaliAnz->setText(QString::number(DisScale*100, 'f', 2)+" %");
layout15ca->addWidget( CaliAnz );
CaliGroupLayout->addLayout( layout15ca );
 
GroupBox10Layout->addWidget( CaliGroup );
 
tabLayout_6->addWidget( GroupBox10 );
TabWidget3->addWidget( tab_6, 6 );
Fram->raiseWidget(1);
1509,14 → 1509,14
connect(FileC, SIGNAL(clicked()), this, SLOT(ChangeDocs()));
connect(FileC2, SIGNAL(clicked()), this, SLOT(ChangeProfs()));
connect(FileC3, SIGNAL(clicked()), this, SLOT(ChangeScripts()));
connect(CaliSlider, SIGNAL(valueChanged(int)), this, SLOT(SetDisScale()));
connect(CaliSlider, SIGNAL(valueChanged(int)), this, SLOT(SetDisScale()));
connect(TabListe, SIGNAL(highlighted(int)), TabWidget3, SLOT(raiseWidget(int)));
setSize(Vor->PageFormat);
setOrien(Vor->Ausrichtung);
UnitChange();
UnitChange();
}
 
/*!
/*!
\fn Preferences::~Preferences
\author Franz Schmid
\date
1526,10 → 1526,10
*/
Preferences::~Preferences()
{
// no need to delete child widgets, Qt does it all for us
// no need to delete child widgets, Qt does it all for us
}
 
/*!
/*!
\fn void Preferences::ChangeDocs()
\author Franz Schmid
\date
1544,7 → 1544,7
Docs->setText(s);
}
 
/*!
/*!
\fn void Preferences::ChangeProfs()
\author Franz Schmid
\date
1559,7 → 1559,7
ProPfad->setText(s);
}
 
/*!
/*!
\fn void Preferences::ChangeScripts()
\author Franz Schmid
\date
1574,7 → 1574,7
ScriptPfad->setText(s);
}
 
/*!
/*!
\fn void Preferences::ChangeScaling()
\author Franz Schmid
\date
1593,7 → 1593,7
Aspect->setEnabled(!setter);
}
 
/*!
/*!
\fn void Preferences::setDS()
\author Franz Schmid
\date
1611,7 → 1611,7
Linkszuerst->setChecked(false);
}
 
/*!
/*!
\fn void Preferences::setBreite(int v)
\author Franz Schmid
\date
1628,7 → 1628,7
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
/*!
/*!
\fn void Preferences::setHoehe(int v)
\author Franz Schmid
\date
1645,7 → 1645,7
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
/*!
/*!
\fn void Preferences::setTop(int v)
\author Franz Schmid
\date
1659,7 → 1659,7
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
/*!
/*!
\fn void Preferences::setBottom(int v)
\author Franz Schmid
\date
1673,7 → 1673,7
TopR->setMaxValue(Hoehe->value() - BottomR->value());
}
 
/*!
/*!
\fn void Preferences::setLeft(int v)
\author Franz Schmid
\date
1687,7 → 1687,7
RightR->setMaxValue(Breite->value() - LeftR->value());
}
 
/*!
/*!
\fn void Preferences::setRight(int v)
\author Franz Schmid
\date
1701,7 → 1701,7
LeftR->setMaxValue(Breite->value() - RightR->value());
}
 
/*!
/*!
\fn void Preferences::setSize(int gr)
\author Franz Schmid
\date
1716,13 → 1716,13
Breite->setEnabled(false);
Hoehe->setEnabled(false);
int br[] = {2380, 1684, 1190, 842, 595, 421, 297, 210, 148, 105, 2836, 2004, 1418, 1002, 709, 501, 355,
250, 178, 125, 89, 462, 298, 312, 542, 595, 1224, 612, 612, 792};
250, 178, 125, 89, 462, 298, 312, 542, 595, 1224, 612, 612, 792};
int ho[] = {3368, 2380, 1684, 1190, 842, 595, 421, 297, 210, 148, 4008, 2836, 2004, 1418, 1002, 709, 501,
355, 250, 178, 125, 649, 683, 624, 720, 935, 792, 1008, 792, 1224};
355, 250, 178, 125, 649, 683, 624, 720, 935, 792, 1008, 792, 1224};
if (gr == 30)
{
Breite->setEnabled(true);
Hoehe->setEnabled(true);
Hoehe->setEnabled(true);
}
else
{
1741,7 → 1741,7
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
}
 
/*!
/*!
\fn void Preferences::setOrien(int ori)
\author Franz Schmid
\date
1774,7 → 1774,7
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
}
 
/*!
/*!
\fn void Preferences::DefKB()
\author Franz Schmid
\date
1790,7 → 1790,7
delete dia;
}
 
/*!
/*!
\fn void Preferences::SetSample()
\author Franz Schmid
\date
1807,7 → 1807,7
TextLabel1_4->setPixmap(pm);
}
 
/*!
/*!
\fn void Preferences::changeMaColor()
\author Franz Schmid
\date
1821,14 → 1821,14
neu = QColorDialog::getColor(Cmax, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
Cmax = neu;
MaxColor->setPixmap(pm);
MaxColor->setPixmap(pm);
}
}
 
/*!
/*!
\fn void Preferences::changeMicolor()
\author Franz Schmid
\date
1842,14 → 1842,14
neu = QColorDialog::getColor(Cmin, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
Cmin = neu;
minColor->setPixmap(pm);
minColor->setPixmap(pm);
}
}
 
/*!
/*!
\fn void Preferences::changePapColor()
\author Franz Schmid
\date
1863,14 → 1863,14
neu = QColorDialog::getColor(Cpaper, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
Cpaper = neu;
PapColor->setPixmap(pm);
PapColor->setPixmap(pm);
}
}
 
/*!
/*!
\fn void Preferences::changeRandColor()
\author Franz Schmid
\date
1884,14 → 1884,14
neu = QColorDialog::getColor(Crand, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
Crand = neu;
RandColor->setPixmap(pm);
RandColor->setPixmap(pm);
}
}
 
/*!
/*!
\fn void Preferences::changeGuideColor()
\author Franz Schmid
\date
1905,14 → 1905,14
neu = QColorDialog::getColor(Cgui, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
QPixmap pm = QPixmap(40, 20);
pm.fill(neu);
Cgui = neu;
GuideColor->setPixmap(pm);
GuideColor->setPixmap(pm);
}
}
 
/*!
/*!
\fn void Preferences::SetTool()
\author Franz Schmid
\date
1923,22 → 1923,22
void Preferences::SetTool()
{
if (TextButton == sender())
Fram->raiseWidget(1);
Fram->raiseWidget(1);
if (RectButton == sender())
Fram->raiseWidget(2);
Fram->raiseWidget(2);
if (OvalButton == sender())
Fram->raiseWidget(2);
Fram->raiseWidget(2);
if (LineButton == sender())
Fram->raiseWidget(3);
Fram->raiseWidget(3);
if (ZoomButton == sender())
Fram->raiseWidget(4);
Fram->raiseWidget(4);
if (BildButton == sender())
Fram->raiseWidget(5);
Fram->raiseWidget(5);
if (PolyButton == sender())
Fram->raiseWidget(6);
Fram->raiseWidget(6);
}
 
/*!
/*!
\fn void Preferences::ToggleKette()
\author Franz Schmid
\date
1952,7 → 1952,7
YScale->setValue(XScale->value());
}
 
/*!
/*!
\fn void Preferences::HChange()
\author Franz Schmid
\date
1966,7 → 1966,7
YScale->setValue(XScale->value());
}
 
/*!
/*!
\fn void Preferences::VChange()
\author Franz Schmid
\date
1980,7 → 1980,7
XScale->setValue(YScale->value());
}
 
/*!
/*!
\fn void Preferences::UnitChange()
\author Franz Schmid
\date
1990,32 → 1990,55
*/
void Preferences::UnitChange()
{
 
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
disconnect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
disconnect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
disconnect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
double AltUmrech = Umrech;
double oldS1 = SpinBox1->minValue() / AltUmrech;
double oldSM1 = SpinBox1->maxValue() / AltUmrech;
double oldSV1 = SpinBox1->value() / AltUmrech;
double oldS2 = SpinBox2->minValue() / AltUmrech;
double oldSM2 = SpinBox2->maxValue() / AltUmrech;
double oldSV2 = SpinBox2->value() / AltUmrech;
double oldS2g = SpinBox2g->minValue() / AltUmrech;
double oldSM2g = SpinBox2g->maxValue() / AltUmrech;
double oldSV2g = SpinBox2g->value() / AltUmrech;
double oldTG = TextGapVal->minValue() / AltUmrech;
double oldTGM = TextGapVal->maxValue() / AltUmrech;
double oldTGV = TextGapVal->value() / AltUmrech;
double oldB = Breite->minValue() / AltUmrech;
double oldBM = Breite->maxValue() / AltUmrech;
double oldH = Hoehe->minValue() / AltUmrech;
double oldHM = Hoehe->maxValue() / AltUmrech;
QString einh;
int decimals;
Einheit = UnitCombo->currentItem();
switch (UnitCombo->currentItem())
{
case 0:
Umrech = 1.0;
decimals = 100;
einh = tr( " pt" );
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
einh = tr( " mm" );
break;
case 2:
Umrech = 1.0 / 72.0;
decimals = 10000;
einh = tr( " in" );
break;
case 3:
Umrech = 1.0 / 12.0;
decimals = 100;
einh = tr( " p" );
break;
case 0:
Umrech = 1.0;
decimals = 100;
einh = tr( " pt" );
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
einh = tr( " mm" );
break;
case 2:
Umrech = 1.0 / 72.0;
decimals = 10000;
einh = tr( " in" );
break;
case 3:
Umrech = 1.0 / 12.0;
decimals = 100;
einh = tr( " p" );
break;
}
SpinBox1->setSuffix(einh);
SpinBox2->setSuffix(einh);
2038,17 → 2061,23
SpinBox1->setDecimals (decimals);
SpinBox2->setDecimals (decimals);
SpinBox2g->setDecimals (decimals);
SpinBox1->setMaxValue(oldSM1 * Umrech);
SpinBox1->setMinValue(oldS1 * Umrech);
SpinBox1->setValue(oldSV1 * Umrech);
SpinBox2->setMaxValue(oldSM2 * Umrech);
SpinBox2->setMinValue(oldS2 * Umrech);
SpinBox2->setValue(oldSV2 * Umrech);
SpinBox2g->setMaxValue(oldSM2g * Umrech);
SpinBox2g->setMinValue(oldS2g * Umrech);
SpinBox2g->setValue(oldSV2g * Umrech);
TextGapVal->setMaxValue(oldTGM * Umrech);
TextGapVal->setMinValue(oldTG * Umrech);
TextGapVal->setValue(oldTGV * Umrech);
 
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
disconnect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
disconnect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
disconnect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
SpinBox1->setValue(qRound(SpinBox1->value() / AltUmrech * Umrech));
SpinBox2->setValue(qRound(SpinBox2->value() / AltUmrech * Umrech));
SpinBox2g->setValue(qRound(SpinBox2g->value() / AltUmrech * Umrech));
TextGapVal->setValue(qRound(TextGapVal->value() / AltUmrech * Umrech));
Breite->setMinValue(oldB * Umrech);
Breite->setMaxValue(oldBM * Umrech);
Hoehe->setMinValue(oldH * Umrech);
Hoehe->setMaxValue(oldHM * Umrech);
Breite->setValue(Pagebr * Umrech);
Hoehe->setValue(Pageho * Umrech);
 
2070,7 → 2099,7
connect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
}
 
/*!
/*!
\fn void Preferences::ValFromSpin2(int a)
\author Franz Schmid
\date
2082,10 → 2111,10
{
disconnect(T6_Slider2, SIGNAL(valueChanged(int)), T6_Faktor2, SLOT(setValue(int)));
T6_Slider2->setValue(a);
connect(T6_Slider2, SIGNAL(valueChanged(int)), T6_Faktor2, SLOT(setValue(int)));
connect(T6_Slider2, SIGNAL(valueChanged(int)), T6_Faktor2, SLOT(setValue(int)));
}
 
/*!
/*!
\fn void Preferences::ValFromSpin(int a)
\author Franz Schmid
\date
2097,10 → 2126,10
{
disconnect(T6_Slider1, SIGNAL(valueChanged(int)), T6_Faktor, SLOT(setValue(int)));
T6_Slider1->setValue(a);
connect(T6_Slider1, SIGNAL(valueChanged(int)), T6_Faktor, SLOT(setValue(int)));
connect(T6_Slider1, SIGNAL(valueChanged(int)), T6_Faktor, SLOT(setValue(int)));
}
 
/*!
/*!
\fn void Preferences::UpdatePreView()
\author Franz Schmid
\date
2115,8 → 2144,8
p.begin(Pre);
p.setBrush(NoBrush);
p.setPen(black);
QPointArray pp = RegularPolygon(100, 100, T6_Ecken->value(), T6_Konvex->isChecked(), GetFaktor(),
T6_Slider2->value());
QPointArray pp = RegularPolygon(100, 100, T6_Ecken->value(), T6_Konvex->isChecked(), GetFaktor(),
T6_Slider2->value());
QRect br = pp.boundingRect();
if (br.x() < 0)
pp.translate(-br.x(), 0);
2136,7 → 2165,7
}
 
 
/*!
/*!
\fn double Preferences::GetZeroFaktor()
\author Franz Schmid
\date
2149,7 → 2178,7
return sqrt(pow(1,2)-pow(((sin((360.0/(T6_Ecken->value()*2))/180*M_PI)* 2.0)/2.0),2));
}
 
/*!
/*!
\fn double Preferences::GetMaxFaktor()
\author Franz Schmid
\date
2168,7 → 2197,7
return ret;
}
 
/*!
/*!
\fn double Preferences::GetFaktor()
\author Franz Schmid
\date
2190,7 → 2219,7
return PFactor;
}
 
/*!
/*!
\fn void Preferences::SetDisScale()
\author Franz Schmid
\date
2205,7 → 2234,7
CaliAnz->setText(QString::number(DisScale*100, 'f', 2)+" %");
}
 
/*!
/*!
\fn void Preferences::DrawRuler()
\author Franz Schmid
\date
2218,26 → 2247,26
double xl, iter, iter2, maxi;
switch (Einheit)
{
case 0:
iter = 10.0;
iter2 = iter * 10.0;
maxi = 200.0;
break;
case 1:
iter = (10.0 / 25.4) * 72.0;
iter2 = iter * 10.0;
maxi = iter2;
break;
case 2:
iter = 18.0;
iter2 = 72.0;
maxi = 2 * iter2;
break;
case 3:
iter = 12.0;
iter2 = 120.0;
maxi = 240.0;
break;
case 0:
iter = 10.0;
iter2 = iter * 10.0;
maxi = 200.0;
break;
case 1:
iter = (10.0 / 25.4) * 72.0;
iter2 = iter * 10.0;
maxi = iter2;
break;
case 2:
iter = 18.0;
iter2 = 72.0;
maxi = 2 * iter2;
break;
case 3:
iter = 12.0;
iter2 = 120.0;
maxi = 240.0;
break;
}
QPixmap pm(static_cast<int>(maxi*DisScale+30), 21);
pm.fill();
2256,18 → 2285,18
p.scale(1.0 / DisScale, 1.0);
switch (Einheit)
{
case 2:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter2));
break;
case 3:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter));
break;
default:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter * 10));
break;
case 2:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter2));
break;
case 3:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter));
break;
default:
p.drawText(static_cast<int>((xl+qRound(2/DisScale)) * DisScale), 12,
QString::number(xl / iter * 10));
break;
}
p.restore();
}
/trunk/Scribus/scribus/mspinbox.cpp
111,7 → 111,7
QString ts = text();
QString su = suffix();
ts.replace(",", ".");
if (su == QObject::tr( " pt" ))
if ((su == QObject::tr( " pt" )) || (su == QObject::tr( "pt" )))
{
ts.replace("pt", "");
ts.replace("mm", "/25.4*72");
119,7 → 119,7
ts.replace("p", "*12");
}
else
if (su == QObject::tr( " mm" ))
if ((su == QObject::tr( " mm" )) || (su == QObject::tr( "mm" )))
{
ts.replace("pt", "/72*25.4");
ts.replace("mm", "");
127,7 → 127,7
ts.replace("p", "/12*25.4");
}
else
if (su == QObject::tr( " in" ))
if ((su == QObject::tr( " in" )) || (su == QObject::tr( "in" )))
{
ts.replace("pt", "/72");
ts.replace("mm", "/25.4");
135,7 → 135,7
ts.replace("p", "/6");
}
else
if (su == QObject::tr( " p" ))
if ((su == QObject::tr( " p" )) || (su == QObject::tr( "p" )))
{
ts.replace("pt", "/12");
ts.replace("mm", "/25.4*6");
154,23 → 154,18
 
void MSpinBox::setDecimals(int deci)
{
double oldDeci = static_cast<double>(Decimals);
double oldMin = static_cast<double>(QSpinBox::minValue());
double oldMax = static_cast<double>(QSpinBox::maxValue());
Decimals = deci;
QSpinBox::setLineStep(Decimals);
if (deci < 10)
Width = 0;
if (deci > 9 && deci < 100)
if ((deci > 9) && (deci < 100))
Width = 1;
if (deci > 99 && deci < 1000)
if ((deci > 99) && (deci < 1000))
Width = 2;
if (deci > 999 && deci < 10000)
if ((deci > 999) && (deci < 10000))
Width = 3;
if (deci > 9999)
Width = 4;
QSpinBox::setMinValue(qRound((oldMin / oldDeci) * Decimals));
QSpinBox::setMaxValue(qRound((oldMax / oldDeci) * Decimals));
}
 
/*!
228,3 → 223,31
{
return static_cast<double>(QSpinBox::value()) / Decimals;
}
 
/*!
\fn MSpinBox::minValue()
\author Franz Schmid
\date
\brief Gets the Minimum Value of the Spinbox
\param None
\retval The Value
*/
 
double MSpinBox::minValue()
{
return static_cast<double>(QSpinBox::minValue()) / Decimals;
}
 
/*!
\fn MSpinBox::maxValue()
\author Franz Schmid
\date
\brief Gets the Maximum Value of the Spinbox
\param None
\retval The Value
*/
 
double MSpinBox::maxValue()
{
return static_cast<double>(QSpinBox::maxValue()) / Decimals;
}
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
59,36 → 59,8
Layout1 = new QHBoxLayout;
Layout1->setSpacing(6);
Layout1->setMargin(0);
First = new QToolButton(this, "First");
First->setMaximumSize(QSize(24,24));
First->setText("");
First->setPixmap(loadIcon("start.png"));
Layout1->addWidget(First);
Back = new QToolButton(this, "Back");
Back->setMaximumSize(QSize(24,24));
Back->setText("");
Back->setPixmap(loadIcon("back.png"));
Layout1->addWidget(Back);
Text1 = new QLabel(this);
Text1->setText( tr("Page:"));
Layout1->addWidget(Text1);
SeitenAusw = new QComboBox( true, this, "SeitenAusw" );
SeitenAusw->setEditable(false);
for (int a = 0; a < MPage; a++)
{
SeitenAusw->insertItem(tmp.setNum(a+1));
}
Layout1->addWidget(SeitenAusw);
Forward = new QToolButton(this, "Forward");
Forward->setMaximumSize(QSize(24,24));
Forward->setText("");
Forward->setPixmap(loadIcon("forward.png"));
Layout1->addWidget(Forward);
Last = new QToolButton(this, "Last");
Last->setMaximumSize(QSize(24,24));
Last->setText("");
Last->setPixmap(loadIcon("finish.png"));
Layout1->addWidget(Last);
PGSel = new PageSelector(this, MPage);
Layout1->addWidget(PGSel);
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem(spacer);
Layout4->addLayout(Layout1);
147,10 → 119,6
PLayout->addWidget(Anzeige);
int w = Anz->width() + 20;
resize(QMIN(QApplication::desktop()->width(),w), 500);
connect(First, SIGNAL(clicked()), this, SLOT(ToStart()));
connect(Back, SIGNAL(clicked()), this, SLOT(BackW()));
connect(Forward, SIGNAL(clicked()), this, SLOT(ForW()));
connect(Last, SIGNAL(clicked()), this, SLOT(ToEnd()));
connect(AliasText, SIGNAL(clicked()), this, SLOT(ToggleTextAA()));
connect(AliasGr, SIGNAL(clicked()), this, SLOT(ToggleGr()));
connect(AliasTr, SIGNAL(clicked()), this, SLOT(ToggleTr()));
159,56 → 127,16
connect(EnableCMYK_M, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
connect(EnableCMYK_Y, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
connect(EnableCMYK_K, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
connect(SeitenAusw, SIGNAL(activated(int)), this, SLOT(ToSeite(int)));
setPageCombo(0);
connect(PGSel, SIGNAL(GotoPage(int)), this, SLOT(ToSeite(int)));
}
 
PPreview::~PPreview()
{
}
 
void PPreview::ToStart()
{
if (APage == 0)
return;
Anz->setPixmap(CreatePreview(0, 72));
APage = 0;
setPageCombo(APage);
}
 
void PPreview::BackW()
{
if (APage == 0)
return;
APage--;
Anz->setPixmap(CreatePreview(APage, 72));
setPageCombo(APage);
}
 
void PPreview::ForW()
{
if (APage == MPage-1)
return;
APage++;
Anz->setPixmap(CreatePreview(APage, 72));
setPageCombo(APage);
}
 
void PPreview::ToEnd()
{
if (APage == MPage-1)
return;
Anz->setPixmap(CreatePreview(MPage-1, 72));
APage = MPage-1;
setPageCombo(APage);
}
 
void PPreview::ToSeite(int num)
{
if (num == APage)
int n = num-1;
if (n == APage)
return;
APage = num;
Anz->setPixmap(CreatePreview(num, 72));
APage = n;
Anz->setPixmap(CreatePreview(n, 72));
}
 
void PPreview::ToggleTextAA()
243,23 → 171,6
Anz->setPixmap(CreatePreview(APage, 72));
}
 
void PPreview::setPageCombo(int num)
{
disconnect(SeitenAusw, SIGNAL(activated(int)), this, SLOT(ToSeite(int)));
SeitenAusw->setCurrentItem(num);
bool setter = true;
if (num == 0)
setter = false;
First->setEnabled(setter);
Back->setEnabled(setter);
setter = true;
if (num == MPage-1)
setter = false;
Forward->setEnabled(setter);
Last->setEnabled(setter);
connect(SeitenAusw, SIGNAL(activated(int)), this, SLOT(ToSeite(int)));
}
 
QPixmap PPreview::CreatePreview(int Seite, int Res)
{
int ret = -1;
/trunk/Scribus/scribus/plugins/printpreview/preview.h
10,6 → 10,7
#include <qcombobox.h>
#include <qcheckbox.h>
#include "scribus.h"
#include "pageselector.h"
 
/** Calls the Plugin with the main Application window as parent
* and the main Application Class as parameter */
29,15 → 30,9
 
public:
PPreview( QWidget* parent, ScribusApp *plug );
~PPreview();
void setPageCombo(int num);
~PPreview() {};
QPixmap CreatePreview(int Seite, int Res);
QToolButton* First;
QToolButton* Back;
QLabel* Text1;
QComboBox* SeitenAusw;
QToolButton* Forward;
QToolButton* Last;
PageSelector *PGSel;
QCheckBox* AliasText;
QCheckBox* AliasGr;
QCheckBox* AliasTr;
54,10 → 49,6
int MPage;
 
public slots:
void ToStart();
void BackW();
void ForW();
void ToEnd();
void ToSeite(int num);
void ToggleTextAA();
void ToggleGr();
/trunk/Scribus/scribus/page.cpp
6012,7 → 6012,7
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
nb->Ptext.at(a)->csize = nb->ISize;
// nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
6052,7 → 6052,7
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
nb->Ptext.at(a)->csize = nb->ISize;
// nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
6095,7 → 6095,7
b->Ptext.at(a)->cshade = b->ShTxtFill;
b->Ptext.at(a)->cstroke = b->TxtStroke;
b->Ptext.at(a)->cshade2 = b->ShTxtStroke;
b->Ptext.at(a)->csize = b->ISize;
// b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= b->TxTStyle;
}
/trunk/Scribus/scribus/scribusview.h
36,6 → 36,8
#include "vruler.h"
#include "libpostscript/pslib.h"
#include "mspinbox.h"
#include "pageselector.h"
 
extern QPixmap loadIcon(QString nam);
 
/**
51,7 → 53,7
~ScribusView() {};
/** Vergroesserungseingabefeld */
MSpinBox* LE;
QSpinBox* PGS;
PageSelector* PGS;
QToolButton *UN;
Hruler *HR;
Vruler *VR;
/trunk/Scribus/scribus/po/scribus.de.ts
254,11 → 254,11
</message>
<message>
<source>Align Text Block</source>
<translation>Zentriert</translation>
<translation>Blocksatz</translation>
</message>
<message>
<source>Align Text Center</source>
<translation>Blocksatz</translation>
<translation>Zentriert</translation>
</message>
</context>
<context>
3589,7 → 3589,7
</message>
<message>
<source>Page:</source>
<translation>Seite:</translation>
<translation type="obsolete">Seite:</translation>
</message>
<message>
<source>Anti-alias Text</source>
3872,6 → 3872,17
</message>
</context>
<context>
<name>PageSelector</name>
<message>
<source>Page </source>
<translation>Seite </translation>
</message>
<message>
<source> of %1</source>
<translation> von %1</translation>
</message>
</context>
<context>
<name>PicSearch</name>
<message>
<source>Result</source>
5944,11 → 5955,11
</message>
<message>
<source>Page </source>
<translation>Seite </translation>
<translation type="obsolete">Seite </translation>
</message>
<message>
<source> of %1</source>
<translation> von %1</translation>
<translation type="obsolete"> von %1</translation>
</message>
<message>
<source>Layer</source>
/trunk/Scribus/scribus/po/scribus.cs_CZ.ts
5497,6 → 5497,22
<source>Postscript-Files (*.ps);;All Files (*)</source>
<translation>Postscriptové soubory (*.ps);;Všechny soubory (*)</translation>
</message>
<message>
<source>Cyan</source>
<translation>Azurová (Cyan)</translation>
</message>
<message>
<source>Magenta</source>
<translation>Purpurová (Magenta)</translation>
</message>
<message>
<source>Yellow</source>
<translation>Žlutá (Yellow)</translation>
</message>
<message>
<source>Black</source>
<translation>Černá (Black)</translation>
</message>
</context>
<context>
<name>EditStyle</name>
5620,6 → 5636,10
<source>Lines:</source>
<translation>Čáry:</translation>
</message>
<message>
<source>Stroke Color:</source>
<translation>Barva obrysu:</translation>
</message>
</context>
<context>
<name>Editor</name>
7707,6 → 7727,26
<source>Display Transparency</source>
<translation>Zobrazit průhlednost</translation>
</message>
<message>
<source>Display CMYK</source>
<translation>Zobrazit CMYK</translation>
</message>
<message>
<source>C</source>
<translation>C</translation>
</message>
<message>
<source>M</source>
<translation>M</translation>
</message>
<message>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
<source>K</source>
<translation>K</translation>
</message>
</context>
<context>
<name>Page</name>
7986,23 → 8026,23
</message>
<message>
<source>Name</source>
<translation type="obsolete">Jméno</translation>
<translation>Jméno</translation>
</message>
<message>
<source>Path</source>
<translation type="obsolete">Cesta</translation>
<translation>Cesta</translation>
</message>
<message>
<source>Page</source>
<translation type="obsolete">Strana</translation>
<translation>Strana</translation>
</message>
<message>
<source>Print</source>
<translation type="obsolete">Tisk</translation>
<translation>Tisk</translation>
</message>
<message>
<source>Status</source>
<translation type="obsolete">Stav</translation>
<translation>Stav</translation>
</message>
<message>
<source>Goto</source>
9031,6 → 9071,37
</message>
</context>
<context>
<name>QTitleBar</name>
<message>
<source>System Menu</source>
<translation>Systémová nabídka</translation>
</message>
<message>
<source>Shade</source>
<translation>Schovat</translation>
</message>
<message>
<source>Unshade</source>
<translation>Zobrazit</translation>
</message>
<message>
<source>Normalize</source>
<translation>Normalizovat</translation>
</message>
<message>
<source>Minimize</source>
<translation>Minimalizovat</translation>
</message>
<message>
<source>Maximize</source>
<translation>Maximalizovat</translation>
</message>
<message>
<source>Close</source>
<translation>Zavřít</translation>
</message>
</context>
<context>
<name>QWorkspace</name>
<message>
<source>&amp;Restore</source>
/trunk/Scribus/scribus/pageselector.cpp
0,0 → 1,162
/****************************************************************************
** Form implementation generated from reading ui file 'pageselector.ui'
**
** Created: Son Feb 15 10:09:03 2004
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
 
#include "pageselector.h"
#include "pageselector.moc"
 
#include <qvariant.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
 
extern QPixmap loadIcon(QString nam);
 
PageSelector::PageSelector( QWidget* parent, int maxPg ) : QWidget( parent, "pgsel", 0 )
{
LastPG = maxPg;
APage = 1;
PageSelectorLayout = new QHBoxLayout( this, 0, 1, "PageSelectorLayout");
 
Start = new QPushButton( this, "Start" );
Start->setDefault( false );
Start->setAutoDefault( false );
Start->setPixmap( loadIcon("start.png") );
PageSelectorLayout->addWidget( Start );
 
Back = new QPushButton( this, "Back" );
Back->setPixmap( loadIcon("back.png") );
Back->setDefault( false );
Back->setAutoDefault( false );
PageSelectorLayout->addWidget( Back );
 
Label1 = new QLabel( this, "Label1" );
Label1->setText( tr( "Page " ) );
PageSelectorLayout->addWidget( Label1 );
v = new QIntValidator(1, LastPG, this);
PageCombo = new QComboBox( true, this, "PageCombo" );
PageCombo->setEditable( true );
PageCombo->setDuplicatesEnabled( false );
QString tmp;
for (int a = 0; a < LastPG; ++a)
{
PageCombo->insertItem(tmp.setNum(a+1));
}
PageCombo->setValidator(v);
PageSelectorLayout->addWidget( PageCombo );
 
Label2 = new QLabel( this, "Label2" );
Label2->setText( tr( " of %1" ).arg(LastPG) );
PageSelectorLayout->addWidget( Label2 );
 
Forward = new QPushButton( this, "Forward" );
Forward->setPixmap( loadIcon("forward.png") );
Forward->setDefault( false );
Forward->setAutoDefault( false );
PageSelectorLayout->addWidget( Forward );
 
Last = new QPushButton( this, "Last" );
Last->setPixmap( loadIcon("finish.png") );
Last->setDefault( false );
Last->setAutoDefault( false );
PageSelectorLayout->addWidget( Last );
Forward->setEnabled(true);
Last->setEnabled(true);
Back->setEnabled(false);
Start->setEnabled(false);
if (APage == LastPG)
{
Forward->setEnabled(false);
Last->setEnabled(false);
}
 
// signals and slots connections
connect( PageCombo, SIGNAL( activated(int) ), this, SLOT( GotoPgE(int) ) );
connect( Back, SIGNAL( clicked() ), this, SLOT( goBk() ) );
connect( Start, SIGNAL( clicked() ), this, SLOT( ToStart() ) );
connect( Forward, SIGNAL( clicked() ), this, SLOT( goFw() ) );
connect( Last, SIGNAL( clicked() ), this, SLOT( ToEnd() ) );
}
 
void PageSelector::GotoPgE(int a)
{
GotoPg(a);
emit GotoPage(a+1);
}
 
void PageSelector::GotoPg(int a)
{
disconnect( PageCombo, SIGNAL( activated(int) ), this, SLOT( GotoPgE(int) ) );
PageCombo->setCurrentItem(a);
APage = a+1;
Back->setEnabled(true);
Start->setEnabled(true);
Forward->setEnabled(true);
Last->setEnabled(true);
if (a == 0)
{
Back->setEnabled(false);
Start->setEnabled(false);
}
if (a == LastPG-1)
{
Forward->setEnabled(false);
Last->setEnabled(false);
}
connect( PageCombo, SIGNAL( activated(int) ), this, SLOT( GotoPgE(int) ) );
}
 
void PageSelector::setMaxValue(int a)
{
disconnect( PageCombo, SIGNAL( activated(int) ), this, SLOT( GotoPgE(int) ) );
LastPG = a;
QString tmp;
PageCombo->clear();
v->setTop(LastPG);
for (int b = 0; b < LastPG; ++b)
{
PageCombo->insertItem(tmp.setNum(b+1));
}
Label2->setText( tr( " of %1" ).arg(LastPG) );
connect( PageCombo, SIGNAL( activated(int) ), this, SLOT( GotoPgE(int) ) );
}
 
void PageSelector::ToStart()
{
if (APage == 1)
return;
GotoPgE(0);
}
 
void PageSelector::ToEnd()
{
if (APage == LastPG-1)
return;
GotoPgE(LastPG-1);
}
 
void PageSelector::goBk()
{
APage--;
if (APage < 1)
APage = 1;
GotoPgE(APage-1);
}
 
void PageSelector::goFw()
{
APage++;
if (APage > LastPG)
APage = LastPG;
GotoPgE(APage-1);
}
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: Scribus/scribus/qm/scribus.cs.qm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Scribus/scribus/qm/scribus.de.qm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream