Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 231 → Rev 232

/trunk/Scribus/ChangeLogCVS
1,4 → 1,14
Changes since Version 1.1.5
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.
/trunk/Scribus/scribus/werktoolb.h
43,6 → 43,7
QToolButton* Zoom;
QToolButton* Texte;
QToolButton* BildB;
QToolButton* TableB;
QToolButton* Linien;
Autoforms* Rechteck;
QToolButton* Polygon;
/trunk/Scribus/scribus/mpalette.h
73,6 → 73,7
QToolButton* SColor;
QWidgetStack* TabStack;
QWidgetStack* TabStack2;
QWidgetStack* TabStack3;
QWidget* page;
QWidget* page_2;
QWidget* page_2a;
80,6 → 81,8
QWidget* page_3;
QWidget* page_4;
QWidget* page_5;
QWidget* page_5a;
QWidget* page_5b;
Cpalette *Cpal;
QGroupBox* NameGroup;
NameWidget* NameEdit;
198,6 → 201,11
QLabel* SprachT;
QComboBox* LangCombo;
QGroupBox* GroupBoxCM;
QGroupBox* TLines;
QCheckBox* TopLine;
QCheckBox* LeftLine;
QCheckBox* RightLine;
QCheckBox* BottomLine;
PageItem *CurItem;
bool HaveDoc;
bool HaveItem;
286,6 → 294,7
void ChIntent();
void NewName();
void NewLanguage();
void HandleTLines();
signals:
void Schliessen();
308,6 → 317,9
QVBoxLayout* pageLayout_3;
QVBoxLayout* pageLayout_4;
QVBoxLayout* pageLayout_5;
QVBoxLayout* pageLayout_5a;
QVBoxLayout* pageLayout_5b;
QVBoxLayout* TLineLayout;
QHBoxLayout* layout60;
QGridLayout* Layout44;
QHBoxLayout* Layout13;
/trunk/Scribus/scribus/mpalette.cpp
708,12 → 708,40
Layout12_2->addWidget( LEndStyle, 7, 0 );
pageLayout_5->addLayout( Layout12_2 );
 
StyledLine = new QListBox(page_5, "StyledL");
TabStack3 = new QWidgetStack( page_5, "TabStack3" );
TabStack3->setFrameShape( QWidgetStack::NoFrame );
 
page_5a = new QWidget( TabStack3, "page" );
pageLayout_5a = new QVBoxLayout( page_5a, 0, 5, "pageLayout_5a");
StyledLine = new QListBox(page_5a, "StyledL");
StyledLine->insertItem( tr("No Style"), 0);
pageLayout_5->addWidget(StyledLine);
pageLayout_5a->addWidget(StyledLine);
TabStack3->addWidget( page_5a, 0 );
 
QSpacerItem* spacer11 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
pageLayout_5->addItem( spacer11 );
page_5b = new QWidget( TabStack3, "page" );
pageLayout_5b = new QVBoxLayout( page_5b, 0, 5, "pageLayout_5a");
TLines = new QGroupBox( page_5b, "Distance" );
TLines->setTitle( tr( "Cell Lines" ) );
TLines->setColumnLayout(0, Qt::Vertical );
TLines->layout()->setSpacing( 2 );
TLines->layout()->setMargin( 5 );
TLineLayout = new QVBoxLayout( TLines->layout() );
TLineLayout->setAlignment( Qt::AlignTop );
TopLine = new QCheckBox( TLines, "TopLine" );
TopLine->setText( tr( "Line at Top" ) );
TLineLayout->addWidget(TopLine);
LeftLine = new QCheckBox( TLines, "TopLine" );
LeftLine->setText( tr( "Line at the Left" ) );
TLineLayout->addWidget(LeftLine);
RightLine = new QCheckBox( TLines, "TopLine" );
RightLine->setText( tr( "Line at the Right " ) );
TLineLayout->addWidget(RightLine);
BottomLine = new QCheckBox( TLines, "TopLine" );
BottomLine->setText( tr( "Line at Bottom" ) );
TLineLayout->addWidget(BottomLine);
pageLayout_5b->addWidget(TLines);
TabStack3->addWidget( page_5b, 1 );
pageLayout_5->addWidget( TabStack3 );
TabStack->addWidget( page_5, 4 );
Cpal = new Cpalette(this);
TabStack->addWidget(Cpal, 5);
846,6 → 874,10
connect(NameEdit, SIGNAL(Leaved()), this, SLOT(NewName()));
connect(LangCombo, SIGNAL(activated(int)), this, SLOT(NewLanguage()));
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect( TopLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( LeftLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( RightLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( BottomLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
HaveItem = false;
Xpos->setValue(0);
Ypos->setValue(0);
853,6 → 885,7
Height->setValue(0);
Rot->setValue(0);
RoundRect->setValue(0);
TabStack3->raiseWidget(0);
TabStack2->raiseWidget(0);
TabStack->raiseWidget(0);
TabStack->widget(0)->setEnabled(false);
1005,16 → 1038,28
/* PFJ - 29.02.04 - Used ternary */
setter = i->Locked ? false : true;
 
Xpos->setEnabled(setter);
Ypos->setEnabled(setter);
Width->setEnabled(setter);
Height->setEnabled(setter);
Rot->setEnabled(setter);
RoundRect->setEnabled(setter);
EditShape->setEnabled(setter);
ShapeGroup->setEnabled(setter);
LayerGroup->setEnabled(setter);
Locked->setOn(!setter);
if ((i->isTableItem) && (i->isSingleSel))
{
setter = false;
TabStack3->raiseWidget(1);
TopLine->setChecked(i->TopLine);
LeftLine->setChecked(i->LeftLine);
RightLine->setChecked(i->RightLine);
BottomLine->setChecked(i->BottomLine);
}
else
TabStack3->raiseWidget(0);
LayerGroup->setEnabled(setter);
Xpos->setEnabled(setter);
Ypos->setEnabled(setter);
Rot->setEnabled(setter);
setter = i->LockRes;
NoResize->setOn(setter);
if (!i->Locked)
2877,3 → 2922,16
delete dia;
}
}
 
void Mpalette::HandleTLines()
{
if ((HaveDoc) && (HaveItem))
{
CurItem->TopLine = TopLine->isChecked();
CurItem->LeftLine = LeftLine->isChecked();
CurItem->RightLine = RightLine->isChecked();
CurItem->BottomLine = BottomLine->isChecked();
doc->ActPage->RefreshItem(CurItem);
emit DocChanged();
}
}
/trunk/Scribus/scribus/insertTable.cpp
0,0 → 1,45
#include "insertTable.h"
#include "insertTable.moc"
 
extern QPixmap loadIcon(QString nam);
 
InsertTable::InsertTable( QWidget* parent, int maxRow, int maxCol )
: QDialog( parent, "InsertTable", true, 0 )
 
{
setCaption( tr( "Insert Table" ) );
setIcon(loadIcon("AppIcon.png"));
 
InsertTableLayout = new QVBoxLayout( this, 11, 8, "InsertTableLayout");
layout2 = new QGridLayout( 0, 1, 1, 0, 6, "layout2");
Cols = new QSpinBox( this, "Cols" );
Cols->setMaxValue( maxCol );
Cols->setMinValue( 1 );
layout2->addWidget( Cols, 1, 1 );
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Number of Rows:" ) );
layout2->addWidget( Text1, 0, 0 );
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Number of Columns:" ) );
layout2->addWidget( Text2, 1, 0 );
Rows = new QSpinBox( this, "Rows" );
Rows->setMaxValue( maxRow );
Rows->setMinValue( 1 );
layout2->addWidget( Rows, 0, 1 );
InsertTableLayout->addLayout( layout2 );
layout1 = new QHBoxLayout( 0, 0, 6, "layout1");
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton->setDefault( TRUE );
layout1->addWidget( OKButton );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
layout1->addWidget( CancelB );
InsertTableLayout->addLayout( layout1 );
resize( QSize(200, 111).expandedTo(minimumSizeHint()) );
 
// signals and slots connections
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( CancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
}
 
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: trunk/Scribus/scribus/util.cpp
===================================================================
--- trunk/Scribus/scribus/util.cpp (revision 231)
+++ trunk/Scribus/scribus/util.cpp (revision 232)
@@ -1731,6 +1731,11 @@
Buffer->Language = b->Language;
Buffer->Cols = b->Cols;
Buffer->ColGap = b->ColGap;
+ Buffer->isTableItem = b->isTableItem;
+ Buffer->TopLine = b->TopLine;
+ Buffer->LeftLine = b->LeftLine;
+ Buffer->RightLine = b->RightLine;
+ Buffer->BottomLine = b->BottomLine;
}
void WordAndPara(PageItem* b, int *w, int *p, int *c, int *wN, int *pN, int *cN)
/trunk/Scribus/scribus/icons/Makefile.am
1,10 → 1,12
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/frame_table.png $(prefix)/lib/scribus/icons/frame_table.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/testfill.png $(prefix)/lib/scribus/icons/testfill.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/frameresize.png $(prefix)/lib/scribus/icons/frameresize.png
403,6 → 405,7
-rm -f $(prefix)/lib/scribus/icons/framenoresize.png
-rm -f $(prefix)/lib/scribus/icons/frameresize.png
-rm -f $(prefix)/lib/scribus/icons/testfill.png
-rm -f $(prefix)/lib/scribus/icons/frame_table.png
 
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/icons/frame_table.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/Scribus/scribus/pageitem.h
===================================================================
--- trunk/Scribus/scribus/pageitem.h (revision 231)
+++ trunk/Scribus/scribus/pageitem.h (revision 232)
@@ -263,6 +263,17 @@
double DashOffset;
VGradient fill_gradient;
QString Language;
+/* Additions for Table Support */
+ PageItem* LeftLink;
+ PageItem* RightLink;
+ PageItem* TopLink;
+ PageItem* BottomLink;
+ bool LeftLine;
+ bool RightLine;
+ bool TopLine;
+ bool BottomLine;
+ bool isTableItem;
+ bool isSingleSel;
};
#endif
/trunk/Scribus/scribus/page.h
134,6 → 134,9
void ItemTextPenS(int sha);
void ItemTextScale(int sha);
void AdjItemGradient(PageItem *b, int typ, QString col1, int sh1, QString col2, int sh2);
void AdvanceSel(PageItem *b, int oldPos, int len, int dir, int expandSel, int state);
void setNewPos(PageItem *b, int oldPos, int len, int dir);
void ExpandSel(PageItem *b, int dir, int oldPos);
QRegion ViewReg();
/** Liste der Elemente */
QPtrList<PageItem> Items;
228,7 → 231,6
void RaiseItem();
void ClearItem();
void DeleteItem();
void ExpandSel(PageItem *b, int inc);
bool slotSetCurs(int x, int y);
void slotDoCurs(bool draw);
void BlinkCurs();
/trunk/Scribus/scribus/cmsprefs.cpp
139,7 → 139,7
 
PrinterI = new QComboBox( true, Render, "PrinterI" );
/* PFJ - 29.02.04 - Changed from uint to int and varname */
for (int prop = 0; prop < array; ++prop)
for (uint prop = 0; prop < array; ++prop)
PrinterI->insertItem(tmp_mp[prop]);
PrinterI->setMinimumSize( QSize( 190, 22 ) );
PrinterI->setEditable(false);
/trunk/Scribus/scribus/pageitem.cpp
209,6 → 209,16
Language = doc->Language;
Cols = Doc->DCols;
ColGap = Doc->DGap;
LeftLink = 0;
RightLink = 0;
TopLink = 0;
BottomLink = 0;
LeftLine = 0;
RightLine = false;
TopLine = false;
BottomLine = false;
isTableItem = false;
isSingleSel = false;
}
 
