Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1194 → Rev 1195

/branches/Version13x/Scribus/scribus/tabtools.h
0,0 → 1,125
#ifndef TABTOOLS_H
#define TABTOOLS_H
 
#include <qvariant.h>
#include <qwidget.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qtoolbutton.h>
#include <qbuttongroup.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qwidgetstack.h>
#include "scfonts.h"
class LinkButton;
class QSpinBox;
class FontCombo;
class PolygonWidget;
class ArrowChooser;
class MSpinBox;
class LineCombo;
class ScribusDoc;
 
class TabTools : public QWidget
{
Q_OBJECT
 
public:
TabTools( QWidget* parent, struct toolPrefs *prefsData, double unitBase, QString unit, ScribusDoc* doc);
~TabTools() {};
 
QButtonGroup* buttonGroupTools;
QToolButton* toolShape;
QToolButton* toolPoly;
QToolButton* toolImage;
QToolButton* toolText;
QToolButton* toolLine;
QToolButton* toolZoom;
QWidgetStack* subStackTools;
QWidget* subTabText;
QLabel* textLabel3b;
QLabel* textLabel3b2;
QLabel* textLabel1b;
QLabel* textLabel2b;
QLabel* textLabel4b;
QSpinBox* columnsText;
QLabel* previewText;
FontCombo* fontComboText;
QComboBox* sizeComboText;
QComboBox* colorComboText;
QComboBox* colorComboStrokeText;
QLabel* textLabel5b;
MSpinBox* gapText;
QWidget* subTabShape;
QLabel* textLabel9b;
QLabel* textLabel10b;
MSpinBox* lineWidthShape;
QLabel* textLabel12b;
QLabel* textLabel11b;
LineCombo* comboStyleShape;
QSpinBox* shadingFillShape;
QComboBox* comboFillShape;
QSpinBox* shadingLineShape;
QLabel* textLabel7b;
QComboBox* colorComboLineShape;
QLabel* textLabel8b;
QWidget* subTabLine;
MSpinBox* lineWidthLine;
QSpinBox* shadingLine;
QComboBox* colorComboLine;
QLabel* textLabel13b;
QLabel* textLabel14b;
QLabel* textLabel15b;
QLabel* textLabel16b;
LineCombo* comboStyleLine;
QWidget* subTabImage;
QComboBox* comboFillImage;
QLabel* textLabel19b;
QSpinBox* shadingFillImage;
QLabel* textLabel20b;
QButtonGroup* buttonGroup3;
QLabel* textLabel17b;
QLabel* textLabel18b;
QSpinBox* scalingHorizontal;
QSpinBox* scalingVertical;
LinkButton* chainButton;
QButtonGroup* buttonGroup5;
QCheckBox* checkRatioImage;
QWidget* subTabPolygon;
PolygonWidget* polyWidget;
QWidget* subTabZoom;
QLabel* textLabel21b;
QSpinBox* minimumZoom;
QLabel* textLabel22b;
QLabel* textLabel23b;
QSpinBox* maximumZoom;
QSpinBox* zoomStep;
ArrowChooser* startArrow;
ArrowChooser* endArrow;
QLabel* startArrowText;
QLabel* endArrowText;
QLabel* arrowText;
SCFonts *fon;
 
protected slots:
virtual void toggleChain();
virtual void hChange();
virtual void vChange();
virtual void changeImageScalingFree(int);
virtual void changeImageScalingRatio(int);
virtual void setSample();
virtual void setTool();
 
protected:
QHBoxLayout* tabToolsLayout;
QVBoxLayout* buttonGroupToolsLayout;
QGridLayout* subTabTextLayout;
QGridLayout* subTabShapeLayout;
QGridLayout* subTabLineLayout;
QGridLayout* subTabImageLayout;
QGridLayout* buttonGroup3Layout;
QHBoxLayout* buttonGroup5Layout;
QHBoxLayout* subTabPolygonLayout;
QGridLayout* subTabZoomLayout;
};
#endif
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/tabguides.h
===================================================================
--- branches/Version13x/Scribus/scribus/tabguides.h (revision 1194)
+++ branches/Version13x/Scribus/scribus/tabguides.h (revision 1195)
@@ -21,15 +21,12 @@
Q_OBJECT
public:
- TabGuides( QWidget* parent, struct guidesPrefs *prefsData, double unitBase, QString unit);
+ TabGuides( QWidget* parent, struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, double unitBase, QString unit);
~TabGuides() {};
MSpinBox* majorSpace;
MSpinBox* minorSpace;
MSpinBox* snapDistance;
- QCheckBox* checkLink;
- QCheckBox* checkFrame;
- QCheckBox* checkPictures;
QCheckBox* checkMargin;
QCheckBox* checkGuides;
QCheckBox* checkBaseline;
@@ -41,12 +38,14 @@
QGroupBox* checkGrid;
QGroupBox* groupBox1;
QGroupBox* groupBox2;
+ QGroupBox* commonBox;
+ QGroupBox* snapBox;
+ QGroupBox* guideBox;
+ QGroupBox* marginBox;
+ QGroupBox* baselineBox;
QButtonGroup* buttonGroup1;
QRadioButton* inBackground;
QRadioButton* inForeground;
- QLabel* textLabel1;
- QLabel* textLabel2;
- QLabel* textLabel3;
QLabel* textLabel4;
QLabel* textLabel5;
QLabel* textLabel6;
@@ -59,6 +58,12 @@
QPushButton* guideColor;
QPushButton* marginColor;
QSpinBox* grabDistance;
+ QLabel* textLabel6a;
+ QSpinBox* autoLine;
+ QLabel* textLabel7a;
+ MSpinBox* baseGrid;
+ MSpinBox* baseOffset;
+ QLabel* textLabel8a;
protected slots:
virtual void changeMajorColor();
@@ -72,11 +77,12 @@
QGridLayout* checkGridLayout;
QGridLayout* groupBox1Layout;
QGridLayout* groupBox2Layout;
- QHBoxLayout* buttonGroup1Layout;
- QGridLayout* layout11;
- QHBoxLayout* layout2;
- QHBoxLayout* layout3;
+ QHBoxLayout* commonBoxLayout;
+ QGridLayout* snapBoxLayout;
+ QHBoxLayout* guideBoxLayout;
+ QHBoxLayout* marginBoxLayout;
+ QGridLayout* baselineBoxLayout;
+ QVBoxLayout* buttonGroup1Layout;
QHBoxLayout* layout9;
- QGridLayout* layout12;
};
#endif
/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp
328,9 → 328,9
tabLayout_7->addLayout( Layout21 );
addItem( tr("Document"), loadIcon("page.png"), tab_7);
 
tabGuides = new TabGuides(prefsWidgets, &prefsData->guidesSettings, Umrech, "");
tabGuides = new TabGuides(prefsWidgets, &prefsData->guidesSettings, &prefsData->typographicSetttings, Umrech, "");
addItem( tr("Guides"), loadIcon("guides.png"), tabGuides);
tabTypo = new TabTypograpy( prefsWidgets, &prefsData->typographicSetttings, Umrech, "");
tabTypo = new TabTypograpy( prefsWidgets, &prefsData->typographicSetttings);
addItem( tr("Typography"), loadIcon("font.png"), tabTypo);
tabTools = new TabTools( prefsWidgets, &prefsData->toolSettings, Umrech, "", 0);
addItem( tr("Tools"), loadIcon("tools.png"), tabTools);
393,15 → 393,16
tabViewLayout = new QVBoxLayout( tabView, 10, 5, "tabViewLayout");
tabViewLayout->setAlignment( Qt::AlignTop );
pageBackground = new QButtonGroup( tabView, "pageBackground" );
pageBackground->setTitle( tr( "Page Background" ) );
pageBackground->setTitle( tr( "Page Display" ) );
pageBackground->setColumnLayout(0, Qt::Vertical );
pageBackground->layout()->setSpacing( 5 );
pageBackground->layout()->setMargin( 10 );
pageBackgroundLayout = new QHBoxLayout( pageBackground->layout() );
pageBackgroundLayout = new QVBoxLayout( pageBackground->layout() );
pageBackgroundLayout->setAlignment( Qt::AlignTop );
layout10 = new QHBoxLayout( 0, 0, 5, "layout10");
textLabel9 = new QLabel( pageBackground, "textLabel9" );
textLabel9->setText( tr( "Color:" ) );
pageBackgroundLayout->addWidget( textLabel9 );
layout10->addWidget( textLabel9 );
backColor = new QPushButton( pageBackground, "backColor" );
backColor->setMinimumSize( QSize( 60, 20 ) );
backColor->setMaximumSize( QSize( 60, 20 ) );
412,12 → 413,27
colorPaper = prefsData->DpapColor;
backColor->setPixmap(pm5);
backColor->setText( QString::null );
pageBackgroundLayout->addWidget( backColor );
layout10->addWidget( backColor );
QSpacerItem* spacer3 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer3 );
pageBackgroundLayout->addLayout( layout10 );
checkUnprintable = new QCheckBox( pageBackground, "checkUnprintable" );
checkUnprintable->setText( tr( "Display &Unprintable Area in Margin Color" ) );
checkUnprintable->setAccel( QKeySequence( tr( "Alt+U" ) ) );
checkUnprintable->setChecked( prefsData->marginColored );
pageBackgroundLayout->addWidget( checkUnprintable );
checkPictures = new QCheckBox( pageBackground, "checkPictures" );
checkPictures->setText( tr( "Show Pictures" ) );
checkPictures->setChecked(prefsData->guidesSettings.showPic);
pageBackgroundLayout->addWidget( checkPictures );
checkLink = new QCheckBox( pageBackground, "checkLink" );
checkLink->setText( tr( "Show Text Chains" ) );
checkLink->setChecked(prefsData->guidesSettings.linkShown);
pageBackgroundLayout->addWidget( checkLink );
checkFrame = new QCheckBox( pageBackground, "checkFrame" );
checkFrame->setText( tr( "Show Frames" ) );
checkFrame->setChecked(prefsData->guidesSettings.framesShown);
pageBackgroundLayout->addWidget( checkFrame );
tabViewLayout->addWidget( pageBackground );
 
groupScratch = new QGroupBox( tabView, "GroupBox7" );
575,6 → 591,9
 
QWidget::setTabOrder( PreviewSize, SaveAtQuit );
 
QToolTip::add( checkLink, tr("Turns the of linked frames on or off"));
QToolTip::add( checkFrame, tr("Turns the display of frames on or off"));
QToolTip::add( checkPictures, tr("Turns the display of pictures on or off"));
QToolTip::add( guiLangCombo, tr( "Select your default language for Scribus to run with.\nLeave this blank to choose based on environment variables.\nYou can still override this by passing a command line option when starting Scribus" ) );
QToolTip::add( GUICombo, tr( "Choose the default window decoration and looks.\nScribus inherits any available KDE or Qt themes" ) );
QToolTip::add( GFsize, tr( "Default font size for the menus and windows" ) );
983,8 → 1002,8
tabGuides->minorSpace->setSuffix(einh);
tabGuides->majorSpace->setSuffix(einh);
tabGuides->snapDistance->setSuffix(einh);
tabTypo->baseGrid->setSuffix(einh);
tabTypo->baseOffset->setSuffix(einh);
tabGuides->baseGrid->setSuffix(einh);
tabGuides->baseOffset->setSuffix(einh);
tabTools->gapText->setSuffix(einh);
topScratch->setSuffix(einh);
bottomScratch->setSuffix(einh);
1004,10 → 1023,10
tabGuides->majorSpace->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->snapDistance->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->snapDistance->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTypo->baseGrid->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTypo->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTypo->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTypo->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->baseGrid->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
/branches/Version13x/Scribus/scribus/libprefs/prefs.h
82,6 → 82,9
QWidget* tabView;
QButtonGroup* pageBackground;
QLabel* textLabel9;
QCheckBox* checkLink;
QCheckBox* checkFrame;
QCheckBox* checkPictures;
QPushButton* backColor;
QCheckBox* checkUnprintable;
QGroupBox* groupScratch;
210,7 → 213,8
QVBoxLayout* MiscLayout;
QVBoxLayout* groupPrintLayout;
QVBoxLayout* tabViewLayout;
QHBoxLayout* pageBackgroundLayout;
QVBoxLayout* pageBackgroundLayout;
QHBoxLayout* layout10;
QHBoxLayout* groupScratchLayout;
QGridLayout* Layout4s;
 
/branches/Version13x/Scribus/scribus/reformdoc.cpp
200,13 → 200,13
reformDocLayout->addWidget( groupAutoSave );
addItem( tr("Document"), loadIcon("page.png"), tabPage);
 
tabGuides = new TabGuides(prefsWidgets, &doc->guidesSettings, UmReFaktor, ein);
tabGuides = new TabGuides(prefsWidgets, &doc->guidesSettings, &doc->typographicSetttings, UmReFaktor, ein);
addItem( tr("Guides"), loadIcon("guides.png"), tabGuides);
 
tabView = new QWidget( prefsWidgets, "tabView" );
tabViewLayout = new QVBoxLayout( tabView, 10, 5, "tabViewLayout");
pageBackground = new QButtonGroup( tabView, "pageBackground" );
pageBackground->setTitle( tr( "Page Background" ) );
pageBackground->setTitle( tr( "Page Display" ) );
pageBackground->setColumnLayout(0, Qt::Vertical );
pageBackground->layout()->setSpacing( 5 );
pageBackground->layout()->setMargin( 10 );
227,7 → 227,7
backColor->setPixmap(pm5);
backColor->setText( QString::null );
layout10->addWidget( backColor );
spacer3 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
QSpacerItem* spacer3 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer3 );
pageBackgroundLayout->addLayout( layout10 );
checkUnprintable = new QCheckBox( pageBackground, "checkUnprintable" );
235,6 → 235,18
checkUnprintable->setAccel( QKeySequence( tr( "Alt+U" ) ) );
checkUnprintable->setChecked( doc->marginColored );
pageBackgroundLayout->addWidget( checkUnprintable );
checkPictures = new QCheckBox( pageBackground, "checkPictures" );
checkPictures->setText( tr( "Show Pictures" ) );
checkPictures->setChecked(doc->guidesSettings.showPic);
pageBackgroundLayout->addWidget( checkPictures );
checkLink = new QCheckBox( pageBackground, "checkLink" );
checkLink->setText( tr( "Show Text Chains" ) );
checkLink->setChecked(doc->guidesSettings.linkShown);
pageBackgroundLayout->addWidget( checkLink );
checkFrame = new QCheckBox( pageBackground, "checkFrame" );
checkFrame->setText( tr( "Show Frames" ) );
checkFrame->setChecked(doc->guidesSettings.framesShown);
pageBackgroundLayout->addWidget( checkFrame );
tabViewLayout->addWidget( pageBackground );
 
groupScratch = new QGroupBox( tabView, "GroupBox7" );
283,9 → 295,11
layout4s->addWidget( Rechtss, 1, 2 );
groupScratchLayout->addLayout( layout4s );
tabViewLayout->addWidget( groupScratch );
 
 
addItem( tr("Display"), loadIcon("screen.png"), tabView);
 
tabTypo = new TabTypograpy( prefsWidgets, &doc->typographicSetttings, UmReFaktor, ein);
tabTypo = new TabTypograpy( prefsWidgets, &doc->typographicSetttings);
addItem( tr("Typography"), loadIcon("font.png"), tabTypo);
 
tabTools = new TabTools( prefsWidgets, &doc->toolSettings, UmReFaktor, ein, doc);
311,6 → 325,9
topR->setMaxValue(pageHeight - bottomR->value());
bottomR->setMaxValue(pageHeight - topR->value());
//tooltips
QToolTip::add( checkLink, tr("Turns the of linked frames on or off"));
QToolTip::add( checkFrame, tr("Turns the display of frames on or off"));
QToolTip::add( checkPictures, tr("Turns the display of pictures on or off"));
QToolTip::add( backColor, tr( "Color for paper" ) );
QToolTip::add( checkUnprintable, tr( "Mask the area outside the margins in the margin color" ) );
QToolTip::add( facingPages, tr( "Enable single or spread based layout" ) );
381,8 → 398,8
tabGuides->minorSpace->setSuffix(einh);
tabGuides->majorSpace->setSuffix(einh);
tabGuides->snapDistance->setSuffix(einh);
tabTypo->baseGrid->setSuffix(einh);
tabTypo->baseOffset->setSuffix(einh);
tabGuides->baseGrid->setSuffix(einh);
tabGuides->baseOffset->setSuffix(einh);
tabTools->gapText->setSuffix(einh);
topScratch->setSuffix(einh);
bottomScratch->setSuffix(einh);
409,10 → 426,10
tabGuides->majorSpace->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->snapDistance->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->snapDistance->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTypo->baseGrid->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTypo->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTypo->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTypo->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->baseGrid->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabGuides->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabGuides->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
/branches/Version13x/Scribus/scribus/tabtypography.h
14,7 → 14,7
Q_OBJECT
 
public:
TabTypograpy( QWidget* parent, struct typoPrefs *prefsData, double unitBase, QString unit);
TabTypograpy( QWidget* parent, struct typoPrefs *prefsData);
~TabTypograpy() {};
 
QGroupBox* groupBox1a;
30,13 → 30,6
QGroupBox* groupBox3a;
QLabel* textLabel5a;
QSpinBox* capsScaling;
QGroupBox* groupBox4a;
QLabel* textLabel6a;
QSpinBox* autoLine;
QLabel* textLabel7a;
MSpinBox* baseGrid;
MSpinBox* baseOffset;
QLabel* textLabel8a;
 
protected:
QGridLayout* tabTypoLayout;
43,7 → 36,6
QGridLayout* groupBox1aLayout;
QGridLayout* groupBox2aLayout;
QGridLayout* groupBox3aLayout;
QGridLayout* groupBox4aLayout;
};
 
#endif
/branches/Version13x/Scribus/scribus/tabtools.cpp
0,0 → 1,649
#include "tabtools.h"
#include "tabtools.moc"
#include <qtooltip.h>
#include <qspinbox.h>
#include "units.h"
#include "mspinbox.h"
#include "linecombo.h"
#include "fontcombo.h"
#include "polygonwidget.h"
#include "arrowchooser.h"
#include "linkbutton.h"
#include "scribusstructs.h"
#include "scribus.h"
extern QPixmap loadIcon(QString nam);
extern QPixmap fontSamples(QString da, int s, QString ts, QColor back);
extern double UmReFaktor;
extern ScribusApp* ScApp;
 
