Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 237 → Rev 238

/trunk/Scribus/README
1,29 → 1,60
This is Scribus Version 1.1.5, the sixth Developers Relase after Scribus 1.0.1
This is Scribus Version 1.1.6, the seventh Developers Release after Scribus 1.0.1
 
This Version introduces a complete rewrite of the rendering Engine. All rendering
is now done via libart and freetype2. This requires that libart and freetype2 are
present.
The Scribus 1.1.x versions feature a complete rewrite of the rendering Engine.
All rendering is now done via libart and freetype2. This requires that libart and freetype2 are present.
 
Additionally Scribus uses now a different way to find Fonts, sadly this gives
some changes in the Fontnames Scribus uses. To convert old Documents follow the
Additionally Scribus uses now a different way to find fonts, sadly this gives
some changes in the font names Scribus uses. To convert old documents follow the
procedure below:
 
1) Create a Document with the old Version of Scribus containing all your Fonts.
1) Create a document with the old Version of Scribus containing all your Fonts.
2) Open the new Scribus and go to the Font Substitution List.
3) Clear out all current Substitutions.
4) Open the Document created in 1) and substitute all the Fonts with the correct
new Fonts.
When you open now old Documents Scribus will convert all Font Names automatically.
4) Open the Document created in 1) and substitute all the fonts with the correct new Fonts.
 
When you open now old Documents Scribus will convert all Font Names
automatically.
 
For Changes please see the ChangeLog.
 
To use Scribus in your native language be sure that the
environment variable LANG is set correctly.
To use Scribus in your native language be sure that the environment
variable LANG is set correctly.
 
Special note for SuSE 8.1 users, you need the devel packages, at least
xdevel.rpm, qtdevel.rpm and tiffdevel.rpm. In the Standard-Install they
were not installed.
 
Other notes/known issues at the time of release:
 
There is a bug in font outline handling for some fonts in the freetype
libraries. It's being worked on upstream. Don't file a bug report. Instead
change the font used if you need the outlines. This is not a Scribus bug.
 
There is a bug in sawfish and enlightenment that creates window ghosting
effect when Tools palettes are turned on. A simple temporary workaround
is to turn each ghosted Tool palette off and on.
 
A more permanent workaround for Gnome users is to use metacity. Scribus
has workarounds for some metacity bugs built-in, but the sawfish /enlightenment
bug seems to be Qt related.
 
If Scribus does not start while complaining about the absence of
PostScript fonts please install either xfonts-scalable or gsfonts-x11.
They are in the "Recommends" and will be installed by all sensible apt
front-ends.
 
For SuSE 9.0 Users.
 
The littlecms libs 1.10, which shipped with 9.0 does not offer complete support
for all the the latest CMS features in Scribus 1.1.6. There will be updated
SuSE 9.0 RPM's linked on the scribus.net site.
 
If you are using Qt 3.3.1, please ensure you are using the latest Qt 3.3.1-2+ rpms.
The -2+ versions have an important fix for drag and drop in Scribus.
 
Many other hints and info are on the scribus.net site. Full compile, installand FAQ's
are available there.
 
 
Franz Schmid
in February 2004
in March 2004
/trunk/Scribus/ChangeLogCVS
1,132 → 1,4
Changes since Version 1.1.5
25.03.2004 Fixed Bug when dragging Objects from the Scrapbook to Template Pages.
Improved the drawing of the ouline Box when resizing Objects.
Some more Patches from Jean-Jacques Sarton.
Updated the Finnish Translation.
Fixes for the zooming.
 
18.03.2004 Fixes for rotated Tables and Borderlines.
 
17.03.2004 Printing and Exporting to PDF for Tables is now working too.
 
16.03.2004 Loading and Saving of Tables is working, including Drag&Drop.
 
15.03.2004 Resizing of TableItems works now properly.
 
14.03.2004 Added first basic Support for Tables.
Jean-Jacques Sarton completed the Textselection with the Cursor Keys:
Shift+Cursor Key selects Chararcters.
Ctrl+Shift+Cursor Key selects Words.
Ctrl+Cursor Up/Down selects Lines.
Ctrl+Home selects Text from the Start to the Cursor Position.
Ctrl+End selects Text from the Cursor Position to the End.
Ctrl+Cursor Key moves to the next Word.
Updated the Danish Translation.
 
13.03.2004 Added Patch from Jean-Jacques Sarton to enable Textselection with the Cursor Keys and Shift pressed.
Fixed Crash when cutting Text (also by Jean-Jacques Sarton).
Improved Object resizing and selecting.
Improved Display when moving Objects.
 
12.03.2004 Updated the Polish Translation.
Fixed a Typo in the Brazilian Translation.
Fixed Bug #340.
 
11.03.2004 Added ToolTips for the Preferences.
When dragging Linked Textframes between Pages with the Mouse the linkage is now keeped.
Updated the Scripter Commands for Linked Textframes too.
 
10.03.2004 Enabled dragging of Objects between Pages.
When you convert a Textframe to outlines the important properties are copied too, Bug #337.
Fixed Bug #338 and #333 too.
 
09.03.2004 Updated the Ukrainian Translation.
Finally fixed placement of the Icons for PDF-Buttons.
Objects keep their Name now when they are Cut and Pasted.
 
08.03.2004 Fixed behaviour of the Icons of PDF-Buttons.
Fixed Bug #326.
Added more ToolTips.
 
07.04.2004 Added an Option to the Preferences to determine if the Contents of a Page
are clipped at the Margins or not.
Added a Folder for storing official approved Scripts.
Fixed Bugs #280, #156 and #133.
Added some Patches from Jean-Jacques Sarton which speed up image handling.
 
06.03.2004 Added Settings for the external Tools to the Preferences.
Scribus should now be more stable when it finds a corrupt Font on startup.
Fixed Bugs #323, #311, #209 and #80
 
05.03.2004 Improved the PDF-Exporter, Images are now written only once into the PDF.
Fixed Bug #314.
 
04.03.2004 Fixed Bugs #319, #310, #289 and #82
Updated the Ukrainian and Czech translation.
 
03.03.2004 Fixed Bugs #318, #317, #313, #311, #257 and #127
Updated the Finnish Translation.
 
02.03.2004 Added the Option to delete all Objects on a Layer, when deleting this Layer.
Changed the readout of the Color Values to Percent in the ColorChooser.
Added a new Command to the Scripter.
Updated a couple of Tooltips and added more.
Updated the Czech Translation.
 
01.03.2004 Improved the SVG-Importer, Text should be now better, but still not perfect.
Added a new Colorset: SVG-Colors.
Updated the Finnish Translation.
 
29.02.2004 Added first Gimp Integration, contributed by Jean Jacques Sarton.
Improved the PrintPreview a little more.
 
27.02.2004 Improved the PrintPreview, it now remembers the last used Settings.
Added some new Commands to the Scripter.
 
25.02.2004 Included a Patch from Alessandro Rimoldini for the main.cpp file.
Included a Patch from Mathy Vanvoorden for the Story Editor.
Fixed bugs with Textframes.
Display of Textframes should look now the same in all Magnifications.
Updated scribus.desktop file.
 
24.02.2004 Fixed Bug with wrong Gradients when copying Objects.
Moved the Documentation files to $prefix/share/scribus
Fixed Problems with Editing Styles changing unexpectedly Textframes.
All Fonts used in a Document are now embedded into PDF by default.
 
23.02.2004 Added the Option to protect an Object against resizing.
Fixed Issues with Rounded Corners.
Added a Context Menueitem for updating Picture frames.
Updated the Finnish Translation.
Changed the behaviour of Mouse Clicks:
Ctrl+Shift+Click selects the Object beneath another.
Shift+Click adds an Object to the Selection.
Ctrl+Alt+Click selects a single Object out of a Group.
 
22.02.2004 Included Patches from Jean-Jacques Sarton.
Fixed Bug #278
Updated the Ukrainian Translation.
Another addition for the Scripter from Petr Vanek.
 
21.02.2004 Added ability to include Softmasks into PDFs when exporting to PDF 1.4
Fixed Bugs #279, #277, #235
Bug #235 was fixed by Petr Vanek.
 
20.02.2004 Fixed Bug when scaling Groups containg lines, Bug #276
 
19.02.2004 Improved the PDF-Export settings, the Compression method for
Images can now be set. Zip and JPEG Compression is available.
 
18.02.2004 Improved the PDF-Export, Images are now written as jpg into the PDF.
Fixed a problem with freetype > 2.1.4
 
17.02.2004 Updated the Danish and Welsh Translation.
Added a new Command to the Scripter, contributed by Petr Vanek.
 
15.02.2004 Fixed some mismatches in the German Translation.
Updated the Czech Translation.
Fixed Bug #268
Fixed Problem with changing Fontsizes in Textframes with no Styles when editing Styles.
Fixed Bug #223
 
 
Changes since Version 1.1.6
29.03.2004 Removed implicit closing of Polylines in the SVG importer.
Added a "Keep aspect ratio" Button to the X-Y-Z Tab of the Properties Palette.
Added the missing pageselector.h file to the install function.
/trunk/Scribus/scribus/pdfopts.cpp
360,7 → 360,7
TextLabel4e->setText( tr( "Moving Lines:" ) );
EffectsLayout->addWidget( TextLabel4e, 3, 0 );
TextLabel5e = new QLabel( Effects, "TextLabel6" );
TextLabel5e->setText( tr( "from the:" ) );
TextLabel5e->setText( tr( "From the:" ) );
EffectsLayout->addWidget( TextLabel5e, 4, 0 );
TextLabel6e = new QLabel( Effects, "TextLabel5" );
TextLabel6e->setText( tr( "Direction:" ) );
732,6 → 732,59
PDFOptsLayout->addLayout( Layout7 );
setMaximumSize( sizeHint() );
 
//tooltips
QToolTip::add( AllPages, tr( "Export all pages to PDF" ) );
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( EmbedFonts, tr( "Check this to 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( 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( 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( 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( 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( 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( 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( 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( 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" ) );
QToolTip::add( BleedRight, tr( "Distance for bleed from the right of the physical page" ) );
 
// signals and slots connections
connect( FileC, SIGNAL( clicked() ), this, SLOT( ChangeFile() ) );
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
/trunk/Scribus/scribus/mpalette.h
167,6 → 167,7
QLabel* Text11a;
MSpinBox* LXpos;
LinkButton* Kette;
LinkButton* Kette2;
MSpinBox* ScaleY;
MSpinBox* ScaleX;
QFrame* Line5_2;
/trunk/Scribus/scribus/mpalette.cpp
134,6 → 134,11
Text3 = new QLabel( GeoGroup, "Text3" );
Text3->setText( tr( "Rotation:" ) );
GeoGroupLayout->addWidget( Text3, 4, 0 );
Kette2 = new LinkButton( GeoGroup );
Kette2->setToggleButton( true );
Kette2->setAutoRaise( true );
Kette2->setMaximumSize( QSize( 15, 32767 ) );
GeoGroupLayout->addMultiCellWidget( Kette2, 2, 3, 2, 2 );
Rot = new MSpinBox( GeoGroup, 2);
Rot->setSuffix(" ");
Rot->setWrapping( true );
462,7 → 467,6
StrokeIcon = new QLabel( page_3, "StrokeIcon" );
StrokeIcon->setText("");
StrokeIcon->setPixmap(loadIcon("Stiftalt.xpm"));
/* PFJ 29.02.04 - Changed to false from FALSE */
StrokeIcon->setScaledContents( false );
layout23->addWidget( StrokeIcon );
TxStroke = new QComboBox( true, page_3, "TxStroke" );
480,7 → 484,6
FillIcon = new QLabel( page_3, "FillIcon" );
FillIcon->setText("");
FillIcon->setPixmap(loadIcon("fill.png"));
/* PFJ 29.02.04 - Changed to false from FALSE */
FillIcon->setScaledContents( false );
layout24->addWidget( FillIcon );
TxFill = new QComboBox( true, page_3, "TxFill" );
619,7 → 622,6
Layout18->addWidget( Frame4 );
 