/** Zeichnet das Item */
1528,28 → 1538,62
if (Pcolor2 != "None")
{
SetFarbe(&tmp, Pcolor2, Shade2);
p->setPen(tmp, Pwidth, PLineArt, PLineEnd, PLineJoin);
if ((isTableItem) && ((TopLine) || (RightLine) || (BottomLine) || (LeftLine)))
p->setPen(tmp, Pwidth, PLineArt, Qt::SquareCap, PLineJoin);
else
p->setPen(tmp, Pwidth, PLineArt, PLineEnd, PLineJoin);
if (DashValues.count() != 0)
p->setDash(DashValues, DashOffset);
}
else
p->setLineWidth(0);
p->setupPolygon(&PoLine);
if (NamedLStyle == "")
p->drawPolyLine();
else
if (isTableItem)
{
multiLine ml = Doc->MLineStyles[NamedLStyle];
for (int it = ml.size()-1; it > -1; it--)
if ((TopLine) || (RightLine) || (BottomLine) || (LeftLine))
{
SetFarbe(&tmp, ml[it].Color, ml[it].Shade);
p->setPen(tmp, ml[it].Width,
static_cast<PenStyle>(ml[it].Dash),
static_cast<PenCapStyle>(ml[it].LineEnd),
static_cast<PenJoinStyle>(ml[it].LineJoin));
p->newPath();
if (TopLine)
{
p->moveTo(0.0, 0.0);
p->lineTo(Width, 0.0);
}
if (RightLine)
{
p->moveTo(Width, 0.0);
p->lineTo(Width, Height);
}
if (BottomLine)
{
p->moveTo(0.0, Height);
p->lineTo(Width, Height);
}
if (LeftLine)
{
p->moveTo(0.0, 0.0);
p->lineTo(0.0, Height);
}
p->drawPolyLine();
}
}
else
{
p->setupPolygon(&PoLine);
if (NamedLStyle == "")
p->drawPolyLine();
else
{
multiLine ml = Doc->MLineStyles[NamedLStyle];
for (int it = ml.size()-1; it > -1; it--)
{
SetFarbe(&tmp, ml[it].Color, ml[it].Shade);
p->setPen(tmp, ml[it].Width,
static_cast<PenStyle>(ml[it].Dash),
static_cast<PenCapStyle>(ml[it].LineEnd),
static_cast<PenJoinStyle>(ml[it].LineJoin));
p->drawPolyLine();
}
}
}
}
if ((!Tinput) && (!Doc->RePos))
{
/trunk/Scribus/scribus/scribusdoc.h
183,6 → 183,11
QValueList<double> TabValues;
QValueList<double> DashValues;
double DashOffset;
bool isTableItem;
bool TopLine;
bool LeftLine;
bool RightLine;
bool BottomLine;
};
 
/** Seitenraender */
/trunk/Scribus/scribus/werktoolb.cpp
42,9 → 42,10
Texte = new QToolButton(loadIcon("Text.xpm"), tr("Insert Text Frame"), QString::null, this,
SLOT(ModeFromTB()), this);
Texte->setToggleButton( true );
BildB = new QToolButton(loadIcon("Bild.xpm"), tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()),
this);
BildB = new QToolButton(loadIcon("Bild.xpm"), tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()), this);
BildB->setToggleButton( true );
TableB = new QToolButton(loadIcon("frame_table.png"), tr("Insert Table"), QString::null, this, SLOT(ModeFromTB()), this);
TableB->setToggleButton( true );
Rechteck = new Autoforms( this );
Rechteck->setPopupDelay(0);
Rechteck->setToggleButton( true );
63,20 → 64,17
LinM->setWhatsThis(id, tr("Insert Bezier Curves"));
id = LinM->insertItem(loadIcon("Stiftalt.xpm"));
LinM->setWhatsThis(id, tr("Insert Freehand Line"));
Linien = new QToolButton(loadIcon("Stift.xpm"), tr("Insert Lines"), QString::null, this, SLOT(ModeFromTB()),
this);
Linien = new QToolButton(loadIcon("Stift.xpm"), tr("Insert Lines"), QString::null, this, SLOT(ModeFromTB()), this);
Linien->setToggleButton( true );
Linien->setPopup(LinM);
Linien->setPopupDelay(0);
LMode = 8;
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this,
SLOT(ModeFromTB()), this);
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this, SLOT(ModeFromTB()), this);
Rotiere->setToggleButton( true );
Rotiere->setEnabled(false);
Zoom = new QToolButton(loadIcon("Lupe.xpm"), tr("Zoom in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom->setToggleButton( true );
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this,
SLOT(ModeFromTB()), this);
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( false );
Textedit2 = new QToolButton(loadIcon("signature.png"), tr("Edit the text with the Story Editor"),
134,6 → 132,7
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
TableB->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
KetteAus->setOn(false);
154,6 → 153,7
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
TableB->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
KetteAus->setOn(false);
171,6 → 171,7
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
TableB->setOn(false);
Rechteck->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
211,6 → 212,11
BildB->setOn(true);
emit NewMode(4);
}
if (TableB == sender())
{
TableB->setOn(true);
emit NewMode(22);
}
if (Linien == sender())
{
Linien->setOn(true);
242,6 → 248,7
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
TableB->setOn(false);
Rechteck->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
/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("13").arg("March").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("14").arg("March").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/Makefile.am
1,13 → 1,13
bin_PROGRAMS = scribus
 
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
INTERFACES =
TRANSLATIONS =
 
SUBDIRS = icons libabout libprefs plugins libpostscript libpdf profiles dicts po qm
 
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp pageselector.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp pageselector.h insertTable.cpp insertTable.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/
/trunk/Scribus/scribus/scribus.cpp
668,10 → 668,10
StilMenu = new QPopupMenu();
ObjMenu = new QPopupMenu();
SetKeyEntry(19, tr("Select New Font"), 0, 0);
MenID = ObjMenu->insertItem( tr("Duplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
SetKeyEntry(20, tr("Duplicate"), MenID, CTRL+Key_D);
MenID = ObjMenu->insertItem( tr("Multiple Duplicate"), this, SLOT(ObjektDupM()));
SetKeyEntry(21, tr("Multiple Duplicate"), MenID, 0);
ODup = ObjMenu->insertItem( tr("Duplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
SetKeyEntry(20, tr("Duplicate"), ODup, CTRL+Key_D);
OMDup = ObjMenu->insertItem( tr("Multiple Duplicate"), this, SLOT(ObjektDupM()));
SetKeyEntry(21, tr("Multiple Duplicate"), OMDup, 0);
Loesch = ObjMenu->insertItem( tr("Delete"), this, SLOT(DeleteObjekt()), CTRL+Key_K);
SetKeyEntry(22, tr("Delete"), Loesch, CTRL+Key_K);
ObjMenu->insertSeparator();
1036,6 → 1036,7
KeyMod = 0;
break;
}
ButtonState buttonState = k->state();
if ((HaveDoc) && (!view->LE->hasFocus()))
{
if (doc->AppMode != 7)
1088,7 → 1089,7
case Key_Delete:
if (!doc->EditClip)
{
if (!b->Locked)
if ((!b->Locked) && (!((b->isTableItem) && (b->isSingleSel))))
doc->ActPage->DeleteItem();
}
break;
1165,6 → 1166,7
slotDocCh();
break;
case 7:
int oldPos = b->CPos; // 15-mar-2004 jjsa for cursor movement with Shift + Arrow key
if (b->PType == 4)
{
doc->ActPage->slotDoCurs(false);
1187,6 → 1189,13
}
}
while (b->CPos < static_cast<int>(b->Ptext.count()));
if ( buttonState & ShiftButton )
{
if ( buttonState & AltButton )
b->CPos = b->Ptext.count();
doc->ActPage->ExpandSel(b, 1, oldPos);
}
else
if (b->CPos == static_cast<int>(b->Ptext.count()))
if (b->NextBox != 0)
{
1214,6 → 1223,8
}
}
}
if ( b->HasSel )
doc->ActPage->RefreshItem(b);
setTBvals(b);
break;
case Key_Up:
1238,6 → 1249,13
}
while (b->CPos > 0);
}
if ( buttonState & ShiftButton )
{
if ( buttonState & AltButton )
b->CPos = 0;
doc->ActPage->ExpandSel(b, -1, oldPos);
}
else
if (b->CPos == 0)
{
if (b->BackBox != 0)
1262,71 → 1280,95
b = b->BackBox;
}
}
if ( b->HasSel )
doc->ActPage->RefreshItem(b);
setTBvals(b);
break;
case Key_Home:
b->CPos = 0;
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, -1, oldPos);
setTBvals(b);
break;
case Key_End:
b->CPos = static_cast<int>(b->Ptext.count());
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, 1, oldPos);
setTBvals(b);
break;
case Key_Left:
b->CPos -= 1;
if (b->CPos < 0)
{
b->CPos = 0;
if (b->BackBox != 0)
{
b->OwnPage->Deselect(true);
b->BackBox->CPos = b->BackBox->Ptext.count();
doc->ActPage = b->BackBox->OwnPage;
b->BackBox->OwnPage->SelectItemNr(b->BackBox->ItemNr);
b = b->BackBox;
}
}
// jjsa add (de)selection if keyMode == 0x00200000
// shift pressed ?
else if ( KeyMod & 0x00200000 && b->CPos >= 0 )
{
doc->ActPage->ExpandSel(b, -1 );
}
else // refresh if selected text under our cursor
{
doc->ActPage->ExpandSel(b,-2);
}
setTBvals(b);
break;
case Key_Right:
b->CPos += 1;
if (b->CPos > static_cast<int>(b->Ptext.count()))
{
if ( buttonState & ControlButton )
{
doc->ActPage->setNewPos(b, oldPos, b->Ptext.count(),-1);
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, -1, oldPos);
}
else if ( buttonState & ShiftButton )
{
b->CPos--;
if ( b->CPos < 0 )
b->CPos = 0;
else
doc->ActPage->ExpandSel(b, -1, oldPos);
}
else
{
b->CPos -= 1;
if (b->NextBox != 0)
if (b->CPos < 0)
{
if (b->NextBox->Ptext.count() != 0)
b->CPos = 0;
if (b->BackBox != 0)
{
b->OwnPage->Deselect(true);
b->NextBox->CPos = 0;
doc->ActPage = b->NextBox->OwnPage;
b->NextBox->OwnPage->SelectItemNr(b->NextBox->ItemNr);
b = b->NextBox;
}
b->BackBox->CPos = b->BackBox->Ptext.count();
doc->ActPage = b->BackBox->OwnPage;
b->BackBox->OwnPage->SelectItemNr(b->BackBox->ItemNr);
b = b->BackBox;
}
}
}
// jjsa add (de)selection if keyMode == 0x00200000
// shift pressed ?
else if ( KeyMod & 0x00200000 && b->CPos <= b->Ptext.count())
}
if ( b->HasSel )
doc->ActPage->RefreshItem(b);
setTBvals(b);
break;
case Key_Right:
if ( buttonState & ControlButton )
{
doc->ActPage->setNewPos(b, oldPos, b->Ptext.count(),1);
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, 1, oldPos);
}
else if ( buttonState & ShiftButton )
{
b->CPos++;
if ( b->CPos > static_cast<int>(b->Ptext.count()) )
b->CPos--;
else
doc->ActPage->ExpandSel(b, 1, oldPos);
}
else
{
b->CPos += 1; // new position within text ?
if (b->CPos > static_cast<int>(b->Ptext.count()))
{
doc->ActPage->ExpandSel(b,1);
b->CPos -= 1;
if (b->NextBox != 0)
{
if (b->NextBox->Ptext.count() != 0)
{
b->OwnPage->Deselect(true);
b->NextBox->CPos = 0;
doc->ActPage = b->NextBox->OwnPage;
b->NextBox->OwnPage->SelectItemNr(b->NextBox->ItemNr);
b = b->NextBox;
}
}
}
else // refresh if selected text under our cursor
{
doc->ActPage->ExpandSel(b,2);
}
setTBvals(b);
break;
}
if ( b->HasSel )
doc->ActPage->RefreshItem(b);
setTBvals(b);
break;
case Key_Delete:
if (b->CPos == static_cast<int>(b->Ptext.count()))
{
2157,7 → 2199,10
extraMenu->setItemEnabled(hyph, 0);
menuBar()->setItemEnabled(Stm, 1);
menuBar()->setItemEnabled(Obm, 1);
ObjMenu->setItemEnabled(ShapeM, 1);
if ((b->isTableItem) && (b->isSingleSel))
ObjMenu->setItemEnabled(ShapeM, 0);
else
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 0);
StilMenu->clear();
StilMenu->insertItem( tr("Color"), ColorMenu);
2182,7 → 2227,10
extraMenu->setItemEnabled(hyph, 1);
menuBar()->setItemEnabled(Stm, 1);
menuBar()->setItemEnabled(Obm, 1);
ObjMenu->setItemEnabled(ShapeM, 1);
if ((b->isTableItem) && (b->isSingleSel))
ObjMenu->setItemEnabled(ShapeM, 0);
else
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 1);
StilMenu->clear();
StilMenu->insertItem( tr("Font"), FontMenu);
2367,14 → 2415,31
ObjMenu->changeItem(LockOb, tr("Unlock"));
}
else
{
ObjMenu->changeItem(LockOb, tr("Lock"));
if ((b->isTableItem) && (b->isSingleSel))
{
ObjMenu->changeItem(LockOb, tr("Lock"));
ObjMenu->setItemEnabled(OBack, 1);
ObjMenu->setItemEnabled(OFront, 1);
ObjMenu->setItemEnabled(ORaise, 1);
ObjMenu->setItemEnabled(OLower, 1);
ObjMenu->setItemEnabled(PfadTP, 0);
ObjMenu->setItemEnabled(ODup, 0);
ObjMenu->setItemEnabled(OMDup, 0);
ObjMenu->setItemEnabled(Loesch, 0);
ObjMenu->setItemEnabled(OBack, 0);
ObjMenu->setItemEnabled(OFront, 0);
ObjMenu->setItemEnabled(ORaise, 0);
ObjMenu->setItemEnabled(OLower, 0);
}
else
{
ObjMenu->setItemEnabled(ODup, 1);
ObjMenu->setItemEnabled(OMDup, 1);
ObjMenu->setItemEnabled(Loesch, 1);
ObjMenu->setItemEnabled(OBack, 1);
ObjMenu->setItemEnabled(OFront, 1);
ObjMenu->setItemEnabled(ORaise, 1);
ObjMenu->setItemEnabled(OLower, 1);
}
}
}
Mpal->NewSel(Nr);
if (Nr != -1)
{
3073,11 → 3138,6
viewMenu->setItemEnabled(Guide, 0);
viewMenu->setItemEnabled(uGuide, 0);
viewMenu->setItemChecked(uGuide, false);
/* viewMenu->changeItem(Markers, tr("Hide Margins"));
viewMenu->changeItem(FrameDr, tr("Hide Frames"));
viewMenu->changeItem(Bilder, tr("Hide Images"));
viewMenu->changeItem(Ras, tr("Show Grid"));
viewMenu->changeItem(Guide, tr("Hide Guides")); */
editMenu->setItemEnabled(tman, 0);
editMenu->setItemEnabled(jman, 0);
menuBar()->setItemEnabled(pgmm, 0);
3285,7 → 3345,9
}
else
{
ScriXmlDoc *ss = new ScriXmlDoc();
if ((b->isTableItem) && (b->isSingleSel))
return;
ScriXmlDoc *ss = new ScriXmlDoc();
BufferI = ss->WriteElem(&doc->ActPage->SelItem, doc);
Buffer2 = BufferI;
doc->ActPage->DeleteItem();
3356,7 → 3418,9
}
else
{
ScriXmlDoc *ss = new ScriXmlDoc();
if ((b->isTableItem) && (b->isSingleSel))
return;
ScriXmlDoc *ss = new ScriXmlDoc();
BufferI = ss->WriteElem(&doc->ActPage->SelItem, doc);
Buffer2 = BufferI;
delete ss;
4122,6 → 4186,7
WerkTools->Zoom->setEnabled(false);
WerkTools->Texte->setEnabled(false);
WerkTools->BildB->setEnabled(false);
WerkTools->TableB->setEnabled(false);
WerkTools->Rechteck->setEnabled(false);
WerkTools->Linien->setEnabled(false);
WerkTools->Polygon->setEnabled(false);
4149,6 → 4214,7
WerkTools->Zoom->setEnabled(true);
WerkTools->Texte->setEnabled(true);
WerkTools->BildB->setEnabled(true);
WerkTools->TableB->setEnabled(true);
WerkTools->Rechteck->setEnabled(true);
WerkTools->Linien->setEnabled(true);
WerkTools->Polygon->setEnabled(true);
4180,6 → 4246,7
WerkTools->Zoom->setOn(false);
WerkTools->Texte->setOn(false);
WerkTools->BildB->setOn(false);
WerkTools->TableB->setOn(false);
WerkTools->Rechteck->setOn(false);
WerkTools->Linien->setOn(false);
WerkTools->Polygon->setOn(false);
4308,6 → 4375,7
WerkTools->Zoom->setOn(false);
WerkTools->Texte->setOn(false);
WerkTools->BildB->setOn(false);
WerkTools->TableB->setOn(false);
WerkTools->Rechteck->setOn(false);
WerkTools->Linien->setOn(false);
WerkTools->Polygon->setOn(false);
6429,6 → 6497,11
{
b = doc->ActPage->SelItem.at(a);
b->Groups.pop();
b->isTableItem = false;
b->LeftLink = 0;
b->RightLink = 0;
b->TopLink = 0;
b->BottomLink = 0;
}
doc->ActPage->Deselect(true);
slotDocCh();
/trunk/Scribus/scribus/page.cpp
21,6 → 21,7
#include "serializer.h"
#include "scribusXml.h"
#include "scribus.h"
#include "insertTable.h"
 
#if (_MSC_VER >= 1200)
#include "win-config.h"
1084,6 → 1085,8
 
void Page::UpdateClip(PageItem* b)
{
if (doku->AppMode == 13)
return;
int ph = static_cast<int>(QMAX(1.0, b->Pwidth / 2.0));
switch (b->PType)
{
2094,6 → 2097,87
return;
}
}
if (doku->AppMode == 22)
{
if ((SelItem.count() == 0) && (HaveSelRect) && (!MidButt))
{
double sc = doku->Scale;
QRect AreaR = QRect(static_cast<int>(Mxp*sc), static_cast<int>(Myp*sc), static_cast<int>(SeRx-(Mxp*sc)), static_cast<int>(SeRy-(Myp*sc)));
QPainter p;
p.begin(this);
p.setRasterOp(XorROP);
p.setPen(QPen(white, 1, DotLine, FlatCap, MiterJoin));
if((Mxp*sc) > SeRx)
{
double tmp=SeRx;
SeRx=static_cast<int>(Mxp*sc);
Mxp=static_cast<int>(tmp/sc);
}
if((Myp*sc) > SeRy)
{
double tmp=SeRy;
SeRy=static_cast<int>(Myp*sc);
Myp=static_cast<int>(tmp/sc);
}
HaveSelRect = false;
double Tx, Ty, Tw, Th;
Tx = Mxp * sc;
Ty = Myp * sc;
Tw = SeRx-(Mxp*sc);
Th = SeRy-(Myp*sc);
int z;
int Cols, Rows;
double deltaX, deltaY, offX, offY;
if ((Th < 6) || (Tw < 6))
{
p.drawRect(AreaR);
p.end();
doku->AppMode = 1;
emit PaintingDone();
return;
}
InsertTable *dia = new InsertTable(this, static_cast<int>(Th / 6), static_cast<int>(Tw / 6));
if (!dia->exec())
{
p.drawRect(AreaR);
p.end();
doku->AppMode = 1;
emit PaintingDone();
delete dia;
return;
}
p.end();
Cols = dia->Cols->value();
Rows = dia->Rows->value();
delete dia;
deltaX = Tw / Cols;
deltaY = Th / Rows;
offX = 0.0;
offY = 0.0;
SelItem.clear();
for (int rc = 0; rc < Rows; ++rc)
{
for (int cc = 0; cc < Cols; ++cc)
{
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;
}
offY += deltaY;
offX = 0.0;
}
}
emit DoGroup();
doku->AppMode = 1;
emit PaintingDone();
emit DocChanged();
update();
return;
}
if (doku->AppMode == 21)
{
doku->AppMode = 1;
2375,37 → 2459,47
if (b->Groups.count() != 0)
pmen->insertItem( tr("Un-group"), this, SIGNAL(DoUnGroup()));
pmen->insertItem( tr("Lock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("Send to Back"), this, SLOT(ToBack()));
pmen->insertItem( tr("Bring to Front"), this, SLOT(ToFront()));
pmen->insertItem( tr("Lower"), this, SLOT(LowerItem()));
pmen->insertItem( tr("Raise"), this, SLOT(RaiseItem()));
if ((!b->isTableItem) && (!b->isSingleSel))
{
pmen->insertItem( tr("Send to Back"), this, SLOT(ToBack()));
pmen->insertItem( tr("Bring to Front"), this, SLOT(ToFront()));
pmen->insertItem( tr("Lower"), this, SLOT(LowerItem()));
pmen->insertItem( tr("Raise"), this, SLOT(RaiseItem()));
}
}
else
pmen->insertItem( tr("Unlock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("Send to Scrapbook"), this, SLOT(sentToScrap()));
if (doku->Layers.count() > 1)
if ((!b->isTableItem) && (!b->isSingleSel))
{
for (uint lam=0; lam < doku->Layers.count(); ++lam)
pmen->insertItem( tr("Send to Scrapbook"), this, SLOT(sentToScrap()));
if (doku->Layers.count() > 1)
{
int lai = pmen3->insertItem(doku->Layers[lam].Name);
if (static_cast<int>(lam) == doku->ActiveLayer)
pmen3->setItemEnabled(lai, 0);
for (uint lam=0; lam < doku->Layers.count(); ++lam)
{
int lai = pmen3->insertItem(doku->Layers[lam].Name);
if (static_cast<int>(lam) == doku->ActiveLayer)
pmen3->setItemEnabled(lai, 0);
}
pmen->insertItem( tr("Send to Layer"), pmen3);
}
pmen->insertItem( tr("Send to Layer"), pmen3);
connect(pmen3, SIGNAL(activated(int)), this, SLOT(sentToLayer(int)));
}
connect(pmen3, SIGNAL(activated(int)), this, SLOT(sentToLayer(int)));
if (((b->PType == 4) || (b->PType == 2) || (b->PType == 6)) && (doku->AppMode != 7))
{
if (b->PType == 4)
{
pmen2->insertItem( tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Outlines"), this, SLOT(TextToPath()));
if (!b->isTableItem)
{
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Outlines"), this, SLOT(TextToPath()));
}
}
if (b->PType == 2)
{
pmen2->insertItem( tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
if (!b->isTableItem)
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
}
if (b->PType == 6)
{
2420,14 → 2514,15
else
pmen->insertItem( tr("Hide Properties..."), ScApp, SLOT(ToggleMpal()));
pmen->insertSeparator();
if (!b->Locked)
if ((!b->Locked) && (!((b->isTableItem) && (b->isSingleSel))))
pmen->insertItem( tr("Cut"), this, SIGNAL(CutItem()));
pmen->insertItem( tr("Copy"), this, SIGNAL(CopyItem()));
if (!((b->isTableItem) && (b->isSingleSel)))
pmen->insertItem( tr("Copy"), this, SIGNAL(CopyItem()));
if ((doku->AppMode == 7) && (ScApp->Buffer2.startsWith("<SCRIBUSTEXT")) && (b->PType == 4))
pmen->insertItem( tr("Paste"), ScApp, SLOT(slotEditPaste()));
if ((b->PType == 2) || ((b->PType == 4) && (b->NextBox == 0) && (b->BackBox == 0)))
pmen->insertItem( tr("Clear Contents"), this, SLOT(ClearItem()));
if ((!b->Locked) && (doku->AppMode != 7))
if ((!b->Locked) && (doku->AppMode != 7) && (!((b->isTableItem) && (b->isSingleSel))))
pmen->insertItem( tr("Delete"), this, SLOT(DeleteItem()));
pmen->exec(QCursor::pos());
delete pmen;
3024,7 → 3119,7
{
newX = static_cast<int>(m->x()/sc);
newY = static_cast<int>(m->y()/sc);
if ((Mpressed) && (m->state() == RightButton) && (!doku->DragP) && (doku->AppMode == 1) && (!b->Locked))
if ((Mpressed) && (m->state() == RightButton) && (!doku->DragP) && (doku->AppMode == 1) && (!b->Locked) && (!((b->isTableItem) && (b->isSingleSel))))
{
if ((abs(Dxp - newX) > 5) || (abs(Dyp - newY) > 5))
{
3501,6 → 3596,8
for (a = 0; a < SelItem.count(); ++a)
{
b = SelItem.at(a);
if ((b->isTableItem) && (b->isSingleSel))
continue;
p.begin(this);
Transform(b, &p);
p.setRasterOp(XorROP);
4430,6 → 4527,9
RecordP.resize(0);
Deselect(false);
break;
case 22:
Deselect(false);
break;
}
}
 
4737,6 → 4837,7
if (SelItem.find(Items.at(ga)) == -1)
SelItem.append(Items.at(ga));
}
Items.at(ga)->isSingleSel = false;
Items.at(ga)->Select = true;
Items.at(ga)->FrameOnly = true;
}
4745,6 → 4846,7
}
else
{
b->isSingleSel = true;
b->Select = true;
b->FrameOnly = true;
b->paintObj();
4923,6 → 5025,76
emit HaveSel(b->PType);
}
 
void Page::AdvanceSel(PageItem *b, int oldPos, int len, int dir, int expandSel, int state)
{
int i;
int isSpace;
if ( dir > 0 )
{
isSpace = b->Ptext.at(oldPos)->ch.at(0).isSpace();
b->CPos = oldPos +1;
for (i=oldPos+1; i < len; i++)
{
if ( b->Ptext.at(i)->ch.at(0).isSpace() == isSpace )
{
if ( expandSel )
b->Ptext.at(i)->cselect = state;
}
else
break;
b->CPos++;
}
}
else if ( oldPos > 0 )
{
isSpace = b->Ptext.at(oldPos-1)->ch.at(0).isSpace();
for (i=oldPos-2; i > 0; i--)
{
if ( b->Ptext.at(i)->ch.at(0).isSpace() == isSpace )
{
if ( expandSel )
b->Ptext.at(i)->cselect = state;
}
else
break;
b->CPos--;
}
}
}
 
// jjsa added on 15-mar-2004
// calculate the end position while ctrl + arrow pressed
 
void Page::setNewPos(PageItem *b, int oldPos, int len, int dir)
{
int i;
int isSpace;
if ( dir > 0 && oldPos < len )
{
isSpace = b->Ptext.at(oldPos)->ch.at(0).isSpace();
b->CPos = oldPos +1;
for (i=oldPos+1; i < len; i++)
{
if ( b->Ptext.at(i)->ch.at(0).isSpace() != isSpace )
break;
b->CPos++;
}
}
else if ( dir < 0 && oldPos > 0 )
{
oldPos--;
isSpace = b->Ptext.at(oldPos)->ch.at(0).isSpace();
for (i=oldPos; i >= 0; i--)
{
if ( b->Ptext.at(i)->ch.at(0).isSpace() != isSpace )
break;
b->CPos--;
}
}
}
 
// jjsa added on 15-mar-2004 expand / decrease selection
 
// jjsa added on 14-mar-2004 text selection with pressed
// shift button and <-, -> cursor keys
// Parameters
4931,99 → 5103,101
// if value is +/-1 work on slection
// if value is +/-2 refresh if text under cursor is selected
 
void Page::ExpandSel(PageItem *b, int inc)
void Page::ExpandSel(PageItem *b, int dir, int oldPos)
{
int pos = b->CPos;
int len = b->Ptext.count();
int rightSel = false; // assume left right and actual char not selected
int leftSel = false;
int actSel = false;
int selMode = false;
if ( inc == -1 || inc == 1 )
selMode = true;
 
if ( dir == -1 || dir == 1 )
selMode = true;
else
{
if ( dir > 0 )
dir = 1;
else
dir = -1;
}
// show for selection of previous, actual and next character
if ( b->HasSel ) /* selection allready present */
{
if (inc > 0 ) // -> key
if (dir > 0 && oldPos < len) // -> key
{
actSel = b->Ptext.at(pos-1)->cselect;
if ( pos < len )
rightSel = b->Ptext.at(pos)->cselect;
if ( pos > 1 )
leftSel = b->Ptext.at(pos-2)->cselect;
if ( oldPos == 0 )
leftSel = false;
else
leftSel = b->Ptext.at(oldPos-1)->cselect;
actSel = b->Ptext.at(oldPos)->cselect;
rightSel = false; // not relevant
}
else // <- key
else if ( dir > 0 && oldPos == len) // -> key
{
actSel = b->Ptext.at(pos)->cselect;
if ( pos > 0 )
leftSel = b->Ptext.at(pos-1)->cselect;
if ( pos+1 < len )
rightSel = b->Ptext.at(pos+1)->cselect;
return;
}
else if ( dir < 0 && oldPos > 0 ) // <- key
{
actSel = b->Ptext.at(oldPos-1)->cselect;
leftSel = false; // not relevant
if ( oldPos < len )
rightSel = b->Ptext.at(oldPos)->cselect;
else
rightSel = false;
}
else if ( dir < 0 && oldPos == 0 ) // <- key
{
return;
}
if ( selMode && ! (leftSel||actSel||rightSel) )
{
// selected outside from concerned range
// deselect all
int i;
for (i=0; i < len; ++i )
{
for (i=0; i < len; i++ )
{
b->Ptext.at(i)->cselect = false;
}
b->HasSel = false;
emit HasNoTextSel();
emit HasNoTextSel();
}
else if ( !selMode )
{
if (leftSel||actSel||rightSel)
Page::RefreshItem(b);
RefreshItem(b);
}
}
if ( !selMode )
return;
// no selection
// no selection
if ( !b->HasSel )
{
if ( inc == -1 ) // <- key
b->Ptext.at(pos)->cselect = true;
else // -> key
b->Ptext.at(pos-1)->cselect = true;
b->HasSel = true;
emit HasTextSel();
leftSel = true;
rightSel = true;
}
else // Selection present
{
if (inc == 1) // -> key
{
if ( leftSel == true )
b->Ptext.at(pos-1)->cselect = true;
else
{
b->Ptext.at(pos-1)->cselect = false;
if ( rightSel == false )
{
b->HasSel = false;
emit HasNoTextSel();
}
}
}
else // <- key
{
if ( rightSel == true )
{
b->Ptext.at(pos)->cselect = true;
}
else
{
b->Ptext.at(pos)->cselect = false;
if ( leftSel == false )
{
b->HasSel = false;
emit HasNoTextSel();
}
}
}
int i;
int start;
int end;
int sel;
if (dir == 1) // -> key
{
start = oldPos;
end = b->CPos;
sel = leftSel == true;
}
Page::RefreshItem(b);
else
{
start = b->CPos;
end = oldPos;
sel = rightSel == true;
}
for ( i = start; i < end; i++)
b->Ptext.at(i)->cselect = sel;
if ( ! sel )
emit HasNoTextSel();
RefreshItem(b);
}
 
bool Page::slotSetCurs(int x, int y)
6775,7 → 6949,10
uint a, old;
if ((Items.count() > 1) && (SelItem.count() != 0))
{
PageItem *b = Items.take(SelItem.at(0)->ItemNr);
PageItem *b = SelItem.at(0);
if ((b->isTableItem) && (b->isSingleSel))
return;
b = Items.take(SelItem.at(0)->ItemNr);
old = SelItem.at(0)->ItemNr;
storeUndoInf(b);
doku->UnData.UnCode = 4;
6802,7 → 6979,10
uint a, old;
if ((Items.count() > 1) && (SelItem.count() != 0))
{
PageItem *b = Items.take(SelItem.at(0)->ItemNr);
PageItem *b = SelItem.at(0);
if ((b->isTableItem) && (b->isSingleSel))
return;
b = Items.take(SelItem.at(0)->ItemNr);
old = SelItem.at(0)->ItemNr;
storeUndoInf(b);
doku->UnData.UnCode = 4;
6829,7 → 7009,10
uint a, old;
if ((Items.count() > 1) && (SelItem.count() != 0) && (SelItem.at(0)->ItemNr>0))
{
PageItem *b = Items.take(SelItem.at(0)->ItemNr);
PageItem *b = SelItem.at(0);
if ((b->isTableItem) && (b->isSingleSel))
return;
b = Items.take(SelItem.at(0)->ItemNr);
old = SelItem.at(0)->ItemNr;
storeUndoInf(b);
doku->UnData.UnCode = 4;
6856,7 → 7039,10
uint a, old;
if ((Items.count() > 1) && (SelItem.count() != 0) && (SelItem.at(0)->ItemNr<Items.count()-2))
{
PageItem *b = Items.take(SelItem.at(0)->ItemNr);
PageItem *b = SelItem.at(0);
if ((b->isTableItem) && (b->isSingleSel))
return;
b = Items.take(SelItem.at(0)->ItemNr);
old = SelItem.at(0)->ItemNr;
storeUndoInf(b);
doku->UnData.UnCode = 4;
6922,6 → 7108,8
for (uint de=0; de<anz; ++de)
{
b = SelItem.at(0);
if ((b->isTableItem) && (b->isSingleSel))
continue;
if (b->PType == 4)
{
if ((b->NextBox != 0) || (b->BackBox != 0))
7188,6 → 7376,11
b->An_Extern = Buffer->An_Extern;
b->AnZiel = Buffer->AnZiel;
b->AnActType = Buffer->AnActType;
b->TopLine = Buffer->TopLine;
b->RightLine = Buffer->RightLine;
b->LeftLine = Buffer->LeftLine;
b->BottomLine = Buffer->BottomLine;
b->isTableItem = Buffer->isTableItem;
if (Buffer->AnName != "")
{
if (!drag)
/trunk/Scribus/scribus/scribus.h
521,6 → 521,8
int OLower;
int OBack;
int OFront;
int ODup;
int OMDup;
bool tipsOn;
bool keyrep;
QPopupMenu *helpMenu;
/trunk/Scribus/scribus/editformats.cpp
175,9 → 175,10
tr("Do you really want do delete this Style?"),
tr("No"),
tr("Yes"),
0, QMessageBox::No, QMessageBox::Yes);
0, 0, 0);
/* PFJ - 29.02.04 - Altered to use the correct QMessageBox value. It was 1 */
if (exit == QMessageBox::Yes)
/* FS - 13.03.04 the 1 is correct in this version of QMessageBox, it returns the Nr of the clicked Button either 0 or 1 or 2 */
if (exit == 1)
{
ListBox1->removeItem(sFnumber);
TempVorl.remove(TempVorl.at(sFnumber));
239,10 → 240,9
 
void StilFormate::UpdateFList()
{
 
ListBox1->clear();
if (TempVorl.count() < 6)
return;
ListBox1->clear();
for (uint x = 5; x < TempVorl.count(); ++x)
ListBox1->insertItem(TempVorl[x].Vname);
if (ListBox1->currentItem() == -1)
/trunk/Scribus/scribus/insertTable.h
0,0 → 1,35
#ifndef INSERTTABLE_H
#define INSERTTABLE_H
 
#include <qvariant.h>
#include <qdialog.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qlayout.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
 
class InsertTable : public QDialog
{
Q_OBJECT
 
public:
InsertTable( QWidget* parent, int maxRow, int maxCol );
~InsertTable() {};
 
QSpinBox* Cols;
QLabel* Text1;
QLabel* Text2;
QSpinBox* Rows;
QPushButton* OKButton;
QPushButton* CancelB;
 
protected:
QVBoxLayout* InsertTableLayout;
QGridLayout* layout2;
QHBoxLayout* layout1;
 
};
 
#endif // INSERTTABLE_H
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: trunk/Scribus/scribus/po/scribus.da_DK.ts
===================================================================
--- trunk/Scribus/scribus/po/scribus.da_DK.ts (revision 231)
+++ trunk/Scribus/scribus/po/scribus.da_DK.ts (revision 232)
@@ -3,54 +3,11 @@
<name>@@translation</name>
<message>
<source>Project-Id-Version: Scribus 1.2</source>
- <translation>Revision-Date: 2004-02-17 14:30:00 CET
+ <translation type="obsolete">Revision-Date: 2004-03-14 14:30:00 CET
Last-Translator: Morten Langlo &lt;mlanglo@post6.tele.dk&gt;</translation>
</message>
</context>
<context>
- <name>@default</name>
- <message>
- <source>&amp;No</source>
- <translation type="obsolete">&amp;Nej</translation>
- </message>
- <message>
- <source>&amp;Yes</source>
- <translation type="obsolete">&amp;Ja</translation>
- </message>
- <message>
- <source>Item</source>
- <translation type="obsolete">Objekt</translation>
- </message>
- <message>
- <source>Left</source>
- <translation type="obsolete">Venstre</translation>
- </message>
- <message>
- <source>Block</source>
- <translation type="obsolete">Blok</translation>
- </message>
- <message>
- <source>Name:</source>
- <translation type="obsolete">Navn:</translation>
- </message>
- <message>
- <source>Right</source>
- <translation type="obsolete">Højre</translation>
- </message>
- <message>
- <source>Center</source>
- <translation type="obsolete">Centrér</translation>
- </message>
- <message>
- <source>Forced</source>
- <translation type="obsolete">Tvunget</translation>
- </message>
- <message>
- <source>Stroke Color:</source>
- <translation type="obsolete">Stregfarve:</translation>
- </message>
-</context>
-<context>
<name>About</name>
<message>
<source>About</source>
@@ -182,6 +139,26 @@
<source>Build-ID:</source>
<translation>Build-ID:</translation>
</message>
+ <message>
+ <source>March</source>
+ <translation type="obsolete">Marts</translation>
+ </message>
+ <message>
+ <source>Homepage and online reference</source>
+ <translation>Hjemmeside og &quot;online&quot; reference</translation>
+ </message>
+ <message>
+ <source>Mailing list</source>
+ <translation>Postliste</translation>
+ </message>
+ <message>
+ <source>Bugs and feature requests</source>
+ <translation>Fejlreportering og anmodning om nye funktioner</translation>
+ </message>
+ <message>
+ <source>Online</source>
+ <translation>Internet</translation>
+ </message>
</context>
<context>
<name>AdvOptions</name>
@@ -305,12 +282,20 @@
</message>
<message>
<source>Align Text Block</source>
- <translation>Lige margener</translation>
+ <translation type="obsolete">Lige margener</translation>
</message>
<message>
<source>Align Text Right</source>
<translation>Justér mod højre</translation>
</message>
+ <message>
+ <source>Align Text Justified</source>
+ <translation>Lige margener</translation>
+ </message>
+ <message>
+ <source>Align Text Forced Justified</source>
+ <translation>Tvunget lige margener</translation>
+ </message>
</context>
<context>
<name>Annot</name>
@@ -452,7 +437,7 @@
</message>
<message>
<source>maximum</source>
- <translation>Maksimum</translation>
+ <translation>maksimum</translation>
</message>
<message>
<source>Formatting</source>
@@ -800,7 +785,7 @@
</message>
<message>
<source>You need at least the Icon for Normal to use Icons for Buttons</source>
- <translation>Du behøver i det mindst normal-ikonet for at bruge ikoner på knapper</translation>
+ <translation>Du behøver i det mindste normal-ikonet for at bruge ikoner på knapper</translation>
</message>
<message>
<source>Selection Change</source>
@@ -1098,7 +1083,7 @@
</message>
<message>
<source>When Icon is too small</source>
- <translation>Når ikon er for lille</translation>
+ <translation type="obsolete">Når ikon er for lille</translation>
</message>
<message>
<source>Caption left to Icon</source>
@@ -1136,12 +1121,16 @@
<source>OK</source>
<translation>OK</translation>
</message>
+ <message>
+ <source>When Icon it too small</source>
+ <translation>Når ikon er for lille</translation>
+ </message>
</context>
<context>
<name>CMSPrefs</name>
<message>
<source>Absolute Colorimetric</source>
- <translation>Absolute Colorimetric</translation>
+ <translation>Absolut kolorimetrisk</translation>
</message>
<message>
<source>Simulate Printer on the Screen</source>
@@ -1181,7 +1170,7 @@
</message>
<message>
<source>Relative Colorimetric</source>
- <translation>Aktiver farvestyring</translation>
+ <translation>Relativ kolorimetrisk</translation>
</message>
<message>
<source>Pictures:</source>
@@ -1193,7 +1182,7 @@
</message>
<message>
<source>Saturation</source>
- <translation>Mætning</translation>
+ <translation>Mætningsgrad</translation>
</message>
<message>
<source>Monitor:</source>
@@ -1290,6 +1279,10 @@
<source>B:</source>
<translation>B:</translation>
</message>
+ <message>
+ <source> %</source>
+ <translation>%</translation>
+ </message>
</context>
<context>
<name>Cpalette</name>
@@ -1329,6 +1322,42 @@
<source> %</source>
<translation>%</translation>
</message>
+ <message>
+ <source>Shade:</source>
+ <translation>Farvemætning:</translation>
+ </message>
+ <message>
+ <source>Edit Line Color Properties</source>
+ <translation>Redigér liniefarve egenskaber</translation>
+ </message>
+ <message>
+ <source>Edit Fill Color Properties</source>
+ <translation>Redigér fyldfarve egenskaber</translation>
+ </message>
+ <message>
+ <source>Saturation of color</source>
+ <translation>Farvemætning</translation>
+ </message>
+ <message>
+ <source>Normal or gradient fill method</source>
+ <translation>Normal eller gradient fyldmetode</translation>
+ </message>
+ <message>
+ <source>Edit the first color of object</source>
+ <translation>Redigér et objekts første farve</translation>
+ </message>
+ <message>
+ <source>Edit the second color of object</source>
+ <translation>Redigér et objekts anden farve</translation>
+ </message>
+ <message>
+ <source>Set the transparency for the color selected</source>
+ <translation>Angiv gennemsigtigheden for den valgte farve</translation>
+ </message>
+ <message>
+ <source>Color of selected object</source>
+ <translation>Det valgte objekts farve</translation>
+ </message>
</context>
<context>
<name>CupsOptions</name>
@@ -1438,7 +1467,7 @@
</message>
<message>
<source>OK to delete Color:</source>
- <translation>OK at slette farve:</translation>
+ <translation type="obsolete">OK at slette farve:</translation>
</message>
<message>
<source>?</source>
@@ -1448,6 +1477,10 @@
<source>OK</source>
<translation>OK</translation>
</message>
+ <message>
+ <source>Delete color:</source>
+ <translation>Slet farve:</translation>
+ </message>
</context>
<context>
<name>DelPages</name>
@@ -1948,6 +1981,42 @@
<source>Remove Unused</source>
<translation>Fjern ubrugte</translation>
</message>
+ <message>
+ <source>Choose a color set to load</source>
+ <translation>Vælg et farvesæt som skal indlæses</translation>
+ </message>
+ <message>
+ <source>Save the current color set</source>
+ <translation>Gem det aktive farvesæt</translation>
+ </message>
+ <message>
+ <source>Remove unused colors from current document&apos;s color set</source>
+ <translation>Fjern ubrugte farver fra det aktive dokuments farvesæt</translation>
+ </message>
+ <message>
+ <source>Append colors to the current set from an existing document</source>
+ <translation>Tilføj farver til det aktive sæt fra et eksisterende dokument</translation>
+ </message>
+ <message>
+ <source>Create a new color within the current set</source>
+ <translation>Lav en ny farve i det aktive sæt</translation>
+ </message>
+ <message>
+ <source>Edit the currently selected color</source>
+ <translation>Redigér den valgte farve</translation>
+ </message>
+ <message>
+ <source>Make a copy of the currently selected color</source>
+ <translation>Lav en kopi af den valgte farve</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected color</source>
+ <translation>Slet den valgte farve</translation>
+ </message>
+ <message>
+ <source>Make the current colorset the default color set</source>
+ <translation>Lav det aktive farvesæt til standard farvesættet</translation>
+ </message>
</context>
<context>
<name>FontPrefs</name>
@@ -2013,7 +2082,7 @@
</message>
<message>
<source>Additional Paths</source>
- <translation>Stier til fonte</translation>
+ <translation>Ekstra stier</translation>
</message>
<message>
<source>Available Fonts</source>
@@ -2079,12 +2148,16 @@
<name>HelpBrowser</name>
<message>
<source>Sorry, no manual available!</source>
- <translation>Desværre, der er ingen manual tilgængelig!</translation>
+ <translation type="obsolete">Desværre, der er ingen manual tilgængelig!</translation>
</message>
<message>
<source></source>
<translation></translation>
</message>
+ <message>
+ <source>Sorry, no manual available! Please see: http://scribus.net for updated docs and downloads.</source>
+ <translation>Desværre er der ingen manual tilgængelig! Se venligst http://scribus.net for den nyeste dokumentation.</translation>
+ </message>
</context>
<context>
<name>HyAsk</name>
@@ -2209,7 +2282,7 @@
</message>
<message>
<source>Global JavaScripts</source>
- <translation>Globale javascripts</translation>
+ <translation type="obsolete">Global javascripts</translation>
</message>
<message>
<source>Add...</source>
@@ -2231,6 +2304,10 @@
<source>Edit...</source>
<translation>Redigér...</translation>
</message>
+ <message>
+ <source>Edit JavaScripts</source>
+ <translation>Redigér JavaScripts</translation>
+ </message>
</context>
<context>
<name>KeyManager</name>
@@ -2341,6 +2418,10 @@
<source></source>
<translation></translation>
</message>
+ <message>
+ <source>Do you want to delete all Objects on this Layer too?</source>
+ <translation>Ønsker du også at slette alle objekter i dette lag?</translation>
+ </message>
</context>
<context>
<name>LineFormate</name>
@@ -2412,6 +2493,10 @@
<source>Warning</source>
<translation>Advarsel</translation>
</message>
+ <message>
+ <source>Close</source>
+ <translation>Luk</translation>
+ </message>
</context>
<context>
<name>Mdup</name>
@@ -2450,6 +2535,14 @@
<source>Hide Console</source>
<translation>Skjul konsol</translation>
</message>
+ <message>
+ <source>Script error</source>
+ <translation>Script-fejl</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>Hvis du kører et officielt script, så reportér det venligst til &lt;a href=&quot;http://bugs.scribus.net&quot;&gt;bugs.scribus.net&lt;/a&gt;.</translation>
+ </message>
</context>
<context>
<name>MergeDoc</name>
@@ -2571,7 +2664,7 @@
</message>
<message>
<source>Move to Back</source>
- <translation>Placér bagerst</translation>
+ <translation type="obsolete">Placér bagerst</translation>
</message>
<message>
<source>Left:</source>
@@ -2599,7 +2692,7 @@
</message>
<message>
<source>Flip horizontal</source>
- <translation>Flip horisontalt</translation>
+ <translation type="obsolete">Flip horisontalt</translation>
</message>
<message>
<source>No Style</source>
@@ -2607,7 +2700,7 @@
</message>
<message>
<source>Flip vertical</source>
- <translation>Flip vertikalt</translation>
+ <translation type="obsolete">Flip vertikalt</translation>
</message>
<message>
<source>Reverse Writing</source>
@@ -2615,7 +2708,7 @@
</message>
<message>
<source>Keep Aspect Ratio</source>
- <translation>Behold bredde/højde forhold</translation>
+ <translation type="obsolete">Behold bredde/højde forhold</translation>
</message>
<message>
<source>Flat Cap</source>
@@ -2655,11 +2748,11 @@
</message>
<message>
<source>Move to Front</source>
- <translation>Placér forrest</translation>
+ <translation type="obsolete">Placér forrest</translation>
</message>
<message>
<source>Lang.:</source>
- <translation>Sprog:</translation>
+ <translation type="obsolete">Sprog:</translation>
</message>
<message>
<source>Edit Shape...</source>
@@ -2749,11 +2842,11 @@
</message>
<message>
<source>Text flows around Box</source>
- <translation>Tekst flyder rundt om boks</translation>
+ <translation type="obsolete">Tekst flyder rundt om boks</translation>
</message>
<message>
<source>Move one Level up</source>
- <translation>Flyt forud</translation>
+ <translation type="obsolete">Flyt forud</translation>
</message>
<message>
<source>Bevel Join</source>
@@ -2761,7 +2854,7 @@
</message>
<message>
<source>Move one Level down</source>
- <translation>Flyt bagud</translation>
+ <translation type="obsolete">Flyt bagud</translation>
</message>
<message>
<source>Miter Join</source>
@@ -2781,7 +2874,7 @@
</message>
<message>
<source>Saturation</source>
- <translation>Mætning</translation>
+ <translation>Mætningsgrad</translation>
</message>
<message>
<source>Kerning:</source>
@@ -2789,11 +2882,11 @@
</message>
<message>
<source>Locks or unlocks the Object</source>
- <translation>Låser eller frigør objektet</translation>
+ <translation type="obsolete">Låser eller frigør objektet</translation>
</message>
<message>
<source>Enables or disables printing of the Object</source>
- <translation>Muliggør eller forhindrer udskrivning af objektet</translation>
+ <translation type="obsolete">Muliggør eller forhindrer udskrivning af objektet</translation>
</message>
<message>
<source>Proportional</source>
@@ -2873,11 +2966,11 @@
</message>
<message>
<source>Relative Colorimetric</source>
- <translation>Relativ Colorimetric</translation>
+ <translation>Relativ kolorimetrisk</translation>
</message>
<message>
<source>Absolute Colorimetric</source>
- <translation>Absolut Colorimetric</translation>
+ <translation>Absolut kolorimetrisk</translation>
</message>
<message>
<source>X1:</source>
@@ -2899,6 +2992,250 @@
<source>OK</source>
<translation>OK</translation>
</message>
+ <message>
+ <source>Shade:</source>
+ <translation>Farvemætning:</translation>
+ </message>
+ <message>
+ <source>Enables or disables resizing of the Object</source>
+ <translation type="obsolete">Muliggør eller forhindrer ændring af objektets størrelse</translation>
+ </message>
+ <message>
+ <source>Text flows around frame</source>
+ <translation>Tekst flyder uden om ramme</translation>
+ </message>
+ <message>
+ <source>Language:</source>
+ <translation>Sprog:</translation>
+ </message>
+ <message>
+ <source>Name of selected object</source>
+ <translation>Det valgte objekts navn</translation>
+ </message>
+ <message>
+ <source>Horizontal position of current basepoint</source>
+ <translation>Horisontale placering af omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Vertical position of current basepoint</source>
+ <translation>Vertikale placering af omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Width</source>
+ <translation>Bredde</translation>
+ </message>
+ <message>
+ <source>Height</source>
+ <translation>Højde</translation>
+ </message>
+ <message>
+ <source>Rotation of object at current basepoint</source>
+ <translation>Rotation af objekt</translation>
+ </message>
+ <message>
+ <source>Point from which measurements or rotation angles are referenced</source>
+ <translation>Referencepunkt for mål og rotation </translation>
+ </message>
+ <message>
+ <source>Select top left for basepoint</source>
+ <translation>Vælg top-venstre som omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Select top right for basepoint</source>
+ <translation>Vælg top-højre som omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Select bottom left for basepoint</source>
+ <translation>Vælg bund-venstre som omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Select bottom right for basepoint</source>
+ <translation>Vælg bund-højre som omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Select center for basepoint</source>
+ <translation>Vælg center som omdrejningspunkt</translation>
+ </message>
+ <message>
+ <source>Flip Horizontal</source>
+ <translation>Flip horisontalt</translation>
+ </message>
+ <message>
+ <source>Flip Vertical</source>
+ <translation>Flip vertikalt</translation>
+ </message>
+ <message>
+ <source>Move one level up</source>
+ <translation>Flyt et niveau op</translation>
+ </message>
+ <message>
+ <source>Move one level down</source>
+ <translation>Flyt et niveau ned</translation>
+ </message>
+ <message>
+ <source>Move to front</source>
+ <translation>Placér forrest</translation>
+ </message>
+ <message>
+ <source>Move to back</source>
+ <translation>Placér bagerst</translation>
+ </message>
+ <message>
+ <source>Lock or unlock the object</source>
+ <translation>Lås eller frigør objektet</translation>
+ </message>
+ <message>
+ <source>Lock or unlock the size of the object</source>
+ <translation>Lås eller frigør objektets størrelse</translation>
+ </message>
+ <message>
+ <source>Enable or disable printing of the object</source>
+ <translation>Muliggør eller forhindre udskrivning af objektet</translation>
+ </message>
+ <message>
+ <source>Enable this to make text in lower objects flow around this frame</source>
+ <translation>et kryds her får tekst i bagvedliggende objekter til at flyde rundt om denne ramme</translation>
+ </message>
+ <message>
+ <source>Enable this to use the imaginary square border around your object, rather than its actual shape</source>
+ <translation>Sæt kryds her for at bruge den imaginære firkant omkring objektet i stedet for den valgte form</translation>
+ </message>
+ <message>
+ <source>Font of selected text or object</source>
+ <translation>Den font der er valgt til den markerede tekst eller objekt</translation>
+ </message>
+ <message>
+ <source>Scaling width of characters</source>
+ <translation>Skalér skrifttegnenes bredde</translation>
+ </message>
+ <message>
+ <source>Color of text stroke</source>
+ <translation>Tekstens stregfarve</translation>
+ </message>
+ <message>
+ <source>Color of text fill</source>
+ <translation>Tekstens fyldfarve</translation>
+ </message>
+ <message>
+ <source>Saturation of color of text stroke</source>
+ <translation>Mætningsgrad af tekstens stregfarve</translation>
+ </message>
+ <message>
+ <source>Saturation of color of text fill</source>
+ <translation>Mætningsgrad af tekstens fyldfarve</translation>
+ </message>
+ <message>
+ <source>Style of current paragraph</source>
+ <translation>Typografi i nuværende afsnit</translation>
+ </message>
+ <message>
+ <source>Language of object</source>
+ <translation>Objektets sprog</translation>
+ </message>
+ <message>
+ <source>Change settings for left or end points</source>
+ <translation>Indstillinger for venstre punkt eller endepunkter</translation>
+ </message>
+ <message>
+ <source>Pattern of line</source>
+ <translation>Liniemønster</translation>
+ </message>
+ <message>
+ <source>Thickness of line</source>
+ <translation>Linietykkelse</translation>
+ </message>
+ <message>
+ <source>Type of line joins</source>
+ <translation>Typen af liniesamlinger</translation>
+ </message>
+ <message>
+ <source>Type of line end</source>
+ <translation>Typen af linie-enden</translation>
+ </message>
+ <message>
+ <source>Line style of current object</source>
+ <translation>Liniestil af valgte objekt</translation>
+ </message>
+ <message>
+ <source>Choose the shape of frame...</source>
+ <translation>Vælg rammens form...</translation>
+ </message>
+ <message>
+ <source>Edit shape of the frame...</source>
+ <translation>Rediger rammens form...</translation>
+ </message>
+ <message>
+ <source>Set radius of corner rounding</source>
+ <translation>Indstil radius for runde hjørner</translation>
+ </message>
+ <message>
+ <source>Number of columns in text frame</source>
+ <translation>Antal kolonner i tekstramme</translation>
+ </message>
+ <message>
+ <source>Distance between columns</source>
+ <translation>Afstand mellem kolonner</translation>
+ </message>
+ <message>
+ <source>Distance of text from top of frame</source>
+ <translation>Afstand af tekst fra rammens top</translation>
+ </message>
+ <message>
+ <source>Distance of text from bottom of frame</source>
+ <translation>Afstand af tekst fra rammens bund</translation>
+ </message>
+ <message>
+ <source>Distance of text from left of frame</source>
+ <translation>Afstand af tekst fra rammens venstre side</translation>
+ </message>
+ <message>
+ <source>Distance of text from right of frame</source>
+ <translation>Afstand af tekst fra rammens højre side</translation>
+ </message>
+ <message>
+ <source>Edit tab settings of text frame...</source>
+ <translation>Rediger tabulatorer for tekstramme...</translation>
+ </message>
+ <message>
+ <source>Allow the image to be a different size to the frame</source>
+ <translation>Tillad billedet at have en anden størrelse en rammen</translation>
+ </message>
+ <message>
+ <source>Horizontal offset of image within frame</source>
+ <translation>Horisontal forskydning af billedet inden i rammen</translation>
+ </message>
+ <message>
+ <source>Vertical offset of image within frame</source>
+ <translation>Vertikal forskydning af billedet inden i rammen</translation>
+ </message>
+ <message>
+ <source>Resize the image horizontally</source>
+ <translation>Ændre billedets størrelse horisontalt</translation>
+ </message>
+ <message>
+ <source>Resize the image vertically</source>
+ <translation>Ændre billedets størrelse vertikalt</translation>
+ </message>
+ <message>
+ <source>Keep the X and Y scaling the same</source>
+ <translation>Behold forholdet mellem X og Y skalering </translation>
+ </message>
+ <message>
+ <source>Make the image fit within the size of the frame</source>
+ <translation>Tilpas billedet til rammen størrelse</translation>
+ </message>
+ <message>
+ <source>Use image proportions rather than those of the frame</source>
+ <translation>Brug billedets højde og bredde i stedet for rammens</translation>
+ </message>
+ <message>
+ <source>Select the source profile of the image</source>
+ <translation>Vælg billedet kildeprofil</translation>
+ </message>
+ <message>
+ <source>Select the rendering intent for the image</source>
+ <translation>Vælg Hensigt med gengivelsen af billedet</translation>
+ </message>
</context>
<context>
<name>MultiLine</name>
@@ -3001,7 +3338,7 @@
</message>
<message>
<source>Exit</source>
- <translation>Afslut</translation>
+ <translation type="obsolete">Afslut</translation>
</message>
<message>
<source>Name:</source>
@@ -3047,6 +3384,10 @@
<source>Normal</source>
<translation>Normal</translation>
</message>
+ <message>
+ <source>Close</source>
+ <translation>Luk</translation>
+ </message>
</context>
<context>
<name>NewDoc</name>
@@ -3522,7 +3863,7 @@
</message>
<message>
<source>Compression</source>
- <translation>Komprimering</translation>
+ <translation type="obsolete">Komprimering</translation>
</message>
<message>
<source>Apply Effect on all Pages</source>
@@ -3566,7 +3907,7 @@
</message>
<message>
<source>PDF/X-3 Output Intent</source>
- <translation>PDF/X-3 udskrift hensigt</translation>
+ <translation>Hensigt med PDF/X-3 udskrift</translation>
</message>
<message>
<source>Security</source>
@@ -3590,7 +3931,7 @@
</message>
<message>
<source>Saturation</source>
- <translation>Mætning</translation>
+ <translation>Mætningsgrad</translation>
</message>
<message>
<source>Vertical</source>
@@ -3602,7 +3943,7 @@
</message>
<message>
<source>Save linked Text Frames as PDF-Articles</source>
- <translation>Gem kædede tekstrammer som PDF-Artikler</translation>
+ <translation>Gem kædede tekstrammer som PDF-artikler</translation>
</message>
<message>
<source>General</source>
@@ -3662,11 +4003,11 @@
</message>
<message>
<source>Relative Colorimetric</source>
- <translation>Relativ Colorimetric</translation>
+ <translation>Relativ kolorimetrisk</translation>
</message>
<message>
<source>Absolute Colorimetric</source>
- <translation>Absolut Colorimetric</translation>
+ <translation>Absolut kolorimetrisk</translation>
</message>
<message>
<source>PDF/X-3</source>
@@ -3676,6 +4017,54 @@
<source>OK</source>
<translation>OK</translation>
</message>
+ <message>
+ <source>Image Settings</source>
+ <translation>Billed-indstillinger</translation>
+ </message>
+ <message>
+ <source>Method:</source>
+ <translation>Metode:</translation>
+ </message>
+ <message>
+ <source>Automatic</source>
+ <translation>Automatisk</translation>
+ </message>
+ <message>
+ <source>JPEG</source>
+ <translation>JPEG</translation>
+ </message>
+ <message>
+ <source>Zip</source>
+ <translation>Zip</translation>
+ </message>
+ <message>
+ <source>None</source>
+ <translation>Ingen</translation>
+ </message>
+ <message>
+ <source>Quality:</source>
+ <translation>Kvalitet:</translation>
+ </message>
+ <message>
+ <source>Maximum</source>
+ <translation>Maksimum</translation>
+ </message>
+ <message>
+ <source>High</source>
+ <translation>Høj</translation>
+ </message>
+ <message>
+ <source>Medium</source>
+ <translation>Medium</translation>
+ </message>
+ <message>
+ <source>Low</source>
+ <translation>Lav</translation>
+ </message>
+ <message>
+ <source>Minimum</source>
+ <translation>minimum</translation>
+ </message>
</context>
<context>
<name>PPreview</name>
@@ -3693,7 +4082,7 @@
</message>
<message>
<source>Anti-alias Graphics</source>
- <translation>Anti-alias Grafik</translation>
+ <translation>Anti-alias grafik</translation>
</message>
<message>
<source>Anti-alias Text</source>
@@ -3860,7 +4249,7 @@
</message>
<message>
<source>Picture</source>
- <translation>Billed</translation>
+ <translation>Billede</translation>
</message>
<message>
<source>Hide Margins</source>
@@ -3880,7 +4269,7 @@
</message>
<message>
<source>Copy Here</source>
- <translation>Kopi her</translation>
+ <translation>Kopiér her</translation>
</message>
<message>
<source>Bring to Front</source>
@@ -3970,6 +4359,34 @@
<source>Polygon</source>
<translation>Polygon</translation>
</message>
+ <message>
+ <source>Update Picture</source>
+ <translation>Opdatér billede</translation>
+ </message>
+ <message>
+ <source>Edit Picture</source>
+ <translation>Redigér billede</translation>
+ </message>
+ <message>
+ <source>Append Text...</source>
+ <translation>Tilføj tekst...</translation>
+ </message>
+ <message>
+ <source>The Program</source>
+ <translation>Programmet</translation>
+ </message>
+ <message>
+ <source>is missing!</source>
+ <translation>mangler!</translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>Advarsel</translation>
+ </message>
+ <message>
+ <source>Copy of</source>
+ <translation>Kopi af</translation>
+ </message>
</context>
<context>
<name>PageSelector</name>
@@ -4119,7 +4536,7 @@
</message>
<message>
<source>Inside:</source>
- <translation>Inderside;</translation>
+ <translation>Inderside:</translation>
</message>
<message>
<source>Size:</source>
@@ -4179,11 +4596,11 @@
</message>
<message>
<source>Vertical Scaling</source>
- <translation>Vertical skalering</translation>
+ <translation>Vertikal skalering</translation>
</message>
<message>
<source>Display Frames</source>
- <translation>Vis rammer</translation>
+ <translation type="obsolete">Vis rammer</translation>
</message>
<message>
<source>Cancel</source>
@@ -4195,7 +4612,7 @@
</message>
<message>
<source>Disp.:</source>
- <translation>Forskydning:</translation>
+ <translation type="obsolete">Forskydning:</translation>
</message>
<message>
<source>Landscape</source>
@@ -4319,7 +4736,7 @@
</message>
<message>
<source>Maximum:</source>
- <translation>Maksimum</translation>
+ <translation>Maksimum:</translation>
</message>
<message>
<source>Bottom:</source>
@@ -4407,7 +4824,7 @@
</message>
<message>
<source>Linestyle:</source>
- <translation>Liniestil:</translation>
+ <translation type="obsolete">Liniestil:</translation>
</message>
<message>
<source>Autosave</source>
@@ -4553,6 +4970,396 @@
<source> p</source>
<translation>p</translation>
</message>
+ <message>
+ <source>External Tools</source>
+ <translation>Eksterne værktøjer</translation>
+ </message>
+ <message>
+ <source>Postscript Interpreter</source>
+ <translation>Postscript-fortolker</translation>
+ </message>
+ <message>
+ <source>Name of executeable:</source>
+ <translation type="obsolete">Navn på program:</translation>
+ </message>
+ <message>
+ <source>Antialias Text</source>
+ <translation>Antialias tekst</translation>
+ </message>
+ <message>
+ <source>Antialias Graphics</source>
+ <translation>Antialias grafik</translation>
+ </message>
+ <message>
+ <source>Image Processing Tool</source>
+ <translation>Program til Billedbehandling</translation>
+ </message>
+ <message>
+ <source>Misc.</source>
+ <translation>Diverse</translation>
+ </message>
+ <message>
+ <source>Displacement:</source>
+ <translation>Forskydning:</translation>
+ </message>
+ <message>
+ <source>Name of executable:</source>
+ <translation>Navn på program:</translation>
+ </message>
+ <message>
+ <source>Printing</source>
+ <translation>Udskrivning</translation>
+ </message>
+ <message>
+ <source>Clip to Page Margins</source>
+ <translation>Afskær ved Margener</translation>
+ </message>
+ <message>
+ <source>Choose the default window decoration and looks.
+Scribus inherits any available KDE or Qt themes</source>
+ <translation>Vælg standard-vinduets udseende.
+Scribus kan bruge alle tilgængelige KDE og Qt temaer</translation>
+ </message>
+ <message>
+ <source>Default font size for the menus and windows</source>
+ <translation>Standard fontstørrelse for menuer og vinduer</translation>
+ </message>
+ <message>
+ <source>Default unit of measurement for document editing</source>
+ <translation>Standard målenhed for dokument-redigering</translation>
+ </message>
+ <message>
+ <source>Number of lines Scribus will scroll for each move of the mouse wheel</source>
+ <translation>Antal linier der rulles for hver bevægelse af muse-hjulet</translation>
+ </message>
+ <message>
+ <source>Radius of the area where Scribus will allow you to grab an objects handles</source>
+ <translation>Størrelsen af det område, hvor du kan tage om et objekts håndtag</translation>
+ </message>
+ <message>
+ <source>Number of recently edited documents to show in the File menu</source>
+ <translation>Antal nyeste dokumenter, som vises i fil-menuen</translation>
+ </message>
+ <message>
+ <source>Change the keyboard shortcuts to your preference</source>
+ <translation>Vælg dine egne tastatur-genveje </translation>
+ </message>
+ <message>
+ <source>Default documents directory</source>
+ <translation>Standard dokumentmappe</translation>
+ </message>
+ <message>
+ <source>Default ICC profiles directory</source>
+ <translation>Standard ICC-profilmappe</translation>
+ </message>
+ <message>
+ <source>Default Scripter scripts directory</source>
+ <translation>Standard Scripter scriptmappe</translation>
+ </message>
+ <message>
+ <source>Default page size, either a standard size or a custom size</source>
+ <translation>Standard sidestørrelse, enten en standard-størrelse eller en bruger-defineret</translation>
+ </message>
+ <message>
+ <source>Default orientation of document pages</source>
+ <translation>Standard retning på dokumentsider</translation>
+ </message>
+ <message>
+ <source>Width of document pages, editable if you have chosen a custom page size</source>
+ <translation>Bredde af dokument-sider, redigérbar hvis du har valgt en brugerdefineret sidestørrelse</translation>
+ </message>
+ <message>
+ <source>Height of document pages, editable if you have chosen a custom page size</source>
+ <translation>Højde af dokument-sider, redigérbar hvis du har valgt en brugerdefineret sidestørrelse</translation>
+ </message>
+ <message>
+ <source>Enable single or spread based layout</source>
+ <translation>Vælg enkelt- eller tosidet layout</translation>
+ </message>
+ <message>
+ <source>Make the first page the left page of a document</source>
+ <translation>Vælg den venstre side af dokumentet som den første side</translation>
+ </message>
+ <message>
+ <source>Distance between the top margin guide and the edge of the page</source>
+ <translation>Afstand mellem top margin-hjælpelinie og sidens kant</translation>
+ </message>
+ <message>
+ <source>Distance between the bottom margin guide and the edge of the page</source>
+ <translation>Afstand mellem bund margin-hjælpelinie og sidens kant</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>Afstand mellem venstre margin-hjælpelinie og sidens kant.
+Hvis der er valgt modstående sider , så kan denne margin bruges til at opnå de rigtige margener for indbinding</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>Når dette er valgt, så gemmer Scribus en backup-kopi af din fil med .bak tilføjet filnavnet
+hver gang det valgte tids-interval udløber</translation>
+ </message>
+ <message>
+ <source>Time period between saving automatically</source>
+ <translation>Tid-interval for den automatiske gemning</translation>
+ </message>
+ <message>
+ <source>Distance between the minor grid lines</source>
+ <translation>Afstand mellem linierne</translation>
+ </message>
+ <message>
+ <source>Distance between the major grid lines</source>
+ <translation>Afstand mellem hovedlinierne</translation>
+ </message>
+ <message>
+ <source>Distance within which an object will snap to your placed guides</source>
+ <translation>Den afstand indenfor hvor et objekt vil placere sig op af en hjælpelinie</translation>
+ </message>
+ <message>
+ <source>Color of the minor grid lines</source>
+ <translation>Farve på linierne</translation>
+ </message>
+ <message>
+ <source>Color of the major grid lines</source>
+ <translation>Farve på hovedlinierne</translation>
+ </message>
+ <message>
+ <source>Color of the guide lines you insert</source>
+ <translation>Farve på de hjælpelinier du indsætter</translation>
+ </message>
+ <message>
+ <source>Place the grid behind your page objects</source>
+ <translation>Placer gitteret bag ved objekterne på siden</translation>
+ </message>
+ <message>
+ <source>Place the grid in front of your page objects</source>
+ <translation>Placer gitteret foran objekterne på siden</translation>
+ </message>
+ <message>
+ <source>Displacement above the baseline of the font on a line</source>
+ <translation>Forskydning over basislinien af fonten på en linie</translation>
+ </message>
+ <message>
+ <source>Relative size of the superscript compared to the normal font</source>
+ <translation>Relativ størrelse af den hævede skrift sammenlignet med den normale font</translation>
+ </message>
+ <message>
+ <source>Displacement below the baseline of the normal font on a line</source>
+ <translation>Forskydning under basislinien af den normale font på en linie</translation>
+ </message>
+ <message>
+ <source>Relative size of the subscript compared to the normal font</source>
+ <translation>Relativ størrelse af den sænkede skrift sammenlignet med den normale font</translation>
+ </message>
+ <message>
+ <source>Relative size of the small caps font compared to the normal font</source>
+ <translation>Relativ størrelse af de små kapitæler sammenlignet med den normale font</translation>
+ </message>
+ <message>
+ <source>Percentage increase over the font size for the line spacing</source>
+ <translation>Procentvis forøgelse over fontstørrelsen af linieafstanden</translation>
+ </message>
+ <message>
+ <source>Text Frame Properties</source>
+ <translation>Tekstramme - egenskaber</translation>
+ </message>
+ <message>
+ <source>Picture Frame Properties</source>
+ <translation>Billedramme - egenskaber</translation>
+ </message>
+ <message>
+ <source>Shape Drawing Properties</source>
+ <translation>Tegn forskellige figurer - egenskaber</translation>
+ </message>
+ <message>
+ <source>Magnification Level Defaults</source>
+ <translation>Forstørrelses niveau - egenskaber</translation>
+ </message>
+ <message>
+ <source>Line Drawing Properties</source>
+ <translation>Tegn linier - egenskaber</translation>
+ </message>
+ <message>
+ <source>Polygon Drawing Properties</source>
+ <translation>Tegn polygoner - egenskaber</translation>
+ </message>
+ <message>
+ <source>Font for new text frames</source>
+ <translation>Font i nye tekstrammer</translation>
+ </message>
+ <message>
+ <source>Size of font for new text frames</source>
+ <translation>Størrelse af font i nye tekstrammer</translation>
+ </message>
+ <message>
+ <source>Color of font</source>
+ <translation>Farve på font</translation>
+ </message>
+ <message>
+ <source>Number of columns in a text frame</source>
+ <translation>Antal kolonner i en tekstramme</translation>
+ </message>
+ <message>
+ <source>Gap between text frame columns</source>
+ <translation>Afstand mellem kolonner i tekstramme</translation>
+ </message>
+ <message>
+ <source>Sample of your font</source>
+ <translation>Prøve af din font</translation>
+ </message>
+ <message>
+ <source>Picture frames allow pictures to scale to any size</source>
+ <translation>Billedramme tillader billeder at blive skaleret til en hvilken som helst størrelse</translation>
+ </message>
+ <message>
+ <source>Horizontal scaling of images</source>
+ <translation>Horisontal skalering af billeder</translation>
+ </message>
+ <message>
+ <source>Vertical scaling of images</source>
+ <translation>Vertikal skalering af billeder</translation>
+ </message>
+ <message>
+ <source>Keep horizontal and vertical scaling the same</source>
+ <translation>Behold den samme skalering både horisontalt og vertikalt</translation>
+ </message>
+ <message>
+ <source>Pictures in picture frames are scaled to the size of the frame</source>
+ <translation>Billeder i billedrammer er skaleret til rammens størrelse</translation>
+ </message>
+ <message>
+ <source>Automatically scaled pictures keep their original proportions</source>
+ <translation>Automatisk skalerede billeder beholder deres originale proportioner</translation>
+ </message>
+ <message>
+ <source>Fill color of picture frames</source>
+ <translation>Billedrammers fyldfarve</translation>
+ </message>
+ <message>
+ <source>Saturation of color of fill</source>
+ <translation>Fyldfarvens mætningsgrad</translation>
+ </message>
+ <message>
+ <source>Line color of shapes</source>
+ <translation>Figurers liniefarve</translation>
+ </message>
+ <message>
+ <source>Saturation of color of lines</source>
+ <translation>Liniefarvens mætningsgrad</translation>
+ </message>
+ <message>
+ <source>Fill color of shapes</source>
+ <translation>Figurers fyldfarve</translation>
+ </message>
+ <message>
+ <source>Line style of shapes</source>
+ <translation>Figurers liniestil</translation>
+ </message>
+ <message>
+ <source>Line width of shapes</source>
+ <translation>Figurers liniebredde</translation>
+ </message>
+ <message>
+ <source>Minimum magnification allowed</source>
+ <translation>Mindste tilladte forstørrelse</translation>
+ </message>
+ <message>
+ <source>Maximum magnification allowed</source>
+ <translation>Største tilladte forstørrelse</translation>
+ </message>
+ <message>
+ <source>Change in magnification for each zoom operation</source>
+ <translation>Ændring af forstørrelsen for hver zoom</translation>
+ </message>
+ <message>
+ <source>Color of lines</source>
+ <translation>Liniernes farve</translation>
+ </message>
+ <message>
+ <source>Saturation of color</source>
+ <translation>Farvemætning</translation>
+ </message>
+ <message>
+ <source>Style of lines</source>
+ <translation>Liniernes stil</translation>
+ </message>
+ <message>
+ <source>Width of lines</source>
+ <translation>Bredde på linie</translation>
+ </message>
+ <message>
+ <source>Number of corners for polygons</source>
+ <translation>Antal hjørner i polygoner</translation>
+ </message>
+ <message>
+ <source>Degrees of rotation for polygons</source>
+ <translation>Rotation i grader for polygoner</translation>
+ </message>
+ <message>
+ <source>Polygons will be convex rather than concave</source>
+ <translation>Polygoner vil være convex snarere end concav</translation>
+ </message>
+ <message>
+ <source>Sample Polygon</source>
+ <translation>Prøve polygon</translation>
+ </message>
+ <message>
+ <source>Change the angles at which lines of the polygon join</source>
+ <translation>Vælg de vinkler, som polygonens linier forbindes med</translation>
+ </message>
+ <message>
+ <source>Choose the size of the preview in the scrapbook palette</source>
+ <translation>Vælg størrelse på ikoner af scrapbogen indhold</translation>
+ </message>
+ <message>
+ <source>Keep the scrapbook contents after closing Scribus</source>
+ <translation>Behold scrapbogens indhold efter lukning af Scribus</translation>
+ </message>
+ <message>
+ <source>When using facing pages, show the two pages side by side</source>
+ <translation>Når modstående sider anvendes, vis da de to sider ved siden af hinanden</translation>
+ </message>
+ <message>
+ <source>Color for paper</source>
+ <translation>Farve på papir</translation>
+ </message>
+ <message>
+ <source>Color for the margin lines</source>
+ <translation>Farve på marginlinier</translation>
+ </message>
+ <message>
+ <source>Mask the area outside the margins in the margin color</source>
+ <translation>Vis området uden for marginer i marginfarve</translation>
+ </message>
+ <message>
+ <source>Enable transparency features within PDF 1.4 export</source>
+ <translation>Muliggør transparent egenskaber i PDF 1.4 eksport</translation>
+ </message>
+ <message>
+ <source>Set the default zoom level</source>
+ <translation>Vælg standard zoom-niveau</translation>
+ </message>
+ <message>
+ <source>Filesystem location for the Ghostscript interpreter</source>
+ <translation>Placering af Ghostscript-fortolkeren i filsystemet</translation>
+ </message>
+ <message>
+ <source>Antialias text for EPS and PDF onscreen rendering</source>
+ <translation>Antialias tekst for EPS og PDF skærmvisning</translation>
+ </message>
+ <message>
+ <source>Antialias graphics for EPS and PDF onscreen rendering</source>
+ <translation>Antialias grafik for EPS og PDF skærmvisning</translation>
+ </message>
+ <message>
+ <source>Filesystem location for editing graphics</source>
+ <translation>Placering af grafik-programmet i filsystemet</translation>
+ </message>
+ <message>
+ <source>Do not show objects outside the margins on the printed page or exported file</source>
+ <translation>Vis ikke objekter udenfor marginer på den udskrevne side eller i den eksporterede fil</translation>
+ </message>
</context>
<context>
<name>QColorDialog</name>
@@ -5041,6 +5848,10 @@
<source>p</source>
<translation>p</translation>
</message>
+ <message>
+ <source>Scribus Scripts</source>
+ <translation>Scribus scripts</translation>
+ </message>
</context>
<context>
<name>QTextEdit</name>
@@ -5452,7 +6263,7 @@
</message>
<message>
<source>Opens a Document</source>
- <translation>Åbn et dokument</translation>
+ <translation type="obsolete">Åbn et dokument</translation>
</message>
<message>
<source>Tabulators...</source>
@@ -5492,7 +6303,7 @@
</message>
<message>
<source>Prints the Current Document</source>
- <translation>Udskriv det aktive dokument</translation>
+ <translation type="obsolete">Udskriv det aktive dokument</translation>
</message>
<message>
<source>Split Polygons</source>
@@ -5656,7 +6467,7 @@
</message>
<message>
<source>Closes the Current Document</source>
- <translation>Luk det aktive dokument</translation>
+ <translation type="obsolete">Luk det aktive dokument</translation>
</message>
<message>
<source>Tool-Tips</source>
@@ -5840,7 +6651,7 @@
</message>
<message>
<source>Creates a new Document</source>
- <translation>Nyt dokument</translation>
+ <translation type="obsolete">Nyt dokument</translation>
</message>
<message>
<source>Spanish</source>
@@ -5920,7 +6731,7 @@
</message>
<message>
<source>Saves the Current Document</source>
- <translation>Gem det aktive dokument</translation>
+ <translation type="obsolete">Gem det aktive dokument</translation>
</message>
<message>
<source>Portuguese</source>
@@ -6000,7 +6811,7 @@
</message>
<message>
<source>Saves the Current Document as PDF</source>
- <translation>Gem det aktive dokument som PDF</translation>
+ <translation type="obsolete">Gem det aktive dokument som PDF</translation>
</message>
<message>
<source>Fatal Error</source>
@@ -6084,13 +6895,34 @@
<source>OK</source>
<translation>OK</translation>
</message>
-</context>
-<context>
- <name>ScribusDoc</name>
<message>
- <source>Document</source>
- <translation type="obsolete">Dokument</translation>
+ <source>Create a new Document</source>
+ <translation>Lav et nyt dokument</translation>
</message>
+ <message>
+ <source>Open a Document</source>
+ <translation>Åbn et dokument</translation>
+ </message>
+ <message>
+ <source>Save the current Document</source>
+ <translation>Gem det aktive dokument</translation>
+ </message>
+ <message>
+ <source>Close the current Document</source>
+ <translation>Luk det aktive dokument</translation>
+ </message>
+ <message>
+ <source>Print the current Document</source>
+ <translation>Udskriv det aktive dokument</translation>
+ </message>
+ <message>
+ <source>Save the current Document as PDF</source>
+ <translation>Gem det aktive dokument som PDF</translation>
+ </message>
+ <message>
+ <source>Append Text...</source>
+ <translation>Tilføj tekst...</translation>
+ </message>
</context>
<context>
<name>ScribusView</name>
@@ -6351,7 +7183,7 @@
</message>
<message>
<source>Shade:</source>
- <translation>Skygge:</translation>
+ <translation>Farvemætning:</translation>
</message>
<message>
<source>Other...</source>
@@ -6435,6 +7267,10 @@
<source>Warning</source>
<translation>Advarsel</translation>
</message>
+ <message>
+ <source>Close</source>
+ <translation>Luk</translation>
+ </message>
</context>
<context>
<name>StoryEditor</name>
@@ -6578,6 +7414,10 @@
<source>Search/Replace...</source>
<translation>Søg/Erstat...</translation>
</message>
+ <message>
+ <source>Do you want save your changes?</source>
+ <translation>Ønsker du at gemme dine ændringer?</translation>
+ </message>
</context>
<context>
<name>StyleSelect</name>
@@ -6591,7 +7431,7 @@
</message>
<message>
<source>Strikeout</source>
- <translation>Gennemstreget</translation>
+ <translation type="obsolete">Gennemstreget</translation>
</message>
<message>
<source>Subscript</source>
@@ -6605,6 +7445,10 @@
<source>Underline</source>
<translation>Understreget</translation>
</message>
+ <message>
+ <source>Strike Out</source>
+ <translation>Gennemstreget</translation>
+ </message>
</context>
<context>
<name>TabManager</name>
@@ -6728,11 +7572,11 @@
</message>
<message>
<source>Edit the Text with the Story Editor</source>
- <translation>Rediger tekst i den indbyggede tekstbehandler</translation>
+ <translation type="obsolete">Rediger tekst i den indbyggede tekstbehandler</translation>
</message>
<message>
<source>Zooms in or out</source>
- <translation>Zoom ind eller ud</translation>
+ <translation type="obsolete">Zoom ind eller ud</translation>
</message>
<message>
<source>Insert Lines</source>
@@ -6748,7 +7592,7 @@
</message>
<message>
<source>Draws various Shapes</source>
- <translation>Indsæt forskellige figurer</translation>
+ <translation type="obsolete">Indsæt forskellige figurer</translation>
</message>
<message>
<source>Edit Contents of Frame</source>
@@ -6786,6 +7630,18 @@
<source>Insert Text Frame</source>
<translation>Indsæt tekstramme</translation>
</message>
+ <message>
+ <source>Zoom in or out</source>
+ <translation>Zoom ind eller ud</translation>
+ </message>
+ <message>
+ <source>Edit the text with the Story Editor</source>
+ <translation>Redigér teksten med den indbyggede tekstbehandler</translation>
+ </message>
+ <message>
+ <source>Draw various Shapes</source>
+ <translation>Tegn forskellige figurer</translation>
+ </message>
</context>
<context>
<name>WerkToolBP</name>
Index: trunk/Scribus/scribus/scribusXml.cpp
===================================================================
--- trunk/Scribus/scribus/scribusXml.cpp (revision 231)
+++ trunk/Scribus/scribus/scribusXml.cpp (revision 232)
@@ -791,6 +791,11 @@
OB.LockRes = static_cast<bool>(QStoInt(obj.attribute("LOCKR","0")));
OB.Reverse = static_cast<bool>(QStoInt(obj.attribute("REVERS","0")));
OB.InvPict = static_cast<bool>(QStoInt(obj.attribute("INVERS","0")));
+ OB.isTableItem = static_cast<bool>(QStoInt(obj.attribute("isTableItem","0")));
+ OB.TopLine = static_cast<bool>(QStoInt(obj.attribute("TopLine","0")));
+ OB.LeftLine = static_cast<bool>(QStoInt(obj.attribute("LeftLine","0")));
+ OB.RightLine = static_cast<bool>(QStoInt(obj.attribute("RightLine","0")));
+ OB.BottomLine = static_cast<bool>(QStoInt(obj.attribute("BottomLine","0")));
OB.LayerNr = QStoInt(obj.attribute("LAYER","0"));
OB.Language = obj.attribute("LANGUAGE", doc->Language);
OB.Transparency = QStodouble(obj.attribute("TransValue","0.0"));
@@ -1443,6 +1448,11 @@
OB.LockRes = static_cast<bool>(QStoInt(obj.attribute("LOCKR","0")));
OB.Reverse = static_cast<bool>(QStoInt(obj.attribute("REVERS","0")));
OB.InvPict = static_cast<bool>(QStoInt(obj.attribute("INVERS","0")));
+ OB.isTableItem = static_cast<bool>(QStoInt(obj.attribute("isTableItem","0")));
+ OB.TopLine = static_cast<bool>(QStoInt(obj.attribute("TopLine","0")));
+ OB.LeftLine = static_cast<bool>(QStoInt(obj.attribute("LeftLine","0")));
+ OB.RightLine = static_cast<bool>(QStoInt(obj.attribute("RightLine","0")));
+ OB.BottomLine = static_cast<bool>(QStoInt(obj.attribute("BottomLine","0")));
OB.LayerNr = QStoInt(obj.attribute("LAYER","0"));
OB.Language = obj.attribute("LANGUAGE", doc->Language);
OB.Transparency = QStodouble(obj.attribute("TransValue","0.0"));
@@ -1998,6 +2008,11 @@
OB.LockRes = static_cast<bool>(QStoInt(pg.attribute("LOCKR","0")));
OB.Reverse = static_cast<bool>(QStoInt(pg.attribute("REVERS","0")));
OB.InvPict = static_cast<bool>(QStoInt(pg.attribute("INVERS","0")));
+ OB.isTableItem = static_cast<bool>(QStoInt(pg.attribute("isTableItem","0")));
+ OB.TopLine = static_cast<bool>(QStoInt(pg.attribute("TopLine","0")));
+ OB.LeftLine = static_cast<bool>(QStoInt(pg.attribute("LeftLine","0")));
+ OB.RightLine = static_cast<bool>(QStoInt(pg.attribute("RightLine","0")));
+ OB.BottomLine = static_cast<bool>(QStoInt(pg.attribute("BottomLine","0")));
OB.Language = pg.attribute("LANGUAGE", doc->Language);
OB.Transparency = QStodouble(pg.attribute("TransValue","0.0"));
if (pg.hasAttribute("TransValueS"))
@@ -2310,6 +2325,11 @@
ob.setAttribute("INVERS", item->InvPict ? 1 : 0);
ob.setAttribute("TransValue", item->Transparency);
ob.setAttribute("TransValueS", item->TranspStroke);
+ ob.setAttribute("isTableItem", static_cast<int>(item->isTableItem));
+ ob.setAttribute("TopLine", static_cast<int>(item->TopLine));
+ ob.setAttribute("LeftLine", static_cast<int>(item->LeftLine));
+ ob.setAttribute("RightLine", static_cast<int>(item->RightLine));
+ ob.setAttribute("BottomLine", static_cast<int>(item->BottomLine));
for(uint k=0;k<item->Ptext.count();++k)
{
QDomElement it=docu.createElement("ITEXT");
@@ -2666,6 +2686,11 @@
ob.setAttribute("INVERS", item->InvPict ? 1 : 0);
ob.setAttribute("TransValue", item->Transparency);
ob.setAttribute("TransValueS", item->TranspStroke);
+ ob.setAttribute("isTableItem", static_cast<int>(item->isTableItem));
+ ob.setAttribute("TopLine", static_cast<int>(item->TopLine));
+ ob.setAttribute("LeftLine", static_cast<int>(item->LeftLine));
+ ob.setAttribute("RightLine", static_cast<int>(item->RightLine));
+ ob.setAttribute("BottomLine", static_cast<int>(item->BottomLine));
for(uint k=0;k<item->Ptext.count();++k)
{
QDomElement it=docu.createElement("ITEXT");
Index: trunk/Scribus/scribus/qm/scribus.da.qm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream