Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 139 → Rev 140

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 1.1.4
01.01.2004 Added Right, Full Stop and Comma Tabulators.
Default Tabs are now every 36 pts == 1.27 mm == 0.5 in.
Added a Dialog to manage the Tabulator Settings.
Textstyles have now also a Tabulator Property.
 
31.12.2003 Fixed Rounding Errors in the Properties Palette.
Added Settings for Number of Columns and the ColumnGap to the Preferences.
First Support for Tabs, currently there is a Tab set every 100 pts in a Textframe.
/trunk/Scribus/scribus/edit1format.h
47,6 → 47,7
FontCombo* FontC;
MSpinBox* SizeC;
QLabel* TextF2;
QPushButton* TabsButton;
QPushButton* Cancel;
QPushButton* OkButton;
struct StVorL *werte;
54,10 → 55,12
QString OldName;
bool IsNew;
double AutoVal;
int DocsEin;
 
private slots:
void Verlassen();
void FontChange(int val);
void ManageTabs();
 
protected:
QHBoxLayout* Layout17;
/trunk/Scribus/scribus/mpalette.cpp
7,6 → 7,7
#include "query.h"
#include "scribusview.h"
#include "autoform.h"
#include "tabmanager.h"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
extern ProfilesL InputProfiles;
381,6 → 382,11
DRight->setMaxValue( 3000 );
DRight->setMinValue( 0 );
DistanceLayout->addWidget( DRight, 5, 1 );
TabsButton = new QPushButton( Distance, "Tabul" );
TabsButton->setText( tr( "Tabulators..." ) );
TabsButton->setDefault( false );
TabsButton->setAutoDefault( false );
DistanceLayout->addMultiCellWidget( TabsButton, 6, 6, 0, 1 );
pageLayout_2a->addWidget(Distance);
TabStack2->addWidget( page_2a, 0 );
 
925,6 → 931,7
connect(MonitorI, SIGNAL(activated(int)), this, SLOT(ChIntent()));
connect(NameEdit, SIGNAL(Leaved()), this, SLOT(NewName()));
connect(LangCombo, SIGNAL(activated(int)), this, SLOT(NewLanguage()));
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
HaveItem = false;
Xpos->setValue(0);
Ypos->setValue(0);
2898,3 → 2905,18
emit DocChanged();
}
}
 
void Mpalette::ManageTabs()
{
if ((HaveDoc) && (HaveItem))
{
TabManager *dia = new TabManager(this, doc->Einheit, CurItem->TabValues);
if (dia->exec())
{
CurItem->TabValues = dia->tmpTab;
doc->ActPage->RefreshItem(CurItem);
emit DocChanged();
}
delete dia;
}
}
/trunk/Scribus/scribus/edit1format.cpp
1,5 → 1,6
#include "edit1format.h"
#include "edit1format.moc"
#include "tabmanager.h"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
#include <qmessagebox.h>
10,6 → 11,7
setCaption( tr( "Edit Style" ) );
setIcon(loadIcon("AppIcon.png"));
AutoVal = au;
DocsEin = dEin;
EditStyleLayout = new QGridLayout( this );
EditStyleLayout->setSpacing( 6 );
EditStyleLayout->setMargin( 10 );
93,6 → 95,9
FirstLin->setMinValue( -3000 );
FirstLin->setLineStep(10);
GroupBox10Layout->addWidget( FirstLin, 0, 1 );
TabsButton = new QPushButton( GroupBox10, "Tabul" );
TabsButton->setText( tr( "Tabulators..." ) );
GroupBox10Layout->addMultiCellWidget( TabsButton, 2, 2, 0, 1 );
EditStyleLayout->addWidget( GroupBox10, 3, 1 );
 
ButtonGroup1 = new QButtonGroup( this, "ButtonGroup1" );
193,7 → 198,6
TextLabel1_2_3->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_3->setText( tr( "Below:" ) );
AbstandVLayout->addWidget( TextLabel1_2_3, 1, 0 );
// EditStyleLayout->addWidget( AbstandV, 3, 1 );
EditStyleLayout->addWidget( AbstandV, 2, 1 );
 
Layout17 = new QHBoxLayout;
218,6 → 222,7
// signals and slots connections
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OkButton, SIGNAL( clicked() ), this, SLOT( Verlassen() ) );
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect(SizeC, SIGNAL(valueChanged(int)), this, SLOT(FontChange(int)));
LeftInd->setDecimals(10);
FirstLin->setDecimals(10);
253,6 → 258,14
LeftInd->setValue(qRound(vor->Indent * UmReFaktor * LeftInd->Decimals));
}
 
void EditStyle::ManageTabs()
{
TabManager *dia = new TabManager(this, DocsEin, werte->TabValues);
if (dia->exec())
werte->TabValues = dia->tmpTab;
delete dia;
}
 
void EditStyle::FontChange(int val)
{
LineSpVal->setValue(static_cast<int>((val * AutoVal / 100) + val));
/trunk/Scribus/scribus/tabmanager.h
0,0 → 1,66
/****************************************************************************
** Form interface generated from reading ui file 'tabmanager.ui'
**
** Created: Don Jan 1 12:57:07 2004
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
 
#ifndef TABMANAGER_H
#define TABMANAGER_H
 
#include <qvariant.h>
#include <qdialog.h>
#include <qvaluelist.h>
 
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QComboBox;
class QLabel;
class QListBox;
class QListBoxItem;
class QPushButton;
class MSpinBox;
 
class TabManager : public QDialog
{
Q_OBJECT
 
public:
TabManager( QWidget* parent, int dEin, QValueList<double> inTab);
~TabManager() {};
void UnitChange(int dEin);
void UpdateTabL();
 
QListBox* TabList;
QLabel* Text1;
QLabel* Text2;
QComboBox* Align;
MSpinBox* Position;
QPushButton* OKButton;
QPushButton* CancelButton;
QPushButton* DelButton;
QPushButton* AddButton;
QValueList<double> tmpTab;
int selTab;
int Einheit;
 
public slots:
void DelTab();
void AddTab();
void ChangeType();
void selIte(QListBoxItem *c);
void PValChange();
 
protected:
QVBoxLayout* TabManagerLayout;
QHBoxLayout* layout9;
QVBoxLayout* layout8;
QGridLayout* layout7;
QGridLayout* layout10;
 
};
 
#endif // TABMANAGER_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/pageitem.cpp
===================================================================
--- trunk/Scribus/scribus/pageitem.cpp (revision 139)
+++ trunk/Scribus/scribus/pageitem.cpp (revision 140)
@@ -230,6 +230,11 @@
QPtrList<ZZ> LiList;
bool outs = false;
bool fBorder = false;
+ bool RTab = false;
+ uint StartRT, StartRT2;
+ int TabCode = 0;
+ QValueList<double> tTabValues;
+ tTabValues.clear();
if (!Doc->DoDrawing)
{
Redrawn = true;
@@ -568,10 +573,10 @@
if ((Doc->AppMode == 7) && (Dirty))
Dirty = false;
CurrCol = 0;
- ColWidth = (Width - (ColGap * (Cols - 1)) - Extra - RExtra) / Cols;
- ColBound = FPoint((ColWidth + ColGap) * CurrCol, ColWidth * (CurrCol+1) + ColGap * CurrCol + Extra+lineCorr);
+ ColWidth = (Width - (ColGap * (Cols - 1)) - Extra - RExtra - 2*lineCorr) / Cols;
+ ColBound = FPoint((ColWidth + ColGap) * CurrCol+Extra + lineCorr, ColWidth * (CurrCol+1) + ColGap * CurrCol + Extra+lineCorr);
ColBound = FPoint(ColBound.x(), ColBound.y()+RExtra+lineCorr);
- CurX = Extra + lineCorr + ColBound.x();
+ CurX = ColBound.x();
CurY = Doc->Vorlagen[0].LineSpa+TExtra+lineCorr;
LiList.clear();
BuPos = 0;
@@ -675,7 +680,7 @@
CurrCol++;
if (CurrCol < Cols)
{
- ColWidth = (Width - (ColGap * (Cols - 1)) - Extra - RExtra) / Cols;
+ ColWidth = (Width - (ColGap * (Cols - 1)) - Extra - RExtra - 2*lineCorr) / Cols;
ColBound = FPoint((ColWidth + ColGap) * CurrCol + Extra+lineCorr, ColWidth * (CurrCol+1) + ColGap * CurrCol + Extra+lineCorr);
CurY = Doc->Vorlagen[0].LineSpa+TExtra+lineCorr;
CurX = ColBound.x();
@@ -704,30 +709,66 @@
CurX += Extra+lineCorr;
fBorder = false;
}
- hl->xp = CurX+hl->cextra;
- hl->yp = CurY;
- CurX += wide+hl->cextra;
+ if ((hl->ch == ".") && (TabCode == 2))
+ {
+ RTab = false;
+ TabCode = 0;
+ }
+ if ((hl->ch == ",") && (TabCode == 3))
+ {
+ RTab = false;
+ TabCode = 0;
+ }
if (hl->ch == QChar(9))
{
- if (TabValues.isEmpty())
- CurX = ceil(CurX / 100.0) * 100.0;
+ wide = 1;
+ if (RTab)
+ RTab = false;
else
{
- double tCurX = CurX;
- double oCurX = CurX;
- for (int yg = static_cast<int>(TabValues.count()-1); yg > -1; yg--)
+ if (hl->cab < 5)
+ tTabValues = TabValues;
+ else
+ tTabValues = Doc->Vorlagen[hl->cab].TabValues;
+ if (tTabValues.isEmpty())
{
- if (CurX < TabValues[yg])
+ CurX = ColBound.x() + ceil((CurX-ColBound.x()) / 36.0) * 36.0;
+ TabCode = 0;
+ RTab = false;
+ }
+ else
+ {
+ double tCurX = CurX - ColBound.x();
+ double oCurX = CurX - ColBound.x();
+ for (int yg = static_cast<int>(tTabValues.count()-1); yg > 0; yg -= 2)
{
- tCurX = TabValues[yg];
+ if (oCurX < tTabValues[yg])
+ {
+ tCurX = tTabValues[yg];
+ TabCode = static_cast<int>(tTabValues[yg-1]);
+ }
}
+ if (TabCode == 0)
+ RTab = false;
+ else
+ RTab = true;
+ if (tCurX == oCurX)
+ CurX = ColBound.x() + ceil((CurX-ColBound.x()) / 36.0) * 36.0;
+ else
+ CurX = ColBound.x() + tCurX;
}
- if (tCurX == oCurX)
- CurX = ceil(CurX / 100.0) * 100.0;
- else
- CurX = tCurX;
+ StartRT = LiList.count();
+ StartRT2 = a;
}
}
+ hl->yp = CurY;
+ if (!RTab)
+ {
+ hl->xp = CurX+hl->cextra;
+ CurX += wide+hl->cextra;
+ }
+ else
+ hl->xp = CurX;
pt1 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY-asce));
if ((!cl.contains(pf.xForm(pt1))) || (!cl.contains(pf.xForm(pt2))) || (CurX+RExtra+lineCorr > ColBound.y()))
@@ -763,9 +804,21 @@
LastSP = BuPos;
}
LiList.append(Zli);
+ if (RTab)
+ {
+ uint rtx2 = 0;
+ for (uint rtx = StartRT; rtx < LiList.count(); ++rtx)
+ {
+ LiList.at(rtx)->xco = QMAX(LiList.at(rtx)->xco-(wide+hl->cextra), 0.0);
+ Ptext.at(StartRT2+rtx2)->xp = QMAX(Ptext.at(StartRT2+rtx2)->xp-(wide+hl->cextra), 0.0);
+ rtx2++;
+ }
+ }
BuPos++;
if ((hl->ch == QChar(13)) || (outs))
{
+ RTab = false;
+ TabCode = 0;
if (outs)
{
if (LastSP != 0) // Hier koenen auch andere Trennungen eingebaut werden
@@ -935,18 +988,13 @@
pt1 = QPoint(static_cast<int>(CurX), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(CurX), static_cast<int>(CurY-asce));
}
- if (CurrCol == 0)
- CurX += Extra+lineCorr;
- else if (fromOut)
+ if (fromOut)
CurX--;
}
else
{
CurY += Doc->Vorlagen[0].LineSpa;
- if (CurrCol == 0)
- CurX = Extra+lineCorr+ColBound.x();
- else
- CurX = ColBound.x();
+ CurX = ColBound.x();
if (hl->ch != QChar(13))
CurX += Doc->Vorlagen[hl->cab].Indent;
else
Index: trunk/Scribus/scribus/scribusdoc.h
===================================================================
--- trunk/Scribus/scribus/scribusdoc.h (revision 139)
+++ trunk/Scribus/scribus/scribusdoc.h (revision 140)
@@ -198,6 +198,7 @@
double Anach;
QString Font;
int FontSize;
+ QValueList<double> TabValues;
};
struct CMSset {
/trunk/Scribus/scribus/libabout/about.cpp
38,7 → 38,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(31).arg("December").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(1).arg("January").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 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 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 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 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 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
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 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
 
install-data-local:
$(mkinstalldirs) $(prefix)/include/scribus/
/trunk/Scribus/scribus/scribus.cpp
79,6 → 79,7
#include "missing.h"
#include "story.h"
#include "autoform.h"
#include "tabmanager.h"
 
#include <unistd.h>
 
2033,6 → 2034,7
StilMenu->insertItem( tr("Font"), FontMenu);
StilMenu->insertItem( tr("Size"), SizeTMenu);
StilMenu->insertItem( tr("Style"), TypeStyleMenu);
StilMenu->insertItem( tr("Tabulators..."), this, SLOT(EditTabs()));
StilMenu->insertItem( tr("Alignment"), AliMenu);
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Shade"), ShadeMenu);
7082,6 → 7084,25
}
}
 
void ScribusApp::EditTabs()
{
if (HaveDoc)
{
if (doc->ActPage->SelItem.count() != 0)
{
PageItem *b = doc->ActPage->SelItem.at(0);
TabManager *dia = new TabManager(this, doc->Einheit, b->TabValues);
if (dia->exec())
{
b->TabValues = dia->tmpTab;
doc->ActPage->RefreshItem(b);
slotDocCh();
}
delete dia;
}
}
}
 
void ScribusApp::slotTest()
{
}
/trunk/Scribus/scribus/scribus.h
387,6 → 387,7
void ToggleGuides();
void ToggleUGuides();
void HaveRaster(bool art);
void EditTabs();
 
signals:
void TextISize(int);
/trunk/Scribus/scribus/scribusdoc.cpp
70,6 → 70,7
vg.Anach = 0;
vg.Font = "";
vg.FontSize = Dsize;
vg.TabValues.clear();
Vorlagen.append(vg);
vg.Vname = "Center Internal";
vg.Ausri = 1;
/trunk/Scribus/scribus/editformats.cpp
94,6 → 94,7
sty.Anach = TempVorl[sFnumber].Anach;
sty.Font = TempVorl[sFnumber].Font;
sty.FontSize = TempVorl[sFnumber].FontSize;
sty.TabValues = TempVorl[sFnumber].TabValues;
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine), Docu->Einheit);
115,6 → 116,7
sty.Anach = 0;
sty.Font = Docu->Dfont;
sty.FontSize = Docu->Dsize;
sty.TabValues.clear();
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine), Docu->Einheit);
185,6 → 187,7
sty.Anach = ss->Vorlagen[xx].Anach;
sty.Font = ss->Vorlagen[xx].Font;
sty.FontSize = ss->Vorlagen[xx].FontSize;
sty.TabValues = ss->Vorlagen[xx].TabValues;
TempVorl.append(sty);
}
}
/trunk/Scribus/scribus/tabmanager.cpp
0,0 → 1,246
/****************************************************************************
** Form implementation generated from reading ui file 'tabmanager.ui'
**
** Created: Don Jan 1 12:57:21 2004
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
 
#include "tabmanager.h"
#include "tabmanager.moc"
#include <qvariant.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
#include "mspinbox.h"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
 
TabManager::TabManager( QWidget* parent, int dEin, QValueList<double> inTab) : QDialog( parent, "TabManager", true, 0 )
{
setCaption( tr( "Manage Tabulators" ) );
setIcon(loadIcon("AppIcon.png"));
tmpTab = inTab;
selTab = -1;
TabManagerLayout = new QVBoxLayout( this, 5, 5, "TabManagerLayout");
layout9 = new QHBoxLayout( 0, 0, 5, "layout9");
 
TabList = new QListBox( this, "TabList" );
layout9->addWidget( TabList );
layout8 = new QVBoxLayout( 0, 0, 5, "layout8");
layout7 = new QGridLayout( 0, 1, 1, 0, 5, "layout7");
 
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Position:" ) );
layout7->addWidget( Text1, 0, 0 );
 
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Alignment:" ) );
layout7->addWidget( Text2, 1, 0 );
 
Align = new QComboBox( true, this, "Align" );
Align->clear();
Align->insertItem( tr( "Left" ) );
Align->insertItem( tr( "Right" ) );
Align->insertItem( tr( "Full Stop" ) );
Align->insertItem( tr( "Comma" ) );
Align->setEditable(false);
Align->setEnabled(false);
layout7->addWidget( Align, 1, 1 );
 
Position = new MSpinBox( this, 1 );
Position->setSuffix( tr( " pt" ) );
Position->setMaxValue( 3000000 );
Position->setMinValue( 0 );
Position->setValue(0);
Position->setEnabled(false);
 
layout7->addWidget( Position, 0, 1 );
layout8->addLayout( layout7 );
QSpacerItem* spacer = new QSpacerItem( 20, 41, QSizePolicy::Minimum, QSizePolicy::Expanding );
layout8->addItem( spacer );
layout9->addLayout( layout8 );
TabManagerLayout->addLayout( layout9 );
 
layout10 = new QGridLayout( 0, 1, 1, 0, 5, "layout10");
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton->setDefault( TRUE );
layout10->addWidget( OKButton, 1, 0 );
 
CancelButton = new QPushButton( this, "CancelButton" );
CancelButton->setText( tr( "Cancel" ) );
layout10->addWidget( CancelButton, 1, 1 );
 
DelButton = new QPushButton( this, "DelButton" );
DelButton->setText( tr( "Remove" ) );
DelButton->setEnabled(false);
layout10->addWidget( DelButton, 0, 1 );
 
AddButton = new QPushButton( this, "AddButton" );
AddButton->setText( tr( "Add" ) );
layout10->addWidget( AddButton, 0, 0 );
TabManagerLayout->addLayout( layout10 );
resize( QSize(321, 229).expandedTo(minimumSizeHint()) );
UnitChange(dEin);
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( CancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect(TabList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selIte(QListBoxItem*)));
connect(Position, SIGNAL(valueChanged(int)), this, SLOT(PValChange()));
connect(DelButton, SIGNAL(clicked()), this, SLOT(DelTab()));
connect(AddButton, SIGNAL(clicked()), this, SLOT(AddTab()));
connect(Align, SIGNAL(activated(int)), this, SLOT(ChangeType()));
UpdateTabL();
}
 
void TabManager::DelTab()
{
QValueList<double>::Iterator it;
it = tmpTab.at(selTab);
it = tmpTab.remove(it);
tmpTab.remove(it);
if (tmpTab.isEmpty())
selTab = -1;
else
selTab = static_cast<int>(tmpTab.count()-2);
UpdateTabL();
}
 
void TabManager::AddTab()
{
tmpTab.prepend(0);
tmpTab.prepend(0);
selTab = 0;
UpdateTabL();
}
 
void TabManager::ChangeType()
{
tmpTab[selTab] = static_cast<double>(Align->currentItem());
}
 
void TabManager::selIte(QListBoxItem *c)
{
disconnect(Position, SIGNAL(valueChanged(int)), this, SLOT(PValChange()));
disconnect(Align, SIGNAL(activated(int)), this, SLOT(ChangeType()));
selTab = c->listBox()->currentItem() * 2;
DelButton->setEnabled(true);
Position->setEnabled(true);
Align->setEnabled(true);
Position->setValue(qRound(tmpTab[selTab+1] * UmReFaktor * Position->Decimals));
Align->setCurrentItem(static_cast<int>(tmpTab[selTab]));
connect(Position, SIGNAL(valueChanged(int)), this, SLOT(PValChange()));
connect(Align, SIGNAL(activated(int)), this, SLOT(ChangeType()));
}
 
void TabManager::PValChange()
{
double CurX = static_cast<double>(Position->value() / UmReFaktor / Position->Decimals);
int gg = static_cast<int>(tmpTab.count()-1);
int g = gg;
double type = tmpTab[selTab];
QValueList<double>::Iterator it;
it = tmpTab.at(selTab);
it = tmpTab.remove(it);
tmpTab.remove(it);
for (int yg = static_cast<int>(tmpTab.count()-1); yg > 0; yg -= 2)
{
if (CurX < tmpTab[yg])
g = yg;
}
selTab = g-1;
if (gg == g)
{
tmpTab.append(type);
tmpTab.append(CurX);
selTab = static_cast<int>(tmpTab.count()-2);
}
else
{
it = tmpTab.at(selTab);
it = tmpTab.insert(it, CurX);
tmpTab.insert(it, type);
}
UpdateTabL();
}
 
void TabManager::UnitChange(int dEin)
{
Position->setDecimals(10);
QString ein;
Einheit = dEin;
switch (dEin)
{
case 0:
ein = " pt";
break;
case 1:
ein = " mm";
break;
case 2:
ein = " in";
Position->setDecimals(10000);
break;
case 3:
ein = " p";
break;
}
Position->setSuffix(ein);
if (!tmpTab.isEmpty() || (selTab != -1))
Position->setValue(qRound(tmpTab[selTab+1] * UmReFaktor * Position->Decimals));
else
Position->setValue(0);
}
 
void TabManager::UpdateTabL()
{
disconnect(TabList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selIte(QListBoxItem*)));
disconnect(Position, SIGNAL(valueChanged(int)), this, SLOT(PValChange()));
disconnect(Align, SIGNAL(activated(int)), this, SLOT(ChangeType()));
TabList->clear();
QString ein, tmp;
switch (Einheit)
{
case 0:
ein = " pt";
break;
case 1:
ein = " mm";
break;
case 2:
ein = " in";
break;
case 3:
ein = " p";
break;
}
for (uint a = 0; a < tmpTab.count(); a += 2)
{
TabList->insertItem(tmp.setNum(qRound(tmpTab[a+1]*UmReFaktor*Position->Decimals)/static_cast<double>(Position->Decimals))+ein);
}
if (tmpTab.isEmpty())
selTab = -1;
if (selTab != -1)
{
Position->setEnabled(true);
Align->setEnabled(true);
Position->setValue(qRound(tmpTab[selTab+1] * UmReFaktor * Position->Decimals));
Align->setCurrentItem(static_cast<int>(tmpTab[selTab]));
TabList->setCurrentItem(selTab / 2);
}
else
{
Position->setValue(0);
Align->setCurrentItem(0);
Position->setEnabled(false);
Align->setEnabled(false);
}
connect(TabList, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selIte(QListBoxItem*)));
connect(Position, SIGNAL(valueChanged(int)), this, SLOT(PValChange()));
connect(Align, SIGNAL(activated(int)), this, SLOT(ChangeType()));
}
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/scribusXml.cpp
===================================================================
--- trunk/Scribus/scribus/scribusXml.cpp (revision 139)
+++ trunk/Scribus/scribus/scribusXml.cpp (revision 140)
@@ -141,6 +141,7 @@
QString tmpf;
QFont fo;
bool fou;
+ double xf;
DoFonts.clear();
f = ReadDatei(fileName);
if (f == "")
@@ -196,6 +197,20 @@
else
vg.Font = DoFonts[doc->Dfont];
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
+ if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
+ {
+ QString tmp = pg.attribute("TABS");
+ QTextStream tgv(&tmp, IO_ReadOnly);
+ vg.TabValues.clear();
+ for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMTAB","0")); ++cxv)
+ {
+ tgv >> xf;
+ vg.TabValues.append(xf);
+ }
+ tmp = "";
+ }
+ else
+ vg.TabValues.clear();
for (uint xx=0; xx<Vorlagen.count(); ++xx)
{
if (vg.Vname == Vorlagen[xx].Vname)
@@ -207,6 +222,7 @@
(vg.Avor == Vorlagen[xx].Avor) &&
(vg.Anach == Vorlagen[xx].Anach) &&
(vg.Font == Vorlagen[xx].Font) &&
+ (vg.TabValues == Vorlagen[xx].TabValues) &&
(vg.FontSize == Vorlagen[xx].FontSize))
{
fou = true;
@@ -433,6 +449,20 @@
else
vg.Font = DoFonts[Defont];
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
+ if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
+ {
+ tmp = pg.attribute("TABS");
+ QTextStream tgv(&tmp, IO_ReadOnly);
+ vg.TabValues.clear();
+ for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMTAB","0")); ++cxv)
+ {
+ tgv >> xf;
+ vg.TabValues.append(xf);
+ }
+ tmp = "";
+ }
+ else
+ vg.TabValues.clear();
for (uint xx=0; xx<doc->Vorlagen.count(); ++xx)
{
if (vg.Vname == doc->Vorlagen[xx].Vname)
@@ -444,6 +474,7 @@
(vg.Avor == doc->Vorlagen[xx].Avor) &&
(vg.Anach == doc->Vorlagen[xx].Anach) &&
(vg.Font == doc->Vorlagen[xx].Font) &&
+ (vg.TabValues == Vorlagen[xx].TabValues) &&
(vg.FontSize == doc->Vorlagen[xx].FontSize))
{
DoVorl[VorlC] = tmV.setNum(xx);
@@ -1060,6 +1091,20 @@
else
vg.Font = DoFonts[Defont];
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
+ if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
+ {
+ tmp = pg.attribute("TABS");
+ QTextStream tgv(&tmp, IO_ReadOnly);
+ vg.TabValues.clear();
+ for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMTAB","0")); ++cxv)
+ {
+ tgv >> xf;
+ vg.TabValues.append(xf);
+ }
+ tmp = "";
+ }
+ else
+ vg.TabValues.clear();
doc->Vorlagen.append(vg);
}
if(pg.tagName()=="JAVA")
@@ -1734,6 +1779,20 @@
else
vg.Font = doc->Dfont;
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10);
+ if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
+ {
+ tmp = pg.attribute("TABS");
+ QTextStream tgv(&tmp, IO_ReadOnly);
+ vg.TabValues.clear();
+ for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMTAB","0")); ++cxv)
+ {
+ tgv >> xf;
+ vg.TabValues.append(xf);
+ }
+ tmp = "";
+ }
+ else
+ vg.TabValues.clear();
for (uint xx=0; xx<doc->Vorlagen.count(); ++xx)
{
if (vg.Vname == doc->Vorlagen[xx].Vname)
@@ -1745,6 +1804,7 @@
(vg.Avor == doc->Vorlagen[xx].Avor) &&
(vg.Anach == doc->Vorlagen[xx].Anach) &&
(vg.Font == doc->Vorlagen[xx].Font) &&
+ (vg.TabValues == Vorlagen[xx].TabValues) &&
(vg.FontSize == doc->Vorlagen[xx].FontSize))
{
DoVorl[VorlC] = tmV.setNum(xx);
@@ -2267,7 +2327,7 @@
tsc = item->Ptext.at(k)->cscale;
if (item->Ptext.at(k)->ch == QChar(13))
text = QChar(5);
- if (item->Ptext.at(k)->ch == QChar(9))
+ else if (item->Ptext.at(k)->ch == QChar(9))
text = QChar(4);
else
text = item->Ptext.at(k)->ch;
@@ -2311,7 +2371,7 @@
{
if (item->Ptext.at(k)->ch == QChar(13))
text += QChar(5);
- if (item->Ptext.at(k)->ch == QChar(9))
+ else if (item->Ptext.at(k)->ch == QChar(9))
text += QChar(4);
else
text += item->Ptext.at(k)->ch;
@@ -2420,6 +2480,14 @@
fo.setAttribute("NACH",doc->Vorlagen[ff].Anach);
fo.setAttribute("FONT",doc->Vorlagen[ff].Font);
fo.setAttribute("FONTSIZE",doc->Vorlagen[ff].FontSize / 10.0);
+ fo.setAttribute("NUMTAB", static_cast<int>(doc->Vorlagen[ff].TabValues.count()));
+ QString tlp = "";
+ QValueList<double>::Iterator tax;
+ for (tax = doc->Vorlagen[ff].TabValues.begin(); tax != doc->Vorlagen[ff].TabValues.end(); ++tax)
+ {
+ tlp += tmp.setNum((*tax)) + " ";
+ }
+ fo.setAttribute("TABS", tlp);
elem.appendChild(fo);
}
}
@@ -2669,7 +2737,7 @@
tsc = item->Ptext.at(k)->cscale;
if (item->Ptext.at(k)->ch == QChar(13))
text = QChar(5);
- if (item->Ptext.at(k)->ch == QChar(9))
+ else if (item->Ptext.at(k)->ch == QChar(9))
text = QChar(4);
else
text = item->Ptext.at(k)->ch;
@@ -2713,7 +2781,7 @@
{
if (item->Ptext.at(k)->ch == QChar(13))
text += QChar(5);
- if (item->Ptext.at(k)->ch == QChar(9))
+ else if (item->Ptext.at(k)->ch == QChar(9))
text += QChar(4);
else
text += item->Ptext.at(k)->ch;
@@ -2940,6 +3008,15 @@
fo.setAttribute("NACH",doc->Vorlagen[ff].Anach);
fo.setAttribute("FONT",doc->Vorlagen[ff].Font);
fo.setAttribute("FONTSIZE",doc->Vorlagen[ff].FontSize / 10.0);
+ fo.setAttribute("NUMTAB", static_cast<int>(doc->Vorlagen[ff].TabValues.count()));
+ QString tlp = "";
+ QString tmp = "";
+ QValueList<double>::Iterator tax;
+ for (tax = doc->Vorlagen[ff].TabValues.begin(); tax != doc->Vorlagen[ff].TabValues.end(); ++tax)
+ {
+ tlp += tmp.setNum((*tax)) + " ";
+ }
+ fo.setAttribute("TABS", tlp);
dc.appendChild(fo);
}
}