Aspect = new QCheckBox( page_4, "Aspect" );
/* PFJ - 29.02.04 - Changed from FALSE and TRUE to false and true */
Aspect->setEnabled( false );
Aspect->setText( tr( "Proportional" ) );
Aspect->setChecked( true );
807,6 → 809,7
QToolTip::add( ScaleX, tr( "Resize the image horizontally" ) );
QToolTip::add( ScaleY, tr( "Resize the image vertically" ) );
QToolTip::add( Kette, tr( "Keep the X and Y scaling the same" ) );
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" ) );
1035,9 → 1038,8
connect(StyledLine, SIGNAL(clicked(QListBoxItem*)), this, SLOT(SetSTline(QListBoxItem*)));
connect(NameEdit, SIGNAL(Leaved()), this, SLOT(NewName()));
NoPrint->setOn(!i->isPrintable);
/* PFJ - 29.02.04 - Used ternary */
setter = i->Locked ? false : true;
 
Kette2->setOn(false);
Width->setEnabled(setter);
Height->setEnabled(setter);
RoundRect->setEnabled(setter);
1092,6 → 1094,7
}
if (i->PType == 5)
{
Kette2->setEnabled(false);
if (LMode)
{
Text1->setText( tr( "X1:" ) );
1115,6 → 1118,7
}
else
{
Kette2->setEnabled(true);
if (i->PType == 2)
{
updateCmsList();
1424,7 → 1428,6
DBottom->setDecimals(10);
DRight->setDecimals(10);
RoundRect->setDecimals(10);
/* PFJ - 29.02.04 - Rejigged for speed */
QString point[] = { tr(" pt"), tr(" mm"), tr(" in"), tr(" p")};
if (doc->Einheit > 3)
doc->Einheit = 0;
1930,9 → 1933,17
if (doc->ActPage->GroupSel)
{
doc->ActPage->getGroupRect(&gx, &gy, &gw, &gh);
doc->ActPage->HowTo = 1;
doc->ActPage->scaleGroup(w / gw, w / gw);
setBH(w, (w / gw) * gh);
if (Kette2->isOn())
{
doc->ActPage->HowTo = 1;
doc->ActPage->scaleGroup(w / gw, w / gw);
setBH(w, (w / gw) * gh);
}
else
{
doc->ActPage->HowTo = 6;
doc->ActPage->scaleGroup(w / gw, 1.0);
}
}
else
{
1955,6 → 1966,7
int rmo = doc->RotMode;
doc->RotMode = 0;
double dist = w - CurItem->Width;
double oldW = CurItem->Width;
PageItem* bb2;
PageItem* bb = CurItem;
while (bb->TopLink != 0)
1980,9 → 1992,24
}
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr, true);
doc->RotMode = rmo;
if (Kette2->isOn())
{
Kette2->setOn(false);
setBH(w, (w / oldW) * CurItem->Height);
NewH();
Kette2->setOn(true);
}
}
else
doc->ActPage->SizeItem(w, CurItem->Height, CurItem->ItemNr, true);
{
if (Kette2->isOn())
{
setBH(w, (w / CurItem->Width) * CurItem->Height);
doc->ActPage->SizeItem(w, (w / CurItem->Width) * CurItem->Height, CurItem->ItemNr, true);
}
else
doc->ActPage->SizeItem(w, CurItem->Height, CurItem->ItemNr, true);
}
}
emit DocChanged();
}
2003,9 → 2030,17
if (doc->ActPage->GroupSel)
{
doc->ActPage->getGroupRect(&gx, &gy, &gw, &gh);
doc->ActPage->HowTo = 1;
doc->ActPage->scaleGroup(h / gh, h / gh);
setBH((h / gh) * gw, h);
if (Kette2->isOn())
{
doc->ActPage->HowTo = 1;
doc->ActPage->scaleGroup(h / gh, h / gh);
setBH((h / gh) * gw, h);
}
else
{
doc->ActPage->HowTo = 5;
doc->ActPage->scaleGroup(1.0, h / gh);
}
}
else
{
2028,6 → 2063,7
int rmo = doc->RotMode;
doc->RotMode = 0;
double dist = h - CurItem->Height;
double oldH = CurItem->Height;
PageItem* bb2;
PageItem* bb = CurItem;
while (bb->LeftLink != 0)
2053,9 → 2089,24
}
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr, true);
doc->RotMode = rmo;
if (Kette2->isOn())
{
Kette2->setOn(false);
setBH((h / oldH) * CurItem->Width, h);
NewW();
Kette2->setOn(true);
}
}
else
doc->ActPage->SizeItem(CurItem->Width, h, CurItem->ItemNr, true);
{
if (Kette2->isOn())
{
setBH((h / CurItem->Height) * CurItem->Width, h);
doc->ActPage->SizeItem((h / CurItem->Height) * CurItem->Width, h, CurItem->ItemNr, true);
}
else
doc->ActPage->SizeItem(CurItem->Width, h, CurItem->ItemNr, true);
}
}
}
emit DocChanged();
/trunk/Scribus/scribus/page.h
56,7 → 56,7
void insertColor(QString nam, double c, double m, double y, double k);
void DrawPageMarks(ScPainter *p, QRect rd);
void DrawPageItems(ScPainter *painter, QRect rd);
void Page::leaveEvent(QEvent *);
void leaveEvent(QEvent *);
void paintEvent(QPaintEvent *e);
void setGroupRect();
void getGroupRect(double *x, double *y, double *w, double *h);
273,8 → 273,8
/** Setzt den Drehungswinkel des Elementes */
void SetAngle(double);
/** Zoomfunktionen */
void ZoomIn();
void ZoomOut();
void ZoomIn(int, int);
void ZoomOut(int, int);
void ZoomAbs();
void AbsPosi(int, int);
void AbsPosi2(int, int);
/trunk/Scribus/scribus/pageitem.cpp
239,7 → 239,7
uint a, nrc, nrc2, zae;
int desc, asce, absa, aSpa, chs, CurrCol;
uint BuPos, LastSP, BuPos2, MaxText;
double oldCurY, LastXp, EndX, OFs, OFs2, wide, rota, wid, lineCorr, ColWidth;
double oldCurY, LastXp, EndX, OFs, OFs2, wide, rota, wid, lineCorr, ColWidth, kernVal;
double sc = Doc->Scale;
QString chx, chx2, chx3;
struct Pti *hl;
902,15 → 902,19
}
}
hl->yp = CurY + oldCurY;
if (LiList.count() == 0)
kernVal = 0;
else
kernVal = hl->cextra;
if (!RTab)
{
hl->xp = CurX+hl->cextra;
CurX += wide+hl->cextra;
hl->xp = CurX+kernVal;
CurX += wide+kernVal;
}
else
hl->xp = CurX;
if ((TabCode == 4) && (RTab))
CurX += (wide+hl->cextra) / 2;
CurX += (wide+kernVal) / 2;
pt1 = QPoint(static_cast<int>(ceil(CurX+RExtra)), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(ceil(CurX+RExtra)), static_cast<int>(ceil(CurY-asce)));
if ((!cl.contains(pf2.xForm(pt1))) || (!cl.contains(pf2.xForm(pt2))) || (CurX+RExtra+lineCorr > ColBound.y()))
928,7 → 932,7
Zli->Style = hl->cstyle;
Zli->ZFo = hl->cfont;
Zli->wide = wide;
Zli->kern = hl->cextra;
Zli->kern = kernVal;
Zli->scale = hl->cscale;
if (((hl->ch == " ") || (hl->ch == QChar(9))) && (!outs))
{
954,8 → 958,8
cen = 2;
for (uint rtx = StartRT; rtx < LiList.count(); ++rtx)
{
LiList.at(rtx)->xco = QMAX(LiList.at(rtx)->xco-(wide+hl->cextra) / cen, 0.0);
Ptext.at(StartRT2+rtx2)->xp = QMAX(Ptext.at(StartRT2+rtx2)->xp-(wide+hl->cextra) / cen, 0.0);
LiList.at(rtx)->xco = QMAX(LiList.at(rtx)->xco-(wide+kernVal) / cen, 0.0);
Ptext.at(StartRT2+rtx2)->xp = QMAX(Ptext.at(StartRT2+rtx2)->xp-(wide+kernVal) / cen, 0.0);
rtx2++;
}
}
/trunk/Scribus/scribus/scribusview.cpp
45,6 → 45,7
: QScrollView(parent, "s", WRepaintNoErase | WNorthWestGravity)
{
Ready = false;
doZooming = false;
Doc = doc;
Doc->PageC = 0;
Prefs = prefs;
109,6 → 110,13
MasterPages.clear();
DocPages.clear();
Ready = true;
// jjsa 27-03-2004 added 5 variables for zoom
oldX = -1,
oldY = -1;
oldScale=1;
oldSby=0;
oldSbx=0;
 
connect(SB1, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
connect(SB2, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
connect(LE, SIGNAL(valueChanged(int)), this, SLOT(Zval()));
153,7 → 161,23
bar.setGeometry(x+415+sadj, y, w-(415+sadj), h);
}
}
// jjsa 27-03-2004 add for better settinf while zooming
void ScribusView::rememberPreviousSettings(int mx, int my)
{
// remember scale
oldScale = Doc->Scale;
 
oldX = childX(Doc->ActPage->parentWidget()) + mx;
oldY = childY(Doc->ActPage->parentWidget()) + my;
 
// scrollbar position
oldSbx = horizontalScrollBar()->value();
oldSby = verticalScrollBar()->value();
 
oldX = childX(Doc->ActPage->parentWidget()) + mx + oldSbx;
oldY = childY(Doc->ActPage->parentWidget()) + my + oldSby;
}
 
/** Senkrechter Scrollbalken */
void ScribusView::setVBarGeometry(QScrollBar &bar, int x, int y, int w, int h)
{
178,6 → 202,7
 
void ScribusView::Zval()
{
rememberPreviousSettings();
Doc->Scale = LE->value() / 100.0 * Prefs->DisScale;
slotDoZoom();
setFocus();
237,8 → 262,8
connect(fe, SIGNAL(Hrule(int)), HR, SLOT(Draw(int)));
connect(fe, SIGNAL(Vrule(int)), VR, SLOT(Draw(int)));
connect(fe, SIGNAL(PgCh(int)), this, SLOT(setMenTxt(int)));
connect(fe, SIGNAL(ZoomIn()), this, SLOT(slotZoomIn2()));
connect(fe, SIGNAL(ZoomOut()), this, SLOT(slotZoomOut2()));
connect(fe, SIGNAL(ZoomIn(int, int)), this, SLOT(slotZoomIn2(int, int)));
connect(fe, SIGNAL(ZoomOut(int, int)), this, SLOT(slotZoomOut2(int, int)));
connect(fe, SIGNAL(ZoomAbs()), this, SLOT(slotDoZoom()));
connect(fe, SIGNAL(AbsPosi(int, int)), this, SLOT(SetCPo(int, int)));
connect(fe, SIGNAL(AbsPosi2(int, int)), this, SLOT(SetCCPo(int, int)));
444,6 → 469,8
uint a;
Page* Seite;
QWidget* PSeite = Doc->ActPage->parentWidget();
int oldXM = childX(PSeite);
int oldYM = childY(PSeite);
if (Doc->Scale > 32)
Doc->Scale = 32;
if (Pages.count() != 0)
491,13 → 518,50
else
resizeContents(static_cast<int>(PSeite->width()*2+60*Doc->Scale),
static_cast<int>((Doc->PageC/2 + 1) * (PSeite->height()+25*Doc->Scale)+30));
setContentsPos(childX(Doc->ActPage->parentWidget())-static_cast<int>(10*Doc->Scale),
childY(Doc->ActPage->parentWidget())-static_cast<int>(10*Doc->Scale));
updateScrollBars();
int newAbsX = (int)(((double)(oldX) * Doc->Scale / oldScale)+.5);
int newAbsY = (int)(((double)(oldY) * Doc->Scale / oldScale)+.5);
 
oldSbx += newAbsX - oldX;
oldSbx += newAbsY - oldY;
 
int maxx = horizontalScrollBar()->maxValue();
if ( oldSbx < 0 )
oldSbx = 0;
else if ( oldSbx > maxx )
oldSbx = maxx;
horizontalScrollBar()->setValue(oldSbx);
 
int maxy = verticalScrollBar()->maxValue();
if ( oldSby < 0 )
oldSby = 0;
else if ( oldSby > maxy )
oldSby = maxy;
verticalScrollBar()->setValue(oldSby);
}
else
{
resizeContents(static_cast<int>(PSeite->width()+30*Doc->Scale), static_cast<int>(Doc->PageC * (PSeite->height()+25*Doc->Scale)+30));
setContentsPos(0, childY(Doc->ActPage->parentWidget())-static_cast<int>(10*Doc->Scale));
updateScrollBars();
int newAbsX = (int)(((double)(oldX) * Doc->Scale / oldScale)+.5);
int newAbsY = (int)(((double)(oldY) * Doc->Scale / oldScale)+.5);
 
oldSbx += newAbsX - oldX;
oldSby += newAbsY - oldY;
 
int maxx = horizontalScrollBar()->maxValue();
if ( oldSbx < 0 )
oldSbx = 0;
else if ( oldSbx > maxx )
oldSbx = maxx;
horizontalScrollBar()->setValue(oldSbx);
 
int maxy = verticalScrollBar()->maxValue();
if ( oldSby < 0 )
oldSby = 0;
else if ( oldSby > maxy )
oldSby = maxy;
verticalScrollBar()->setValue(oldSby);
}
disconnect(LE, SIGNAL(valueChanged(int)), this, SLOT(Zval()));
LE->setValue(Doc->Scale/Prefs->DisScale*100);
508,6 → 572,7
PageItem *b = Doc->ActPage->SelItem.at(0);
SetCCPo(static_cast<int>(b->Xpos + b->Width/2), static_cast<int>(b->Ypos + b->Height/2));
}
 
}
}
 
571,37 → 636,44
PGS->GotoPg(Seite);
}
 
/** Vergr�rt die Ansicht */
void ScribusView::slotZoomIn()
void ScribusView::slotZoomIn(int mx,int my)
{
Doc->Scale *= 2;
if (Doc->Scale > 32)
Doc->Scale = 32;
slotDoZoom();
rememberPreviousSettings(mx,my);
Doc->Scale *= 2;
if (Doc->Scale > 32)
Doc->Scale = 32*Prefs->DisScale;
slotDoZoom();
}
 
/** Verkleinert die Ansicht */
void ScribusView::slotZoomOut()
void ScribusView::slotZoomOut(int mx,int my)
{
Doc->Scale /= 2;
slotDoZoom();
}
rememberPreviousSettings(mx,my);
Doc->Scale /= 2;
slotDoZoom();
}
 
/** Vergr�rt die Ansicht */
void ScribusView::slotZoomIn2()
void ScribusView::slotZoomIn2(int mx,int my)
{
Doc->Scale += static_cast<double>(Doc->MagStep)/100;
if (Doc->Scale > static_cast<double>(Doc->MagMax)/100)
Doc->Scale = static_cast<double>(Doc->MagMax)/100;
if (doZooming)
return;
doZooming = true;
rememberPreviousSettings(mx,my);
Doc->Scale += static_cast<double>(Doc->MagStep*Prefs->DisScale)/100.0;
if (Doc->Scale > static_cast<double>(Doc->MagMax*Prefs->DisScale)/100.0)
Doc->Scale = static_cast<double>(Doc->MagMax*Prefs->DisScale)/100.0;
slotDoZoom();
doZooming = false;
}
 
/** Verkleinert die Ansicht */
void ScribusView::slotZoomOut2()
void ScribusView::slotZoomOut2(int mx,int my)
{
Doc->Scale -= static_cast<double>(Doc->MagStep)/100;
if (Doc->Scale < static_cast<double>(Doc->MagMin)/100)
Doc->Scale = static_cast<double>(Doc->MagMin)/100;
rememberPreviousSettings(mx,my);
Doc->Scale -= static_cast<double>(Doc->MagStep*Prefs->DisScale)/100.0;
if (Doc->Scale < static_cast<double>(Doc->MagMin*Prefs->DisScale)/100.0)
Doc->Scale = static_cast<double>(Doc->MagMin*Prefs->DisScale)/100.0;
slotDoZoom();
}
 
680,6 → 752,8
 
void ScribusView::ShowTemplate(int nr)
{
// jjsa 27-03-2004
rememberPreviousSettings();
for (uint a=0; a<Pages.count(); a++)
{
Pages.at(a)->parentWidget()->hide();
700,6 → 774,8
 
void ScribusView::HideTemplate()
{
// jjsa 27-03-2004
rememberPreviousSettings();
for (uint a=0; a<Pages.count(); a++)
{
Pages.at(a)->Deselect(true);
/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("25").arg("March").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("29").arg("March").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/Makefile.am
102,6 → 102,8
$(INSTALL_DATA) $(srcdir)/vgradient.h $(prefix)/include/scribus/vgradient.h
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/fparser.h $(prefix)/include/scribus/fparser.h
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/pageselector.h $(prefix)/include/scribus/pageselector.h
 
uninstall-local:
-rm -f $(prefix)/lib/scribus/rgbsvg.txt
150,6 → 152,7
-rm -f $(prefix)/include/scribus/fontcombo.h
-rm -f $(prefix)/include/scribus/scpainter.h
-rm -f $(prefix)/include/scribus/vgradient.h
-rm -f $(prefix)/include/scribus/pageselector.h
 
scribus_LDADD = $(LIBJPEG) $(LIBART_LIBS) $(LIBFREETYPE_LIBS) $(LIBCUPS) $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
AM_LDFLAGS = -export-dynamic -s
163,7 → 166,6
 
# them while "make clean", use CLEANFILES
DISTCLEANFILES = $(scribus_METASOURCES)
 
# this is to enable Qt behavoir of am_edit
KDE_OPTIONS = qtonly
 
/trunk/Scribus/scribus/scribus.cpp
241,6 → 241,7
Prefs.DColors.insert("Red", CMYKColor(0, 255, 255, 0));
Prefs.DColors.insert("Yellow", CMYKColor(0, 0, 255, 0));
Prefs.DColors.insert("Magenta", CMYKColor(0, 255, 0, 0));
Prefs.DColorSet = "Scribus-Small";
}
else
{
264,6 → 265,7
}
fiC.close();
}
Prefs.DColorSet = "X11 RGB-Set";
}
DispX = 10;
DispY = 10;
373,7 → 375,6
Prefs.DocDir = QString(getenv("HOME"));
Prefs.ProfileDir = "";
Prefs.ScriptDir = "";
Prefs.DColorSet = "Scribus-Small";
Prefs.CustomColorSets.clear();
Prefs.PrPr_Mode = false;
Prefs.PrPr_AlphaText = false;
419,11 → 420,11
Prefs.DCMSset.DefaultIntentMonitor2 = 1;
Prefs.DCMSset.DefaultIntentPrinter = 0;
Prefs.GFontSub.clear();
SetKeyEntry(56, tr("Smart Hyphen"), 0, ALT+Key_Minus);
SetKeyEntry(56, tr("Smart Hyphen"), 0, CTRL+Key_Minus);
SetKeyEntry(57, tr("Align Left"), 0, CTRL+Key_L);
SetKeyEntry(58, tr("Align Right"), 0, CTRL+Key_R);
SetKeyEntry(59, tr("Align Center"), 0, CTRL+Key_E);
SetKeyEntry(60, tr("Insert Page Number"), 0, ALT+Key_NumberSign);
SetKeyEntry(60, tr("Insert Page Number"), 0, CTRL+Key_NumberSign);
SetKeyEntry(61, tr("Attach Text to Path"), PfadT, 0);
SetKeyEntry(62, tr("Show Layers"), viewLpal, 0);
SetKeyEntry(63, tr("Javascripts..."), jman, 0);
811,15 → 812,15
// helpMenu->insertItem( tr("Test2"), this, SLOT(slotTest2()));
menuBar()->insertItem( tr("&File"), fileMenu);
menuBar()->insertItem( tr("&Edit"), editMenu);
Stm = menuBar()->insertItem( tr("Style"), StilMenu);
Obm = menuBar()->insertItem( tr("Item"), ObjMenu);
pgmm = menuBar()->insertItem( tr("Page"), pageMenu);
Stm = menuBar()->insertItem( tr("&Style"), StilMenu);
Obm = menuBar()->insertItem( tr("&Item"), ObjMenu);
pgmm = menuBar()->insertItem( tr("&Page"), pageMenu);
menuBar()->setItemEnabled(Stm, 0);
menuBar()->setItemEnabled(Obm, 0);
menuBar()->setItemEnabled(pgmm, 0);
menuBar()->insertItem( tr("&View"), viewMenu);
menuBar()->insertItem( tr("&Tools"), toolMenu);
exmn = menuBar()->insertItem( tr("&Extras"), extraMenu);
exmn = menuBar()->insertItem( tr("E&xtras"), extraMenu);
menuBar()->setItemEnabled(exmn, 0);
menuBar()->insertItem( tr("&Windows"), windowsMenu );
menuBar()->insertSeparator();
954,33 → 955,33
void ScribusApp::DeleteSel(PageItem *b)
{
Pti *it;
int FirstSel = 0;
bool first = false;
for (it = b->Ptext.first(); it != 0; it = b->Ptext.next())
{
if (it->cselect)
{
first = true;
b->Ptext.remove();
it = b->Ptext.prev();
if (it == 0)
{
it = b->Ptext.first();
}
}
if (!first)
FirstSel++;
}
if (b->Ptext.count() != 0)
{
if (b->Ptext.first()->cselect)
{
if (b->Ptext.first()->cselect)
{
b->Ptext.remove();
b->CPos = 0;
}
}
else
b->CPos = QMIN(b->CPos, doc->ActPage->oldCp);
}
b->CPos = FirstSel;
}
else
b->CPos = 0;
int l;
if (b->CPos > (l = b->Ptext.count()) )
b->CPos = l;
b->HasSel = false;
DisableTxEdit();
}
3200,8 → 3201,6
{
if(doc->TemplateMode)
{
// disconnect(ActWin->muster, SIGNAL(Fertig()), this, SLOT(ManTempEnd()));
// ManTempEnd();
ActWin->muster->close();
qApp->processEvents();
}
7659,9 → 7658,11
}
}
}
QMap<QString,QFont>::Iterator itfo;
for (itfo = doc->UsedFonts.begin(); itfo != doc->UsedFonts.end(); ++itfo)
{
QMap<QString,QFont>::Iterator itfo, itnext;
for (itfo = doc->UsedFonts.begin(); itfo != doc->UsedFonts.end(); itfo = itnext)
{
itnext = itfo;
++itnext;
if (!Really.contains(itfo.key()))
{
FT_Done_Face(doc->FFonts[itfo.key()]);
/trunk/Scribus/scribus/plugins/scriptplugin/conswin.cpp
59,7 → 59,9
removeParagraph(paragraphs()-1);
insertParagraph(Prompt+LastComm, -1);
moveCursor(QTextEdit::MoveEnd, false);
}
moveCursor(QTextEdit::MoveBackward, false);
del();
}
return;
}
QTextEdit::keyPressEvent(k);
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
100,7 → 100,7
Tes->rmenid = men->insertItem(QObject::tr("Recent Scripts"), Tes->rmen);
men->insertSeparator();
Tes->cons = men->insertItem(QObject::tr("Show Console"), Tes, SLOT(slotInteractiveScript()));
plug->menuBar()->insertItem(QObject::tr("Script"), men, -1, plug->menuBar()->count() - 2);
plug->menuBar()->insertItem(QObject::tr("S&cript"), men, -1, plug->menuBar()->count() - 2);
QObject::connect(Tes->pcon->OutWin, SIGNAL(returnPressed()), Tes, SLOT(slotExecute()));
QObject::connect(Tes->pcon, SIGNAL(Schliessen()), Tes, SLOT(slotInteractiveScript()));
QObject::connect(Tes->rmen, SIGNAL(activated(int)), Tes, SLOT(RecentScript(int)));
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
1055,8 → 1055,6
*/
void SVGPlug::svgMoveTo(FPointArray *i, double x1, double y1)
{
if (!FirstM)
svgClosePath(i);
CurrX = x1;
CurrY = y1;
StartX = x1;
/trunk/Scribus/scribus/page.cpp
597,8 → 597,7
p.begin(this);
Transform(b, &p);
QRegion apr = QRegion(p.xForm(b->Clip));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width),
static_cast<int>(b->Height))));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width), static_cast<int>(b->Height))));
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
b->DrawObj(painter, rd);
620,8 → 619,7
p.begin(this);
Transform(b, &p);
QRegion apr = QRegion(p.xForm(b->Clip));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width),
static_cast<int>(b->Height))));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width), static_cast<int>(b->Height))));
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
{
693,6 → 691,7
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
{
if (!((doku->EditClip) && (Mpressed)))
b->DrawObj(painter, rd);
b->Redrawn = true;
if ((doku->AppMode == 7) && (b->Select))
817,8 → 816,7
MoveItem(x, y, b, fromMP);
}
if (GroupSel)
repaint(QRect(static_cast<int>(gx-5), static_cast<int>(gy-5), static_cast<int>(gw+10),
static_cast<int>(gh+10)));
repaint(QRect(static_cast<int>(gx-5), static_cast<int>(gy-5), static_cast<int>(gw+10), static_cast<int>(gh+10)));
}
 