TabTools::TabTools( QWidget* parent, struct toolPrefs *prefsData, double unitBase, QString unit, ScribusDoc* doc) : QWidget( parent, "tabtools", 0 )
{
fon = &ScApp->Prefs.AvailFonts;
tabToolsLayout = new QHBoxLayout( this, 11, 6, "tabToolsLayout");
buttonGroupTools = new QButtonGroup( this, "buttonGroupTools" );
buttonGroupTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, buttonGroupTools->sizePolicy().hasHeightForWidth() ) );
buttonGroupTools->setExclusive( true );
buttonGroupTools->setRadioButtonExclusive( true );
buttonGroupTools->setColumnLayout(0, Qt::Vertical );
buttonGroupTools->layout()->setSpacing( 5 );
buttonGroupTools->layout()->setMargin( 5 );
buttonGroupTools->setTitle( QString::null );
buttonGroupToolsLayout = new QVBoxLayout( buttonGroupTools->layout() );
buttonGroupToolsLayout->setAlignment( Qt::AlignTop );
toolText = new QToolButton( buttonGroupTools, "toolText" );
toolText->setToggleButton( true );
toolText->setText( QString::null );
toolText->setIconSet( QIconSet( loadIcon("Text.xpm") ) );
buttonGroupToolsLayout->addWidget( toolText );
toolImage = new QToolButton( buttonGroupTools, "toolImage" );
toolImage->setToggleButton( true );
toolImage->setText( QString::null );
toolImage->setIconSet( QIconSet( loadIcon("Bild.xpm") ) );
buttonGroupToolsLayout->addWidget( toolImage );
toolShape = new QToolButton( buttonGroupTools, "toolShape" );
toolShape->setToggleButton( true );
toolShape->setText( QString::null );
toolShape->setIconSet( QIconSet( loadIcon("Rechtecke.xpm") ) );
buttonGroupToolsLayout->addWidget( toolShape);
toolPoly = new QToolButton( buttonGroupTools, "toolPoly" );
toolPoly->setToggleButton( true );
toolPoly->setText( QString::null );
toolPoly->setIconSet( QIconSet( loadIcon("spline.png") ) );
buttonGroupToolsLayout->addWidget( toolPoly );
toolLine = new QToolButton( buttonGroupTools, "toolLine" );
toolLine->setToggleButton( true );
toolLine->setText( QString::null );
toolLine->setIconSet( QIconSet( loadIcon("Stift.xpm") ) );
buttonGroupToolsLayout->addWidget( toolLine );
toolZoom = new QToolButton( buttonGroupTools, "toolZoom" );
toolZoom->setToggleButton( true );
toolZoom->setText( QString::null );
toolZoom->setIconSet( QIconSet( loadIcon("Lupe.xpm") ) );
buttonGroupToolsLayout->addWidget( toolZoom );
tabToolsLayout->addWidget( buttonGroupTools );
subStackTools = new QWidgetStack( this, "subStackTools" );
subStackTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)5, 0, 0, subStackTools->sizePolicy().hasHeightForWidth() ) );
subStackTools->setFrameShape( QWidgetStack::GroupBoxPanel );
subStackTools->setFrameShadow( QWidgetStack::Sunken );
 
subTabText = new QWidget( subStackTools, "subTabText" );
subTabTextLayout = new QGridLayout( subTabText, 1, 1, 11, 6, "subTabTextLayout");
fontComboText = new FontCombo(subTabText, &ScApp->Prefs);
for (int fc=0; fc<fontComboText->count(); ++fc)
{
if (fontComboText->text(fc) == prefsData->defFont)
{
fontComboText->setCurrentItem(fc);
break;
}
}
subTabTextLayout->addMultiCellWidget( fontComboText, 0, 0, 1, 3, Qt::AlignLeft );
textLabel1b = new QLabel( fontComboText, tr( "Font:" ), subTabText, "textLabel1b" );
subTabTextLayout->addWidget( textLabel1b, 0, 0 );
sizeComboText = new QComboBox( true, subTabText, "SizeCombo" );
sizeComboText->setEditable(false);
QString ar_sizes[] = {" 7", " 9", "10", "11", "12", "14", "18", "24", "36", "48", "60", "72"};
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes);
for (uint s = 0; s < f_size; ++s)
sizeComboText->insertItem(ar_sizes[s] + tr(" pt"));
for (int a = 0; a < sizeComboText->count(); ++a)
{
if (sizeComboText->text(a).left(2).toInt() == prefsData->defSize / 10)
sizeComboText->setCurrentItem(a);
}
subTabTextLayout->addMultiCellWidget( sizeComboText, 1, 1, 1, 3, Qt::AlignLeft );
textLabel2b = new QLabel(sizeComboText, tr( "Size:" ), subTabText, "textLabel2b" );
subTabTextLayout->addWidget( textLabel2b, 1, 0 );
colorComboText = new QComboBox( true, subTabText, "colorComboText" );
colorComboText->setEditable(false);
QPixmap pmT2;
pmT2 = QPixmap(15, 15);
ColorList::Iterator itc;
colorComboText->insertItem( tr("None"));
if (prefsData->dPenText == "None")
colorComboText->setCurrentItem(colorComboText->count()-1);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pmT2.fill(doc->PageColors[itc.key()].getRGBColor());
colorComboText->insertItem(pmT2, itc.key());
if (itc.key() == prefsData->dPenText)
colorComboText->setCurrentItem(colorComboText->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pmT2.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
colorComboText->insertItem(pmT2, itc.key());
if (itc.key() == prefsData->dPenText)
colorComboText->setCurrentItem(colorComboText->count()-1);
}
}
subTabTextLayout->addMultiCellWidget( colorComboText, 2, 2, 1, 3, Qt::AlignLeft );
textLabel3b = new QLabel(colorComboText, tr( "Fill Color:" ), subTabText, "textLabel3b" );
subTabTextLayout->addWidget( textLabel3b, 2, 0 );
colorComboStrokeText = new QComboBox( true, subTabText, "colorComboStrokeText" );
colorComboStrokeText->setEditable(false);
colorComboStrokeText->insertItem( tr("None"));
if (prefsData->dStrokeText == "None")
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pmT2.fill(doc->PageColors[itc.key()].getRGBColor());
colorComboStrokeText->insertItem(pmT2, itc.key());
if (itc.key() == prefsData->dStrokeText)
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pmT2.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
colorComboStrokeText->insertItem(pmT2, itc.key());
if (itc.key() == prefsData->dStrokeText)
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1);
}
}
subTabTextLayout->addMultiCellWidget( colorComboStrokeText, 3, 3, 1, 3, Qt::AlignLeft );
textLabel3b2 = new QLabel(colorComboStrokeText, tr( "Stroke Color:" ), subTabText, "textLabel3b2" );
subTabTextLayout->addWidget( textLabel3b2, 3, 0 );
columnsText = new QSpinBox( subTabText, "columnsText" );
columnsText->setMinValue( 1 );
columnsText->setMaxValue(100);
columnsText->setValue(prefsData->dCols);
subTabTextLayout->addWidget( columnsText, 4, 1, Qt::AlignLeft );
textLabel4b = new QLabel(columnsText, tr("Colu&mns:"), subTabText, "TextCol");
subTabTextLayout->addWidget( textLabel4b, 4, 0 );
gapText = new MSpinBox( 0, 200, subTabText, 2 );
gapText->setSuffix( unit );
gapText->setValue(prefsData->dGap * unitBase);
subTabTextLayout->addWidget( gapText, 4, 3, Qt::AlignLeft );
textLabel5b = new QLabel(gapText, tr("&Gap:"), subTabText, "TextCol");
subTabTextLayout->addWidget( textLabel5b, 4, 2 );
previewText = new QLabel( tr( "Woven silk pyjamas exchanged for blue quartz" ), subTabText, "previewText" );
previewText->setMinimumSize( QSize( 280, 70 ) );
previewText->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
subTabTextLayout->addMultiCellWidget( previewText, 5, 5, 0, 3 );
subStackTools->addWidget( subTabText, 0 );
 
subTabShape = new QWidget( subStackTools, "subTabShape" );
subTabShapeLayout = new QGridLayout( subTabShape, 1, 1, 11, 6, "subTabShapeLayout");
subTabShapeLayout->setAlignment( Qt::AlignTop );
colorComboLineShape = new QComboBox( true, subTabShape, "colorComboLineShape" );
colorComboLineShape->setEditable(false);
colorComboLineShape->insertItem( tr("None"));
if (prefsData->dPen == "None")
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1);
QPixmap pm2S = QPixmap(15, 15);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pm2S.fill(doc->PageColors[itc.key()].getRGBColor());
colorComboLineShape->insertItem(pm2S, itc.key());
if (itc.key() == prefsData->dPen)
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pm2S.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
colorComboLineShape->insertItem(pm2S, itc.key());
if (itc.key() == prefsData->dPen)
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1);
}
}
subTabShapeLayout->addWidget( colorComboLineShape, 0, 1, Qt::AlignLeft );
textLabel7b = new QLabel( colorComboLineShape, tr( "&Line Color:" ), subTabShape, "textLabel7b" );
subTabShapeLayout->addWidget( textLabel7b, 0, 0 );
shadingLineShape = new QSpinBox( subTabShape, "shadingLineShape" );
shadingLineShape->setMaxValue( 100 );
shadingLineShape->setSuffix( tr( " %" ) );
shadingLineShape->setMinValue( 0 );
shadingLineShape->setValue(prefsData->dShade2);
subTabShapeLayout->addWidget( shadingLineShape, 1, 1, Qt::AlignLeft );
textLabel8b = new QLabel( shadingLineShape, tr( "&Shading:" ), subTabShape, "textLabel8b" );
subTabShapeLayout->addWidget( textLabel8b, 1, 0 );
comboFillShape = new QComboBox( true, subTabShape, "comboFillShape" );
comboFillShape->setEditable(false);
comboFillShape->insertItem( tr("None"));
if (prefsData->dBrush == "None")
comboFillShape->setCurrentItem(comboFillShape->count()-1);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pm2S.fill(doc->PageColors[itc.key()].getRGBColor());
comboFillShape->insertItem(pm2S, itc.key());
if (itc.key() == prefsData->dBrush)
comboFillShape->setCurrentItem(comboFillShape->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pm2S.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
comboFillShape->insertItem(pm2S, itc.key());
if (itc.key() == prefsData->dBrush)
comboFillShape->setCurrentItem(comboFillShape->count()-1);
}
}
subTabShapeLayout->addWidget( comboFillShape, 2, 1, Qt::AlignLeft );
textLabel9b = new QLabel( comboFillShape, tr( "&Fill Color:" ), subTabShape, "textLabel9b" );
subTabShapeLayout->addWidget( textLabel9b, 2, 0 );
shadingFillShape = new QSpinBox( subTabShape, "shadingFillShape" );
shadingFillShape->setMaxValue( 100 );
shadingFillShape->setSuffix( tr( " %" ) );
shadingFillShape->setMinValue( 0 );
shadingFillShape->setValue(prefsData->dShade);
subTabShapeLayout->addWidget( shadingFillShape, 3, 1, Qt::AlignLeft );
textLabel10b = new QLabel( shadingFillShape, tr( "S&hading:" ), subTabShape, "textLabel10b" );
subTabShapeLayout->addWidget( textLabel10b, 3, 0 );
comboStyleShape = new LineCombo(subTabShape);
comboStyleShape->setEditable(false);
switch (prefsData->dLineArt)
{
case SolidLine:
comboStyleShape->setCurrentItem(0);
break;
case DashLine:
comboStyleShape->setCurrentItem(1);
break;
case DotLine:
comboStyleShape->setCurrentItem(2);
break;
case DashDotLine:
comboStyleShape->setCurrentItem(3);
break;
case DashDotDotLine:
comboStyleShape->setCurrentItem(4);
break;
default:
comboStyleShape->setCurrentItem(0);
break;
}
subTabShapeLayout->addWidget( comboStyleShape, 4, 1, Qt::AlignLeft );
textLabel11b = new QLabel( comboStyleShape, tr( "Line Style:" ), subTabShape, "textLabel11b" );
subTabShapeLayout->addWidget( textLabel11b, 4, 0 );
lineWidthShape = new MSpinBox( 0, 36, subTabShape, 1 );
lineWidthShape->setSuffix( tr( " pt" ) );
lineWidthShape->setValue(prefsData->dWidth);
subTabShapeLayout->addWidget( lineWidthShape, 5, 1, Qt::AlignLeft );
textLabel12b = new QLabel( lineWidthShape, tr( "Line &Width:" ), subTabShape, "TextLabel2_3_4" );
subTabShapeLayout->addWidget( textLabel12b, 5, 0 );
subStackTools->addWidget( subTabShape, 1 );
 
subTabLine = new QWidget( subStackTools, "subTabLine" );
subTabLineLayout = new QGridLayout( subTabLine, 1, 1, 11, 6, "subTabLineLayout");
subTabLineLayout->setAlignment( Qt::AlignTop );
colorComboLine = new QComboBox( true, subTabLine, "colorComboLine" );
colorComboLine->setEditable(false);
QPixmap pm2L = QPixmap(15, 15);
colorComboLine->insertItem( tr("None"));
if (prefsData->dPenLine == "None")
colorComboLine->setCurrentItem(colorComboLine->count()-1);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pm2L.fill(doc->PageColors[itc.key()].getRGBColor());
colorComboLine->insertItem(pm2L, itc.key());
if (itc.key() == prefsData->dPenLine)
colorComboLine->setCurrentItem(colorComboLine->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pm2L.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
colorComboLine->insertItem(pm2L, itc.key());
if (itc.key() == prefsData->dPenLine)
colorComboLine->setCurrentItem(colorComboLine->count()-1);
}
}
subTabLineLayout->addMultiCellWidget( colorComboLine, 0, 0, 1, 2, Qt::AlignLeft );
textLabel13b = new QLabel(colorComboLine, tr("&Line Color:"), subTabLine, "textLabel13b" );
subTabLineLayout->addWidget( textLabel13b, 0, 0 );
shadingLine = new QSpinBox( subTabLine, "shadingLine" );
shadingLine->setMaxValue( 100 );
shadingLine->setValue(prefsData->dShadeLine);
shadingLine->setSuffix( tr( " %" ) );
subTabLineLayout->addMultiCellWidget( shadingLine, 1, 1, 1, 2, Qt::AlignLeft );
textLabel14b = new QLabel(shadingLine, tr("&Shading:"), subTabLine, "textLabel14b" );
subTabLineLayout->addWidget( textLabel14b, 1, 0 );
comboStyleLine = new LineCombo(subTabLine);
comboStyleLine->setEditable(false);
switch (prefsData->dLstyleLine)
{
case SolidLine:
comboStyleLine->setCurrentItem(0);
break;
case DashLine:
comboStyleLine->setCurrentItem(1);
break;
case DotLine:
comboStyleLine->setCurrentItem(2);
break;
case DashDotLine:
comboStyleLine->setCurrentItem(3);
break;
case DashDotDotLine:
comboStyleLine->setCurrentItem(4);
break;
default:
comboStyleLine->setCurrentItem(0);
break;
}
subTabLineLayout->addMultiCellWidget( comboStyleLine, 2, 2, 1, 2, Qt::AlignLeft );
textLabel15b = new QLabel(subTabLine, tr("Line S&tyle:"), subTabLine, "textLabel15b" );
subTabLineLayout->addWidget( textLabel15b, 2, 0 );
startArrow = new ArrowChooser(subTabLine, true);
subTabLineLayout->addWidget( startArrow, 4, 1 );
endArrow = new ArrowChooser(subTabLine, false);
subTabLineLayout->addWidget( endArrow, 4, 2 );
if (doc != 0)
{
startArrow->rebuildList(&doc->arrowStyles);
endArrow->rebuildList(&doc->arrowStyles);
}
else
{
startArrow->rebuildList(&ScApp->Prefs.arrowStyles);
endArrow->rebuildList(&ScApp->Prefs.arrowStyles);
}
startArrow->setCurrentItem(prefsData->dStartArrow);
endArrow->setCurrentItem(prefsData->dEndArrow);
arrowText = new QLabel( tr( "Arrows:" ), subTabLine, "arrowText" );
subTabLineLayout->addMultiCellWidget( arrowText, 3, 4, 0, 0 );
startArrowText = new QLabel( startArrow, tr( "Start:" ), subTabLine, "startArrowText" );
subTabLineLayout->addWidget( startArrowText, 3, 1 );
endArrowText = new QLabel( endArrow, tr( "End:" ), subTabLine, "endArrowText" );
subTabLineLayout->addWidget( endArrowText, 3, 2 );
lineWidthLine = new MSpinBox( 1, 36, subTabLine, 1 );
lineWidthLine->setSuffix( tr( " pt" ) );
lineWidthLine->setValue(prefsData->dWidthLine);
subTabLineLayout->addMultiCellWidget( lineWidthLine, 5, 5, 1, 2, Qt::AlignLeft );
textLabel16b = new QLabel(lineWidthLine, tr("Line &Width:"), subTabLine, "textLabel16b" );
subTabLineLayout->addWidget( textLabel16b, 5, 0 );
subStackTools->addWidget( subTabLine, 2 );
 
subTabImage = new QWidget( subStackTools, "subTabImage" );
subTabImageLayout = new QGridLayout( subTabImage, 1, 1, 11, 6, "subTabImageLayout");
subTabImageLayout->setAlignment( Qt::AlignTop );
buttonGroup3 = new QButtonGroup( subTabImage, "buttonGroup3" );
buttonGroup3->setCheckable( true );
buttonGroup3->setChecked( prefsData->scaleType );
buttonGroup3->setColumnLayout(0, Qt::Vertical );
buttonGroup3->layout()->setSpacing( 6 );
buttonGroup3->layout()->setMargin( 11 );
buttonGroup3->setTitle( tr( "&Free Scaling" ) );
buttonGroup3Layout = new QGridLayout( buttonGroup3->layout() );
buttonGroup3Layout->setAlignment( Qt::AlignTop );
scalingHorizontal = new QSpinBox( buttonGroup3, "scalingHorizontal" );
scalingHorizontal->setMaxValue( 1000 );
scalingHorizontal->setMinValue( 1 );
scalingHorizontal->setValue(qRound(prefsData->scaleX * 100));
scalingHorizontal->setSuffix( tr( " %" ) );
buttonGroup3Layout->addWidget( scalingHorizontal, 0, 1, Qt::AlignRight );
textLabel17b = new QLabel(scalingHorizontal, tr("&Horizontal Scaling:"), buttonGroup3, "textLabel17b" );
buttonGroup3Layout->addWidget( textLabel17b, 0, 0 );
scalingVertical = new QSpinBox( buttonGroup3, "scalingVertical" );
scalingVertical->setMaxValue( 1000 );
scalingVertical->setMinValue( 1 );
scalingVertical->setSuffix( tr( " %" ) );
scalingVertical->setValue(qRound(prefsData->scaleY * 100));
buttonGroup3Layout->addWidget( scalingVertical, 1, 1, Qt::AlignRight );
textLabel18b = new QLabel(scalingVertical, tr( "&Vertical Scaling:" ), buttonGroup3, "textLabel18b" );
buttonGroup3Layout->addWidget( textLabel18b, 1, 0 );
chainButton = new LinkButton( buttonGroup3 );
chainButton->setToggleButton( true );
chainButton->setAutoRaise(true);
buttonGroup3Layout->addMultiCellWidget( chainButton, 0, 1, 2, 2, Qt::AlignLeft );
subTabImageLayout->addMultiCellWidget( buttonGroup3, 0, 0, 0, 1 );
buttonGroup5 = new QButtonGroup( subTabImage, "buttonGroup5" );
buttonGroup5->setCheckable( true );
buttonGroup5->setChecked( !prefsData->scaleType );
buttonGroup5->setColumnLayout(0, Qt::Vertical );
buttonGroup5->layout()->setSpacing( 6 );
buttonGroup5->layout()->setMargin( 11 );
buttonGroup5->setTitle( tr( "&Scale Picture to Frame Size" ) );
buttonGroup5Layout = new QHBoxLayout( buttonGroup5->layout() );
buttonGroup5Layout->setAlignment( Qt::AlignTop );
checkRatioImage = new QCheckBox( buttonGroup5, "checkRatioImage" );
checkRatioImage->setText( tr( "Keep Aspect &Ratio" ) );
checkRatioImage->setChecked(prefsData->aspectRatio);
buttonGroup5Layout->addWidget( checkRatioImage );
subTabImageLayout->addMultiCellWidget( buttonGroup5, 1, 1, 0, 1 );
comboFillImage = new QComboBox( true, subTabImage, "comboFillImage" );
comboFillImage->setEditable(false);
QPixmap pm2I = QPixmap(15, 15);
comboFillImage->insertItem( tr("None"));
if (prefsData->dBrushPict == "None")
comboFillImage->setCurrentItem(comboFillImage->count()-1);
if (doc != 0)
{
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pm2I.fill(doc->PageColors[itc.key()].getRGBColor());
comboFillImage->insertItem(pm2I, itc.key());
if (itc.key() == prefsData->dBrushPict)
comboFillImage->setCurrentItem(comboFillImage->count()-1);
}
}
else
{
for (itc = ScApp->Prefs.DColors.begin(); itc != ScApp->Prefs.DColors.end(); ++itc)
{
pm2I.fill(ScApp->Prefs.DColors[itc.key()].getRGBColor());
comboFillImage->insertItem(pm2I, itc.key());
if (itc.key() == prefsData->dBrushPict)
comboFillImage->setCurrentItem(comboFillImage->count()-1);
}
}
subTabImageLayout->addWidget( comboFillImage, 2, 1, Qt::AlignLeft );
textLabel19b = new QLabel(comboFillImage, tr( "F&ill Color:" ), subTabImage, "textLabel19b" );
subTabImageLayout->addWidget( textLabel19b, 2, 0 );
shadingFillImage = new QSpinBox( subTabImage, "shadingFillImage" );
shadingFillImage->setMaxValue( 100 );
shadingFillImage->setValue( prefsData->shadePict );
shadingFillImage->setSuffix( tr( " %" ) );
subTabImageLayout->addWidget( shadingFillImage, 3, 1, Qt::AlignLeft );
textLabel20b = new QLabel(shadingFillImage, tr( "S&hading:" ), subTabImage, "textLabel20b" );
subTabImageLayout->addWidget( textLabel20b, 3, 0 );
subStackTools->addWidget( subTabImage, 3 );
 
subTabPolygon = new QWidget( subStackTools, "subTabPolygon" );
subTabPolygonLayout = new QHBoxLayout( subTabPolygon, 11, 6, "subTabPolygonLayout");
subTabPolygonLayout->setAlignment( Qt::AlignTop );
polyWidget = new PolygonWidget(subTabPolygon, prefsData->polyC, prefsData->polyFd, prefsData->polyF, prefsData->polyS, prefsData->polyR);
subTabPolygonLayout->addWidget( polyWidget );
subStackTools->addWidget( subTabPolygon, 4 );
 
subTabZoom = new QWidget( subStackTools, "subTabZoom" );
subTabZoomLayout = new QGridLayout( subTabZoom, 1, 1, 11, 6, "subTabZoomLayout");
subTabZoomLayout->setAlignment( Qt::AlignTop );
minimumZoom = new QSpinBox( subTabZoom, "minimumZoom" );
minimumZoom->setMaxValue( 3200 );
minimumZoom->setMinValue( 10 );
minimumZoom->setValue(prefsData->magMin);
minimumZoom->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( minimumZoom, 0, 1, Qt::AlignLeft );
textLabel21b = new QLabel( minimumZoom, tr( "Mi&nimum:" ), subTabZoom, "textLabel21b" );
subTabZoomLayout->addWidget( textLabel21b, 0, 0);
maximumZoom = new QSpinBox( subTabZoom, "maximumZoom" );
maximumZoom->setMaxValue( 3200 );
maximumZoom->setMinValue( 10 );
maximumZoom->setValue(prefsData->magMax);
maximumZoom->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( maximumZoom, 1, 1, Qt::AlignLeft );
textLabel22b = new QLabel( maximumZoom, tr( "Ma&ximum:" ), subTabZoom, "textLabel22b" );
subTabZoomLayout->addWidget( textLabel22b, 1, 0 );
zoomStep = new QSpinBox( subTabZoom, "zoomStep" );
zoomStep->setMaxValue( 200 );
zoomStep->setMinValue( 1 );
zoomStep->setLineStep( 25 );
zoomStep->setValue( prefsData->magStep );
zoomStep->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( zoomStep, 2, 1, Qt::AlignLeft );
textLabel23b = new QLabel( zoomStep, tr( "&Stepping:" ), subTabZoom, "textLabel23b" );
subTabZoomLayout->addWidget( textLabel23b, 2, 0 );
subStackTools->addWidget( subTabZoom, 5 );
tabToolsLayout->addWidget( subStackTools );
toolText->setOn(true);
setSample();
QToolTip::add( toolText, tr( "Text Frame Properties" ) );
QToolTip::add( toolImage, tr( "Picture Frame Properties" ) );
QToolTip::add( toolShape, tr( "Shape Drawing Properties" ) );
QToolTip::add( toolZoom, tr( "Magnification Level Defaults" ) );
QToolTip::add( toolLine, tr( "Line Drawing Properties" ) );
QToolTip::add( toolPoly, tr( "Polygon Drawing Properties" ) );
QToolTip::add( fontComboText, tr( "Font for new text frames" ) );
QToolTip::add( sizeComboText, tr( "Size of font for new text frames" ) );
QToolTip::add( colorComboText, tr( "Color of font" ) );
QToolTip::add( columnsText, tr( "Number of columns in a text frame" ) );
QToolTip::add( gapText, tr( "Gap between text frame columns" ) );
QToolTip::add( previewText, tr( "Sample of your font" ) );
QToolTip::add( buttonGroup3, tr( "Picture frames allow pictures to scale to any size" ) );
QToolTip::add( scalingHorizontal, tr( "Horizontal scaling of images" ) );
QToolTip::add( scalingVertical, tr( "Vertical scaling of images" ) );
QToolTip::add( chainButton, tr( "Keep horizontal and vertical scaling the same" ) );
QToolTip::add( buttonGroup5, tr( "Pictures in picture frames are scaled to the size of the frame" ) );
QToolTip::add( checkRatioImage, tr( "Automatically scaled pictures keep their original proportions" ) );
QToolTip::add( comboFillImage, tr( "Fill color of picture frames" ) );
QToolTip::add( shadingFillImage, tr( "Saturation of color of fill" ) );
QToolTip::add( colorComboLineShape, tr( "Line color of shapes" ) );
QToolTip::add( shadingLineShape, tr( "Saturation of color of lines" ) );
QToolTip::add( comboFillShape, tr( "Fill color of shapes" ) );
QToolTip::add( shadingFillShape, tr( "Saturation of color of fill" ) );
QToolTip::add( comboStyleShape, tr( "Line style of shapes" ) );
QToolTip::add( lineWidthShape, tr( "Line width of shapes" ) );
QToolTip::add( minimumZoom, tr( "Minimum magnification allowed" ) );
QToolTip::add( maximumZoom, tr( "Maximum magnification allowed" ) );
QToolTip::add( zoomStep, tr( "Change in magnification for each zoom operation" ) );
QToolTip::add( colorComboLine, tr( "Color of lines" ) );
QToolTip::add( shadingLine, tr( "Saturation of color" ) );
QToolTip::add( comboStyleLine, tr( "Style of lines" ) );
QToolTip::add( lineWidthLine, tr( "Width of lines" ) );
connect(toolShape, SIGNAL(clicked()), this, SLOT(setTool()));
connect(toolPoly, SIGNAL(clicked()), this, SLOT(setTool()));
connect(toolImage, SIGNAL(clicked()), this, SLOT(setTool()));
connect(toolText, SIGNAL(clicked()), this, SLOT(setTool()));
connect(toolLine, SIGNAL(clicked()), this, SLOT(setTool()));
connect(toolZoom, SIGNAL(clicked()), this, SLOT(setTool()));
connect(fontComboText, SIGNAL(activated(int)), this, SLOT(setSample()));
connect(sizeComboText, SIGNAL(activated(int)), this, SLOT(setSample()));
connect(buttonGroup3, SIGNAL(clicked(int)), this, SLOT(changeImageScalingFree(int)));
connect(buttonGroup5, SIGNAL(clicked(int)), this, SLOT(changeImageScalingRatio(int)));
connect(chainButton, SIGNAL(clicked()), this, SLOT(toggleChain()));
connect(scalingHorizontal, SIGNAL(valueChanged(int)), this, SLOT(hChange()));
connect(scalingVertical, SIGNAL(valueChanged(int)), this, SLOT(vChange()));
}
 
/*!
\fn void TabTools::ToggleKette()
\author Franz Schmid
\date
\brief TabTools (Tools, Image Frame), Sets Y Scale value from X Scale value when chain is toggled
\param None
\retval None
*/
void TabTools::toggleChain()
{
if (chainButton->isOn())
scalingVertical->setValue(scalingHorizontal->value());
}
 
/*!
\fn void TabTools::HChange()
\author Franz Schmid
\date
\brief TabTools (Tools, Image Frame), Sets Y Scale value from X Scale value when X Scale value is changed
\param None
\retval None
*/
void TabTools::hChange()
{
if (chainButton->isOn())
scalingVertical->setValue(scalingHorizontal->value());
}
 
/*!
\fn void TabTools::vChange()
\author Franz Schmid
\date
\brief TabTools (Tools, Image Frame). Sets X Scale value from Y Scale value when Y Scale value is changed
\param None
\retval None
*/
void TabTools::vChange()
{
if (chainButton->isOn())
scalingHorizontal->setValue(scalingVertical->value());
}
 
void TabTools::changeImageScalingFree(int)
{
if (buttonGroup3->isChecked())
buttonGroup5->setChecked(false);
else
buttonGroup5->setChecked(true);
}
 
void TabTools::changeImageScalingRatio(int)
{
if (buttonGroup5->isChecked())
buttonGroup3->setChecked(false);
else
buttonGroup3->setChecked(true);
}
 
/*!
\fn void TabTools::SetSample()
\author Franz Schmid
\date
\brief TabTools (Tools, Text frame), Sets the sample text in selected font in text frame preferences
\param None
\retval None
*/
void TabTools::setSample()
{
QString ts = tr( "Woven silk pyjamas exchanged for blue quartz" );
QString da = (*fon)[fontComboText->currentText()]->Datei;
int s = sizeComboText->currentText().left(2).toInt();
QPixmap pm = fontSamples(da, s, ts, paletteBackgroundColor());
previewText->setPixmap(pm);
}
 
/*!
\fn void TabTools::SetTool()
\author Franz Schmid
\date
\brief TabTools (Tools), Raises widget for selected Tool properties
\param None
\retval None
*/
void TabTools::setTool()
{
if (toolText == sender())
subStackTools->raiseWidget(0);
if (toolShape == sender())
subStackTools->raiseWidget(1);
if (toolLine == sender())
subStackTools->raiseWidget(2);
if (toolImage == sender())
subStackTools->raiseWidget(3);
if (toolPoly == sender())
subStackTools->raiseWidget(4);
if (toolZoom == sender())
subStackTools->raiseWidget(5);
}
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/reformdoc.h
===================================================================
--- branches/Version13x/Scribus/scribus/reformdoc.h (revision 1194)
+++ branches/Version13x/Scribus/scribus/reformdoc.h (revision 1195)
@@ -68,6 +68,9 @@
QLabel* orientationQLabel;
QComboBox* sizeQComboBox;
QComboBox* orientationQComboBox;
+ QCheckBox* checkLink;
+ QCheckBox* checkFrame;
+ QCheckBox* checkPictures;
TabGuides* tabGuides;
QWidget* tabView;
@@ -109,7 +112,6 @@
QHBoxLayout* layout7;
QVBoxLayout* pageBackgroundLayout;
QHBoxLayout* layout10;
- QSpacerItem* spacer3;
QHBoxLayout* groupAutoSaveLayout;
protected slots:
/branches/Version13x/Scribus/scribus/tabtypography.cpp
8,7 → 8,7
#include "mspinbox.h"
#include "scribusstructs.h"
 
TabTypograpy::TabTypograpy( QWidget* parent, struct typoPrefs *prefsData, double unitBase, QString unit) : QWidget( parent, "tabtypo", 0 )
TabTypograpy::TabTypograpy( QWidget* parent, struct typoPrefs *prefsData) : QWidget( parent, "tabtypo", 0 )
{
tabTypoLayout = new QGridLayout( this, 1, 1, 11, 6, "tabTypoLayout");
groupBox1a = new QGroupBox( this, "groupBox1a" );
73,38 → 73,10
textLabel5a = new QLabel(capsScaling, tr( "Sc&aling:" ), groupBox3a, "textLabel5a" );
groupBox3aLayout->addWidget( textLabel5a, 0, 0 );
tabTypoLayout->addWidget( groupBox3a, 2, 0 );
groupBox4a = new QGroupBox( this, "groupBox4a" );
groupBox4a->setColumnLayout(0, Qt::Vertical );
groupBox4a->layout()->setSpacing( 6 );
groupBox4a->layout()->setMargin( 11 );
groupBox4a->setTitle( tr( "Other" ) );
groupBox4aLayout = new QGridLayout( groupBox4a->layout() );
groupBox4aLayout->setAlignment( Qt::AlignTop );
baseGrid = new MSpinBox( 1, 1000, groupBox4a, 1 );
baseGrid->setSuffix( unit );
baseGrid->setValue(prefsData->valueBaseGrid * unitBase);
groupBox4aLayout->addWidget( baseGrid, 0, 1, Qt::AlignLeft );
textLabel6a = new QLabel(baseGrid, tr( "Baseline &Grid:" ),groupBox4a, "textLabel6a" );
groupBox4aLayout->addWidget( textLabel6a, 0, 0 );
baseOffset = new MSpinBox( 0, 1000, groupBox4a, 1 );
baseOffset->setSuffix( unit );
baseOffset->setValue(prefsData->offsetBaseGrid * unitBase);
groupBox4aLayout->addWidget( baseOffset, 1, 1, Qt::AlignLeft );
textLabel7a = new QLabel(baseOffset, tr( "Baseline &Offset:" ),groupBox4a, "textLabel7a" );
groupBox4aLayout->addWidget( textLabel7a, 1, 0 );
autoLine = new QSpinBox( groupBox4a, "autoLine" );
autoLine->setMaxValue( 100 );
autoLine->setMinValue( 1 );
autoLine->setValue( prefsData->autoLineSpacing );
autoLine->setSuffix( tr( " %" ) );
groupBox4aLayout->addWidget( autoLine, 2, 1, Qt::AlignLeft );
textLabel8a = new QLabel( autoLine, tr( "Automatic &Line Spacing:" ), groupBox4a, "textLabel8a" );
groupBox4aLayout->addWidget( textLabel8a, 2, 0 );
tabTypoLayout->addWidget( groupBox4a, 3, 0 );
 
QToolTip::add( superDisplacement, tr( "Displacement above the baseline of the font on a line" ) );
QToolTip::add( superScaling, tr( "Relative size of the superscript compared to the normal font" ) );
QToolTip::add( subDisplacement, tr( "Displacement below the baseline of the normal font on a line" ) );
QToolTip::add( subScaling, tr( "Relative size of the subscript compared to the normal font" ) );
QToolTip::add( capsScaling, tr( "Relative size of the small caps font compared to the normal font" ) );
QToolTip::add( autoLine, tr( "Percentage increase over the font size for the line spacing" ) );
}
/branches/Version13x/Scribus/scribus/tabguides.cpp
15,11 → 15,109
#include "mspinbox.h"
#include "scribusstructs.h"
 
TabGuides::TabGuides( QWidget* parent, struct guidesPrefs *prefsData, double unitBase, QString unit) : QWidget( parent, "tabguide", 0 )
TabGuides::TabGuides( QWidget* parent, struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, double unitBase, QString unit) : QWidget( parent, "tabguide", 0 )
{
tabGuidesLayout = new QVBoxLayout( this, 10, 5, "tabViewLayout");
 
commonBox = new QGroupBox( this, "commonBox" );
commonBox->setTitle( tr( "Common Settings" ) );
commonBox->setColumnLayout(0, Qt::Vertical );
commonBox->layout()->setSpacing( 5 );
commonBox->layout()->setMargin( 10 );
commonBoxLayout = new QHBoxLayout( commonBox->layout() );
 
buttonGroup1 = new QButtonGroup( commonBox, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Horizontal );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing in Documents" ) );
buttonGroup1Layout = new QVBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( prefsData->before );
inForeground->setChecked( !prefsData->before );
commonBoxLayout->addWidget( buttonGroup1 );
 
snapBox = new QGroupBox( commonBox, "snapBox" );
snapBox->setTitle( tr( "Snapping" ) );
snapBox->setColumnLayout(0, Qt::Vertical );
snapBox->layout()->setSpacing( 5 );
snapBox->layout()->setMargin( 10 );
snapBoxLayout = new QGridLayout( snapBox->layout() );
textLabel8 = new QLabel( snapBox, "textLabel8" );
textLabel8->setText( tr( "Snap Distance:" ) );
snapBoxLayout->addWidget( textLabel8, 0, 0 );
snapDistance = new MSpinBox( unitBase, 1000 * unitBase, snapBox, 2 );
snapDistance->setValue( prefsData->guideRad * unitBase );
snapDistance->setSuffix( unit );
snapBoxLayout->addWidget( snapDistance, 0, 1 );
textLabel82 = new QLabel( snapBox, "textLabel8" );
textLabel82->setText( tr( "Grab Radius:" ) );
snapBoxLayout->addWidget( textLabel82, 1, 0 );
grabDistance = new QSpinBox( snapBox, "grabDistance" );
grabDistance->setMaxValue( 1000 );
grabDistance->setMinValue( 1 );
grabDistance->setLineStep( 1 );
grabDistance->setValue( prefsData->grabRad );
grabDistance->setSuffix( tr( " px" ) );
snapBoxLayout->addWidget( grabDistance, 1, 1 );
commonBoxLayout->addWidget( snapBox );
tabGuidesLayout->addWidget( commonBox );
layout9 = new QHBoxLayout( 0, 0, 5, "layout9");
guideBox = new QGroupBox( this, "guideBox" );
guideBox->setTitle( tr( "Guides" ) );
guideBox->setColumnLayout(0, Qt::Vertical );
guideBox->layout()->setSpacing( 5 );
guideBox->layout()->setMargin( 10 );
guideBoxLayout = new QHBoxLayout( guideBox->layout() );
checkGuides = new QCheckBox( guideBox, "checkGuides" );
checkGuides->setText( tr( "Show Guides" ) );
checkGuides->setChecked(prefsData->guidesShown);
guideBoxLayout->addWidget( checkGuides );
guideColor = new QPushButton( guideBox, "guideColor" );
guideColor->setMinimumSize( QSize( 60, 20 ) );
guideColor->setMaximumSize( QSize( 60, 20 ) );
guideColor->setFlat( false );
guideColor->setAutoDefault( false );
QPixmap pm3 = QPixmap(54, 14);
pm3.fill(prefsData->guideColor);
colorGuides = prefsData->guideColor;
guideColor->setPixmap(pm3);
guideColor->setText( QString::null );
guideBoxLayout->addWidget( guideColor );
layout9->addWidget( guideBox );
marginBox = new QGroupBox( this, "guideBox" );
marginBox->setTitle( tr( "Margins" ) );
marginBox->setColumnLayout(0, Qt::Vertical );
marginBox->layout()->setSpacing( 5 );
marginBox->layout()->setMargin( 10 );
marginBoxLayout = new QHBoxLayout( marginBox->layout() );
checkMargin = new QCheckBox( marginBox, "checkMargin" );
checkMargin->setText( tr( "Show Margins" ) );
checkMargin->setChecked(prefsData->marginsShown);
marginBoxLayout->addWidget( checkMargin );
marginColor = new QPushButton( marginBox, "marginColor" );
marginColor->setMinimumSize( QSize( 60, 20 ) );
marginColor->setMaximumSize( QSize( 60, 20 ) );
marginColor->setAutoDefault( false );
QPixmap pm6 = QPixmap(54, 14);
pm6.fill(prefsData->margColor);
colorMargin = prefsData->margColor;
marginColor->setPixmap(pm6);
marginColor->setFlat( false );
marginColor->setText( QString::null );
marginBoxLayout->addWidget( marginColor );
layout9->addWidget( marginBox );
tabGuidesLayout->addLayout( layout9 );
 
checkGrid = new QGroupBox( this, "checkGrid" );
checkGrid->setTitle( tr( "Show Grid" ) );
checkGrid->setTitle( tr( "Show Page Grid" ) );
checkGrid->setCheckable( true );
checkGrid->setChecked(prefsData->gridShown);
checkGrid->setColumnLayout(0, Qt::Vertical );
86,59 → 184,19
groupBox2Layout->addWidget( minorSpace, 0, 1 );
checkGridLayout->addWidget( groupBox2, 0, 1 );
tabGuidesLayout->addWidget( checkGrid );
buttonGroup1 = new QButtonGroup( this, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing of Guides" ) );
buttonGroup1Layout = new QHBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( prefsData->before );
inForeground->setChecked( !prefsData->before );
tabGuidesLayout->addWidget( buttonGroup1 );
layout11 = new QGridLayout( 0, 1, 1, 0, 5, "layout11");
textLabel8 = new QLabel( this, "textLabel8" );
textLabel8->setText( tr( "Guide Snap Distance:" ) );
layout11->addWidget( textLabel8, 0, 0 );
snapDistance = new MSpinBox( unitBase, 1000 * unitBase, this, 2 );
snapDistance->setValue( prefsData->guideRad * unitBase );
snapDistance->setSuffix( unit );
layout11->addWidget( snapDistance, 0, 1, Qt::AlignLeft );
textLabel82 = new QLabel( this, "textLabel8" );
textLabel82->setText( tr( "Grab Radius:" ) );
layout11->addWidget( textLabel82, 1, 0 );
grabDistance = new QSpinBox( this, "grabDistance" );
grabDistance->setMaxValue( 1000 );
grabDistance->setMinValue( 1 );
grabDistance->setLineStep( 1 );
grabDistance->setValue( prefsData->grabRad );
grabDistance->setSuffix( tr( " px" ) );
layout11->addWidget( grabDistance, 1, 1, Qt::AlignLeft );
 
checkMargin = new QCheckBox( this, "checkMargin" );
checkMargin->setText( tr( "Show Margins" ) );
checkMargin->setChecked(prefsData->marginsShown);
layout11->addWidget( checkMargin, 2, 0 );
checkGuides = new QCheckBox( this, "checkGuides" );
checkGuides->setText( tr( "Show Guides" ) );
checkGuides->setChecked(prefsData->guidesShown);
layout11->addWidget( checkGuides, 3, 0 );
checkBaseline = new QCheckBox( this, "checkBaseline" );
baselineBox = new QGroupBox( this, "baselineBox" );
baselineBox->setTitle( tr( "Baseline Grid" ) );
baselineBox->setColumnLayout(0, Qt::Vertical );
baselineBox->layout()->setSpacing( 5 );
baselineBox->layout()->setMargin( 10 );
baselineBoxLayout = new QGridLayout( baselineBox->layout() );
baselineBoxLayout->setAlignment( Qt::AlignTop );
checkBaseline = new QCheckBox( baselineBox, "checkBaseline" );
checkBaseline->setText( tr( "Show Baseline Grid" ) );
checkBaseline->setChecked(prefsData->baseShown);
layout11->addWidget( checkBaseline, 4, 0 );
layout2 = new QHBoxLayout( 0, 0, 5, "layout2");
textLabel2 = new QLabel( this, "textLabel2" );
textLabel2->setText( tr( "Color:" ) );
layout2->addWidget( textLabel2 );
baselineColor = new QPushButton( this, "baselineColor" );
baselineBoxLayout->addWidget( checkBaseline, 0, 0 );
baselineColor = new QPushButton( baselineBox, "baselineColor" );
baselineColor->setMinimumSize( QSize( 60, 20 ) );
baselineColor->setMaximumSize( QSize( 60, 20 ) );
baselineColor->setFlat( false );
148,55 → 206,29
colorBaselineGrid = prefsData->baseColor;
baselineColor->setPixmap(pm4);
baselineColor->setText( QString::null );
layout2->addWidget( baselineColor );
layout11->addLayout( layout2, 4, 1 );
layout3 = new QHBoxLayout( 0, 0, 5, "layout3");
textLabel3 = new QLabel( this, "textLabel3" );
textLabel3->setText( tr( "Color:" ) );
layout3->addWidget( textLabel3 );
guideColor = new QPushButton( this, "guideColor" );
guideColor->setMinimumSize( QSize( 60, 20 ) );
guideColor->setMaximumSize( QSize( 60, 20 ) );
guideColor->setFlat( false );
guideColor->setAutoDefault( false );
QPixmap pm3 = QPixmap(54, 14);
pm3.fill(prefsData->guideColor);
colorGuides = prefsData->guideColor;
guideColor->setPixmap(pm3);
guideColor->setText( QString::null );
layout3->addWidget( guideColor );
layout11->addLayout( layout3, 3, 1 );
layout9 = new QHBoxLayout( 0, 0, 5, "layout9");
textLabel1 = new QLabel( this, "textLabel1" );
textLabel1->setText( tr( "Color:" ) );
layout9->addWidget( textLabel1 );
marginColor = new QPushButton( this, "marginColor" );
marginColor->setMinimumSize( QSize( 60, 20 ) );
marginColor->setMaximumSize( QSize( 60, 20 ) );
marginColor->setAutoDefault( false );
QPixmap pm6 = QPixmap(54, 14);
pm6.fill(prefsData->margColor);
colorMargin = prefsData->margColor;
marginColor->setPixmap(pm6);
marginColor->setFlat( false );
marginColor->setText( QString::null );
layout9->addWidget( marginColor );
layout11->addLayout( layout9, 2, 1 );
tabGuidesLayout->addLayout( layout11 );
layout12 = new QGridLayout( 0, 1, 1, 0, 5, "layout12");
checkLink = new QCheckBox( this, "checkLink" );
checkLink->setText( tr( "Show Text Chains" ) );
checkLink->setChecked(prefsData->linkShown);
layout12->addWidget( checkLink, 1, 0 );
checkFrame = new QCheckBox( this, "checkFrame" );
checkFrame->setText( tr( "Show Frames" ) );
checkFrame->setChecked(prefsData->framesShown);
layout12->addWidget( checkFrame, 0, 0 );
checkPictures = new QCheckBox( this, "checkPictures" );
checkPictures->setText( tr( "Show Pictures" ) );
layout12->addWidget( checkPictures, 0, 1 );
checkPictures->setChecked(prefsData->showPic);
tabGuidesLayout->addLayout( layout12 );
baselineBoxLayout->addWidget( baselineColor, 0, 1 );
autoLine = new QSpinBox( baselineBox, "autoLine" );
autoLine->setMaxValue( 100 );
autoLine->setMinValue( 1 );
autoLine->setValue( prefsData2->autoLineSpacing );
autoLine->setSuffix( tr( " %" ) );
baselineBoxLayout->addWidget( autoLine, 1, 1 );
textLabel8a = new QLabel( autoLine, tr( "Automatic &Line Spacing:" ), baselineBox, "textLabel8a" );
baselineBoxLayout->addWidget( textLabel8a, 1, 0 );
baseGrid = new MSpinBox( 1, 1000, baselineBox, 1 );
baseGrid->setSuffix( unit );
baseGrid->setValue(prefsData2->valueBaseGrid * unitBase);
baselineBoxLayout->addWidget( baseGrid, 0, 3 );
textLabel6a = new QLabel(baseGrid, tr( "Baseline &Grid:" ), baselineBox, "textLabel6a" );
baselineBoxLayout->addWidget( textLabel6a, 0, 2 );
baseOffset = new MSpinBox( 0, 1000, baselineBox, 1 );
baseOffset->setSuffix( unit );
baseOffset->setValue(prefsData2->offsetBaseGrid * unitBase);
baselineBoxLayout->addWidget( baseOffset, 1, 3 );
textLabel7a = new QLabel(baseOffset, tr( "Baseline &Offset:" ), baselineBox, "textLabel7a" );
baselineBoxLayout->addWidget( textLabel7a, 1, 2 );
tabGuidesLayout->addWidget( baselineBox );
 
connect(majorGridColor, SIGNAL(clicked()), this, SLOT(changeMajorColor()));
connect(minorGridColor, SIGNAL(clicked()), this, SLOT(changeMinorColor()));
connect(baselineColor, SIGNAL(clicked()), this, SLOT(changeBaselineColor()));
215,9 → 247,7
QToolTip::add( checkGrid, tr("Turns the gridlines on or off"));
QToolTip::add( checkGuides, tr("Turns the guides on or off"));
QToolTip::add( checkMargin, tr("Turns the margins on or off"));
QToolTip::add( checkLink, tr("Turns the of linked frames on or off"));
QToolTip::add( checkFrame, tr("Turns the display of frames on or off"));
QToolTip::add( checkPictures, tr("Turns the display of pictures on or off"));
QToolTip::add( autoLine, tr( "Percentage increase over the font size for the line spacing" ) );
}
 
void TabGuides::changeMajorColor()
/branches/Version13x/Scribus/scribus/scribus.cpp
2565,12 → 2565,12
doc->marginColored = dia->checkUnprintable->isChecked();
doc->papColor = dia->colorPaper;
doc->guidesSettings.marginsShown = dia->tabGuides->checkMargin->isChecked();
doc->guidesSettings.framesShown = dia->tabGuides->checkFrame->isChecked();
doc->guidesSettings.framesShown = dia->checkFrame->isChecked();
doc->guidesSettings.gridShown = dia->tabGuides->checkGrid->isChecked();
doc->guidesSettings.guidesShown = dia->tabGuides->checkGuides->isChecked();
doc->guidesSettings.baseShown = dia->tabGuides->checkBaseline->isChecked();
doc->guidesSettings.showPic = dia->tabGuides->checkPictures->isChecked();
doc->guidesSettings.linkShown = dia->tabGuides->checkLink->isChecked();
doc->guidesSettings.showPic = dia->checkPictures->isChecked();
doc->guidesSettings.linkShown = dia->checkLink->isChecked();
doc->guidesSettings.grabRad = dia->tabGuides->grabDistance->value();
doc->guidesSettings.guideRad = dia->tabGuides->snapDistance->value() / UmReFaktor;
doc->guidesSettings.minorGrid = dia->tabGuides->minorSpace->value() / UmReFaktor;
2585,9 → 2585,9
doc->typographicSetttings.valueSubScript = dia->tabTypo->subDisplacement->value();
doc->typographicSetttings.scalingSubScript = dia->tabTypo->subScaling->value();
doc->typographicSetttings.valueSmallCaps = dia->tabTypo->capsScaling->value();
doc->typographicSetttings.autoLineSpacing = dia->tabTypo->autoLine->value();
doc->typographicSetttings.valueBaseGrid = dia->tabTypo->baseGrid->value() / UmReFaktor;
doc->typographicSetttings.offsetBaseGrid = dia->tabTypo->baseOffset->value() / UmReFaktor;
doc->typographicSetttings.autoLineSpacing = dia->tabGuides->autoLine->value();
doc->typographicSetttings.valueBaseGrid = dia->tabGuides->baseGrid->value() / UmReFaktor;
doc->typographicSetttings.offsetBaseGrid = dia->tabGuides->baseOffset->value() / UmReFaktor;
doc->toolSettings.defFont = dia->tabTools->fontComboText->currentText();
doc->toolSettings.defSize = dia->tabTools->sizeComboText->currentText().left(2).toInt() * 10;
doc->toolSettings.dStrokeText = dia->tabTools->colorComboStrokeText->currentText();
7130,12 → 7130,12
Prefs.toolSettings.defFont = dia->tabTools->fontComboText->currentText();
Prefs.toolSettings.defSize = dia->tabTools->sizeComboText->currentText().left(2).toInt() * 10;
Prefs.guidesSettings.marginsShown = dia->tabGuides->checkMargin->isChecked();
Prefs.guidesSettings.framesShown = dia->tabGuides->checkFrame->isChecked();
Prefs.guidesSettings.framesShown = dia->checkFrame->isChecked();
Prefs.guidesSettings.gridShown = dia->tabGuides->checkGrid->isChecked();
Prefs.guidesSettings.guidesShown = dia->tabGuides->checkGuides->isChecked();
Prefs.guidesSettings.baseShown = dia->tabGuides->checkBaseline->isChecked();
Prefs.guidesSettings.showPic = dia->tabGuides->checkPictures->isChecked();
Prefs.guidesSettings.linkShown = dia->tabGuides->checkLink->isChecked();
Prefs.guidesSettings.showPic = dia->checkPictures->isChecked();
Prefs.guidesSettings.linkShown = dia->checkLink->isChecked();
Prefs.guidesSettings.grabRad = dia->tabGuides->grabDistance->value();
Prefs.guidesSettings.guideRad = dia->tabGuides->snapDistance->value() / UmReFaktor;
Prefs.guidesSettings.minorGrid = dia->tabGuides->minorSpace->value() / UmReFaktor;
7150,9 → 7150,9
Prefs.typographicSetttings.valueSubScript = dia->tabTypo->subDisplacement->value();
Prefs.typographicSetttings.scalingSubScript = dia->tabTypo->subScaling->value();
Prefs.typographicSetttings.valueSmallCaps = dia->tabTypo->capsScaling->value();
Prefs.typographicSetttings.autoLineSpacing = dia->tabTypo->autoLine->value();
Prefs.typographicSetttings.valueBaseGrid = dia->tabTypo->baseGrid->value() / UmReFaktor;
Prefs.typographicSetttings.offsetBaseGrid = dia->tabTypo->baseOffset->value() / UmReFaktor;
Prefs.typographicSetttings.autoLineSpacing = dia->tabGuides->autoLine->value();
Prefs.typographicSetttings.valueBaseGrid = dia->tabGuides->baseGrid->value() / UmReFaktor;
Prefs.typographicSetttings.offsetBaseGrid = dia->tabGuides->baseOffset->value() / UmReFaktor;
Prefs.toolSettings.dPen = dia->tabTools->colorComboLineShape->currentText();
if (Prefs.toolSettings.dPen == tr("None"))
Prefs.toolSettings.dPen = "None";