Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 239 → Rev 240

/trunk/Scribus/ChangeLogCVS
1,4 → 1,14
Changes since Version 1.1.6
02.04.2004 Flipping state of images is now preserved when updating or editing Images, Bug #408
Properties Palette is now updated immediately after text style change, Bug #404
Textcolor is now imported too when appending Styles, Bug #402
Applying "No Style" resets now all Textproperties to the default style, Bug #400
You can now move Objects in 0.1 Point units when pressing CTRL and the Cursor Keys, Bug #397
Colors in PDF-Textfields are now exported correctly, Bug #396
Pressing Tab while editing a Text doesn't jump to the Pageselector anymore, Bug #395
Pressing Shift while rotating the Mouse Whell scrolls now horizontal, Bug #388
Updated several Tooltips.
 
30.03.2004 Fixed Issue on export to PDF and Postscript with Objects with zero Linewidth.
Fixed Issues with locked Objects and Groups.
Double clicking on a Table Cell selects this Cell now.
/trunk/Scribus/scribus/pdfopts.cpp
737,49 → 737,49
QToolTip::add( OnlySome, tr( "Export a range of pages to PDF" ) );
QToolTip::add( FirstPage, tr( "First page to export when exporting a range" ) );
QToolTip::add( LastPage, tr( "Last page to export when exporting a range" ) );
QToolTip::add( ComboBox1, tr( "Determines the PDF compatibility.\nThe default is Acrobat 4.0 which gives the widest compatibility.\nChoose Acrobat 5.0 if your file has PDF 1.4 features such as transparency or you require 128 bit encryption.\nPDF/X-3 is for exporting the PDF for commercial printing and is selectable when you have activated color management." ) );
QToolTip::add( ComboBind, tr( "This determines the binding of pages in the PDF. Unless you know\nyou need to change it leave the default choice - Left." ) );
QToolTip::add( CheckBox1, tr( "Enabling this generates thumbnails of each page in the PDF.\nSome viewers can use the thumbnails for navigation." ) );
QToolTip::add( Article, tr( "Enable this for generating PDF Articles, which is useful\nfor navigating linked articles in a PDF." ) );
QToolTip::add( CheckBM, tr( "Enabling this will embed the bookmarks you created in your document.\nThese are useful for navigating long PDF documents." ) );
QToolTip::add( Resolution, tr( "Choose the export resolution of text and vector graphics.\nThis does not affect the resolution of bitmap images like photos." ) );
QToolTip::add( Compression, tr( "Enable compression of text and graphics.\nUnless you have a reason, leave this checked. This reduces PDF size." ) );
QToolTip::add( CMethod, tr( "Choose the version of compression for images.\nAutomatic allows Scribus to choose the best method.\nZIP is good for images with solid colors.\nJPEG is better at creating smaller PDF files which have many photos (with slight image loss possible).\nLeave it set to automatic, unless you have a need for special compression options." ) );
QToolTip::add( CQualtity, tr( "Choose the compression level: Minimum (25\%), Low (50\%), Medium (75\%), High (85\%), Maximum (95\%)" ) );
QToolTip::add( DSColor, tr( "This choice will enable downsampling of your bitmap images to the selected DPI." ) );
QToolTip::add( ValC, tr( "Choose the DPI (Dots Per Inch) for image export.\nLeaving this unchecked will render them at their native resolution." ) );
QToolTip::add( ComboBox1, tr( "Determines the PDF compatibility. The default is Acrobat 4.0 which gives the widest compatibility.\nChoose Acrobat 5.0 if your file has PDF 1.4 features such as transparency or you require 128 bit encryption.\nPDF/X-3 is for exporting the PDF for commercial printing and is selectable when you have activated color management." ) );
QToolTip::add( ComboBind, tr( "Determines the binding of pages in the PDF. Unless you know\nyou need to change it leave the default choice - Left." ) );
QToolTip::add( CheckBox1, tr( "Generates thumbnails of each page in the PDF.\nSome viewers can use the thumbnails for navigation." ) );
QToolTip::add( Article, tr( "Generate PDF Articles, which is useful for navigating linked articles in a PDF." ) );
QToolTip::add( CheckBM, tr( "Embed the bookmarks you created in your document.\nThese are useful for navigating long PDF documents." ) );
QToolTip::add( Resolution, tr( "Export resolution of text and vector graphics.\nThis does not affect the resolution of bitmap images like photos." ) );
QToolTip::add( Compression, tr( "Compression of text and graphics.\nUnless you have a reason, leave this checked. This reduces PDF size." ) );
QToolTip::add( CMethod, tr( "Version of compression for images.\nAutomatic allows Scribus to choose the best method.\nZIP is good for images with solid colors.\nJPEG is better at creating smaller PDF files which have many photos (with slight image loss possible).\nLeave it set to automatic, unless you have a need for special compression options." ) );
QToolTip::add( CQualtity, tr( "Compression level: Minimum (25\%), Low (50\%), Medium (75\%), High (85\%), Maximum (95\%)" ) );
QToolTip::add( DSColor, tr( "Downsample your bitmap images to the selected DPI.\nLeaving this unchecked will render them at their native resolution." ) );
QToolTip::add( ValC, tr( "DPI (Dots Per Inch) for image export.") );
 
QToolTip::add( EmbedFonts, tr( "Check this to embed fonts into the PDF. Embedding the fonts\nwill preserve the layout and appearance of your document." ) );
QToolTip::add( EmbedFonts, tr( "Embed fonts into the PDF. Embedding the fonts\nwill preserve the layout and appearance of your document." ) );
 
QToolTip::add( CheckBox10, tr( "Checking this enables presentation effects when using Acrobat Reader in full screen mode." ) );
QToolTip::add( PagePrev, tr( "Checking this will show page previews of each page listed above." ) );
QToolTip::add( CheckBox10, tr( "Enables presentation effects when using Acrobat Reader in full screen mode." ) );
QToolTip::add( PagePrev, tr( "Show page previews of each page listed above." ) );
QToolTip::add( PageTime, tr( "Length of time the page is shown before the presentation starts on the selected page." ) );
QToolTip::add( EffectTime, tr( "Length of time the effect runs.\nA shorter time will speed up the effect, a longer one will slow it down." ) );
QToolTip::add( EffectType, tr( "Choose type of the display effect." ) );
QToolTip::add( EDirection, tr( "Choose the direction of the effect of moving lines for the split and blind effects." ) );
QToolTip::add( EDirection_2, tr( "Choose the starting position for the box and split effects." ) );
QToolTip::add( EDirection_2_2, tr( "Choose the direction of the glitter or wipe effects." ) );
QToolTip::add( EffectType, tr( "Type of the display effect." ) );
QToolTip::add( EDirection, tr( "Direction of the effect of moving lines for the split and blind effects." ) );
QToolTip::add( EDirection_2, tr( "Starting position for the box and split effects." ) );
QToolTip::add( EDirection_2_2, tr( "Direction of the glitter or wipe effects." ) );
QToolTip::add( EonAllPg, tr( "Apply the selected effect to all pages." ) );
 
QToolTip::add( Encry, tr( "Checking this will enable the security features in your exported PDF.\nIf you selected Acrobat 4.0, the PDF will be protected by 40 bit encryption.\nIf you selected Acrobat 5.0, the PDF will be protected by 128 bit encryption.\nDisclaimer: PDF encryption is not as reliable as GPG or PGP encryption and does have some limitations." ) );
QToolTip::add( Encry, tr( "Enable the security features in your exported PDF.\nIf you selected Acrobat 4.0, the PDF will be protected by 40 bit encryption.\nIf you selected Acrobat 5.0, the PDF will be protected by 128 bit encryption.\nDisclaimer: PDF encryption is not as reliable as GPG or PGP encryption and does have some limitations." ) );
QToolTip::add( PassOwner, tr( "Choose a master password which enables or disables all the\nsecurity features in your exported PDF" ) );
QToolTip::add( PassUser, tr( "Choose a password for users to be able to read your PDF" ) );
QToolTip::add( PrintSec, tr( "Unchecking this will disallow printing of the PDF" ) );
QToolTip::add( ModifySec, tr( "Unchecking this will disallow modifying of the PDF" ) );
QToolTip::add( CopySec, tr( "Unchecking this will disallow copying of text or graphics from the PDF" ) );
QToolTip::add( AddSec, tr( "Unchecking this will disallow adding annotations and fields to the PDF" ) );
QToolTip::add( PrintSec, tr( "Allow printing of the PDF" ) );
QToolTip::add( ModifySec, tr( "Allow modifying of the PDF" ) );
QToolTip::add( CopySec, tr( "Allow copying of text or graphics from the PDF" ) );
QToolTip::add( AddSec, tr( "Allow adding annotations and fields to the PDF" ) );
 
QToolTip::add( OutCombo, tr( "This chooses the color model for the output of your PDF.\nChoose Screen/Web for PDFs which are used for screen display and for printing on typical inkjets.\nChoose Printer when printing to a true 4 color CMYK printer." ) );
QToolTip::add( OutCombo, tr( "Color model for the output of your PDF.\nChoose Screen/Web for PDFs which are used for screen display and for printing on typical inkjets.\nChoose Printer when printing to a true 4 color CMYK printer." ) );
QToolTip::add( EmbedProfs, tr( "Embed a color profile for solid colors" ) );
QToolTip::add( SolidPr, tr( "Select the color profile for solid colors" ) );
QToolTip::add( IntendS, tr( "Select the rendering intent for solid colors" ) );
QToolTip::add( SolidPr, tr( "Color profile for solid colors" ) );
QToolTip::add( IntendS, tr( "Rendering intent for solid colors" ) );
QToolTip::add( EmbedProfs2, tr( "Embed a color profile for images" ) );
QToolTip::add( NoEmbedded, tr( "Do not use color profiles that are embedded in source images" ) );
QToolTip::add( ImageP, tr( "Select the color profile for images" ) );
QToolTip::add( IntendI, tr( "Select the rendering intent for images" ) );
QToolTip::add( ImageP, tr( "Color profile for images" ) );
QToolTip::add( IntendI, tr( "Rendering intent for images" ) );
 
QToolTip::add( PrintProfC, tr( "Select the output profile for printing. If possible, get some guidance from your printer on profile selection." ) );
QToolTip::add( InfoString, tr( "This is a mandatory string for PDF/X-3 or the PDF will fail\nPDF/X-3 conformance. We recommend you use the title of the document." ) );
QToolTip::add( PrintProfC, tr( "Output profile for printing. If possible, get some guidance from your printer on profile selection." ) );
QToolTip::add( InfoString, tr( "Mandatory string for PDF/X-3 or the PDF will fail\nPDF/X-3 conformance. We recommend you use the title of the document." ) );
QToolTip::add( BleedTop, tr( "Distance for bleed from the top of the physical page" ) );
QToolTip::add( BleedBottom, tr( "Distance for bleed from the bottom of the physical page" ) );
QToolTip::add( BleedLeft, tr( "Distance for bleed from the left of the physical page" ) );
/trunk/Scribus/scribus/mpalette.cpp
769,8 → 769,8
QToolTip::add( Locked, tr( "Lock or unlock the object" ) );
QToolTip::add( NoResize, tr( "Lock or unlock the size of the object" ) );
QToolTip::add( NoPrint, tr( "Enable or disable printing of the object" ) );
QToolTip::add( Textflow, tr( "Enable this to make text in lower objects flow around this frame" ) );
QToolTip::add( Textflow2, tr( "Enable this to use the imaginary square border around your object, rather than its actual shape" ) );
QToolTip::add( Textflow, tr( "Make text in lower objects flow around this frame" ) );
QToolTip::add( Textflow2, tr( "Use the imaginary square border around your object, rather than its actual shape" ) );
 
QToolTip::add( Fonts, tr( "Font of selected text or object" ) );
QToolTip::add( Size, tr( "Font Size" ) );
812,8 → 812,8
QToolTip::add( Kette2, tr( "Keep the aspect ratio" ) );
QToolTip::add( FrameScale, tr( "Make the image fit within the size of the frame" ) );
QToolTip::add( Aspect, tr( "Use image proportions rather than those of the frame" ) );
QToolTip::add( InputP, tr( "Select the source profile of the image" ) );
QToolTip::add( MonitorI, tr( "Select the rendering intent for the image" ) );
QToolTip::add( InputP, tr( "Source profile of the image" ) );
QToolTip::add( MonitorI, tr( "Rendering intent for the image" ) );
 
connect(Xpos, SIGNAL(valueChanged(int)), this, SLOT(NewX()));
connect(Ypos, SIGNAL(valueChanged(int)), this, SLOT(NewY()));
/trunk/Scribus/scribus/cmsprefs.cpp
200,10 → 200,10
QToolTip::add( InputP2, tr( "Default color profile for solid colors on the page" ) );
QToolTip::add( MonitorP, tr( "Color profile that you have generated or received from the manufacturer.\nThis profile should be specific to your monitor and not a generic profile (i.e. sRGB)." ) );
QToolTip::add( PrinterP, tr( "Color profile for your printer model from the manufacturer.\nThis profile should be specific to your printer and not a generic profile (i.e. sRGB)." ) );
QToolTip::add( MonitorI, tr( "Choose the default rendering intent for your monitor. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( PrinterI, tr( "Choose the default rendering intent for your printer. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( Simulate, tr( "This enables 'soft proofing' of how your document colors will print,\nbased on the chosen printer profile." ) );
QToolTip::add( GamutC, tr( "This is a method of showing colors on the screen which may not print properly.\nThis requires very accurate profiles and serves only as a warning." ) );
QToolTip::add( MonitorI, tr( "Default rendering intent for your monitor. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( PrinterI, tr( "Default rendering intent for your printer. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( Simulate, tr( "Enable 'soft proofing' of how your document colors will print,\nbased on the chosen printer profile." ) );
QToolTip::add( GamutC, tr( "Method of showing colors on the screen which may not print properly.\nThis requires very accurate profiles and serves only as a warning." ) );
QToolTip::add( BlackP, tr( "Black Point Compensation is a method of improving contrast in photos.\nIt is recommended that you enable this if you have photos in your document." ) );
 
// signals and slots connections
/trunk/Scribus/scribus/mergedoc.cpp
27,7 → 27,7
setCaption( tr( "Import a Page" ) );
setIcon(loadIcon("AppIcon.png"));
Count = 0;
Mpa = Mpages;
Mpa = Mpages;
MergeDocLayout = new QVBoxLayout( this, 11, 6, "MergeDocLayout");
textLabel1 = new QLabel( this, "textLabel1" );
textLabel1->setText( tr( "Document to load:" ) );
51,15 → 51,15
textLabel3->setText( tr( "Import Page Nr:" ) );
layout2->addWidget( textLabel3 );
if (Mpa)
{
PageNa = new QComboBox( true, this, "Templ" );
PageNa->setMinimumSize( QSize( 120, 22 ) );
{
PageNa = new QComboBox( true, this, "Templ" );
PageNa->setMinimumSize( QSize( 120, 22 ) );
PageNa->setEditable(false);
PageNa->setEnabled(false);
layout2->addWidget( PageNa );
}
}
else
{
{
PageNr = new QSpinBox( this, "PageNr" );
PageNr->setMinValue( 1 );
PageNr->setMaxValue( 2000 );
66,7 → 66,7
PageNr->setValue( 1 );
PageNr->setEnabled(false);
layout2->addWidget( PageNr );
}
}
MergeDocLayout->addLayout( layout2 );
 
layout3 = new QHBoxLayout( 0, 0, 2, "layout3");
114,10 → 114,10
if (Filename->text() != "")
dia.setSelection(Filename->text());
if (dia.exec() == QDialog::Accepted)
{
{
fn = dia.selectedFile();
if (!fn.isEmpty())
{
{
qApp->setOverrideCursor(QCursor(waitCursor), true);
ScriXmlDoc *ss = new ScriXmlDoc();
if (Mpa)
126,43 → 126,43
ret = ss->ReadPageCount(fn, &Count, &dummy);
qApp->setOverrideCursor(QCursor(arrowCursor), true);
if ((ret) && (Count != 0))
{
{
Filename->setText(fn);
Import->setEnabled(true);
if (Mpa)
{
{
PageNa->clear();
PageNa->setEnabled(true);
PageNa->insertStringList(ss->MNames);
}
}
else
{
{
PageNr->setEnabled(true);
PageNr->setValue(1);
PageNr->setMaxValue(Count);
}
}
Inform->setText( tr("Document contains: %1 Page(s)").arg(Count));
}
}
delete ss;
}
}
}
else
{
{
Filename->setText("");
Count = 0;
Import->setEnabled(false);
if (Mpa)
{
{
PageNa->clear();
PageNa->setEnabled(false);
}
}
else
{
{
PageNr->setEnabled(false);
PageNr->setValue(1);
PageNr->setMaxValue(Count);
}
}
Inform->setText( tr("Document contains: %1 Page(s)").arg(Count));
}
}
}
 
/trunk/Scribus/scribus/seiten.cpp
549,7 → 549,7
connect(LP, SIGNAL(clicked()), this, SLOT(HandleLP()));
connect(Trash, SIGNAL(DelMaster(QString)), this, SLOT(DelMPage(QString)));
QToolTip::add( Trash, tr( "Drag Pages or Template Pages onto the Trashbin to delete them." ) );
QToolTip::add( PageView, tr( "This previews all the pages of your Document." ));
QToolTip::add( PageView, tr( "Previews all the pages of your document." ));
QToolTip::add( TemplList,
tr( "Here are all your Templates, to create a new Page\ndrag a Template to the Pageview below." ) );
}
/trunk/Scribus/scribus/guidemanager.cpp
52,382 → 52,376
) : QDialog(parent, "GuideManager", true, 0)
 
{
QString tmp;
int decimals;
setCaption(tr("Manage Guides"));
setIcon(loadIcon("AppIcon.png"));
 
/* Initialise the global variables */
tp[0] = " pt"; tp[1] = " mm"; tp[2] = " in"; tp[3] = " p";
int dp[] = {100, 1000, 10000, 100};
 
Einheit = Einh;
decimals = dp[Einheit];
 
LocHor = YGuides; // in page XGuides and YGuides are inverted
LocVer = XGuides;
LocPageWidth = PageW;
LocPageHeight = PageH;
LocLocked = GuideLock;
selHor = -1;
selVer = -1;
 
/* Create the dialog elements */
GuideManagerLayout = new QVBoxLayout(this, 11, 6, "GuideManagerLayout");
 
Layout6 = new QHBoxLayout(0, 0, 6, "Layout6");
 
HorGroup = new QGroupBox(this, "HorGroup");
HorGroup->setTitle( tr("Horizontal Guides"));
HorGroup->setColumnLayout(0, Qt::Vertical);
HorGroup->layout()->setSpacing(6);
HorGroup->layout()->setMargin(11);
HorGroupLayout = new QVBoxLayout(HorGroup->layout());
HorGroupLayout->setAlignment(Qt::AlignTop);
 
HorList = new QListBox(HorGroup, "HorList");
HorList->setMinimumSize(QSize(0, 200));
HorGroupLayout->addWidget(HorList);
 
Layout4 = new QHBoxLayout(0, 0, 6, "Layout4");
 
TextLabel2 = new QLabel(HorGroup, "TextLabel2");
TextLabel2->setText( tr("Y-Pos:"));
Layout4->addWidget(TextLabel2);
 
HorSpin = new MSpinBox(HorGroup, 4);
HorSpin->setDecimals(decimals);
HorSpin->setMaxValue(LocPageHeight);
HorSpin->setMinValue(0);
Layout4->addWidget(HorSpin);
 
HorGroupLayout->addLayout(Layout4);
 
Layout3 = new QHBoxLayout(0, 0, 6, "Layout3");
 
HorSet = new QPushButton(HorGroup, "HorSet");
HorSet->setText( tr("Add"));
HorSet->setAutoDefault(false);
Layout3->addWidget(HorSet);
 
HorDel = new QPushButton(HorGroup, "HorDel");
HorDel->setText(tr("Delete"));
HorDel->setAutoDefault(false);
Layout3->addWidget(HorDel);
 
HorGroupLayout->addLayout(Layout3);
 
Layout6->addWidget(HorGroup);
 
VerGroup = new QGroupBox(this, "VerGroup");
VerGroup->setTitle( tr("Vertical Guides"));
VerGroup->setColumnLayout(0, Qt::Vertical);
VerGroup->layout()->setSpacing(6);
VerGroup->layout()->setMargin(11);
VerGroupLayout = new QVBoxLayout(VerGroup->layout());
VerGroupLayout->setAlignment(Qt::AlignTop);
 
VerList = new QListBox(VerGroup, "VerList");
VerList->setMinimumSize(QSize(0, 200));
VerGroupLayout->addWidget(VerList);
 
Layout2 = new QHBoxLayout(0, 0, 6, "Layout2");
 
TextLabel1 = new QLabel(VerGroup, "TextLabel1");
TextLabel1->setText( tr("X-Pos:"));
Layout2->addWidget(TextLabel1);
 
VerSpin = new MSpinBox(VerGroup, 4);
VerSpin->setDecimals(decimals);
VerSpin->setMaxValue(LocPageWidth);
VerSpin->setMinValue(0);
Layout2->addWidget(VerSpin);
 
VerGroupLayout->addLayout(Layout2);
 
Layout1 = new QHBoxLayout(0, 0, 6, "Layout1");
 
VerSet = new QPushButton(VerGroup, "VerSet");
VerSet->setText( tr("Add"));
VerSet->setAutoDefault(false);
Layout1->addWidget(VerSet);
 
VerDel = new QPushButton(VerGroup, "VerDel");
VerDel->setText( tr("Delete"));
VerDel->setAutoDefault(false);
Layout1->addWidget(VerDel);
 
VerGroupLayout->addLayout(Layout1);
 
Layout6->addWidget(VerGroup);
 
GuideManagerLayout->addLayout(Layout6);
 
Lock = new QCheckBox(this, "Lock");
Lock->setText( tr("Lock Guides"));
Lock->setChecked(LocLocked);
GuideManagerLayout->addWidget(Lock);
 
Layout5 = new QHBoxLayout(0, 0, 6, "Layout5");
 
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer);
 
OK = new QPushButton(this, "OK");
OK->setText( tr("OK"));
OK->setDefault(true);
Layout5->addWidget(OK );
 
QSpacerItem* spacer_2 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer_2);
 
Cancel = new QPushButton(this, "Cancel");
Cancel->setText( tr("Cancel"));
Layout5->addWidget(Cancel);
 
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout5->addItem(spacer_3);
 
GuideManagerLayout->addLayout(Layout5);
 
/* Initialise the units */
UnitChange();
 
// Create signals and slots connections
connect( OK, SIGNAL(clicked()), this, SLOT(accept() ));
connect( Cancel, SIGNAL(clicked()), this, SLOT(reject()));
connect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
connect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
connect(HorSet, SIGNAL(clicked()), this, SLOT(AddHorVal()));
connect(HorDel, SIGNAL(clicked()), this, SLOT(DelHorVal()));
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
connect(VerSet, SIGNAL(clicked()), this, SLOT(AddVerVal()));
connect(VerDel, SIGNAL(clicked()), this, SLOT(DelVerVal()));
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
connect(Lock, SIGNAL(clicked()), this, SLOT(HandleLock()));
 
UpdateHorList();
UpdateVerList();
 
/* Intialise selection in ListBoxes */
if (HorList->numRows() > 0)
HorList->setCurrentItem(0);
else
{
HorSpin->setValue(0);
if (VerList->numRows() > 0)
VerList->setCurrentItem(0);
else
VerSpin->setValue(0);
HorDel->setEnabled(false);
VerDel->setEnabled(false);
}
}
 
QString tmp;
int decimals;
setCaption(tr("Manage Guides"));
setIcon(loadIcon("AppIcon.png"));
/* Initialise the global variables */
tp[0] = " pt";
tp[1] = " mm";
tp[2] = " in";
tp[3] = " p";
int dp[] = {100, 1000, 10000, 100};
Einheit = Einh;
decimals = dp[Einheit];
LocHor = YGuides; // in page XGuides and YGuides are inverted
LocVer = XGuides;
LocPageWidth = PageW;
LocPageHeight = PageH;
LocLocked = GuideLock;
selHor = selVer = -1;
/* Create the dialog elements */
GuideManagerLayout = new QVBoxLayout(this, 11, 6, "GuideManagerLayout");
Layout6 = new QHBoxLayout(0, 0, 6, "Layout6");
HorGroup = new QGroupBox(this, "HorGroup");
HorGroup->setTitle( tr("Horizontal Guides"));
HorGroup->setColumnLayout(0, Qt::Vertical);
HorGroup->layout()->setSpacing(6);
HorGroup->layout()->setMargin(11);
HorGroupLayout = new QVBoxLayout(HorGroup->layout());
HorGroupLayout->setAlignment(Qt::AlignTop);
HorList = new QListBox(HorGroup, "HorList");
HorList->setMinimumSize(QSize(0, 200));
HorGroupLayout->addWidget(HorList);
Layout4 = new QHBoxLayout(0, 0, 6, "Layout4");
TextLabel2 = new QLabel(HorGroup, "TextLabel2");
TextLabel2->setText( tr("X-Pos:"));
Layout4->addWidget(TextLabel2);
HorSpin = new MSpinBox(HorGroup, 4);
HorSpin->setDecimals(decimals);
HorSpin->setMaxValue(LocPageHeight);
HorSpin->setMinValue(0);
Layout4->addWidget(HorSpin);
HorGroupLayout->addLayout(Layout4);
Layout3 = new QHBoxLayout(0, 0, 6, "Layout3");
HorSet = new QPushButton(HorGroup, "HorSet");
HorSet->setText( tr("Add"));
HorSet->setAutoDefault(false);
Layout3->addWidget(HorSet);
HorDel = new QPushButton(HorGroup, "HorDel");
HorDel->setText(tr("Delete"));
HorDel->setAutoDefault(false);
Layout3->addWidget(HorDel);
HorGroupLayout->addLayout(Layout3);
Layout6->addWidget(HorGroup);
VerGroup = new QGroupBox(this, "VerGroup");
VerGroup->setTitle( tr("Vertical Guides"));
VerGroup->setColumnLayout(0, Qt::Vertical);
VerGroup->layout()->setSpacing(6);
VerGroup->layout()->setMargin(11);
VerGroupLayout = new QVBoxLayout(VerGroup->layout());
VerGroupLayout->setAlignment(Qt::AlignTop);
VerList = new QListBox(VerGroup, "VerList");
VerList->setMinimumSize(QSize(0, 200));
VerGroupLayout->addWidget(VerList);
Layout2 = new QHBoxLayout(0, 0, 6, "Layout2");
TextLabel1 = new QLabel(VerGroup, "TextLabel1");
TextLabel1->setText( tr("Y-Pos:"));
Layout2->addWidget(TextLabel1);
VerSpin = new MSpinBox(VerGroup, 4);
VerSpin->setDecimals(decimals);
VerSpin->setMaxValue(LocPageWidth);
VerSpin->setMinValue(0);
Layout2->addWidget(VerSpin);
VerGroupLayout->addLayout(Layout2);
Layout1 = new QHBoxLayout(0, 0, 6, "Layout1");
VerSet = new QPushButton(VerGroup, "VerSet");
VerSet->setText( tr("Add"));
VerSet->setAutoDefault(false);
Layout1->addWidget(VerSet);
VerDel = new QPushButton(VerGroup, "VerDel");
VerDel->setText( tr("Delete"));
VerDel->setAutoDefault(false);
Layout1->addWidget(VerDel);
VerGroupLayout->addLayout(Layout1);
Layout6->addWidget(VerGroup);
GuideManagerLayout->addLayout(Layout6);
Lock = new QCheckBox(this, "Lock");
Lock->setText( tr("Lock Guides"));
Lock->setChecked(LocLocked);
GuideManagerLayout->addWidget(Lock);
Layout5 = new QHBoxLayout(0, 0, 6, "Layout5");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer);
OK = new QPushButton(this, "OK");
OK->setText( tr("OK"));
OK->setDefault(true);
Layout5->addWidget(OK );
QSpacerItem* spacer_2 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer_2);
Cancel = new QPushButton(this, "Cancel");
Cancel->setText( tr("Cancel"));
Layout5->addWidget(Cancel);
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout5->addItem(spacer_3);
GuideManagerLayout->addLayout(Layout5);
/* Initialise the units */
UnitChange();
// Create signals and slots connections
connect( OK, SIGNAL(clicked()), this, SLOT(accept() ));
connect( Cancel, SIGNAL(clicked()), this, SLOT(reject()));
connect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
connect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
connect(HorSet, SIGNAL(clicked()), this, SLOT(AddHorVal()));
connect(HorDel, SIGNAL(clicked()), this, SLOT(DelHorVal()));
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
connect(VerSet, SIGNAL(clicked()), this, SLOT(AddVerVal()));
connect(VerDel, SIGNAL(clicked()), this, SLOT(DelVerVal()));
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
connect(Lock, SIGNAL(clicked()), this, SLOT(HandleLock()));
UpdateHorList();
UpdateVerList();
/* Intialise selection in ListBoxes */
if (HorList->numRows() > 0)
HorList->setCurrentItem(0);
else
{
HorSpin->setValue(0);
if (VerList->numRows() > 0)
VerList->setCurrentItem(0);
else
VerSpin->setValue(0);
HorDel->setEnabled(false);
VerDel->setEnabled(false);
}
}
void GuideManager::DelHorVal()
{
QValueList<double>::Iterator it;
it = LocHor.at(selHor);
it = LocHor.remove(it);
selHor = LocHor.isEmpty() ? -1 : static_cast<int>(LocHor.count() - 1);
if (selHor == -1)
HorDel->setEnabled(false);
UpdateHorList();
QValueList<double>::Iterator it;
it = LocHor.at(selHor);
it = LocHor.remove(it);
selHor = LocHor.isEmpty() ? -1 : static_cast<int>(LocHor.count() - 1);
if (selHor == -1)
HorDel->setEnabled(false);
UpdateHorList();
}
 
void GuideManager::DelVerVal()
{
QValueList<double>::Iterator it;
it = LocVer.at(selVer);
it = LocVer.remove(it);
selVer = LocVer.isEmpty() ? -1 : static_cast<int>(LocVer.count() - 1);
if (selVer == -1)
VerDel->setEnabled(false);
UpdateVerList();
QValueList<double>::Iterator it;
it = LocVer.at(selVer);
it = LocVer.remove(it);
selVer = LocVer.isEmpty() ? -1 : static_cast<int>(LocVer.count() - 1);
if (selVer == -1)
VerDel->setEnabled(false);
UpdateVerList();
}
 
void GuideManager::AddHorVal()
{
LocHor.prepend(0);
selHor = 0;
 
VerList->clearSelection();
VerSpin->setEnabled(false);
VerDel->setEnabled(false);
 
HorDel->setEnabled(true);
UpdateHorList();
HorSpin->setFocus();
HorSpin->selectAll();
LocHor.prepend(0);
selHor = 0;
VerList->clearSelection();
VerSpin->setEnabled(false);
VerDel->setEnabled(false);
HorDel->setEnabled(true);
UpdateHorList();
HorSpin->setFocus();
HorSpin->selectAll();
}
 
void GuideManager::AddVerVal()
{
LocVer.prepend(0);
selVer = 0;
 
HorList->clearSelection();
HorSpin->setEnabled(false);
HorDel->setEnabled(false);
 
VerDel->setEnabled(true);
UpdateVerList();
VerSpin->setFocus();
VerSpin->selectAll();
LocVer.prepend(0);
selVer = 0;
HorList->clearSelection();
HorSpin->setEnabled(false);
HorDel->setEnabled(false);
VerDel->setEnabled(true);
UpdateVerList();
VerSpin->setFocus();
VerSpin->selectAll();
}
 
void GuideManager::HandleLock()
{
LocLocked = Lock->isChecked();
LocLocked = Lock->isChecked();
}
 
void GuideManager::selHorIte(QListBoxItem *c)
{
disconnect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
selHor = c->listBox()->currentItem();
HorDel->setEnabled(true);
VerDel->setEnabled(false);
VerList->clearSelection();
VerSpin->setEnabled(false);
HorSpin->setEnabled(true);
HorSpin->setValue(LocHor[selHor] * UmReFaktor);
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
disconnect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
selHor = c->listBox()->currentItem();
HorDel->setEnabled(true);
VerDel->setEnabled(false);
VerList->clearSelection();
VerSpin->setEnabled(false);
HorSpin->setEnabled(true);
HorSpin->setValue(LocHor[selHor] * UmReFaktor);
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
}
 
void GuideManager::selVerIte(QListBoxItem *c)
{
disconnect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
selVer = c->listBox()->currentItem();
VerDel->setEnabled(true);
HorDel->setEnabled(false);
HorList->clearSelection();
HorSpin->setEnabled(false);
VerSpin->setEnabled(true);
VerSpin->setValue(LocVer[selVer] * UmReFaktor);
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
disconnect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
selVer = c->listBox()->currentItem();
VerDel->setEnabled(true);
HorDel->setEnabled(false);
HorList->clearSelection();
HorSpin->setEnabled(false);
VerSpin->setEnabled(true);
VerSpin->setValue(LocVer[selVer] * UmReFaktor);
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
}
 
void GuideManager::ChangeHorVal()
{
int n = static_cast<int>(LocHor.count());
int m = n;
double curHor = HorSpin->value() / UmReFaktor;
 
QValueList<double>::Iterator it = LocHor.at(selHor);
LocHor.remove(it);
 
for (int i = n - 1; i > 0; i--)
if (curHor < LocHor[i - 1])
m = i;
 
selHor = m - 1;
 
if (m == n)
{
LocHor.append(curHor);
selHor = m - 1;
}
else
{
it = LocHor.at(selHor);
LocHor.insert(it,curHor);
}
UpdateHorList();
int n = static_cast<int>(LocHor.count());
int m = n;
double curHor = HorSpin->value() / UmReFaktor;
QValueList<double>::Iterator it = LocHor.at(selHor);
LocHor.remove(it);
for (int i = n - 1; i > 0; i--)
if (curHor < LocHor[i - 1])
m = i;
selHor = m - 1;
if (m == n)
{
LocHor.append(curHor);
selHor = m - 1;
}
else
{
it = LocHor.at(selHor);
LocHor.insert(it,curHor);
}
UpdateHorList();
}
 
void GuideManager::ChangeVerVal()
{
int n = static_cast<int>(LocVer.count());
int m = n;
double curVer = VerSpin->value() / UmReFaktor;
 
QValueList<double>::Iterator it = LocVer.at(selVer);
LocVer.remove(it);
 
for (int i = n - 1; i > 0; i--)
if (curVer < LocVer[i - 1])
m = i;
 
selVer = m - 1;
 
if (m == n)
{
LocVer.append(curVer);
selVer = m - 1;
}
else
{
it = LocVer.at(selVer);
LocVer.insert(it,curVer);
}
UpdateVerList();
int n = static_cast<int>(LocVer.count());
int m = n;
double curVer = VerSpin->value() / UmReFaktor;
QValueList<double>::Iterator it = LocVer.at(selVer);
LocVer.remove(it);
for (int i = n - 1; i > 0; i--)
if (curVer < LocVer[i - 1])
m = i;
selVer = m - 1;
if (m == n)
{
LocVer.append(curVer);
selVer = m - 1;
}
else
{
it = LocVer.at(selVer);
LocVer.insert(it,curVer);
}
UpdateVerList();
}
 
void GuideManager::UnitChange()
{
QString tmp = GetUnit();
HorSpin->setSuffix(tmp);
VerSpin->setSuffix(tmp);
QString tmp = GetUnit();
HorSpin->setSuffix(tmp);
VerSpin->setSuffix(tmp);
}
 
QString GuideManager::GetUnit()
{
QString tmp = tr(tp[Einheit]);
return tmp;
QString tmp = tr(tp[Einheit]);
return tmp;
}
 
void GuideManager::UpdateHorList()
{
disconnect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
disconnect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
disconnect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
disconnect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
HorList->clear();
QString tmp;
for (uint i = 0; i < LocHor.count(); ++ i)
HorList->insertItem(tmp.setNum(qRound(LocHor[i] * UmReFaktor * 10000.0) / 10000.0, 'f', 4) +
GetUnit());
if (LocHor.isEmpty())
selHor = -1;
 
HorList->clear();
if (selHor != -1)
HorList->setCurrentItem(selHor);
HorSpin->setEnabled(selHor != -1 ? true : false);
HorSpin->setValue(selHor != -1 ? (LocHor[selHor] * UmReFaktor * 10000.0) / 10000.0 : 0);
 
QString tmp;
 
for (uint i = 0; i < LocHor.count(); ++ i)
HorList->insertItem(tmp.setNum(qRound(LocHor[i] * UmReFaktor * 10000.0) / 10000.0, 'f', 4) + GetUnit());
if (LocHor.isEmpty())
selHor = -1;
if (selHor != -1)
{
HorSpin->setEnabled(true);
HorSpin->setValue((LocHor[selHor] * UmReFaktor * 10000.0) / 10000.0);
HorList->setCurrentItem(selHor);
}
else
{
HorSpin->setValue(0);
HorSpin->setEnabled(false);
}
connect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
connect(HorList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selHorIte(QListBoxItem*)));
connect(HorSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeHorVal()));
}
 
void GuideManager::UpdateVerList()
{
disconnect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
disconnect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
disconnect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
disconnect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
QString tmp;
VerList->clear();
for (uint i = 0; i < LocVer.count(); ++ i)
VerList->insertItem(tmp.setNum(qRound(LocVer[i] * UmReFaktor * 10000.0) / 10000.0, 'f', 4) +
GetUnit());
if (LocVer.isEmpty())
selVer = -1;
if (selVer != -1)
VerList->setCurrentItem(selVer);
VerSpin->setEnabled(selVer != -1 ? true : false);
VerSpin->setValue(selVer != -1 ? (LocVer[selVer] * UmReFaktor * 10000.0) / 10000.0 : 0);
 
QString tmp;
 
VerList->clear();
 
for (uint i = 0; i < LocVer.count(); ++ i)
VerList->insertItem(tmp.setNum(qRound(LocVer[i] * UmReFaktor * 10000.0) / 10000.0, 'f', 4) + GetUnit());
if (LocVer.isEmpty())
selVer = -1;
if (selVer != -1)
{
VerSpin->setEnabled(true);
VerSpin->setValue((LocVer[selVer] * UmReFaktor * 10000.0) / 10000.0);
VerList->setCurrentItem(selVer);
}
else
{
VerSpin->setValue(0);
VerSpin->setEnabled(false);
}
connect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
connect(VerList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selVerIte(QListBoxItem*)));
connect(VerSpin, SIGNAL(valueChanged(int)), this, SLOT(ChangeVerVal()));
}
/trunk/Scribus/scribus/hysettings.cpp
43,7 → 43,7
 
WordLen = new QSpinBox( this, "WordLen" );
WordLen->setMinValue( 3 );
QToolTip::add( WordLen, tr( "This is the length of the smallest word to be hyphenated." ) );
QToolTip::add( WordLen, tr( "Length of the smallest word to be hyphenated." ) );
 
Layout3->addWidget( WordLen, 3, 1 );
HySettingsLayout->addLayout( Layout3 );
/trunk/Scribus/scribus/scribusview.cpp
48,18 → 48,18
doZooming = false;
Doc = doc;
Doc->PageC = 0;
Prefs = prefs;
Prefs = prefs;
setHScrollBarMode(QScrollView::AlwaysOn);
setVScrollBarMode(QScrollView::AlwaysOn);
setMargins(25, 25, 0, 0);
setResizePolicy(Manual);
enableClipper(true);
viewport()->setBackgroundMode(PaletteBackground);
viewport()->setBackgroundMode(PaletteBackground);
QFont fo = QFont(font());
fo.setPointSize(10);
LE = new MSpinBox( this, 2 );
LE = new MSpinBox( this, 2 );
LE->setFont(fo);
LE->setSuffix( tr( " %" ) );
LE->setSuffix( tr( " %" ) );
LE->setMaxValue( 3200 );
LE->setMinValue( 10 );
LE->setValue( 100 );
219,6 → 219,7
Doc->ActPage = fe;
fe->Margins.Top = Doc->PageM.Top;
fe->Margins.Bottom = Doc->PageM.Bottom;
fe->setFocusPolicy(QWidget::ClickFocus);
addChild(feh, static_cast<int>(10*s), static_cast<int>(Doc->PageC*((Doc->PageH+30)*s)+10*s));
feh->show();
Doc->PageC++;
613,8 → 614,8
 
void ScribusView::GotoPa(int Seite)
{
GotoPage(Seite-1);
setFocus();
GotoPage(Seite-1);
}
 
void ScribusView::ChgUnit(int art)
2281,19 → 2282,19
}
else
{
if (w->orientation() == QWheelEvent::Vertical)
if ((w->orientation() != QWheelEvent::Vertical) || ( w->state() & ShiftButton ))
{
if (w->delta() < 0)
scrollBy(0, Prefs->Wheelval);
scrollBy(Prefs->Wheelval, 0);
else
scrollBy(0, -Prefs->Wheelval);
scrollBy(-Prefs->Wheelval, 0);
}
else
{
if (w->delta() < 0)
scrollBy(Prefs->Wheelval, 0);
scrollBy(0, Prefs->Wheelval);
else
scrollBy(-Prefs->Wheelval, 0);
scrollBy(0, -Prefs->Wheelval);
}
}
w->accept();
/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("30").arg("March").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("02").arg("April").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/navigator.cpp
24,13 → 24,13
setScaledContents(false);
setAlignment(static_cast<int>( QLabel::AlignLeft | QLabel::AlignTop) );
if (fn != "")
{
{
QPixmap img = LoadPDF(fn, Seite, Size, &Breite, &Hoehe);
if (!img.isNull())
pmx = img;
else
pmx = LoadPDF(fn, 1, Size, &Breite, &Hoehe);
}
}
else
pmx = vie->PageToPixmap(Seite, Size);
resize(pmx.width(), pmx.height());
44,7 → 44,7
{
drawMark(m->x(), m->y());
emit Coords(static_cast<double>(m->x())/static_cast<double>(pmx.width()),
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
}
 
void Navigator::mousePressEvent(QMouseEvent *m)
51,13 → 51,13
{
drawMark(m->x(), m->y());
emit Coords(static_cast<double>(m->x())/static_cast<double>(pmx.width()),
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
}
 
void Navigator::mouseReleaseEvent(QMouseEvent *m)
{
emit Coords(static_cast<double>(m->x())/static_cast<double>(pmx.width()),
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
static_cast<double>(m->y())/static_cast<double>(pmx.height()));
}
 
void Navigator::paintEvent(QPaintEvent *e)
87,23 → 87,22
{
bool ret = false;
if (fn != "")
{
{
QPixmap img = LoadPDF(fn, Seite, Size, &Breite, &Hoehe);
if (!img.isNull())
{
{
pmx = img;
ret = true;
}
}
else
pmx = LoadPDF(fn, 1, Size, &Breite, &Hoehe);
}
}
else
{
{
pmx = view->PageToPixmap(Seite, Size);
ret = true;
}
}
resize(pmx.width(), pmx.height());
repaint();
return ret;
}
 
/trunk/Scribus/scribus/scribus.cpp
1013,19 → 1013,19
{
if (HaveDoc)
{
if (w->orientation() == QWheelEvent::Vertical)
if ((w->orientation() != QWheelEvent::Vertical) || ( w->state() & ShiftButton ))
{
if (w->delta() < 0)
view->scrollBy(0, Prefs.Wheelval);
view->scrollBy(Prefs.Wheelval, 0);
else
view->scrollBy(0, -Prefs.Wheelval);
view->scrollBy(-Prefs.Wheelval, 0);
}
else
{
if (w->delta() < 0)
view->scrollBy(Prefs.Wheelval, 0);
view->scrollBy(0, Prefs.Wheelval);
else
view->scrollBy(-Prefs.Wheelval, 0);
view->scrollBy(0, -Prefs.Wheelval);
}
w->accept();
}
1062,7 → 1062,7
break;
}
ButtonState buttonState = k->state();
if ((HaveDoc) && (!view->LE->hasFocus()))
if ((HaveDoc) && (!view->LE->hasFocus()) && (!view->PGS->PageCombo->hasFocus()))
{
if (doc->AppMode != 7)
{
1130,6 → 1130,8
{
if ( buttonState & ShiftButton )
doc->ActPage->moveGroup(-10, 0);
else if ( buttonState & ControlButton )
doc->ActPage->moveGroup(-0.1, 0);
else
doc->ActPage->moveGroup(-1, 0);
}
1146,6 → 1148,8
{
if ( buttonState & ShiftButton )
doc->ActPage->moveGroup(10, 0);
else if ( buttonState & ControlButton )
doc->ActPage->moveGroup(0.1, 0);
else
doc->ActPage->moveGroup(1, 0);
}
1162,6 → 1166,8
{
if ( buttonState & ShiftButton )
doc->ActPage->moveGroup(0, -10);
else if ( buttonState & ControlButton )
doc->ActPage->moveGroup(0, -0.1);
else
doc->ActPage->moveGroup(0, -1);
}
1178,6 → 1184,8
{
if ( buttonState & ShiftButton )
doc->ActPage->moveGroup(0, 10);
else if ( buttonState & ControlButton )
doc->ActPage->moveGroup(0, 0.1);
else
doc->ActPage->moveGroup(0, 1);
}
4451,6 → 4459,8
{
disconnect(doc->CurTimer, SIGNAL(timeout()), doc->ActPage, SLOT(BlinkCurs()));
doc->CurTimer->stop();
view->LE->setFocusPolicy(QWidget::ClickFocus);
view->PGS->PageCombo->setFocusPolicy(QWidget::ClickFocus);
delete doc->CurTimer;
editMenu->setItemEnabled(edid4, 0);
editMenu->setItemEnabled(edid5, 0);
4464,6 → 4474,8
}
if (mode == 7)
{
view->LE->setFocusPolicy(QWidget::NoFocus);
view->PGS->PageCombo->setFocusPolicy(QWidget::NoFocus);
if (b != 0)
{
if ((b->PType == 6) || (b->PType == 7) || (b->PType == 8))
5257,6 → 5269,8
doc->ActPage->SetAbStyle(a);
doc->CurrentABStil = a;
Mpal->setAli(a);
PageItem *b = doc->ActPage->SelItem.at(0);
setTBvals(b);
slotDocCh();
}
}
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
1500,9 → 1500,9
}
}
if (!first)
gradient->Color2 = Col;
else
gradient->Color1 = Col;
else
gradient->Color2 = Col;
first = true;
gradient->gradient.addStop( Doku->PageColors[Col].getRGBColor(), offset, 0.5, 1.0 );
}
/trunk/Scribus/scribus/page.cpp
7149,17 → 7149,18
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
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)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
}
if (s == 0)
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
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)->cfont = nb->IFont;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
a--;
}
if (cr)
7192,17 → 7193,18
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
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)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
}
if (s == 0)
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
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)->cfont = nb->IFont;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
if (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
7238,17 → 7240,18
b->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
b->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
b->Ptext.at(a)->ccolor = b->TxtFill;
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)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= b->TxTStyle;
}
}
if (s == 0)
{
b->Ptext.at(a)->ccolor = b->TxtFill;
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)->cfont = b->IFont;
b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= b->TxTStyle;
}
}
}
}
7436,8 → 7439,12
PageItem *b = SelItem.at(0);
if (b->PicAvail)
{
int fho = b->flippedH;
int fvo = b->flippedV;
b->pixmOrg = QImage();
LoadPict(b->Pfile, b->ItemNr);
b->flippedH = fho;
b->flippedV = fvo;
AdjustPictScale(b);
AdjustPreview(b, false);
update();
7509,7 → 7516,11
{
if ( ex == 0 )
{
int fho = b->flippedH;
int fvo = b->flippedV;
LoadPict(b->Pfile, b->ItemNr);
b->flippedH = fho;
b->flippedV = fvo;
AdjustPictScale(b);
AdjustPreview(b, false);
update();
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2343,7 → 2343,7
QImage img;
QImage img2;
QMap<int, QString> ind2PDFabr;
char *tmp[] = {"/Cour", "/CoBo", "/CoOb", "/CoBO", "/Helv", "/HeBo", "/HeOb", "/HeBO",
const char *tmp[] = {"/Cour", "/CoBo", "/CoOb", "/CoBO", "/Helv", "/HeBo", "/HeOb", "/HeBO",
"/TiRo", "/TiBo", "/TiIt", "/TiBI", "/ZaDb", "/Symb"};
size_t ar = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < ar; ++a)
2360,7 → 2360,7
bm += cc;
}
QStringList bmst = QStringList::split("\r", bm);
char *m[] = {"4", "5", "F", "l", "H", "n"};
const char *m[] = {"4", "5", "F", "l", "H", "n"};
ct = m[ite->AnChkStil];
StartObj(ObjCounter);
Seite.AObjects.append(ObjCounter);
2412,14 → 2412,14
PutDoc("/BS << /Type /Border /W ");
PutDoc(ite->AnBColor != "None" ? IToStr(ite->AnBwid) : QString("0"));
PutDoc(" /S /");
char *x[] = {"S", "D", "U", "B", "I"};
const char *x[] = {"S", "D", "U", "B", "I"};
PutDoc(x[ite->AnBsty]);
PutDoc(" >>\n");
cnx = "("+ind2PDFabr[ite->AnFont]+" "+FToStr(ite->ISize / 10.0)+" Tf";
if (Options->UseRGB)
{
if (ite->Pcolor2 != "None")
cnx += " "+SetFarbe(ite->Pcolor2, ite->Shade2)+" rg\n";
if (ite->TxtFill != "None")
cnx += " "+SetFarbe(ite->TxtFill, ite->ShTxtFill)+" rg\n";
if (ite->Pcolor != "None")
cnx += " "+SetFarbe(ite->Pcolor, ite->Shade)+" RG\n";
}
2432,14 → 2432,14
cnx += " /"+ICCProfiles[Options->SolidProf].ResName+" CS\n";
if (ite->Pcolor != "None")
cnx += SetFarbe(ite->Pcolor, ite->Shade)+" SCN\n";
if (ite->Pcolor2 != "None")
cnx += SetFarbe(ite->Pcolor2, ite->Shade2)+" scn\n";
if (ite->TxtFill != "None")
cnx += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" scn\n";
}
else
{
#endif
if (ite->Pcolor2 != "None")
cnx += " "+SetFarbe(ite->Pcolor2, ite->Shade2)+" k";
if (ite->TxtFill != "None")
cnx += " "+SetFarbe(ite->TxtFill, ite->ShTxtFill)+" k";
if (ite->Pcolor != "None")
cnx += " "+SetFarbe(ite->Pcolor, ite->Shade)+" K";
}
2727,8 → 2727,8
cc += "/Tx BMC\nBT\n";
if (Options->UseRGB)
{
if (ite->Pcolor2 != "None")
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" rg\n";
if (ite->TxtFill != "None")
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" rg\n";
}
else
{
2735,18 → 2735,18
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles))
{
if (ite->Pcolor2 != "None")
if (ite->TxtFill != "None")
{
cc += " /"+ICCProfiles[Options->SolidProf].ResName+" cs\n";
cc += " /"+ICCProfiles[Options->SolidProf].ResName+" CS\n";
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" scn\n";
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" scn\n";
}
}
else
{
#endif
if (ite->Pcolor2 != "None")
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" k\n";
if (ite->TxtFill != "None")
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" k\n";
}
#ifdef HAVE_CMS
}
2761,8 → 2761,8
cc = "q\nBT\n";
if (Options->UseRGB)
{
if (ite->Pcolor2 != "None")
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" rg\n";
if (ite->TxtFill != "None")
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" rg\n";
}
else
{
2769,18 → 2769,18
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles))
{
if (ite->Pcolor2 != "None")
if (ite->TxtFill != "None")
{
cc += " /"+ICCProfiles[Options->SolidProf].ResName+" cs\n";
cc += " /"+ICCProfiles[Options->SolidProf].ResName+" CS\n";
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" scn\n";
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" scn\n";
}
}
else
{
#endif
if (ite->Pcolor2 != "None")
cc += SetFarbe(ite->Pcolor2, ite->Shade2)+" k\n";
if (ite->TxtFill != "None")
cc += SetFarbe(ite->TxtFill, ite->ShTxtFill)+" k\n";
}
#ifdef HAVE_CMS
}
/trunk/Scribus/scribus/editformats.cpp
222,13 → 222,13
sty.Font = ss->Vorlagen[xx].Font;
sty.FontSize = ss->Vorlagen[xx].FontSize;
sty.TabValues = ss->Vorlagen[xx].TabValues;
sty.Drop = TempVorl[xx].Drop;
sty.DropLin = TempVorl[xx].DropLin;
sty.FontEffect = TempVorl[xx].FontEffect;
sty.FColor = TempVorl[xx].FColor;
sty.FShade = TempVorl[xx].FShade;
sty.SColor = TempVorl[xx].SColor;
sty.SShade = TempVorl[xx].SShade;
sty.Drop = ss->Vorlagen[xx].Drop;
sty.DropLin = ss->Vorlagen[xx].DropLin;
sty.FontEffect = ss->Vorlagen[xx].FontEffect;
sty.FColor = ss->Vorlagen[xx].FColor;
sty.FShade = ss->Vorlagen[xx].FShade;
sty.SColor = ss->Vorlagen[xx].SColor;
sty.SShade = ss->Vorlagen[xx].SShade;
TempVorl.append(sty);
}
}
/trunk/Scribus/scribus/pageselector.cpp
32,6 → 32,7
Start->setDefault( false );
Start->setAutoDefault( false );
Start->setPixmap( loadIcon("start.png") );
Start->setFocusPolicy(QWidget::NoFocus);
PageSelectorLayout->addWidget( Start );
 
Back = new QPushButton( this, "Back" );
38,6 → 39,7
Back->setPixmap( loadIcon("back.png") );
Back->setDefault( false );
Back->setAutoDefault( false );
Back->setFocusPolicy(QWidget::NoFocus);
PageSelectorLayout->addWidget( Back );
 
Label1 = new QLabel( this, "Label1" );
53,6 → 55,7
PageCombo->insertItem(tmp.setNum(a+1));
}
PageCombo->setValidator(v);
PageCombo->setFocusPolicy(QWidget::ClickFocus);
PageSelectorLayout->addWidget( PageCombo );
 
Label2 = new QLabel( this, "Label2" );
63,6 → 66,7
Forward->setPixmap( loadIcon("forward.png") );
Forward->setDefault( false );
Forward->setAutoDefault( false );
Forward->setFocusPolicy(QWidget::NoFocus);
PageSelectorLayout->addWidget( Forward );
 
Last = new QPushButton( this, "Last" );
69,6 → 73,7
Last->setPixmap( loadIcon("finish.png") );
Last->setDefault( false );
Last->setAutoDefault( false );
Last->setFocusPolicy(QWidget::NoFocus);
PageSelectorLayout->addWidget( Last );
Forward->setEnabled(true);
Last->setEnabled(true);