void Page::getGroupRect(double *x, double *y, double *w, double *h)
851,21 → 849,15
if (norm)
{
pgc.setPen(QPen(red, 1, SolidLine, FlatCap, MiterJoin));
pgc.drawRect(static_cast<int>(x+w-6), static_cast<int>(y+h-6), 6, 6);
pgc.drawRect(qRound(x+w-6), qRound(y+h-6), 6, 6);
pgc.drawRect(qRound(x+w/2 - 3), qRound(y+h-6), 6, 6);
pgc.drawRect(qRound(x+w/2 - 3), qRound(y), 6, 6);
pgc.drawRect(qRound(x+w-6), qRound(y+h/2 - 3), 6, 6);
pgc.drawRect(qRound(x+w-6), qRound(y), 6, 6);
pgc.drawRect(qRound(x), qRound(y), 6, 6);
pgc.drawRect(qRound(x), qRound(y+h/2 - 3), 6, 6);
pgc.drawRect(qRound(x), qRound(y+h-6), 6, 6);
}
// pgc.drawRect(int(x), int(y), 6, 6);
/* pgc.drawRect(int(x+w-6), int(y), 6, 6);
pgc.drawRect(int(x), int(y+h-6), 6, 6);
if (w > 6)
{
pgc.drawRect(int(x+w/2 - 3), int(y+h-6), 6, 6);
pgc.drawRect(int(x+w/2 - 3), int(y), 6, 6);
}
if (h > 6)
{
pgc.drawRect(int(x+w-6), int(y+h/2 - 3), 6, 6);
pgc.drawRect(int(x), int(y+h/2 - 3), 6, 6);
} */
pgc.end();
}
 
944,8 → 936,7
p->setPen(QPen(white, 1, DotLine, FlatCap, MiterJoin));
if (!old.isNull())
p->drawRect(old);
if (!neu.isNull())
p->drawRect(neu);
p->drawRect(neu);
}
old = neu;
}
1044,7 → 1035,8
painter->translate(0.5, 0.5);
if (doku->Before)
DrawPageMarks(painter, rd);
b->DrawObj(painter, rd);
if (!((doku->EditClip) && (Mpressed)))
b->DrawObj(painter, rd);
if (!doku->Before)
DrawPageMarks(painter, rd);
painter->end();
1118,11 → 1110,11
{
if (b->ScaleType)
return;
if ((b->OrigW == 0) || (b->OrigH == 0))
return;
bool savF;
b->LocalX = 0;
b->LocalY = 0;
if ((b->OrigW == 0) || (b->OrigH == 0))
return;
double xs = b->Width / static_cast<double>(b->OrigW);
double ys = b->Height / static_cast<double>(b->OrigH);
if (!b->Sizing)
1689,15 → 1681,15
FPointArray Clip;
Clip = b->PoLine;
FPoint tp2 = GetMinClipF(Clip);
SizeItem(b->Width - tp2.x(), b->Height - tp2.y(), b->ItemNr, false, false);
SizeItem(b->Width - tp2.x(), b->Height - tp2.y(), b->ItemNr, true, false);
Clip.translate(-tp2.x(), -tp2.y());
if (b->Rot != 0)
{
FPoint npv = FPoint(tp2.x(), tp2.y());
MoveRotated(b, npv);
MoveRotated(b, npv, true);
}
else
MoveItem(tp2.x(), tp2.y(), b);
MoveItem(tp2.x(), tp2.y(), b, true);
if (b->flippedH % 2 == 0)
MoveItemI(-tp2.x()/b->LocalScX, 0, b->ItemNr);
if (b->flippedV % 2 == 0)
1707,7 → 1699,7
MoveItemI((b->Width - tp.x())/b->LocalScX, 0, b->ItemNr);
if (b->flippedV % 2 != 0)
MoveItemI(0, (b->Height - tp.y())/b->LocalScY, b->ItemNr);
SizeItem(tp.x(), tp.y(), b->ItemNr, false, false);
SizeItem(tp.x(), tp.y(), b->ItemNr, true, false);
b->ClipEdited = true;
b->PoLine = Clip.copy();
if (b->PType == 7)
2098,9 → 2090,11
bb->Sizing = false;
FPoint b, b1, t, t1, h, h1, g, tes, tes2;
double oldRot, oldLocalX, oldLocalY;
switch (HowTo)
/* switch (HowTo)
{
case 1:
case 5:
case 6: */
oldRot = bb->Rot;
oldLocalX = bb->LocalX;
oldLocalY = bb->LocalY;
2141,7 → 2135,7
n = FPoint(gx-oldPos.x(), gy-oldPos.y());
double x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
double y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
MoveItem(gx-x, gy-y, bb);
MoveItem(gx-x, gy-y, bb, true);
if (oldRot != 0)
{
bb->Rot = atan2(t1.y()-b1.y(),t1.x()-b1.x())*(180.0/M_PI);
2164,8 → 2158,8
bb->LocalY = oldLocalY;
bb->OldB2 = bb->Width;
bb->OldH2 = bb->Height;
break;
}
// break;
// }
}
setGroupRect();
setUpdatesEnabled(true);
2304,8 → 2298,6
z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, doku->Dwidth, doku->DpenText);
b = Items.at(z);
b->isTableItem = true;
// b->LineSp = static_cast<int>(deltaY - 3);
// b->ISize = static_cast<int>((b->LineSp - (b->LineSp * static_cast<double>(doku->AutoLine) / 100.0))) * 10;
SelItem.append(b);
offX += deltaX;
}
2759,11 → 2751,50
mx = Mxp;
my = Myp;
getGroupRect(&gx, &gy, &gw, &gh);
scx = fabs(mx-gx) / gw;
scy = fabs(my-gy) / gh;
switch (HowTo)
{
case 1:
scx = fabs(mx-gx) / gw;
scy = fabs(my-gy) / gh;
break;
case 2:
scx = fabs(mx-(gx+gw)) / gw;
scy = fabs(my-(gy+gh)) / gh;
break;
case 3:
scx = fabs(mx-gx) / gw;
scy = fabs(my-(gy+gh)) / gh;
break;
case 4:
scx = fabs(mx-(gx+gw)) / gw;
scy = fabs(my-gy) / gh;
break;
case 5:
scx = 1.0;
scy = fabs(my-gy) / gh;
break;
case 6:
scx = fabs(mx-gx) / gw;
scy = 1.0;
break;
case 7:
scx = fabs(mx-(gx+gw)) / gw;
scy = 1.0;
break;
case 8:
scx = 1.0;
scy = fabs(my-(gy+gh)) / gh;
break;
}
RotMode = doku->RotMode;
doku->RotMode = 0;
scaleGroup(scx, scy);
if ((HowTo == 3) || (HowTo == 8))
moveGroup(0, my-gy);
if (HowTo == 2)
moveGroup(mx-gx, my-gy);
if ((HowTo == 7) || (HowTo == 4))
moveGroup(mx-gx, 0);
doku->RotMode = RotMode;
}
}
3246,8 → 3277,7
if (b->Ptext.count() != 0)
{
b->ISize = QMAX(qRound(b->ISize * scy), 1);
b->LineSp = ((b->ISize / 10.0)* static_cast<double>(doku->AutoLine) / 100) +
(b->ISize / 10.0);
b->LineSp = ((b->ISize / 10.0)* static_cast<double>(doku->AutoLine) / 100) + (b->ISize / 10.0);
b->TxtScale = QMIN(QMAX(qRound(b->TxtScale * scx), 25), 400);
doku->CurrTextScale = b->TxtScale;
doku->CurrFontSize = b->ISize;
3380,64 → 3410,9
}
else
{
// emit Magnify ? ZoomIn() : ZoomOut();
// if (SelItem.count() == 0)
// emit AbsPosi2(Mxp, Myp);
// I want that zoom in/out is centered to mouse cursor
if (SelItem.count() == 0)
{
// Position of cursor before zoom operation
int oldAbsX;
int oldAbsY;
// Position of old point under cursor after zoom operation
int newAbsX;
int newAbsY;
// position of child
int cx = Anz->childX(parentWidget());
int cy = Anz->childY(parentWidget());
// scale before zoom operation
double oldScale = doku->Scale;
// for scrollbar max value check
int sbhMax;
int sbvMax;
// remember position of scrollbars
QScrollBar *sbv = Anz->verticalScrollBar();
QScrollBar *sbh = Anz->horizontalScrollBar();
int sbx = sbh->value();
int sby = sbv->value();
// mouse position absolute X position of frame + mouse position
// within the page, ...
oldAbsX = Anz->contentsX() + m->x();
oldAbsY = Anz->contentsY() + m->y();
// do zoom
emit Magnify ? ZoomIn() : ZoomOut();
// we need this to get valid values for the scrollbars
Anz->updateScrollBars();
// if no changes don't recalculate sbx and sby
if ( oldScale != doku->Scale )
{
// new coordinate of point under our cursor
newAbsX = (int)(((double)(oldAbsX-cx)* doku->Scale / oldScale)+.5)+cx;
newAbsY = (int)(((double)(oldAbsY-cy) * doku->Scale / oldScale)+.5)+cy;
// calculate the scrollbar displacement
sbx += newAbsX - oldAbsX;
sby += newAbsY - oldAbsY;
// check for scrollbar position
sbhMax = sbh->maxValue();
if ( sbx < 0 )
sbx = 0;
else if ( sbx > sbhMax )
sbx = sbhMax;
sbvMax = sbv->maxValue();
if ( sby < 0 )
sby = 0;
else if ( sby > sbvMax )
sby = sbvMax;
}
// set scrollbar value
sbh->setValue(sbx);
sbv->setValue(sby);
}
int mx=m->x();
int my=m->y();
emit Magnify ? ZoomIn(mx,my) : ZoomOut(mx,my);
HaveSelRect = false;
}
}
3937,11 → 3912,39
}
else
np2 = QPoint(m->x(), m->y());
Mxp = static_cast<int>(np2.x()/sc);
Myp = static_cast<int>(np2.y()/sc);
PaintSizeRect(&p, QRect(QPoint(static_cast<int>(gx*sc), static_cast<int>(gy*sc)), np2));
PaintSizeRect(&p, QRect(QPoint(qRound(gx*sc), qRound(gy*sc)), np2));
break;
case 2:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(np2, QPoint(qRound((gx+gw)*sc), qRound((gy+gh)*sc))));
break;
case 3:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(np2, QPoint(qRound(gx*sc), qRound((gy+gh)*sc))));
break;
case 4:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(np2, QPoint(qRound((gx+gw)*sc), qRound(gy*sc))));
break;
case 5:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(qRound(gx*sc), qRound(gy*sc), qRound(gw*sc), np2.y()-qRound(gy*sc)));
break;
case 6:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(qRound(gx*sc), qRound(gy*sc), np2.x()-qRound(gx*sc), qRound(gh*sc)));
break;
case 7:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(QPoint(np2.x(), qRound(gy*sc)), QPoint(qRound((gx+gw)*sc), qRound((gy+gh)*sc))));
break;
case 8:
np2 = QPoint(m->x(), m->y());
PaintSizeRect(&p, QRect(QPoint(qRound(gx*sc), np2.y()), QPoint(qRound((gx+gw)*sc), qRound((gy+gh)*sc))));
break;
}
Mxp = qRound(np2.x()/sc);
Myp = qRound(np2.y()/sc);
p.end();
}
else
4167,20 → 4170,27
QRect mpo = QRect(m->x()-doku->GrabRad, m->y()-doku->GrabRad, doku->GrabRad*2, doku->GrabRad*2);
double gx, gy, gh, gw;
getGroupRectScreen(&gx, &gy, &gw, &gh);
if (QRect(static_cast<int>(gx), static_cast<int>(gy), static_cast<int>(gw),
static_cast<int>(gh)).intersects(mpo))
if (QRect(static_cast<int>(gx), static_cast<int>(gy), static_cast<int>(gw), static_cast<int>(gh)).intersects(mpo))
{
qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeBDiagCursor), true);
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
if (QRect(static_cast<int>(gx+gw/2)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeVerCursor), true);
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy+gh/2)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeHorCursor), true);
if (QRect(static_cast<int>(gx+gw/2)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeVerCursor), true);
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy+gh/2)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeHorCursor), true);
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
qApp->setOverrideCursor(QCursor(SizeBDiagCursor), true);
if (doku->AppMode == 9)
qApp->setOverrideCursor(QCursor(loadIcon("Rotieren2.xpm")), true);
else
qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
{
if (doku->AppMode == 9)
qApp->setOverrideCursor(QCursor(loadIcon("Rotieren2.xpm")), true);
else
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
}
}
else
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
4613,6 → 4623,10
{
if (GroupSel)
{
p.begin(this);
QRect ne = QRect();
PaintSizeRect(&p, ne);
p.end();
double gx, gy, gh, gw;
getGroupRectScreen(&gx, &gy, &gw, &gh);
if ((QRect(static_cast<int>(gx), static_cast<int>(gy), static_cast<int>(gw),
4624,6 → 4638,46
HowTo = 1;
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
}
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
{
HowTo = 2;
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true);
}
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
{
HowTo = 3;
qApp->setOverrideCursor(QCursor(SizeBDiagCursor), true);
}
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
{
HowTo = 4;
qApp->setOverrideCursor(QCursor(SizeBDiagCursor), true);
}
if (QRect(static_cast<int>(gx+gw/2)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
{
HowTo = 5;
qApp->setOverrideCursor(QCursor(SizeVerCursor), true);
}
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy+gh/2)-6, 6, 6).intersects(mpo))
{
HowTo = 6;
qApp->setOverrideCursor(QCursor(SizeHorCursor), true);
}
if (QRect(static_cast<int>(gx)-6, static_cast<int>(gy+gh/2)-6, 6, 6).intersects(mpo))
{
HowTo = 7;
qApp->setOverrideCursor(QCursor(SizeHorCursor), true);
}
if (QRect(static_cast<int>(gx+gw/2)-6, static_cast<int>(gy)-6, 6, 6).intersects(mpo))
{
HowTo = 8;
qApp->setOverrideCursor(QCursor(SizeVerCursor), true);
}
if (b->LockRes)
{
qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
HowTo = 0;
}
if (HowTo != 0)
mCG = true;
}
7071,27 → 7125,30
break;
}
nb->Ptext.at(a)->cab = s;
if (doku->Vorlagen[s].Font != "")
if (s > 4)
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
if (doku->Vorlagen[s].Font != "")
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
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;
}
}
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;
}
a--;
}
if (cr)
7111,27 → 7168,30
while (a < static_cast<int>(nb->Ptext.count()))
{
nb->Ptext.at(a)->cab = s;
if (doku->Vorlagen[s].Font != "")
if (s > 4)
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
if (doku->Vorlagen[s].Font != "")
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
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;
}
}
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 (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
7154,27 → 7214,30
for (a = 0; a < static_cast<int>(b->Ptext.count()); ++a)
{
b->Ptext.at(a)->cab = s;
if (doku->Vorlagen[s].Font != "")
if (s > 4)
{
b->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
b->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
b->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
b->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
b->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
b->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
if (doku->Vorlagen[s].Font != "")
{
b->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
b->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
b->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
b->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
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;
}
}
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;
}
}
}
}
/trunk/Scribus/scribus/scribusview.h
84,6 → 84,7
void ProcessPage(PSLib *p, Page* a, uint PNr, bool sep = false, bool farb = true, bool ic = false);
void SetClipPath(PSLib *p, FPointArray *c);
void SetFarbe(QString farb, int shade, int *h, int *s, int *v, int *k);
void rememberPreviousSettings(int mx=0, int my=0);
/** Dokument zu dem die Seite geh�t */
ScribusDoc *Doc;
preV *Prefs;
92,13 → 93,13
/** Fhrt die Vergr�erung/Verkleinerung aus; */
void slotDoZoom();
/** Vergr�ert die Ansicht */
void slotZoomIn();
void slotZoomIn(int mx=0,int my=0);
/** Verkleinert die Ansicht */
void slotZoomOut();
void slotZoomOut(int mx=0,int my=0);
/** Vergr�ert die Ansicht */
void slotZoomIn2();
void slotZoomIn2(int mx=0,int my=0);
/** Verkleinert die Ansicht */
void slotZoomOut2();
void slotZoomOut2(int mx=0,int my=0);
/** Zeichnet alle Seiten neu */
void DrawNew();
void setMenTxt(int Seite);
117,6 → 118,12
QPopupMenu *Unitmen;
QPopupMenu *Laymen;
bool Ready;
int oldX;
int oldY;
int oldSbx;
int oldSby;
double oldScale;
bool doZooming;
private slots:
void Zval();
/trunk/Scribus/scribus/main.cpp
41,6 → 41,11
#include "config.h"
#endif
 
// jjsa 28-03-2004 added define for choosing of option type
// if USE_LONG_OPT is 1 old options will be compiled
// else use option with single '-'
#define USE_LONG_OPT 0
 
QString lang = "";
bool showSplash = true;
bool useGui = true;
57,6 → 62,7
QString arg = "";
 
arg = argv[1];
#if USE_LONG_OPT // jjsa 28-03-2004 begin
if (arg == "--version") {
std::cout << "Scribus Version " << VERSION << std::endl;
return 0;
66,7 → 72,19
showUsage();
return 0;
}
#else
if (arg == "-version") {
std::cout << "Scribus Version " << VERSION << std::endl;
return 0;
} else if (arg == "-help") {
std::cout << std::endl;
std::cout << "Scribus, a DTP-Program" << std::endl;
showUsage();
return 0;
}
#endif // jjsa 28-03-2004end
 
#if USE_LONG_OPT // jjsa 28-03-2004 begin
for(int i = 1; i < argc; i++) {
arg = argv[i];
if ((arg == "--lang") && (++i < argc)) {
75,6 → 93,12
showSplash = false;
} else if (arg == "--no-gui") {
useGui = false;
// jjsa 28-03-2004 begin
} else if (arg == "-display" && i < argc) {
// allow setting of display, QT expect the
// option -display <display_name>
i++;
// jjsa 28-03-2004 end
} else {
file = QFile::decodeName(argv[i]);
if (!QFileInfo(file).exists()) {
89,6 → 113,32
}
}
}
#else
for(int i = 1; i < argc; i++) {
arg = argv[i];
if ((arg == "-lang") && (++i < argc)) {
lang = argv[i];
} else if (arg == "-no-splash") {
showSplash = false;
} else if (arg == "-no-gui") {
useGui = false;
} else if (arg.left(2) == "--" || arg == "-file" || arg.left(1) != "-") {
if ( arg.left(1) == "-" ) {
i++;
}
file = QFile::decodeName(argv[i]);
if (!QFileInfo(file).exists()) {
std::cout << std::endl;
std::cout << "File " << file << "does not exist, aborting." << std::endl;
showUsage();
return 0;
}
} else if (arg.left(1) == "-" && i+1 < argc ) {
i++;
}
}
#endif
 
/* if (useGui)
{
// Please Test this carefully and report problems.
131,6 → 181,8
\param lang QString a two letter string describing the lang environement
\retval QString A string describing the language environement
*/
#if USE_LONG_OPT // jjsa 28-03-2004 begin
void showUsage()
{
std::cout << std::endl;
141,6 → 193,21
std::cout << "--version Output version information and exit" << std::endl;
std::cout << std::endl;
}
#else
void showUsage()
{
std::cout << std::endl;
std::cout << "Usage: scribus [option ... ] [file]" << std::endl;
std::cout << "Options:" << std::endl;
std::cout << "-lang xx Uses xx as shortcut for a language" << std::endl;
std::cout << "-help Print help (this message) and exit" << std::endl;
std::cout << "-version Output version information and exit" << std::endl;
std::cout << "-file|-- name Open file 'name'" << std::endl;
std::cout << "name Open file 'name', the file name must not begin with '-'" << std::endl;
std::cout << "QT specific options as -display ..." << std::endl;
std::cout << std::endl;
}
#endif // jjsa 28-03-2004 end
 
/*!
\fn int mainGui(int argc, char **argv)
/trunk/Scribus/scribus/colorm.cpp
33,12 → 33,6
: QDialog( parent, "dd", true, 0 )
{
setName( "Farbmanager" );
/* DontChange.clear();
DontChange += "White";
DontChange += "Black";
DontChange += "Cyan";
DontChange += "Magenta";
DontChange += "Yellow"; */
HaveDoc = HDoc;
CColSet = Cust;
setSizePolicy(QSizePolicy((QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1,
/trunk/Scribus/scribus/po/scribus.de.ts
131,6 → 131,26
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
<source>March</source>
<translation type="obsolete">März</translation>
</message>
<message>
<source>Homepage and online reference</source>
<translation>Homepage und Online Referenz</translation>
</message>
<message>
<source>Mailing list</source>
<translation>Mailing Liste</translation>
</message>
<message>
<source>Bugs and feature requests</source>
<translation>Fehlerberichte und Wünsche</translation>
</message>
<message>
<source>Online</source>
<translation>Internet</translation>
</message>
</context>
<context>
<name>AdvOptions</name>
254,12 → 274,20
</message>
<message>
<source>Align Text Block</source>
<translation>Blocksatz</translation>
<translation type="obsolete">Blocksatz</translation>
</message>
<message>
<source>Align Text Center</source>
<translation>Zentriert</translation>
</message>
<message>
<source>Align Text Justified</source>
<translation>Blocksatz</translation>
</message>
<message>
<source>Align Text Forced Justified</source>
<translation>Erzwungener Blocksatz</translation>
</message>
</context>
<context>
<name>Annot</name>
1011,7 → 1039,7
</message>
<message>
<source>When Icon is too small</source>
<translation>bei zu kleinem Icon</translation>
<translation type="obsolete">bei zu kleinem Icon</translation>
</message>
<message>
<source>When Icon is too big</source>
1077,6 → 1105,10
<source>Caption overlays Icon</source>
<translation>Text überlagert Icon</translation>
</message>
<message>
<source>When Icon it too small</source>
<translation>bei zu kleinem Icon</translation>
</message>
</context>
<context>
<name>CMSPrefs</name>
1148,6 → 1180,49
<source>Absolute Colorimetric</source>
<translation>Absolut farbmetrisch</translation>
</message>
<message>
<source>Default color profile for imported images</source>
<translation>Farbprofil für Bilder</translation>
</message>
<message>
<source>Default color profile for solid colors on the page</source>
<translation>Farbprofil für Objektfarben</translation>
</message>
<message>
<source>Color profile that you have generated or received from the manufacturer.
This profile should be specific to your monitor and not a generic profile (i.e. sRGB).</source>
<translation>Farbprofil für den Monitor.</translation>
</message>
<message>
<source>Color profile for your printer model from the manufacturer.
This profile should be specific to your printer and not a generic profile (i.e. sRGB).</source>
<translation>Farbprofil für den Drucker.</translation>
</message>
<message>
<source>Choose the default rendering intent for your monitor. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the default rendering intent for your printer. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This enables &apos;soft proofing&apos; of how your document colors will print,
based on the chosen printer profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is a method of showing colors on the screen which may not print properly.
This requires very accurate profiles and serves only as a warning.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Black Point Compensation is a method of improving contrast in photos.
It is recommended that you enable this if you have photos in your document.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMYKChoose</name>
1227,6 → 1302,10
<source>B:</source>
<translation>B:</translation>
</message>
<message>
<source> %</source>
<translation> %</translation>
</message>
</context>
<context>
<name>Cpalette</name>
1266,6 → 1345,42
<source>None</source>
<translation>Keine</translation>
</message>
<message>
<source>Shade:</source>
<translation>Tonwert:</translation>
</message>
<message>
<source>Edit Line Color Properties</source>
<translation>Linienfarbe auswählen</translation>
</message>
<message>
<source>Edit Fill Color Properties</source>
<translation>Füllfarbe auswählen</translation>
</message>
<message>
<source>Saturation of color</source>
<translation>Tonwert der Farbe</translation>
</message>
<message>
<source>Normal or gradient fill method</source>
<translation>Füllmethode</translation>
</message>
<message>
<source>Edit the first color of object</source>
<translation>Erste Verlaufsfarbe auswählen</translation>
</message>
<message>
<source>Edit the second color of object</source>
<translation>Zweite Verlaufsfarbe auswählen</translation>
</message>
<message>
<source>Set the transparency for the color selected</source>
<translation>Transparenz für Farbe auswählen</translation>
</message>
<message>
<source>Color of selected object</source>
<translation>Farbe des selektierten Objekts</translation>
</message>
</context>
<context>
<name>CupsOptions</name>
1367,7 → 1482,7
</message>
<message>
<source>OK to delete Color:</source>
<translation>Löschen der Farbe:</translation>
<translation type="obsolete">Löschen der Farbe:</translation>
</message>
<message>
<source>?</source>
1385,6 → 1500,10
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
<source>Delete color:</source>
<translation>Lösche Farbe:</translation>
</message>
</context>
<context>
<name>DelPages</name>
1869,6 → 1988,42
<source>Remove Unused</source>
<translation>Unbenutzte löschen</translation>
</message>
<message>
<source>Choose a color set to load</source>
<translation>Farbpalette auswählen</translation>
</message>
<message>
<source>Save the current color set</source>
<translation>Farbpalette speichern</translation>
</message>
<message>
<source>Remove unused colors from current document&apos;s color set</source>
<translation>Unbenutzte Farben löschen</translation>
</message>
<message>
<source>Append colors to the current set from an existing document</source>
<translation>Farben aus anderem Dokument nachladen</translation>
</message>
<message>
<source>Create a new color within the current set</source>
<translation>Neue Farbe anlegen</translation>
</message>
<message>
<source>Edit the currently selected color</source>
<translation>Farbe bearbeiten</translation>
</message>
<message>
<source>Make a copy of the currently selected color</source>
<translation>Kopie der ausgewählen Farbe anlegen</translation>
</message>
<message>
<source>Delete the currently selected color</source>
<translation>Ausgewählte Farbe löschen</translation>
</message>
<message>
<source>Make the current colorset the default color set</source>
<translation>Aktuelle Palette zur Voreinstellung machen</translation>
</message>
</context>
<context>
<name>FontPrefs</name>
2000,8 → 2155,12
<name>HelpBrowser</name>
<message>
<source>Sorry, no manual available!</source>
<translation>Leider kein Handbuch verfügbar!</translation>
<translation type="obsolete">Leider kein Handbuch verfügbar!</translation>
</message>
<message>
<source>Sorry, no manual available! Please see: http://scribus.net for updated docs and downloads.</source>
<translation>Leider kein Handbuch verfügbar! Bitte besuchen Sie: http://scribus.net für Updates.</translation>
</message>
</context>
<context>
<name>HyAsk</name>
2121,7 → 2280,7
<name>JavaDocs</name>
<message>
<source>Global JavaScripts</source>
<translation>Globale Java-Scripte</translation>
<translation type="obsolete">Globale Java-Scripte</translation>
</message>
<message>
<source>Edit...</source>
2147,6 → 2306,10
<source>New Script</source>
<translation>Neues Script</translation>
</message>
<message>
<source>Edit JavaScripts</source>
<translation>JavaScripts bearbeiten</translation>
</message>
</context>
<context>
<name>KeyManager</name>
2253,6 → 2416,10
<source>New Layer</source>
<translation>Neue Ebene</translation>
</message>
<message>
<source>Do you want to delete all Objects on this Layer too?</source>
<translation>Wollen Sie auch alle Objekte dieser Ebene löschen?</translation>
</message>
</context>
<context>
<name>LineFormate</name>
2324,6 → 2491,10
<source>Documents (*.sla *.scd);;All Files (*)</source>
<translation>Dokumente (*.sla *.scd);;Alle Dateien (*)</translation>
</message>
<message>
<source>Close</source>
<translation>Schließen</translation>
</message>
</context>
<context>
<name>Mdup</name>
2362,6 → 2533,14
<source>Hide Console</source>
<translation>Konsole verbergen</translation>
</message>
<message>
<source>Script error</source>
<translation>Fehler bei der ausführung eines Scripts</translation>
</message>
<message>
<source>If you are running an official script report it at &lt;a href=&quot;http://bugs.scribus.net&quot;&gt;bugs.scribus.net&lt;/a&gt; please.</source>
<translation>Falls das Script ein offizelles Scribus Script ist, den Fehler bitte auf &lt;a href=&quot;http://bugs.scribus.net&quot;&gt;bugs.scribus.net&lt;/a&gt; melden.</translation>
</message>
</context>
<context>
<name>MergeDoc</name>
2521,7 → 2700,7
</message>
<message>
<source>Text flows around Box</source>
<translation>Text umfließt Objekt</translation>
<translation type="obsolete">Text umfließt Objekt</translation>
</message>
<message>
<source>Use Bounding Box</source>
2615,7 → 2794,7
</message>
<message>
<source>Lang.:</source>
<translation>Sprache:</translation>
<translation type="obsolete">Sprache:</translation>
</message>
<message>
<source>Free Scaling</source>
2643,7 → 2822,7
</message>
<message>
<source>Keep Aspect Ratio</source>
<translation>Seitenverhältnis beibehalten</translation>
<translation type="obsolete">Seitenverhältnis beibehalten</translation>
</message>
<message>
<source>Proportional</source>
2743,35 → 2922,35
</message>
<message>
<source>Flip horizontal</source>
<translation>Horizontal spiegeln</translation>
<translation type="obsolete">Horizontal spiegeln</translation>
</message>
<message>
<source>Flip vertical</source>
<translation>Vertikal spiegeln</translation>
<translation type="obsolete">Vertikal spiegeln</translation>
</message>
<message>
<source>Move one Level up</source>
<translation>Eine Ebene höher</translation>
<translation type="obsolete">Eine Ebene höher</translation>
</message>
<message>
<source>Move one Level down</source>
<translation>Eine Ebene tiefer</translation>
<translation type="obsolete">Eine Ebene tiefer</translation>
</message>
<message>
<source>Move to Front</source>
<translation>In den Vordergrund</translation>
<translation type="obsolete">In den Vordergrund</translation>
</message>
<message>
<source>Move to Back</source>
<translation>In den Hintergrund</translation>
<translation type="obsolete">In den Hintergrund</translation>
</message>
<message>
<source>Locks or unlocks the Object</source>
<translation>Sperrt oder entsperrt das Objekt</translation>
<translation type="obsolete">Sperrt oder entsperrt das Objekt</translation>
</message>
<message>
<source>Enables or disables printing of the Object</source>
<translation>Schaltet die Druckbarkeit des Objekts ein oder aus</translation>
<translation type="obsolete">Schaltet die Druckbarkeit des Objekts ein oder aus</translation>
</message>
<message>
<source>X1:</source>
2807,6 → 2986,278
<source>OK</source>
<translation>OK</translation>
</message>
<message>
<source>Text flows around frame</source>
<translation>Text umfließt Rahmen</translation>
</message>
<message>
<source>Shade:</source>
<translation>Tonwert:</translation>
</message>
<message>
<source>Language:</source>
<translation>Sprache:</translation>
</message>
<message>
<source>Name of selected object</source>
<translation>Name des selektierten Objekts</translation>
</message>
<message>
<source>Horizontal position of current basepoint</source>
<translation>Horizontale Position des aktuellen Ursprungs</translation>
</message>
<message>
<source>Vertical position of current basepoint</source>
<translation>Vertikale Position des aktuellen Ursprungs</translation>
</message>
<message>
<source>Width</source>
<translation>Breite</translation>
</message>
<message>
<source>Height</source>
<translation>Höhe</translation>
</message>
<message>
<source>Rotation of object at current basepoint</source>
<translation>Drehung des Objekts um den aktuellen Ursprung</translation>
</message>
<message>
<source>Point from which measurements or rotation angles are referenced</source>
<translation>Ursprungspunkt</translation>
</message>
<message>
<source>Select top left for basepoint</source>
<translation>Links-Oben als Ursprung setzen</translation>
</message>
<message>
<source>Select top right for basepoint</source>
<translation>Rechts-Oben als Ursprung setzen</translation>
</message>
<message>
<source>Select bottom left for basepoint</source>
<translation>Links-Unten als Ursprung setzen</translation>
</message>
<message>
<source>Select bottom right for basepoint</source>
<translation>Rechts-Unten als Ursprung setzen</translation>
</message>
<message>
<source>Select center for basepoint</source>
<translation>Mittelpunkt als Ursprung setzen</translation>
</message>
<message>
<source>Flip Horizontal</source>
<translation>Horizontal spiegeln</translation>
</message>
<message>
<source>Flip Vertical</source>
<translation>Vertikal spiegeln</translation>
</message>
<message>
<source>Move one level up</source>
<translation>Eine Ebene nach oben</translation>
</message>
<message>
<source>Move one level down</source>
<translation>Eine Ebene nach unten</translation>
</message>
<message>
<source>Move to front</source>
<translation>In den Vordergrund</translation>
</message>
<message>
<source>Move to back</source>
<translation>In den Hintergrund</translation>
</message>
<message>
<source>Lock or unlock the object</source>
<translation>Objekt sperren oder entsperren</translation>
</message>
<message>
<source>Lock or unlock the size of the object</source>
<translation>Größenänderung sperren oder entsperren</translation>
</message>
<message>
<source>Enable or disable printing of the object</source>
<translation>Drucken erlauben/verbieten</translation>
</message>
<message>
<source>Enable this to make text in lower objects flow around this frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this to use the imaginary square border around your object, rather than its actual shape</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font of selected text or object</source>
<translation>Schriftart des Objekts</translation>
</message>
<message>
<source>Scaling width of characters</source>
<translation>Zeichenbreiten skalieren</translation>
</message>
<message>
<source>Color of text stroke</source>
<translation>Textumrissfarbe</translation>
</message>
<message>
<source>Color of text fill</source>
<translation>Textfarbe</translation>
</message>
<message>
<source>Saturation of color of text stroke</source>
<translation>Tonwert der Textumrissfarbe</translation>
</message>
<message>
<source>Saturation of color of text fill</source>
<translation>Tonwert der Textfarbe</translation>
</message>
<message>
<source>Style of current paragraph</source>
<translation>Stilvorlage für aktuellen Absatz</translation>
</message>
<message>
<source>Language of object</source>
<translation>Sprache des Objekts</translation>
</message>
<message>
<source>Change settings for left or end points</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pattern of line</source>
<translation>Strichelung der Line</translation>
</message>
<message>
<source>Thickness of line</source>
<translation>Linienbreite</translation>
</message>
<message>
<source>Type of line joins</source>
<translation>Art der Ecken</translation>
</message>
<message>
<source>Type of line end</source>
<translation>Art der Enden</translation>
</message>
<message>
<source>Line style of current object</source>
<translation>Linienstil des Objekts</translation>
</message>
<message>
<source>Choose the shape of frame...</source>
<translation>Rahmenform auswählen...</translation>
</message>
<message>
<source>Edit shape of the frame...</source>
<translation>Rahmenform bearbeiten...</translation>
</message>
<message>
<source>Set radius of corner rounding</source>
<translation>Radius der Eckrundung setzen</translation>
</message>
<message>
<source>Number of columns in text frame</source>
<translation>Anzahl der Spalten im Textrahmen</translation>
</message>
<message>
<source>Distance between columns</source>
<translation>Spaltenabstand</translation>
</message>
<message>
<source>Distance of text from top of frame</source>
<translation>Abstand des Textes vom oberen Rahmenrand</translation>
</message>
<message>
<source>Distance of text from bottom of frame</source>
<translation>Abstand des Textes vom unteren Rahmenrand</translation>
</message>
<message>
<source>Distance of text from left of frame</source>
<translation>Abstand des Textes vom linken Rahmenrand</translation>
</message>
<message>
<source>Distance of text from right of frame</source>
<translation>Abstand des Textes vom rechten Rahmenrand</translation>
</message>
<message>
<source>Edit tab settings of text frame...</source>
<translation>Tabulatoren setzen/bearbeiten...</translation>
</message>
<message>
<source>Allow the image to be a different size to the frame</source>
<translation>Erlaube verschiedene Größen für Bild und Rahmen</translation>
</message>
<message>
<source>Horizontal offset of image within frame</source>
<translation>Horizontaler Versatz des Bildes innerhalb des Rahmens</translation>
</message>
<message>
<source>Vertical offset of image within frame</source>
<translation>Vertikaler Versatz des Bildes innerhalb des Rahmens</translation>
</message>
<message>
<source>Resize the image horizontally</source>
<translation>Bild horizontal skalieren</translation>
</message>
<message>
<source>Resize the image vertically</source>
<translation>Bild vertikal skalieren</translation>
</message>
<message>
<source>Keep the X and Y scaling the same</source>
<translation>Seitenverhältnis beibehalten</translation>
</message>
<message>
<source>Make the image fit within the size of the frame</source>
<translation>Bild füllt den Rahmen aus</translation>
</message>
<message>
<source>Use image proportions rather than those of the frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the source profile of the image</source>
<translation>Farbprofil für Bild auswählen</translation>
</message>
<message>
<source>Select the rendering intent for the image</source>
<translation>Rendering Intent für Bild auswählen</translation>
</message>
<message>
<source>Cell Lines</source>
<translation>Zellumrandungen</translation>
</message>
<message>
<source>Line at Top</source>
<translation>Oben</translation>
</message>
<message>
<source>Line at the Left</source>
<translation>Links</translation>
</message>
<message>
<source>Line at the Right </source>
<translation>Rechts</translation>
</message>
<message>
<source>Line at Bottom</source>
<translation>Unten</translation>
</message>
<message>
<source> mm</source>
<translation> mm</translation>
</message>
<message>
<source> in</source>
<translation> in</translation>
</message>
<message>
<source> p</source>
<translation> p</translation>
</message>
</context>
<context>
<name>MultiLine</name>
2917,7 → 3368,7
</message>
<message>
<source>Exit</source>
<translation>Verlassen</translation>
<translation type="obsolete">Verlassen</translation>
</message>
<message>
<source>Warning</source>
2955,6 → 3406,10
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
<source>Close</source>
<translation>Schließen</translation>
</message>
</context>
<context>
<name>NewDoc</name>
3290,7 → 3745,7
</message>
<message>
<source>Compression</source>
<translation>Komprimierung</translation>
<translation type="obsolete">Komprimierung</translation>
</message>
<message>
<source>Downsample Images to:</source>
3366,7 → 3821,7
</message>
<message>
<source>from the:</source>
<translation>von:</translation>
<translation type="obsolete">von:</translation>
</message>
<message>
<source>Direction:</source>
3580,6 → 4035,265
<source>Absolute Colorimetric</source>
<translation>Absolut farbmetrisch</translation>
</message>
<message>
<source>Image Settings</source>
<translation>Bildeinstellungen</translation>
</message>
<message>
<source>Method:</source>
<translation>Methode:</translation>
</message>
<message>
<source>Automatic</source>
<translation>Automatisch</translation>
</message>
<message>
<source>JPEG</source>
<translation>JPEG</translation>
</message>
<message>
<source>Zip</source>
<translation>Zip</translation>
</message>
<message>
<source>None</source>
<translation>Keine</translation>
</message>
<message>
<source>Quality:</source>
<translation>Qualität:</translation>
</message>
<message>
<source>Maximum</source>
<translation>Maximal</translation>
</message>
<message>
<source>High</source>
<translation>Hoch</translation>
</message>
<message>
<source>Medium</source>
<translation>Mittel</translation>
</message>
<message>
<source>Low</source>
<translation>Niedrig</translation>
</message>
<message>
<source>Minimum</source>
<translation>Minimal</translation>
</message>
<message>
<source>From the:</source>
<translation>Vom:</translation>
</message>
<message>
<source>Export all pages to PDF</source>
<translation>Alle Seiten als PDF exportieren</translation>
</message>
<message>
<source>Export a range of pages to PDF</source>
<translation>Eine Seitenbereich als PDF exportieren</translation>
</message>
<message>
<source>First page to export when exporting a range</source>
<translation>Erste Seite</translation>
</message>
<message>
<source>Last page to export when exporting a range</source>
<translation>Letzte Seite</translation>
</message>
<message>
<source>Determines the PDF compatibility.
The default is Acrobat 4.0 which gives the widest compatibility.
Choose Acrobat 5.0 if your file has PDF 1.4 features such as transparency or you require 128 bit encryption.
PDF/X-3 is for exporting the PDF for commercial printing and is selectable when you have activated color management.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This determines the binding of pages in the PDF. Unless you know
you need to change it leave the default choice - Left.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this generates thumbnails of each page in the PDF.
Some viewers can use the thumbnails for navigation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this for generating PDF Articles, which is useful
for navigating linked articles in a PDF.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will embed the bookmarks you created in your document.
These are useful for navigating long PDF documents.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the export resolution of text and vector graphics.
This does not affect the resolution of bitmap images like photos.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable compression of text and graphics.
Unless you have a reason, leave this checked. This reduces PDF size.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the version of compression for images.
Automatic allows Scribus to choose the best method.
ZIP is good for images with solid colors.
JPEG is better at creating smaller PDF files which have many photos (with slight image loss possible).
Leave it set to automatic, unless you have a need for special compression options.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the compression level: Minimum (25%), Low (50%), Medium (75%), High (85%), Maximum (95%)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This choice will enable downsampling of your bitmap images to the selected DPI.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the DPI (Dots Per Inch) for image export.
Leaving this unchecked will render them at their native resolution.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check this to embed fonts into the PDF. Embedding the fonts
will preserve the layout and appearance of your document.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Checking this enables presentation effects when using Acrobat Reader in full screen mode.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Checking this will show page previews of each page listed above.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Length of time the page is shown before the presentation starts on the selected page.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Length of time the effect runs.
A shorter time will speed up the effect, a longer one will slow it down.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose type of the display effect.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the direction of the effect of moving lines for the split and blind effects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the starting position for the box and split effects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the direction of the glitter or wipe effects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Apply the selected effect to all pages.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Checking this will enable the security features in your exported PDF.
If you selected Acrobat 4.0, the PDF will be protected by 40 bit encryption.
If you selected Acrobat 5.0, the PDF will be protected by 128 bit encryption.
Disclaimer: PDF encryption is not as reliable as GPG or PGP encryption and does have some limitations.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose a master password which enables or disables all the
security features in your exported PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose a password for users to be able to read your PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unchecking this will disallow printing of the PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unchecking this will disallow modifying of the PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unchecking this will disallow copying of text or graphics from the PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unchecking this will disallow adding annotations and fields to the PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This chooses the color model for the output of your PDF.
Choose Screen/Web for PDFs which are used for screen display and for printing on typical inkjets.
Choose Printer when printing to a true 4 color CMYK printer.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Embed a color profile for solid colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the color profile for solid colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the rendering intent for solid colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Embed a color profile for images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do not use color profiles that are embedded in source images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the color profile for images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the rendering intent for images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select the output profile for printing. If possible, get some guidance from your printer on profile selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is a mandatory string for PDF/X-3 or the PDF will fail
PDF/X-3 conformance. We recommend you use the title of the document.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance for bleed from the top of the physical page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance for bleed from the bottom of the physical page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance for bleed from the left of the physical page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance for bleed from the right of the physical page</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PPreview</name>
3870,6 → 4584,34
<source>None</source>
<translation>Keine</translation>
</message>
<message>
<source>Update Picture</source>
<translation>Bild neu laden</translation>
</message>
<message>
<source>Edit Picture</source>
<translation>Bild bearbeiten</translation>
</message>
<message>
<source>Append Text...</source>
<translation>Text anfügen...</translation>
</message>
<message>
<source>The Program</source>
<translation>Das Programm</translation>
</message>
<message>
<source>is missing!</source>
<translation>fehlt!</translation>
</message>
<message>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
<source>Copy of</source>
<translation>Kopie von</translation>
</message>
</context>
<context>
<name>PageSelector</name>
4215,7 → 4957,7
</message>
<message>
<source>Disp.:</source>
<translation>Versatz:</translation>
<translation type="obsolete">Versatz:</translation>
</message>
<message>
<source> %</source>
4279,7 → 5021,7
</message>
<message>
<source>Linestyle:</source>
<translation>Linienstil:</translation>
<translation type="obsolete">Linienstil:</translation>
</message>
<message>
<source>Line Width:</source>
4367,7 → 5109,7
</message>
<message>
<source>Display Frames</source>
<translation>Zeige Rahmen</translation>
<translation type="obsolete">Zeige Rahmen</translation>
</message>
<message>
<source>Display Pages Side by Side</source>
4449,6 → 5191,394
<source>Display</source>
<translation>Anzeige</translation>
</message>
<message>
<source>External Tools</source>
<translation>Externe Hilfsprogramme</translation>
</message>
<message>
<source>Misc.</source>
<translation>Versch.</translation>
</message>
<message>
<source>Displacement:</source>
<translation>Versatz:</translation>
</message>
<message>
<source>Postscript Interpreter</source>
<translation>Postscript Interpreter</translation>
</message>
<message>
<source>Name of executable:</source>
<translation>Programmname:</translation>
</message>
<message>
<source>Antialias Text</source>
<translation>Text weichzeichnen</translation>
</message>
<message>
<source>Antialias Graphics</source>
<translation>Graphiken weichzeichnen</translation>
</message>
<message>
<source>Image Processing Tool</source>
<translation>Bildbearbeitungsprogramm</translation>
</message>
<message>
<source>Printing</source>
<translation>Drucken</translation>
</message>
<message>
<source>Clip to Page Margins</source>
<translation>Beschneiden auf Seitenränder</translation>
</message>
<message>
<source>Choose the default window decoration and looks.
Scribus inherits any available KDE or Qt themes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default font size for the menus and windows</source>
<translation>Schriftgröße für Menüs und Dialoge</translation>
</message>
<message>
<source>Default unit of measurement for document editing</source>
<translation>Maßeinheit für Dokumente</translation>
</message>
<message>
<source>Number of lines Scribus will scroll for each move of the mouse wheel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius of the area where Scribus will allow you to grab an objects handles</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number of recently edited documents to show in the File menu</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change the keyboard shortcuts to your preference</source>
<translation>Tastaturkürzel einstellen</translation>
</message>
<message>
<source>Default documents directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default ICC profiles directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Scripter scripts directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default page size, either a standard size or a custom size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default orientation of document pages</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width of document pages, editable if you have chosen a custom page size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Height of document pages, editable if you have chosen a custom page size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable single or spread based layout</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make the first page the left page of a document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the top margin guide and the edge of the page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the bottom margin guide and the edge of the page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the left margin guide and the edge of the page.
If Facing Pages is selected, this margin space can be used to achieve the correct margins for binding</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the right margin guide and the edge of the page.
If Facing Pages is selected, this margin space can be used to achieve the correct margins for binding</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>When enabled, Scribus saves a backup copy of your file with the .bak extension
each time the time period elapses</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Time period between saving automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the minor grid lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance between the major grid lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance within which an object will snap to your placed guides</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color of the minor grid lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color of the major grid lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color of the guide lines you insert</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Place the grid behind your page objects</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Place the grid in front of your page objects</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Displacement above the baseline of the font on a line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relative size of the superscript compared to the normal font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Displacement below the baseline of the normal font on a line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relative size of the subscript compared to the normal font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relative size of the small caps font compared to the normal font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Percentage increase over the font size for the line spacing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Text Frame Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Picture Frame Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shape Drawing Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Magnification Level Defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Drawing Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Polygon Drawing Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font for new text frames</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Size of font for new text frames</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color of font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number of columns in a text frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Gap between text frame columns</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sample of your font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Picture frames allow pictures to scale to any size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Horizontal scaling of images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Vertical scaling of images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Keep horizontal and vertical scaling the same</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pictures in picture frames are scaled to the size of the frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatically scaled pictures keep their original proportions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill color of picture frames</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Saturation of color of fill</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line color of shapes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Saturation of color of lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill color of shapes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line style of shapes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line width of shapes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Minimum magnification allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maximum magnification allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change in magnification for each zoom operation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color of lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Saturation of color</source>
<translation type="unfinished">Tonwert der Farbe</translation>
</message>
<message>
<source>Style of lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width of lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number of corners for polygons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Degrees of rotation for polygons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Polygons will be convex rather than concave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sample Polygon</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change the angles at which lines of the polygon join</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose the size of the preview in the scrapbook palette</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Keep the scrapbook contents after closing Scribus</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>When using facing pages, show the two pages side by side</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color for paper</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color for the margin lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mask the area outside the margins in the margin color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable transparency features within PDF 1.4 export</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set the default zoom level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Filesystem location for the Ghostscript interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Antialias text for EPS and PDF onscreen rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Antialias graphics for EPS and PDF onscreen rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Filesystem location for editing graphics</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do not show objects outside the margins on the printed page or exported file</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QColorDialog</name>
4864,7 → 5994,7
</message>
<message>
<source>Script</source>
<translation>Script</translation>
<translation type="obsolete">Script</translation>
</message>
<message>
<source>Online Reference</source>
4922,6 → 6052,30
<source> p</source>
<translation> p</translation>
</message>
<message>
<source>pt</source>
<translation>pt</translation>
</message>
<message>
<source>mm</source>
<translation>mm</translation>
</message>
<message>
<source>in</source>
<translation>in</translation>
</message>
<message>
<source>p</source>
<translation>p</translation>
</message>
<message>
<source>Scribus Scripts</source>
<translation>Scribus Scripte</translation>
</message>
<message>
<source>S&amp;cript</source>
<translation>S&amp;cript</translation>
</message>
</context>
<context>
<name>QTextEdit</name>
5121,27 → 6275,27
</message>
<message>
<source>Creates a new Document</source>
<translation>Erzeugt ein neues Dokument</translation>
<translation type="obsolete">Erzeugt ein neues Dokument</translation>
</message>
<message>
<source>Opens a Document</source>
<translation>Öffnet ein Dokument</translation>
<translation type="obsolete">Öffnet ein Dokument</translation>
</message>
<message>
<source>Saves the Current Document</source>
<translation>Speichert das aktuelle Dokument</translation>
<translation type="obsolete">Speichert das aktuelle Dokument</translation>
</message>
<message>
<source>Closes the Current Document</source>
<translation>Schließt das aktuelle Dokument</translation>
<translation type="obsolete">Schließt das aktuelle Dokument</translation>
</message>
<message>
<source>Prints the Current Document</source>
<translation>Druckt das aktuelle Dokument</translation>
<translation type="obsolete">Druckt das aktuelle Dokument</translation>
</message>
<message>
<source>Saves the Current Document as PDF</source>
<translation>Speichert das aktuelle Dokument als PDF</translation>
<translation type="obsolete">Speichert das aktuelle Dokument als PDF</translation>
</message>
<message>
<source>Searching for Fonts</source>
5577,7 → 6731,7
</message>
<message>
<source>Edit</source>
<translation>Bearbeiten</translation>
<translation type="obsolete">Bearbeiten</translation>
</message>
<message>
<source>Style</source>
5585,27 → 6739,27
</message>
<message>
<source>Item</source>
<translation>Objekt</translation>
<translation type="obsolete">Objekt</translation>
</message>
<message>
<source>Page</source>
<translation>Seite</translation>
<translation type="obsolete">Seite</translation>
</message>
<message>
<source>View</source>
<translation>Ansicht</translation>
<translation type="obsolete">Ansicht</translation>
</message>
<message>
<source>Extras</source>
<translation>Extras</translation>
<translation type="obsolete">Extras</translation>
</message>
<message>
<source>Windows</source>
<translation>Fenster</translation>
<translation type="obsolete">Fenster</translation>
</message>
<message>
<source>Help</source>
<translation>Hilfe</translation>
<translation type="obsolete">Hilfe</translation>
</message>
<message>
<source>Left</source>
5946,6 → 7100,74
<source>Irish</source>
<translation>Irisch</translation>
</message>
<message>
<source>Create a new Document</source>
<translation>Neues Dokument erzeugen</translation>
</message>
<message>
<source>Open a Document</source>
<translation>Öffnet ein Dokument</translation>
</message>
<message>
<source>Save the current Document</source>
<translation>Speichert das aktuelle Dokument</translation>
</message>
<message>
<source>Close the current Document</source>
<translation>Schließt das aktuelle Dokument</translation>
</message>
<message>
<source>Print the current Document</source>
<translation>Druckt das aktuelle Dokument</translation>
</message>
<message>
<source>Save the current Document as PDF</source>
<translation>Speichert das aktuelle Dokument als PDF</translation>
</message>
<message>
<source>Append Text...</source>
<translation>Text anfügen...</translation>
</message>
<message>
<source>&amp;File</source>
<translation>&amp;Datei</translation>
</message>
<message>
<source>&amp;Edit</source>
<translation>&amp;Bearbeiten</translation>
</message>
<message>
<source>&amp;Style</source>
<translation>S&amp;til</translation>
</message>
<message>
<source>&amp;Item</source>
<translation>&amp;Objekt</translation>
</message>
<message>
<source>&amp;Page</source>
<translation>&amp;Seite</translation>
</message>
<message>
<source>&amp;View</source>
<translation>&amp;Ansicht</translation>
</message>
<message>
<source>&amp;Tools</source>
<translation>&amp;Werkzeuge</translation>
</message>
<message>
<source>E&amp;xtras</source>
<translation>E&amp;xtras</translation>
</message>
<message>
<source>&amp;Windows</source>
<translation>&amp;Fenster</translation>
</message>
<message>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
</context>
<context>
<name>ScribusView</name>
6290,6 → 7512,10
<source>Documents (*.sla *.scd);;All Files (*)</source>
<translation>Dokumente (*.sla *.scd);;Alle Dateien (*)</translation>
</message>
<message>
<source>Close</source>
<translation>Schließen</translation>
</message>
</context>
<context>
<name>StoryEditor</name>
6433,6 → 7659,10
<source>Search/Replace...</source>
<translation>Suchen/Ersetzen...</translation>
</message>
<message>
<source>Do you want save your changes?</source>
<translation>Wollen Sie Ihre Änderungen sichern?</translation>
</message>
</context>
<context>
<name>StyleSelect</name>
6454,12 → 7684,16
</message>
<message>
<source>Strikeout</source>
<translation>Durchgestrichen</translation>
<translation type="obsolete">Durchgestrichen</translation>
</message>
<message>
<source>Outline Text</source>
<translation>Umrandet</translation>
</message>
<message>
<source>Strike Out</source>
<translation>Durchgestrichen</translation>
</message>
</context>
<context>
<name>TabManager</name>
6619,7 → 7853,7
</message>
<message>
<source>Zooms in or out</source>
<translation>Vergrößern oder verkleinern</translation>
<translation type="obsolete">Vergrößern oder verkleinern</translation>
</message>
<message>
<source>Edit Contents of Frame</source>
6627,7 → 7861,7
</message>
<message>
<source>Edit the Text with the Story Editor</source>
<translation>Text mit dem Story Editor bearbeiten</translation>
<translation type="obsolete">Text mit dem Story Editor bearbeiten</translation>
</message>
<message>
<source>Link Text Frames</source>
6639,8 → 7873,24
</message>
<message>
<source>Draws various Shapes</source>
<translation type="obsolete">Zeichnet verschiedene Formen</translation>
</message>
<message>
<source>Zoom in or out</source>
<translation>Vergrößern oder verkleinern</translation>
</message>
<message>
<source>Edit the text with the Story Editor</source>
<translation>Text mit dem Story Editor bearbeiten</translation>
</message>
<message>
<source>Draw various Shapes</source>
<translation>Zeichnet verschiedene Formen</translation>
</message>
<message>
<source>Insert Table</source>
<translation>Tabelle einfügen</translation>
</message>
</context>
<context>
<name>WerkToolBP</name>
/trunk/Scribus/scribus/qm/scribus.ru.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/qm/scribus.de.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream