Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 172 → Rev 173

/trunk/Scribus/ChangeLogCVS
1,4 → 1,11
Changes since Version 1.1.4
25.01.2004 Added Font Effects and Colors to the Paragraph Styles.
Applied Craig's patches for better Precision.
 
24.01.2004 Since there is a bad Bug in the Font embedding Functions all
TrueType Fonts are now subsetted.
Added a first Finnish Translation.
 
22.01.2004 Updated Polish Translation.
Updated Python Scripts from Henning Schröder.
 
/trunk/Scribus/scribus/mpalette.h
30,6 → 30,8
#include "spalette.h"
#include "fontcombo.h"
#include "styleselect.h"
#include "alignselect.h"
#include "shadebutton.h"
 
class Autoforms;
extern bool CMSavail;
144,12 → 146,7
MSpinBox* Size;
QToolButton* Revert;
StyleSelect* SeStyle;
QButtonGroup* GroupAlign;
QToolButton* TextL;
QToolButton* TextR;
QToolButton* TextC;
QToolButton* TextB;
QToolButton* TextF;
AlignSelect* GroupAlign;
QGroupBox* GroupBox3;
MSpinBox* LineSp;
MSpinBox* Extra;
190,12 → 187,10
QSpinBox* ChScale;
QLabel* StrokeIcon;
QComboBox* TxStroke;
QToolButton *PM1;
QPopupMenu *TxStrokeSh;
ShadeButton *PM1;
QLabel* FillIcon;
QComboBox* TxFill;
QToolButton *PM2;
QPopupMenu *TxFillSh;
ShadeButton *PM2;
QLabel* SprachT;
QComboBox* LangCombo;
QGroupBox* GroupBoxCM;
234,7 → 229,7
void NewTFont(int);
void newTxtFill();
void newTxtStroke();
void setActShade(int id);
void setActShade();
void setActFarben(QString p, QString b, int shp, int shb);
void ManageTabs();
263,7 → 258,7
void NewLSty();
void NewLJoin();
void NewLEnd();
void NewAli();
void NewAli(int a);
void setTypeStyle(int s);
void NewLMode();
void DoLower();
329,7 → 324,6
QHBoxLayout* ShapeGroupLayout;
QGridLayout* DistanceLayout;
QGridLayout* DistanceLayout2;
QGridLayout* GroupAlignLayout;
QGridLayout* GroupBox3Layout;
QVBoxLayout* GroupBox3aLayout;
QVBoxLayout* GroupBoxCMLayout;
/trunk/Scribus/scribus/edit1format.h
11,9 → 11,14
#include <qlayout.h>
#include <qtooltip.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include "mspinbox.h"
#include "fontcombo.h"
#include "scribusdoc.h"
#include "alignselect.h"
#include "styleselect.h"
#include "scribusdoc.h"
#include "shadebutton.h"
 
class EditStyle : public QDialog
{
21,7 → 26,7
 
public:
EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs,
double au, int dEin);
double au, int dEin, ScribusDoc *doc);
~EditStyle() {};
 
QLabel* TextLabel1;
36,14 → 41,12
MSpinBox* FirstLin;
MSpinBox* AboveV;
MSpinBox* BelowV;
QButtonGroup* ButtonGroup1;
QLabel* EffeLabel;
StyleSelect* EffeS;
QLabel* AligLabel;
AlignSelect* AligS;
QGroupBox* GroupBox10;
QGroupBox* AbstandV;
QRadioButton* Left;
QRadioButton* Center;
QRadioButton* Right;
QRadioButton* Full;
QRadioButton* Forced;
QGroupBox* GroupFont;
QLabel* TextF1;
FontCombo* FontC;
50,6 → 53,12
MSpinBox* SizeC;
QLabel* TextF2;
QPushButton* TabsButton;
QLabel* StrokeIcon;
QComboBox* TxStroke;
ShadeButton *PM1;
QLabel* FillIcon;
QComboBox* TxFill;
ShadeButton *PM2;
QCheckBox* DropCaps;
QLabel* CapLabel;
QSpinBox* DropLines;
67,12 → 76,12
void FontChange();
void ManageTabs();
void ManageDrops();
void ColorChange();
 
protected:
QHBoxLayout* Layout17;
QGridLayout* EditStyleLayout;
QGridLayout* GroupBox10Layout;
QGridLayout* ButtonGroup1Layout;
QGridLayout* AbstandVLayout;
QGridLayout* GroupFontLayout;
};
/trunk/Scribus/scribus/mpalette.cpp
8,9 → 8,11
#include "scribusview.h"
#include "autoform.h"
#include "tabmanager.h"
#include "scribus.h"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
extern ProfilesL InputProfiles;
extern ScribusApp* ScApp;
 
NameWidget::NameWidget(QWidget* parent) : QLineEdit(parent)
{
473,20 → 475,9
TxStroke = new QComboBox( true, page_3, "TxStroke" );
TxStroke->setEditable(false);
layout23->addWidget( TxStroke );
TxStrokeSh = new QPopupMenu();
TxStrokeSh->insertItem( tr("Other..."));
char *tmp[] = {"0 %", "10 %", "20 %", "30 %", "40 %", "50 %", "60 %", "70 %", "80 %", "90 %", "100 %"};
size_t array = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < array; ++a)
TxStrokeSh->insertItem(tmp[a]);
QSpacerItem* spacer2S = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout23->addItem( spacer2S );
PM1 = new QToolButton(page_3, "Colors");
PM1->setBackgroundMode(PaletteBackground);
PM1->setPopup(TxStrokeSh);
PM1->setPopupDelay(1);
PM1->setText("100 %");
PM1->setAutoRaise(true);
PM1 = new ShadeButton(page_3);
layout23->addWidget( PM1 );
layout46->addLayout( layout23 );
layout24 = new QHBoxLayout( 0, 0, 5, "layout24");
498,18 → 489,9
TxFill = new QComboBox( true, page_3, "TxFill" );
TxFill->setEditable(false);
layout24->addWidget( TxFill );
TxFillSh = new QPopupMenu();
TxFillSh->insertItem( tr("Other..."));
for (uint a = 0; a < array; ++a)
TxFillSh->insertItem(tmp[a]);
QSpacerItem* spacer2Sf = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout24->addItem( spacer2Sf );
PM2 = new QToolButton(page_3, "Colors");
PM2->setBackgroundMode(PaletteBackground);
PM2->setPopup(TxFillSh);
PM2->setPopupDelay(1);
PM2->setText("100 %");
PM2->setAutoRaise(true);
PM2 = new ShadeButton(page_3);
layout24->addWidget( PM2 );
layout46->addLayout( layout24 );
 
528,46 → 510,7
layout47->addLayout( layout46 );
pageLayout_3->addLayout( layout47 );
 
GroupAlign = new QButtonGroup( page_3, "GroupAlign" );
GroupAlign->setFrameShape( QButtonGroup::NoFrame );
GroupAlign->setTitle("");
GroupAlign->setExclusive( true );
GroupAlign->setColumnLayout(0, Qt::Vertical );
GroupAlign->layout()->setSpacing( 0 );
GroupAlign->layout()->setMargin( 0 );
GroupAlignLayout = new QGridLayout( GroupAlign->layout() );
GroupAlignLayout->setAlignment( Qt::AlignTop );
 
TextL = new QToolButton( GroupAlign, "TextL" );
TextL->setMaximumSize( QSize( 22, 22 ) );
TextL->setPixmap(loadIcon("text_left.png"));
TextL->setToggleButton( true );
TextL->setOn( true );
GroupAlignLayout->addWidget( TextL, 0, 0 );
 
TextR = new QToolButton( GroupAlign, "TextR" );
TextR->setMaximumSize( QSize( 22, 22 ) );
TextR->setPixmap(loadIcon("text_right.png"));
TextR->setToggleButton( true );
GroupAlignLayout->addWidget( TextR, 0, 1 );
 
TextC = new QToolButton( GroupAlign, "TextC" );
TextC->setMaximumSize( QSize( 22, 22 ) );
TextC->setPixmap(loadIcon("text_center.png"));
TextC->setToggleButton( true );
GroupAlignLayout->addWidget( TextC, 0, 2 );
 
TextB = new QToolButton( GroupAlign, "TextB" );
TextB->setMaximumSize( QSize( 22, 22 ) );
TextB->setPixmap(loadIcon("text_block.png"));
TextB->setToggleButton( true );
GroupAlignLayout->addWidget( TextB, 0, 3 );
 
TextF = new QToolButton( GroupAlign, "TextF" );
TextF->setMaximumSize( QSize( 22, 22 ) );
TextF->setPixmap(loadIcon("text_force.png"));
TextF->setToggleButton( true );
GroupAlignLayout->addWidget( TextF, 0, 4 );
GroupAlign = new AlignSelect(page_3);
pageLayout_3->addWidget( GroupAlign );
 
GroupBox3 = new QGroupBox( page_3, "GroupBox3" );
781,10 → 724,6
QToolTip::add( LineSp, tr( "Line Spacing" ) );
QToolTip::add( Extra, tr( "Manual Kerning" ) );
QToolTip::add( Revert, tr( "Reverse Writing" ) );
QToolTip::add( TextL, tr( "Align Text Left" ) );
QToolTip::add( TextR, tr( "Align Text Right" ) );
QToolTip::add( TextB, tr( "Align Text Block" ) );
QToolTip::add( TextC, tr( "Align Text Center" ) );
QToolTip::add( FlipH, tr( "Flip horizontal" ) );
QToolTip::add( FlipV, tr( "Flip vertical" ) );
QToolTip::add( Zup, tr( "Move one Level up" ) );
814,7 → 753,7
connect(Kette, SIGNAL(clicked()), this, SLOT(ToggleKette()));
connect(FlipH, SIGNAL(clicked()), this, SLOT(DoFlipH()));
connect(FlipV, SIGNAL(clicked()), this, SLOT(DoFlipV()));
connect(GroupAlign, SIGNAL(clicked(int)), this, SLOT(NewAli()));
connect(GroupAlign, SIGNAL(State(int)), this, SLOT(NewAli(int)));
connect(Revert, SIGNAL(clicked()), this, SLOT(DoRevert()));
connect(SeStyle, SIGNAL(State(int)), this, SLOT(setTypeStyle(int)));
connect(FreeScale, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
841,8 → 780,8
connect(Fonts, SIGNAL(activated(int)), this, SLOT(NewTFont(int)));
connect(TxFill, SIGNAL(activated(int)), this, SLOT(newTxtFill()));
connect(TxStroke, SIGNAL(activated(int)), this, SLOT(newTxtStroke()));
connect(TxFillSh, SIGNAL(activated(int)), this, SLOT(setActShade(int)));
connect(TxStrokeSh, SIGNAL(activated(int)), this, SLOT(setActShade(int)));
connect(PM1, SIGNAL(clicked()), this, SLOT(setActShade()));
connect(PM2, SIGNAL(clicked()), this, SLOT(setActShade()));
connect(ChScale, SIGNAL(valueChanged(int)), this, SLOT(NewTScale()));
connect(Locked, SIGNAL(clicked()), this, SLOT(handleLock()));
connect(NoPrint, SIGNAL(clicked()), this, SLOT(handlePrint()));
884,6 → 823,8
 
void Mpalette::SelTab(int t)
{
if (ScApp->ScriptRunning)
return;
TabStack->raiseWidget(t);
if (HaveItem)
{
960,6 → 901,8
 
void Mpalette::SetCurItem(PageItem *i)
{
if (ScApp->ScriptRunning)
return;
disconnect(StyledLine, SIGNAL(clicked(QListBoxItem*)), this, SLOT(SetSTline(QListBoxItem*)));
disconnect(NameEdit, SIGNAL(Leaved()), this, SLOT(NewName()));
HaveItem = false;
1085,6 → 1028,8
 
void Mpalette::NewSel(int nr)
{
if (ScApp->ScriptRunning)
return;
int visID;
if (doc->ActPage->GroupSel)
{
1437,6 → 1382,8
 
void Mpalette::setXY(double x, double y)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
double inX, inY, b, h, r, dummy1, dummy2;
QWMatrix ma;
1485,6 → 1432,8
 
void Mpalette::setBH(double x, double y)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
QWMatrix ma;
1508,6 → 1457,8
 
void Mpalette::setR(double r)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
double rr = r;
if (r > 0)
1519,6 → 1470,8
 
void Mpalette::setRR(double r)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
RoundRect->setValue(r*UmReFaktor);
1527,6 → 1480,8
 
void Mpalette::setCols(int r, double g)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
DCol->setValue(r);
1543,6 → 1498,8
 
void Mpalette::setLsp(double r)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
LineSp->setValue(r);
1551,6 → 1508,8
 
void Mpalette::setSize(int s)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
Size->setValue(s / 10.0);
1559,6 → 1518,8
 
void Mpalette::setExtra(double e)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
Extra->setValue(e);
1567,6 → 1528,8
 
void Mpalette::ChangeScaling()
{
if (ScApp->ScriptRunning)
return;
if (FreeScale == sender())
{
FrameScale->setChecked(false);
1602,6 → 1565,8
 
void Mpalette::setLvalue(double scx, double scy, double x, double y)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
LXpos->setValue(x * UmReFaktor);
1613,6 → 1578,8
 
void Mpalette::setSvalue(double s)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
LSize->setValue(s);
1621,6 → 1588,8
 
void Mpalette::setLIvalue(PenStyle p, PenCapStyle pc, PenJoinStyle pj)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
switch (p)
1679,6 → 1648,8
 
void Mpalette::setStil(int s)
{
if (ScApp->ScriptRunning)
return;
StrokeIcon->setEnabled(false);
TxStroke->setEnabled(false);
PM1->setEnabled(false);
1693,38 → 1664,18
 
void Mpalette::setAli(int e)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
switch (e)
{
case 0:
TextL->setOn(true);
break;
case 2:
TextR->setOn(true);
break;
case 1:
TextC->setOn(true);
break;
case 3:
TextB->setOn(true);
break;
case 4:
TextF->setOn(true);
break;
default:
TextL->setOn(false);
TextR->setOn(false);
TextC->setOn(false);
TextB->setOn(false);
TextF->setOn(false);
break;
}
GroupAlign->setStyle(e);
HaveItem = tmp;
}
 
void Mpalette::setTScale(int e)
{
if (ScApp->ScriptRunning)
return;
bool tmp = HaveItem;
HaveItem = false;
ChScale->setValue(e);
1743,6 → 1694,8
 
void Mpalette::NewX()
{
if (ScApp->ScriptRunning)
return;
double x,y,w,h, gx, gy, gh, gw, base;
QWMatrix ma;
x = Xpos->value() / UmReFaktor;
1795,6 → 1748,8
 
void Mpalette::NewY()
{
if (ScApp->ScriptRunning)
return;
double x,y,w,h, gx, gy, gh, gw, base;
QWMatrix ma;
x = Xpos->value() / UmReFaktor;
1847,6 → 1802,8
 
void Mpalette::NewW()
{
if (ScApp->ScriptRunning)
return;
double x,y,w,h, gx, gy, gh, gw;
x = Xpos->value() / UmReFaktor;
y = Ypos->value() / UmReFaktor;
1884,6 → 1841,8
 
void Mpalette::NewH()
{
if (ScApp->ScriptRunning)
return;
double x,y,w,h, gx, gy, gh, gw;
x = Xpos->value() / UmReFaktor;
y = Ypos->value() / UmReFaktor;
1921,6 → 1880,8
 
void Mpalette::NewR()
{
if (ScApp->ScriptRunning)
return;
double gx, gy, gh, gw;
if ((HaveDoc) && (HaveItem))
{
1939,6 → 1900,8
 
void Mpalette::NewRR()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->RadRect = RoundRect->value() / UmReFaktor;
1949,6 → 1912,8
 
void Mpalette::NewLsp()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ChLineSpa(LineSp->value());
1958,6 → 1923,8
 
void Mpalette::NewCols()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->Cols = DCol->value();
1968,6 → 1935,8
 
void Mpalette::NewGap()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->ColGap = DGap->value() / UmReFaktor;
1978,6 → 1947,8
 
void Mpalette::NewSize()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->chFSize(qRound(Size->value()*10.0));
1987,6 → 1958,8
 
void Mpalette::NewExtra()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
if ((CurItem->HasSel) || (doc->AppMode == 1))
2009,6 → 1982,8
 
void Mpalette::NewLocalXY()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ChLocalXY(LXpos->value() / UmReFaktor, LYpos->value() / UmReFaktor);
2018,6 → 1993,8
 
void Mpalette::NewLocalSC()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ChLocalSc(ScaleX->value() / 100.0, ScaleY->value() / 100.0);
2027,6 → 2004,8
 
void Mpalette::NewLS()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ChLineWidth(LSize->value());
2036,6 → 2015,8
 
void Mpalette::NewLSty()
{
if (ScApp->ScriptRunning)
return;
PenStyle c = SolidLine;
switch (LStyle->currentItem())
{
2064,6 → 2045,8
 
void Mpalette::NewLMode()
{
if (ScApp->ScriptRunning)
return;
if (LineMode->currentItem() == 0)
{
Text1->setText( tr( "X-Pos:" ) );
2092,6 → 2075,8
 
void Mpalette::NewLJoin()
{
if (ScApp->ScriptRunning)
return;
PenJoinStyle c = MiterJoin;
switch (LJoinStyle->currentItem())
{
2114,6 → 2099,8
 
void Mpalette::NewLEnd()
{
if (ScApp->ScriptRunning)
return;
PenCapStyle c = FlatCap;
switch (LEndStyle->currentItem())
{
2136,6 → 2123,8
 
void Mpalette::ToggleKette()
{
if (ScApp->ScriptRunning)
return;
if (Kette->isOn())
{
ScaleY->setValue(ScaleX->value());
2163,6 → 2152,8
 
void Mpalette::DoFlipH()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->FlipImageH();
2172,6 → 2163,8
 
void Mpalette::DoFlipV()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->FlipImageV();
2179,25 → 2172,18
}
}
 
void Mpalette::NewAli()
void Mpalette::NewAli(int a)
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
if (TextL->isOn())
emit NewAbStyle(0);
if (TextR->isOn())
emit NewAbStyle(2);
if (TextC->isOn())
emit NewAbStyle(1);
if (TextB->isOn())
emit NewAbStyle(3);
if (TextF->isOn())
emit NewAbStyle(4);
}
emit NewAbStyle(a);
}
 
void Mpalette::setTypeStyle(int s)
{
if (ScApp->ScriptRunning)
return;
emit Stellung(s);
emit BackHome();
}
2204,6 → 2190,8
 
void Mpalette::DoLower()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->LowerItem();
2213,6 → 2201,8
 
void Mpalette::DoRaise()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->RaiseItem();
2222,6 → 2212,8
 
void Mpalette::DoFront()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ToFront();
2231,6 → 2223,8
 
void Mpalette::DoBack()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ToBack();
2240,6 → 2234,8
 
void Mpalette::NewRotMode(int m)
{
if (ScApp->ScriptRunning)
return;
double inX, inY, gx, gy, gh, gw;
if ((HaveDoc) && (HaveItem))
{
2313,6 → 2309,8
 
void Mpalette::DoFlow()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->Textflow = Textflow->isChecked();
2324,6 → 2322,8
 
void Mpalette::DoFlow2()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->Textflow2 = Textflow2->isChecked();
2334,6 → 2334,8
 
void Mpalette::MakeIrre(int f, int c, double *vals)
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
if ((CurItem->PType == 7) || (CurItem->PType == 8))
2362,6 → 2364,8
 
void Mpalette::EditSh()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
if ((CurItem->PType == 1) || (CurItem->PType == 3))
2377,6 → 2381,8
 
void Mpalette::NewTDist()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->Extra = DLeft->value() / UmReFaktor;
2390,6 → 2396,8
 
void Mpalette::NewTFont(int c)
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
emit NewTF(Fonts->text(c));
}
2396,6 → 2404,8
 
void Mpalette::DoRevert()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
if (Revert->isOn())
2415,7 → 2425,9
 
void Mpalette::SetLineFormats(ScribusDoc *dd)
{
disconnect(StyledLine, SIGNAL(clicked(QListBoxItem*)), this, SLOT(SetSTline(QListBoxItem*)));
if (ScApp->ScriptRunning)
return;
disconnect(StyledLine, SIGNAL(clicked(QListBoxItem*)), this, SLOT(SetSTline(QListBoxItem*)));
StyledLine->clear();
if (dd != 0)
{
2432,6 → 2444,8
 
void Mpalette::SetSTline(QListBoxItem *c)
{
if (ScApp->ScriptRunning)
return;
if (c == NULL)
return;
bool setter = c->listBox()->currentItem() == 0 ? true : false;
2449,6 → 2463,8
 
void Mpalette::updateCList()
{
if (ScApp->ScriptRunning)
return;
if (!HaveDoc)
return;
TxFill->clear();
2467,6 → 2483,8
 
void Mpalette::updateCmsList()
{
if (ScApp->ScriptRunning)
return;
if (HaveDoc)
{
if ((CMSavail) && (doc->CMSSettings.CMSinUse))
2502,6 → 2520,8
 
void Mpalette::ChProf(const QString& prn)
{
if (ScApp->ScriptRunning)
return;
bool EmbedP;
if ((HaveDoc) && (HaveItem))
{
2518,6 → 2538,8
 
void Mpalette::ChIntent()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->IRender = MonitorI->currentItem();
2528,6 → 2550,8
 
void Mpalette::ShowCMS()
{
if (ScApp->ScriptRunning)
return;
if (HaveItem)
{
HaveItem = false;
2563,63 → 2587,21
}
}
 
void Mpalette::setActShade(int id)
void Mpalette::setActShade()
{
bool ok = false;
uint a;
int c, b;
for (a = 0; a < TxFillSh->count(); ++a)
if (ScApp->ScriptRunning)
return;
int b;
if (PM1 == sender())
{
TxFillSh->setItemChecked(TxFillSh->idAt(a), false);
b = PM1->getValue();
doc->ActPage->ItemTextPenS(b);
doc->CurrTextFillSh = b;
}
for (a = 0; a < TxFillSh->count(); ++a)
{
TxStrokeSh->setItemChecked(TxStrokeSh->idAt(a), false);
}
if (TxFillSh == sender())
{
c = TxFillSh->indexOf(id);
TxFillSh->setItemChecked(id, true);
}
else
{
c = TxStrokeSh->indexOf(id);
TxStrokeSh->setItemChecked(id, true);
}
if (c > 0)
b = (c-1) * 10;
if (c == 0)
{
Query* dia = new Query(this, "New", 1, 0, "Shade:", "Shade");
if (dia->exec())
{
c = dia->Answer->text().toInt(&ok);
if (ok)
{
b = c;
if (TxFillSh == sender())
PM2->setText(dia->Answer->text()+" %");
else
PM1->setText(dia->Answer->text()+" %");
}
delete dia;
}
else
{
delete dia;
return;
}
}
if (TxFillSh == sender())
{
PM2->setText(QString::number(b)+" %");
b = PM2->getValue();
doc->ActPage->ItemTextBrushS(b);
doc->CurrTextFillSh = b;
}
else
{
PM1->setText(QString::number(b)+" %");
doc->ActPage->ItemTextPenS(b);
doc->CurrTextStrokeSh = b;
}
emit DocChanged();
2627,27 → 2609,12
 
void Mpalette::setActFarben(QString p, QString b, int shp, int shb)
{
uint a;
if (ScApp->ScriptRunning)
return;
CListe::Iterator it;
int c = 1;
for (a = 0; a < TxFillSh->count(); ++a)
{
TxFillSh->setItemChecked(TxFillSh->idAt(a), false);
}
for (a = 0; a < TxFillSh->count(); ++a)
{
TxStrokeSh->setItemChecked(TxStrokeSh->idAt(a), false);
}
if ((shb % 10) == 0)
TxFillSh->setItemChecked(TxFillSh->idAt(shb/10+1), true);
else
TxFillSh->setItemChecked(TxFillSh->idAt(0), true);
PM2->setText(QString::number(shb)+" %");
if ((shp % 10) == 0)
TxStrokeSh->setItemChecked(TxStrokeSh->idAt(shp/10+1), true);
else
TxStrokeSh->setItemChecked(TxStrokeSh->idAt(0), true);
PM1->setText(QString::number(shp)+" %");
PM2->setValue(shb);
PM1->setValue(shp);
if ((b != "None") && (b != ""))
{
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
2673,8 → 2640,10
 
void Mpalette::handleLock()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
doc->ActPage->ToggleLock();
doc->ActPage->ToggleLock();
}
 
void Mpalette::handlePrint()
2696,6 → 2665,8
 
void Mpalette::handlePathLine()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->PoShow = NormText2->isChecked();
2706,6 → 2677,8
 
void Mpalette::handlePathDist()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->Extra = Dist->value();
2718,6 → 2691,8
 
void Mpalette::handlePathOffs()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
CurItem->BaseOffs = -LineW->value();
2730,6 → 2705,8
 
void Mpalette::NewName()
{
if (ScApp->ScriptRunning)
return;
QString NameOld = CurItem->AnName;
QString NameNew = NameEdit->text();
bool found = false;
2766,6 → 2743,8
 
void Mpalette::fillLangCombo(QMap<QString,QString> Sprachen)
{
if (ScApp->ScriptRunning)
return;
LangCombo->clear();
QMap<QString,QString>::Iterator it;
for (it = Sprachen.begin(); it != Sprachen.end(); ++it)
/trunk/Scribus/scribus/edit1format.cpp
5,7 → 5,7
extern double UmReFaktor;
#include <qmessagebox.h>
 
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin)
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin, ScribusDoc *doc)
: QDialog( parent, "EditST", true, 0)
{
setCaption( tr( "Edit Style" ) );
59,24 → 59,73
SizeC->setMaxValue(1024);
SizeC->setValue(vor->FontSize / 10.0);
GroupFontLayout->addWidget( SizeC, 1, 1 );
EffeLabel = new QLabel( GroupFont, "EffeLabel" );
EffeLabel->setText( tr("Effect:"));
GroupFontLayout->addWidget( EffeLabel, 2, 0 );
EffeS = new StyleSelect(GroupFont);
EffeS->setStyle(vor->FontEffect);
GroupFontLayout->addWidget( EffeS, 2, 1, Qt::AlignLeft );
AligLabel = new QLabel( GroupFont, "AligLabel" );
AligLabel->setText( tr("Alignment:"));
GroupFontLayout->addWidget( AligLabel, 3, 0 );
AligS = new AlignSelect(GroupFont);
AligS->setStyle(vor->Ausri);
GroupFontLayout->addWidget( AligS, 3, 1, Qt::AlignLeft );
 
FillIcon = new QLabel( GroupFont, "FillIcon" );
FillIcon->setText( tr("Fill Color:"));
GroupFontLayout->addWidget( FillIcon, 4, 0 );
TxFill = new QComboBox( true, GroupFont, "TxFill" );
TxFill->setEditable(false);
GroupFontLayout->addWidget( TxFill, 4, 1 );
PM2 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM2, 4, 2, Qt::AlignLeft );
 
StrokeIcon = new QLabel( GroupFont, "StrokeIcon" );
StrokeIcon->setText("Stroke Color:");
GroupFontLayout->addWidget( StrokeIcon, 5, 0 );
TxStroke = new QComboBox( true, GroupFont, "TxStroke" );
TxStroke->setEditable(false);
GroupFontLayout->addWidget( TxStroke, 5, 1 );
PM1 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM1, 5, 2, Qt::AlignLeft );
 
TxFill->clear();
TxStroke->clear();
CListe::Iterator it;
QPixmap pm = QPixmap(15, 15);
TxFill->insertItem( tr("None"));
TxStroke->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
TxFill->insertItem(pm, it.key());
TxStroke->insertItem(pm, it.key());
}
StrokeIcon->setEnabled(false);
TxStroke->setEnabled(false);
TxFill->setCurrentText(vor->FColor);
TxStroke->setCurrentText(vor->SColor);
PM2->setValue(vor->FShade);
PM1->setValue(vor->SShade);
 
DropCaps = new QCheckBox( GroupFont, "DropCaps" );
DropCaps->setText( tr( "Drop Caps" ) );
DropCaps->setChecked(vor->Drop);
GroupFontLayout->addMultiCellWidget( DropCaps, 2, 2, 0, 2 );
GroupFontLayout->addMultiCellWidget( DropCaps, 6, 6, 0, 2 );
CapLabel = new QLabel( GroupFont, "CapLabel" );
CapLabel->setText( tr("Lines:"));
GroupFontLayout->addWidget( CapLabel, 3, 0 );
GroupFontLayout->addWidget( CapLabel, 7, 0 );
DropLines = new QSpinBox( GroupFont, "DropLines" );
DropLines->setMinValue( 2 );
DropLines->setMaxValue( 20 );
DropLines->setValue(vor->DropLin);
GroupFontLayout->addWidget( DropLines, 3, 1 );
GroupFontLayout->addWidget( DropLines, 7, 1 );
bool enable = vor->Drop ? true : false;
DropLines->setEnabled(enable);
CapLabel->setEnabled(enable);
 
EditStyleLayout->addWidget( GroupFont, 2, 0 );
EditStyleLayout->addMultiCellWidget( GroupFont, 2, 3, 0, 0 );
 
GroupBox10 = new QGroupBox( this, "GroupBox10" );
GroupBox10->setTitle( tr( "Indentation" ) );
114,56 → 163,6
GroupBox10Layout->addMultiCellWidget( TabsButton, 2, 2, 0, 1 );
EditStyleLayout->addWidget( GroupBox10, 3, 1 );
 
ButtonGroup1 = new QButtonGroup( this, "ButtonGroup1" );
ButtonGroup1->setTitle( tr( "Alignment" ) );
ButtonGroup1->setColumnLayout(0, Qt::Vertical );
ButtonGroup1->layout()->setSpacing( 0 );
ButtonGroup1->layout()->setMargin( 0 );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
ButtonGroup1Layout->setSpacing( 5 );
ButtonGroup1Layout->setMargin( 10 );
 
Left = new QRadioButton( ButtonGroup1, "Left" );
Left->setText( tr( "Left" ) );
Left->setChecked( true );
ButtonGroup1Layout->addWidget( Left, 0, 0 );
 
Right = new QRadioButton( ButtonGroup1, "Right" );
Right->setText( tr( "Right" ) );
ButtonGroup1Layout->addWidget( Right, 1, 0 );
 
Center = new QRadioButton( ButtonGroup1, "Center" );
Center->setText( tr( "Center" ) );
ButtonGroup1Layout->addWidget( Center, 0, 1 );
 
Full = new QRadioButton( ButtonGroup1, "Full" );
Full->setText( tr( "Block" ) );
ButtonGroup1Layout->addWidget( Full, 1, 1 );
 
Forced = new QRadioButton( ButtonGroup1, "Full" );
Forced->setText( tr( "Forced" ) );
ButtonGroup1Layout->addWidget( Forced, 2, 1 );
switch (vor->Ausri)
{
case 0 :
Left->setChecked( true );
break;
case 1 :
Center->setChecked( true );
break;
case 2 :
Right->setChecked( true );
break;
case 3 :
Full->setChecked( true );
break;
case 4 :
Forced->setChecked( true );
break;
}
EditStyleLayout->addWidget( ButtonGroup1, 3, 0 );
 
AbstandV = new QGroupBox( this, "AbstandV" );
AbstandV->setTitle( tr( "Vertical Spaces" ) );
AbstandV->setColumnLayout(0, Qt::Vertical );
239,6 → 238,7
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect( DropCaps, SIGNAL( clicked() ), this, SLOT( ManageDrops() ) );
connect(SizeC, SIGNAL(valueChanged(int)), this, SLOT(FontChange()));
connect(EffeS, SIGNAL(State(int)), this, SLOT(ColorChange()));
LeftInd->setDecimals(10);
FirstLin->setDecimals(10);
AboveV->setDecimals(10);
273,6 → 273,14
LeftInd->setValue(vor->Indent * UmReFaktor);
}
 
void EditStyle::ColorChange()
{
int s = EffeS->getStyle();
bool enabled = (s & 4) ? true : false;
StrokeIcon->setEnabled(enabled);
TxStroke->setEnabled(enabled);
}
 
void EditStyle::ManageDrops()
{
bool enabled = DropCaps->isChecked() ? true : false;
327,16 → 335,8
}
}
}
if (Left->isChecked())
werte->Ausri = 0;
if (Center->isChecked())
werte->Ausri = 1;
if (Right->isChecked())
werte->Ausri = 2;
if (Full->isChecked())
werte->Ausri = 3;
if (Forced->isChecked())
werte->Ausri = 4;
werte->FontEffect = EffeS->getStyle();
werte->Ausri = AligS->getStyle();
werte->LineSpa = LineSpVal->value();
werte->Indent = LeftInd->value() / UmReFaktor;
werte->First = FirstLin->value() / UmReFaktor;
347,5 → 347,9
werte->FontSize = qRound(SizeC->value() * 10.0);
werte->Drop = DropCaps->isChecked();
werte->DropLin = DropLines->value();
werte->FColor = TxFill->currentText();
werte->FShade = PM2->getValue();
werte->SColor = TxStroke->currentText();
werte->SShade = PM1->getValue();
accept();
}
/trunk/Scribus/scribus/shadebutton.h
0,0 → 1,23
#ifndef SHADEBUTTON_H
#define SHADEBUTTON_H
 
#include <qtoolbutton.h>
#include <qpopupmenu.h>
 
class ShadeButton : public QToolButton
{
 
Q_OBJECT
 
public:
ShadeButton(QWidget* parent);
~ShadeButton() {};
QPopupMenu *FillSh;
int getValue();
void setValue(int val);
 
private slots:
virtual void setShade(int id);
};
#endif
 
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/seiten.cpp
===================================================================
--- Scribus/scribus/seiten.cpp (revision 172)
+++ Scribus/scribus/seiten.cpp (revision 173)
@@ -1,7 +1,9 @@
#include "seiten.h"
#include "seiten.moc"
#include <qcursor.h>
+#include "scribus.h"
extern QPixmap loadIcon(QString nam);
+extern ScribusApp* ScApp;
/* Code fuer DragObjekt */
SeDrag::SeDrag(QString secret, QWidget * parent, const char * name): QStoredDrag("page/magic", parent, name)
@@ -665,6 +667,8 @@
void SeitenPal::RebuildTemp()
{
+ if (ScApp->ScriptRunning)
+ return;
TemplList->clear();
if (Vie == 0)
return;
@@ -680,6 +684,8 @@
void SeitenPal::RebuildPage()
{
+ if (ScApp->ScriptRunning)
+ return;
QString str;
disconnect(DS, SIGNAL(clicked()), this, SLOT(HandleDS()));
disconnect(LP, SIGNAL(clicked()), this, SLOT(HandleLP()));
/trunk/Scribus/scribus/scpainter.cpp
242,7 → 242,7
void ScPainter::fillPath()
{
if( m_index == 0 ) return;
int find = -1;
/* int find = -1;
for( int i = m_index - 1; i >= 0; i-- )
{
if( m_path[i].code == ART_MOVETO_OPEN || m_path[i].code == ART_MOVETO )
262,7 → 262,7
m_path[ m_index ].code = ART_END;
}
else
m_path[ m_index++ ].code = ART_END;
m_path[ m_index++ ].code = ART_END; */
if( fillMode != 0)
{
ArtVpath *path = art_bez_path_to_vec( m_path , 0.25 );
832,6 → 832,8
if (points->point(poi).x() > 900000)
{
nPath = true;
ensureSpace( m_index + 1 );
m_path[ m_index ].code = ART_END;
continue;
}
if (nPath)
867,6 → 869,9
}
m_index++;
}
ensureSpace( m_index + 1 );
m_path[ m_index ].code = ART_END;
m_index++;
}
}
 
897,6 → 902,9
lineTo( x+w, y+h );
lineTo( x, y+h );
lineTo( x, y );
ensureSpace( m_index + 1 );
m_path[ m_index ].code = ART_END;
m_index++;
fillPath();
strokePath();
}
/trunk/Scribus/scribus/alignselect.cpp
0,0 → 1,113
#include "alignselect.h"
#include "alignselect.moc"
 
extern QPixmap loadIcon(QString nam);
 
AlignSelect::AlignSelect(QWidget* parent) : QButtonGroup(parent, "AlignSelect")
{
setFrameShape( QButtonGroup::NoFrame );
setTitle("");
setExclusive( true );
setColumnLayout(0, Qt::Vertical );
layout()->setSpacing( 0 );
layout()->setMargin( 0 );
GroupAlignLayout = new QGridLayout( layout() );
GroupAlignLayout->setAlignment( Qt::AlignTop );
 
TextL = new QToolButton( this, "TextL" );
TextL->setMaximumSize( QSize( 22, 22 ) );
TextL->setPixmap(loadIcon("text_left.png"));
TextL->setToggleButton( true );
TextL->setOn( true );
GroupAlignLayout->addWidget( TextL, 0, 0 );
 
TextR = new QToolButton( this, "TextR" );
TextR->setMaximumSize( QSize( 22, 22 ) );
TextR->setPixmap(loadIcon("text_right.png"));
TextR->setToggleButton( true );
GroupAlignLayout->addWidget( TextR, 0, 1 );
 
TextC = new QToolButton( this, "TextC" );
TextC->setMaximumSize( QSize( 22, 22 ) );
TextC->setPixmap(loadIcon("text_center.png"));
TextC->setToggleButton( true );
GroupAlignLayout->addWidget( TextC, 0, 2 );
 
TextB = new QToolButton( this, "TextB" );
TextB->setMaximumSize( QSize( 22, 22 ) );
TextB->setPixmap(loadIcon("text_block.png"));
TextB->setToggleButton( true );
GroupAlignLayout->addWidget( TextB, 0, 3 );
 
TextF = new QToolButton( this, "TextF" );
TextF->setMaximumSize( QSize( 22, 22 ) );
TextF->setPixmap(loadIcon("text_force.png"));
TextF->setToggleButton( true );
GroupAlignLayout->addWidget( TextF, 0, 4 );
QToolTip::add( TextL, tr( "Align Text Left" ) );
QToolTip::add( TextR, tr( "Align Text Right" ) );
QToolTip::add( TextB, tr( "Align Text Block" ) );
QToolTip::add( TextC, tr( "Align Text Center" ) );
resize(minimumSizeHint());
connect(this, SIGNAL(clicked(int)), this, SLOT(setTypeStyle(int)));
}
 
void AlignSelect::setStyle(int s)
{
switch (s)
{
case 0:
setButton(0);
break;
case 2:
setButton(1);
break;
case 1:
setButton(2);
break;
case 3:
setButton(3);
break;
case 4:
setButton(4);
break;
}
}
 
int AlignSelect::getStyle()
{
int ret = 0;
if (TextL->isOn())
ret = 0;
if (TextR->isOn())
ret = 2;
if (TextC->isOn())
ret = 1;
if (TextB->isOn())
ret = 3;
if (TextF->isOn())
ret = 4;
return ret;
}
 
void AlignSelect::setTypeStyle(int a)
{
switch (a)
{
case 0:
emit State(0);
break;
case 1:
emit State(2);
break;
case 2:
emit State(1);
break;
case 3:
emit State(3);
break;
case 4:
emit State(4);
break;
}
}
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: Scribus/scribus/pageitem.cpp
===================================================================
--- Scribus/scribus/pageitem.cpp (revision 172)
+++ Scribus/scribus/pageitem.cpp (revision 173)
@@ -510,6 +510,7 @@
}
if (!pixm.isNull())
pd.drawImage(static_cast<int>(LocalX*LocalScX), static_cast<int>(LocalY*LocalScY), pixm);
+ pd.end();
pmd.setMask(bmd);
QImage ip2 = pmd.convertToImage();
if (!ip2.isNull())
Index: Scribus/scribus/cpalette.cpp
===================================================================
--- Scribus/scribus/cpalette.cpp (revision 172)
+++ Scribus/scribus/cpalette.cpp (revision 173)
@@ -17,7 +17,6 @@
#include "cpalette.h"
#include "cpalette.moc"
-#include "query.h"
extern QPixmap loadIcon(QString nam);
Cpalette::Cpalette(QWidget* parent) : QWidget(parent, "Cdouble")
@@ -49,25 +48,8 @@
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
Mode = 2;
- ShaMenu = new QPopupMenu();
- ShaMenu->insertItem( tr("Other..."));
- ShaMenu->insertItem("0 %");
- ShaMenu->insertItem("10 %");
- ShaMenu->insertItem("20 %");
- ShaMenu->insertItem("30 %");
- ShaMenu->insertItem("40 %");
- ShaMenu->insertItem("50 %");
- ShaMenu->insertItem("60 %");
- ShaMenu->insertItem("70 %");
- ShaMenu->insertItem("80 %");
- ShaMenu->insertItem("90 %");
- ShaMenu->insertItem("100 %");
- PM1 = new QToolButton(this, "Colors");
- PM1->setBackgroundMode(PaletteBackground);
- PM1->setPopup(ShaMenu);
- PM1->setPopupDelay(1);
- PM1->setText("100 %");
- PM1->setAutoRaise(true);
+ PM1 = new ShadeButton(this);
+ PM1->setValue(100);
Layout1->addWidget(PM1);
Form1Layout->addLayout(Layout1);
@@ -133,7 +115,7 @@
connect(Inhalt, SIGNAL(clicked()), this, SLOT(InhaltButton()));
connect(Innen, SIGNAL(clicked()), this, SLOT(InnenButton()));
connect(ListBox1, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selFarbe(QListBoxItem*)));
- connect(ShaMenu, SIGNAL(activated(int)), this, SLOT(setActShade(int)));
+ connect(PM1, SIGNAL(clicked()), this, SLOT(setActShade()));
connect(GradCombo, SIGNAL(activated(int)), this, SLOT(slotGrad(int)));
connect(GrColor1, SIGNAL(clicked()), this, SLOT(slotColor()));
connect(GrColor2, SIGNAL(clicked()), this, SLOT(slotColor()));
@@ -249,10 +231,7 @@
if ((sh % 10) == 0)
SetMen(sh/10+1);
else
- {
SetMen(0);
- PM1->setText(QString::number(sh)+" %");
- }
}
void Cpalette::setActFarben(QString p, QString b, int shp, int shb)
@@ -381,41 +360,15 @@
int Cpalette::SetMen(int c)
{
int b = 0;
- uint a;
- for (a = 0; a < ShaMenu->count(); ++a)
- ShaMenu->setItemChecked(ShaMenu->idAt(a), false);
- ShaMenu->setItemChecked(ShaMenu->idAt(c), true);
if (c > 0)
b = (c-1) * 10;
- PM1->setText(QString::number(b)+" %");
+ PM1->setValue(b);
return b;
}
-void Cpalette::setActShade(int id)
+void Cpalette::setActShade()
{
- QString antw;
- bool ok = false;
- int c = ShaMenu->indexOf(id);
- int b = SetMen(c);
- if (c == 0)
- {
- Query* dia = new Query(this, "New", 1, 0, "Shade:", "Shade");
- if (dia->exec())
- {
- c = dia->Answer->text().toInt(&ok);
- if (ok)
- {
- b = c;
- PM1->setText(dia->Answer->text()+" %");
- }
- delete dia;
- }
- else
- {
- delete dia;
- return;
- }
- }
+ int b = PM1->getValue();
switch (Mode)
{
case 1:
/trunk/Scribus/scribus/scribusdoc.h
205,6 → 205,11
QValueList<double> TabValues;
bool Drop;
int DropLin;
int FontEffect;
QString FColor;
int FShade;
QString SColor;
int SShade;
};
 
struct CMSset {
/trunk/Scribus/scribus/scribusview.cpp
33,6 → 33,7
#include <qstringlist.h>
#include <qimage.h>
#include <qcstring.h>
#include <qfileinfo.h>
 
extern void Level2Layer(ScribusDoc *doc, struct Layer *ll, int Level);
extern double Cwidth(ScribusDoc *doc, QString name, QString ch, int Siz, QString ch2 = " ");
1113,7 → 1114,10
tsz = hl->csize * Doc->VHochSc / 100;
if (hl->cstyle & 2)
tsz = hl->csize * Doc->VHochSc / 100;
if (((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
/* Subset all TTF Fonts until the bug in the TTF-Embedding Code is fixed */
QFileInfo fd = QFileInfo((*Doc->AllFonts)[hl->cfont]->Datei);
QString fext = fd.extension(false).lower();
if ((fext == "ttf") || ((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
{
uint chr = chx[0].unicode();
if (((*Doc->AllFonts)[hl->cfont]->CharWidth.contains(chr)) && (chr != 32))
1607,7 → 1611,10
tsz = hl->csize * Doc->VHochSc / 100;
if (hl->cstyle & 2)
tsz = hl->csize * Doc->VHochSc / 100;
if (((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
/* Subset all TTF Fonts until the bug in the TTF-Embedding Code is fixed */
QFileInfo fd = QFileInfo((*Doc->AllFonts)[hl->cfont]->Datei);
QString fext = fd.extension(false).lower();
if ((fext == "ttf") || ((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
{
uint chr = chx[0].unicode();
if (((*Doc->AllFonts)[hl->cfont]->CharWidth.contains(chr)) && (chr != 32))
1991,7 → 1998,10
SetFarbe(hl->ccolor, hl->cshade, &h, &s, &v, &k);
p->PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
}
if (((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
/* Subset all TTF Fonts until the bug in the TTF-Embedding Code is fixed */
QFileInfo fd = QFileInfo((*Doc->AllFonts)[hl->cfont]->Datei);
QString fext = fd.extension(false).lower();
if ((fext == "ttf") || ((*Doc->AllFonts)[hl->cfont]->isOTF) || ((*Doc->AllFonts)[hl->cfont]->Subset))
{
uint chr = chx[0].unicode();
if (((*Doc->AllFonts)[hl->cfont]->CharWidth.contains(chr)) && (chr != 32))
/trunk/Scribus/scribus/libpostscript/pslib.cpp
108,7 → 108,11
int a = 0;
for (it = DocFonts.begin(); it != DocFonts.end(); ++it)
{
if ((AllFonts[it.key()]->isOTF) || (AllFonts[it.key()]->Subset))
/* Subset all TTF Fonts until the bug in the TTF-Embedding Code is fixed */
QFileInfo fd = QFileInfo(AllFonts[it.key()]->Datei);
QString fext = fd.extension(false).lower();
 
if ((fext == "ttf") || (AllFonts[it.key()]->isOTF) || (AllFonts[it.key()]->Subset))
{
FontDesc += "/"+AllFonts[it.key()]->RealName()+" "+IToStr(AllFonts[it.key()]->RealGlyphs.count()+1)+" dict def\n";
FontDesc += AllFonts[it.key()]->RealName()+" begin\n";
/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(23).arg("January").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(25).arg("January").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
163,12 → 163,15
"<tr><td><b>" + tr("Welsh:") + "</b></td><td></td></tr>" +
"<tr><td>Kevin Donnelly</td><td>kevin@dotmon.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Russian:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Russian:") + "</b></td><td></td></tr>" +
"<tr><td>Alexandre Prokoudine</td><td>techwriter@land.ru</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Brazilian:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Brazilian:") + "</b></td><td></td></tr>" +
"<tr><td>Celio Santos</td><td>celio@electronic.srv.br</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Finnish:") + "</b></td><td></td></tr>" +
"<tr><td>Riku Leino</td><td>tsoots@welho.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"</table>");
TextView2->setTextFormat( QTextView::RichText );
tabLayout_2->addWidget( TextView2 );
/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 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 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 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 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 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
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 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
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/
/trunk/Scribus/scribus/newfile.cpp
6,21 → 6,26
: QDialog( parent, "newDoc", true, 0 )
{
char *units[] = {" pt", " mm", " in", " p"};
int decimals;
ein = units[Vor->Einheit];
switch (Vor->Einheit)
{
case 0:
Umrech = 1.0;
Umrech = 1.0;
decimals = 100;
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
break;
case 2:
Umrech = 1.0 / 72.0;
break;
decimals = 10000;
break;
case 3:
Umrech = 1.0 / 12.0;
break;
decimals = 100;
break;
}
einheit = Vor->Einheit;
Orient = 0;
43,7 → 48,7
ComboBox1 = new QComboBox( true, ButtonGroup1_2, "ComboBox1" );
QString sizelist[] = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "B0", "B1", "B2", "B3", "B4",
"B5", "B6", "B7", "B8", "B9", "B10", "C5E", "Comm10E", "DLE", "Executive", "Folio",
"Ledger", "Letter", "Tabloid", tr("Custom")};
"Ledger", "Legal", "Letter", "Tabloid", tr("Custom")};
size_t const num_mappings = (sizeof sizelist)/(sizeof *sizelist);
for (uint m = 0; m < num_mappings; ++m)
ComboBox1->insertItem(sizelist[m]);
64,9 → 69,10
TextLabel1_2 = new QLabel( ButtonGroup1_2, "TextLabel1_2" );
TextLabel1_2->setText( tr( "Width:" ) );
Layout5->addWidget( TextLabel1_2 );
Breite = new MSpinBox( ButtonGroup1_2, 2 );
Breite = new MSpinBox( ButtonGroup1_2, 4 );
Breite->setEnabled( false );
Breite->setMinimumSize( QSize( 70, 20 ) );
Breite->setDecimals( decimals );
Breite->setSuffix(ein);
Breite->setMaxValue( 10000 );
Breite->setMinValue( 1 );
74,9 → 80,10
TextLabel2_2 = new QLabel( ButtonGroup1_2, "TextLabel2_2" );
TextLabel2_2->setText( tr( "Height:" ) );
Layout5->addWidget( TextLabel2_2 );
Hoehe = new MSpinBox( ButtonGroup1_2, 2 );
Hoehe = new MSpinBox( ButtonGroup1_2, 4 );
Hoehe->setEnabled( false );
Hoehe->setMinimumSize( QSize( 70, 20 ) );
Hoehe->setDecimals( decimals );
Hoehe->setSuffix(ein);
Hoehe->setMaxValue( 10000 );
Hoehe->setMinValue( 1 );
121,8 → 128,9
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
Layout3->addWidget( TextLabel7, 1, 0 );
TopR = new MSpinBox( GroupBox7, 2 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setMinimumSize( QSize( 70, 20 ) );
TopR->setDecimals( decimals );
TopR->setMaxValue( 1000 );
TopR->setMinValue( 0 );
TopR->setSuffix( ein );
129,8 → 137,9
TopR->setValue(Vor->RandOben * Umrech);
Top = Vor->RandOben;
Layout3->addWidget( TopR, 0, 1 );
BottomR = new MSpinBox( GroupBox7, 2 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setMinimumSize( QSize( 70, 20 ) );
BottomR->setDecimals( decimals );
BottomR->setSuffix( ein );
BottomR->setMaxValue( 1000 );
BottomR->setMinValue( 0 );
137,16 → 146,18
BottomR->setValue(Vor->RandUnten * Umrech);
Bottom = Vor->RandUnten;
Layout3->addWidget( BottomR, 1, 1 );
LeftR = new MSpinBox( GroupBox7, 2 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setMinimumSize( QSize( 70, 20 ) );
LeftR->setSuffix( ein );
LeftR->setDecimals( decimals );
LeftR->setSuffix( ein );
LeftR->setMaxValue( 1000 );
LeftR->setMinValue( 0 );
LeftR->setValue(Vor->RandLinks * Umrech);
Left = Vor->RandLinks;
Layout3->addWidget( LeftR, 0, 3 );
RightR = new MSpinBox( GroupBox7, 2 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setMinimumSize( QSize( 70, 20 ) );
RightR->setDecimals( decimals );
RightR->setSuffix( ein );
RightR->setMaxValue( 1000 );
RightR->setMinValue( 0 );
211,7 → 222,8
TextLabel3 = new QLabel( GroupBox4, "TextLabel3" );
TextLabel3->setText( tr( "Columns:" ) );
Layout2->addWidget( TextLabel3, 0, 0 );
Distance = new MSpinBox( GroupBox4, 2 );
Distance = new MSpinBox( GroupBox4, 4 );
Distance->setDecimals( decimals );
Distance->setSuffix( ein );
Distance->setMaxValue( 1000 );
Distance->setValue(11 * Umrech);
327,22 → 339,37
{
char *units[] = {" pt", " mm", " in", " p"};
ein = units[u];
int decimals;
 
switch (u)
{
case 0:
Umrech = 1.0;
decimals = 100;
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
break;
case 2:
Umrech = 1.0 / 72.0;
decimals = 10000;
break;
case 3:
Umrech = 1.0 / 12.0;
decimals = 100;
break;
}
einheit = u;
 
Breite->setDecimals( decimals );
Hoehe->setDecimals( decimals );
RightR->setDecimals( decimals );
LeftR->setDecimals( decimals );
TopR->setDecimals( decimals );
BottomR->setDecimals( decimals );
Distance->setDecimals( decimals );
 
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
373,6 → 400,7
Breite->setSuffix(ein);
Hoehe->setSuffix(ein);
Distance->setSuffix( ein );
}
 
void NewDoc::ExitOK()
447,8 → 475,11
Breite->setEnabled(true);
Hoehe->setEnabled(true);
}
Pagebr = page_x[gr];
Pageho = page_y[gr];
else
{
Pagebr = page_x[gr];
Pageho = page_y[gr];
}
Breite->setValue(Pagebr * Umrech);
Hoehe->setValue(Pageho * Umrech);
RightR->setMaxValue(Breite->value() - LeftR->value());
/trunk/Scribus/scribus/scfonts_ttf.cpp
118,7 → 118,7
length=file.readBlock(tmp,65534);
if(length)
{
str+="\n<";
str+="\n<\n";
for (int j = 0; j < length; j++)
{
unsigned char u=tmp[posi];
140,7 → 140,7
linebuf[poso++]=0;
str += linebuf;
poso = 0;
str += "00>";
str += "00\n>";
}
}
while (length==65534);
/trunk/Scribus/scribus/alignselect.h
0,0 → 1,40
#ifndef ALIGNSELECT_H
#define ALIGNSELECT_H
 
#include <qbuttongroup.h>
#include <qtoolbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
 
class AlignSelect : public QButtonGroup
{
 
Q_OBJECT
 
public:
AlignSelect(QWidget* parent);
~AlignSelect() {};
void setStyle(int s);
int getStyle();
 
QButtonGroup* GroupAlign;
QToolButton* TextL;
QToolButton* TextR;
QToolButton* TextC;
QToolButton* TextB;
QToolButton* TextF;
 
private slots:
void setTypeStyle(int a);
 
signals:
void State(int);
 
protected:
QGridLayout* GroupAlignLayout;
 
};
 
#endif
 
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/search.cpp
===================================================================
--- Scribus/scribus/search.cpp (revision 172)
+++ Scribus/scribus/search.cpp (revision 173)
@@ -16,6 +16,7 @@
#include "fontcombo.h"
#include "page.h"
#include "styleselect.h"
+#include "shadebutton.h"
extern QPixmap loadIcon(QString nam);
@@ -67,10 +68,18 @@
SFill->setText( tr( "Fill Color" ) );
SearchLayout->addWidget( SFill, 5, 0 );
+ SFillS = new QCheckBox( Search, "SFillS" );
+ SFillS->setText( tr( "Fill Shade" ) );
+ SearchLayout->addWidget( SFillS, 6, 0 );
+
SStroke = new QCheckBox( Search, "SStroke" );
SStroke->setText( tr( "Stroke Color" ) );
- SearchLayout->addWidget( SStroke, 6, 0 );
+ SearchLayout->addWidget( SStroke, 7, 0 );
+ SStrokeS = new QCheckBox( Search, "SStrokeS" );
+ SStrokeS->setText( tr( "Stroke Shade" ) );
+ SearchLayout->addWidget( SStrokeS, 8, 0 );
+
STextVal = new QLineEdit( Search, "STextVal" );
STextVal->setEnabled(false);
SearchLayout->addWidget( STextVal, 0, 1 );
@@ -121,6 +130,10 @@
SFillVal->setEnabled(false);
SearchLayout->addWidget( SFillVal, 5, 1 );
+ SFillSVal = new ShadeButton(Search);
+ SFillSVal->setEnabled(false);
+ SearchLayout->addWidget( SFillSVal, 6, 1, Qt::AlignLeft );
+
SStrokeVal = new QComboBox( true, Search, "SStrokeVal" );
SStrokeVal->setEditable(false);
SStrokeVal->insertItem( tr("None"));
@@ -131,8 +144,12 @@
}
SStrokeVal->setCurrentText(doc->CurrTextStroke);
SStrokeVal->setEnabled(false);
- SearchLayout->addWidget( SStrokeVal, 6, 1 );
+ SearchLayout->addWidget( SStrokeVal, 7, 1 );
+ SStrokeSVal = new ShadeButton(Search);
+ SStrokeSVal->setEnabled(false);
+ SearchLayout->addWidget( SStrokeSVal, 8, 1, Qt::AlignLeft );
+
SelLayout->addWidget( Search );
Replace = new QGroupBox( this, "Replace" );
@@ -167,10 +184,18 @@
RFill->setText( tr( "Fill Color" ) );
ReplaceLayout->addWidget( RFill, 5, 0 );
+ RFillS = new QCheckBox( Replace, "RFillS" );
+ RFillS->setText( tr( "Fill Shade" ) );
+ ReplaceLayout->addWidget( RFillS, 6, 0 );
+
RStroke = new QCheckBox( Replace, "RStroke" );
RStroke->setText( tr( "Stroke Color" ) );
- ReplaceLayout->addWidget( RStroke, 6, 0 );
+ ReplaceLayout->addWidget( RStroke, 7, 0 );
+ RStrokeS = new QCheckBox( Replace, "RStrokeS" );
+ RStrokeS->setText( tr( "Stroke Shade" ) );
+ ReplaceLayout->addWidget( RStrokeS, 8, 0 );
+
RTextVal = new QLineEdit( Replace, "RTextVal" );
RTextVal->setEnabled(false);
ReplaceLayout->addWidget( RTextVal, 0, 1 );
@@ -219,6 +244,10 @@
RFillVal->setEnabled(false);
ReplaceLayout->addWidget( RFillVal, 5, 1 );
+ RFillSVal = new ShadeButton(Replace);
+ RFillSVal->setEnabled(false);
+ ReplaceLayout->addWidget( RFillSVal, 6, 1, Qt::AlignLeft );
+
RStrokeVal = new QComboBox( true, Replace, "RStrokeVal" );
RStrokeVal->setEditable(false);
RStrokeVal->insertItem( tr("None"));
@@ -229,8 +258,12 @@
}
RStrokeVal->setCurrentText(doc->CurrTextStroke);
RStrokeVal->setEnabled(false);
- ReplaceLayout->addWidget( RStrokeVal, 6, 1 );
+ ReplaceLayout->addWidget( RStrokeVal, 7, 1 );
+ RStrokeSVal = new ShadeButton(Replace);;
+ RStrokeSVal->setEnabled(false);
+ ReplaceLayout->addWidget( RStrokeSVal, 8, 1, Qt::AlignLeft );
+
SelLayout->addWidget( Replace );
SearchReplaceLayout->addLayout( SelLayout );
@@ -282,6 +315,8 @@
connect( SSize, SIGNAL( clicked() ), this, SLOT( enableSizeSearch() ) );
connect( SEffect, SIGNAL( clicked() ), this, SLOT( enableEffSearch() ) );
connect( SFill, SIGNAL( clicked() ), this, SLOT( enableFillSearch() ) );
+ connect( SFillS, SIGNAL( clicked() ), this, SLOT( enableFillSSearch() ) );
+ connect( SStrokeS, SIGNAL( clicked() ), this, SLOT( enableStrokeSSearch() ) );
connect( SStroke, SIGNAL( clicked() ), this, SLOT( enableStrokeSearch() ) );
connect( RText, SIGNAL( clicked() ), this, SLOT( enableTxReplace() ) );
connect( RStyle, SIGNAL( clicked() ), this, SLOT( enableStyleReplace() ) );
@@ -290,6 +325,8 @@
connect( REffect, SIGNAL( clicked() ), this, SLOT( enableEffReplace() ) );
connect( RFill, SIGNAL( clicked() ), this, SLOT( enableFillReplace() ) );
connect( RStroke, SIGNAL( clicked() ), this, SLOT( enableStrokeReplace() ) );
+ connect( RFillS, SIGNAL( clicked() ), this, SLOT( enableFillSReplace() ) );
+ connect( RStrokeS, SIGNAL( clicked() ), this, SLOT( enableStrokeSReplace() ) );
// tab order
setTabOrder( SText, SStyle );
@@ -350,10 +387,13 @@
int sStyle = 0;
int sSize = 0;
int sEff = 0;
+ int sFillSh = 100;
+ int sStrokeSh = 100;
bool rep = false;
bool found = true;
if ((RFill->isChecked()) || (RStroke->isChecked()) || (RStyle->isChecked()) || (RFont->isChecked())
- || (RSize->isChecked()) || (RText->isChecked()) || (REffect->isChecked()))
+ || (RStrokeS->isChecked()) || (RFillS->isChecked()) || (RSize->isChecked()) || (RText->isChecked())
+ || (REffect->isChecked()))
rep = true;
if (SText->isChecked())
sText = STextVal->text();
@@ -363,8 +403,12 @@
sEff = SEffVal->getStyle();
if (SFill->isChecked())
fCol = SFillVal->currentText();
+ if (SFillS->isChecked())
+ sFillSh = SFillSVal->getValue();
if (SStroke->isChecked())
sCol = SStrokeVal->currentText();
+ if (SStrokeS->isChecked())
+ sStrokeSh = SStrokeSVal->getValue();
if (SFont->isChecked())
sFont = SFontVal->currentText();
if (SStyle->isChecked())
@@ -376,7 +420,8 @@
uint inde = 0;
uint as = Item->CPos;
ReplStart = as;
- for (uint a = as; a < Item->Ptext.count(); ++a)
+ uint a;
+ for (a = as; a < Item->Ptext.count(); ++a)
{
if (SText->isChecked())
{
@@ -408,7 +453,17 @@
{
if (Item->Ptext.at(a)->cstroke != sCol)
found = false;
- }
+ }
+ if (SStrokeS->isChecked())
+ {
+ if (Item->Ptext.at(a)->cshade2 != sStrokeSh)
+ found = false;
+ }
+ if (SFillS->isChecked())
+ {
+ if (Item->Ptext.at(a)->cshade != sFillSh)
+ found = false;
+ }
if (SEffect->isChecked())
{
if ((Item->Ptext.at(a)->cstyle & 127) != sEff)
@@ -468,7 +523,7 @@
inde = 0;
}
}
- if (!found)
+ if ((!found) || (a == Item->Ptext.count()))
{
Doc->DoDrawing = true;
Doc->ActPage->RefreshItem(Item, true);
@@ -537,6 +592,7 @@
{
hg->cfont = Doc->Vorlagen[hg->cab].Font;
hg->csize = Doc->Vorlagen[hg->cab].FontSize;
+ hg->cstyle = Doc->Vorlagen[hg->cab].FontEffect;
}
if (RFont->isChecked())
hg->cfont = RFontVal->currentText();
@@ -566,8 +622,12 @@
emit NewAbs(RStyleVal->currentItem());
if (RFill->isChecked())
Doc->ActPage->ItemTextBrush(RFillVal->currentText());
+ if (RFillS->isChecked())
+ Doc->ActPage->ItemTextBrushS(RFillSVal->getValue());
if (RStroke->isChecked())
Doc->ActPage->ItemTextPen(RStrokeVal->currentText());
+ if (RStrokeS->isChecked())
+ Doc->ActPage->ItemTextPenS(RStrokeSVal->getValue());
if (RFont->isChecked())
emit NewFont(RFontVal->currentText());
if (RSize->isChecked())
@@ -642,11 +702,21 @@
SFillVal->setEnabled(SFill->isChecked());
}
+void SearchReplace::enableFillSSearch()
+{
+ SFillSVal->setEnabled(SFillS->isChecked());
+}
+
void SearchReplace::enableStrokeSearch()
{
SStrokeVal->setEnabled(SStroke->isChecked());
}
+void SearchReplace::enableStrokeSSearch()
+{
+ SStrokeSVal->setEnabled(SStrokeS->isChecked());
+}
+
void SearchReplace::enableTxReplace()
{
RTextVal->setEnabled(RText->isChecked());
@@ -677,8 +747,18 @@
RFillVal->setEnabled(RFill->isChecked());
}
+void SearchReplace::enableFillSReplace()
+{
+ RFillSVal->setEnabled(RFillS->isChecked());
+}
+
void SearchReplace::enableStrokeReplace()
{
RStrokeVal->setEnabled(RStroke->isChecked());
}
+void SearchReplace::enableStrokeSReplace()
+{
+ RStrokeSVal->setEnabled(RStrokeS->isChecked());
+}
+
/trunk/Scribus/scribus/scribus.cpp
117,6 → 117,7
 
ScribusApp::ScribusApp(SplashScreen *splash)
{
ScApp = this;
setCaption( tr("Scribus " VERSION));
setKeyCompression(false);
setIcon(loadIcon("AppIcon.png"));
192,6 → 193,7
{
HaveDoc = 0;
singleClose = false;
ScriptRunning = false;
view = NULL;
doc = NULL;
BuildFontMenu();
506,7 → 508,6
typedef void (*HandlerType)(int);
HandlerType handler = 0;
handler = ScribusApp::defaultCrashHandler;
ScApp = this;
if (!handler)
handler = SIG_DFL;
sigset_t mask;
858,23 → 859,37
void ScribusApp::ReportMP(double xp, double yp)
{
QString tmp, tmp2;
int multiplier, precision;
double divisor;
switch (doc->Einheit)
{
case 0:
tmp2 = " pt";
multiplier = 100;
divisor = 100.0;
precision = 2;
break;
case 1:
tmp2 = " mm";
multiplier = 1000;
divisor = 1000.0;
precision = 3;
break;
case 2:
tmp2 = " in";
multiplier = 10000;
divisor = 10000.0;
precision = 4;
break;
case 3:
tmp2 = " p";
multiplier = 100;
divisor = 100.0;
precision = 2;
break;
}
XDat->setText(tmp.setNum(qRound(xp*UmReFaktor * 100) / 100.0, 'f', 2)+tmp2);
YDat->setText(tmp.setNum(qRound(yp*UmReFaktor * 100) / 100.0, 'f', 2)+tmp2);
XDat->setText(tmp.setNum(qRound(xp*UmReFaktor * multiplier) / divisor, 'f', precision)+tmp2);
YDat->setText(tmp.setNum(qRound(yp*UmReFaktor * multiplier) / divisor, 'f', precision)+tmp2);
}
 
void ScribusApp::SetKeyEntry(int Nr, QString text, int Men, int KeyC)
4712,9 → 4727,23
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
}
else
{
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->CurrentStyle;
}
}
}
}
4734,9 → 4763,23
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
}
else
{
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->CurrentStyle;
}
}
}
}
/trunk/Scribus/scribus/libprefs/prefs.cpp
44,10 → 44,29
Preferences::Preferences( QWidget* parent, preV *Vor)
: QDialog( parent, "pref", true, 0 )
{
int decimals;
fon = &Vor->AvailFonts;
ap = (ScribusApp*)parent;
Umrech = 1.0;
Einheit = ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit;
 
switch (Einheit)
{
case 0:
decimals = 100;
break;
case 1:
decimals = 1000;
break;
case 2:
decimals = 10000;
break;
case 3:
decimals = 100;
break;
}
 
 
DisScale = Vor->DisScale;
KKC = Vor->KeyActions;
setCaption( tr( "Preferences" ) );
303,9 → 322,10
GZText3->setText( tr( "Width:" ) );
Layout5_2->addWidget( GZText3 );
 
Breite = new MSpinBox( GroupSize, 2 );
Breite = new MSpinBox( GroupSize, 4 );
Breite->setEnabled( false );
Breite->setMinimumSize( QSize( 70, 20 ) );
Breite->setDecimals( decimals );
Breite->setMaxValue( 10000 );
Breite->setMinValue( 1 );
Layout5_2->addWidget( Breite );
314,9 → 334,10
GZText4->setText( tr( "Height:" ) );
Layout5_2->addWidget( GZText4 );
 
Hoehe = new MSpinBox( GroupSize, 2 );
Hoehe = new MSpinBox( GroupSize, 4 );
Hoehe->setEnabled( false );
Hoehe->setMinimumSize( QSize( 70, 20 ) );
Hoehe->setDecimals( decimals );
Hoehe->setMaxValue( 10000 );
Hoehe->setMinValue( 1 );
Layout5_2->addWidget( Hoehe );
348,29 → 369,33
GroupRandLayout = new QGridLayout( GroupRand->layout() );
GroupRandLayout->setAlignment( Qt::AlignTop );
 
TopR = new MSpinBox( GroupRand, 2 );
TopR = new MSpinBox( GroupRand, 4 );
TopR->setMinimumSize( QSize( 70, 20 ) );
TopR->setDecimals( decimals );
TopR->setMaxValue( 1000 );
TopR->setMinValue( 0 );
TopR->setValue(Vor->RandOben * Umrech);
RandT = Vor->RandOben;
GroupRandLayout->addWidget( TopR, 0, 1 );
BottomR = new MSpinBox( GroupRand, 2 );
BottomR = new MSpinBox( GroupRand, 4 );
BottomR->setMinimumSize( QSize( 70, 20 ) );
BottomR->setDecimals( decimals );
BottomR->setMaxValue( 1000 );
BottomR->setMinValue( 0 );
BottomR->setValue(Vor->RandUnten * Umrech);
RandB = Vor->RandUnten;
GroupRandLayout->addWidget( BottomR, 1, 1 );
RightR = new MSpinBox( GroupRand, 2 );
RightR = new MSpinBox( GroupRand, 4 );
RightR->setMinimumSize( QSize( 70, 20 ) );
RightR->setDecimals( decimals );
RightR->setMaxValue( 1000 );
RightR->setMinValue( 0 );
RightR->setValue(Vor->RandRechts * Umrech);
RandR = Vor->RandRechts;
GroupRandLayout->addWidget( RightR, 1, 3 );
LeftR = new MSpinBox( GroupRand, 2 );
LeftR = new MSpinBox( GroupRand, 4 );
LeftR->setMinimumSize( QSize( 70, 20 ) );
LeftR->setDecimals( decimals );
LeftR->setMaxValue( 1000 );
LeftR->setMinValue( 0 );
LeftR->setValue(Vor->RandLinks * Umrech);
444,11 → 469,13
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1, TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2->setText( tr( "Major Grid Spacing:" ) );
Layout10->addWidget( TextLabel2, 1, 0 );
SpinBox1 = new MSpinBox( GroupBox1, 2 );
SpinBox1 = new MSpinBox( GroupBox1, 4 );
SpinBox1->setDecimals( decimals );
SpinBox1->setMaxValue( 1000 );
SpinBox1->setMinValue( 1 );
Layout10->addWidget( SpinBox1, 0, 1 );
SpinBox2 = new MSpinBox( GroupBox1, 2 );
SpinBox2 = new MSpinBox( GroupBox1, 4 );
SpinBox2->setDecimals( decimals );
SpinBox2->setMaxValue( 1000 );
SpinBox2->setMinValue( 10 );
Layout10->addWidget( SpinBox2, 1, 1 );
456,7 → 483,8
TextLabel2g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1, TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2g->setText( tr( "Guide Snap Distance:" ) );
Layout10->addWidget( TextLabel2g, 2, 0 );
SpinBox2g = new MSpinBox( GroupBox1, 2 );
SpinBox2g = new MSpinBox( GroupBox1, 4 );
SpinBox2g->setDecimals( decimals );
SpinBox2g->setMaxValue( 1000 );
SpinBox2g->setMinValue( 1 );
Layout10->addWidget( SpinBox2g, 2, 1 );
868,6 → 896,7
Layout15a->addWidget( TextGap, 4, 0 );
TextGapVal = new MSpinBox( ToolFrame, 1 );
TextGapVal->setSuffix( tr( " pt" ) );
TextGapVal->setDecimals( decimals );
TextGapVal->setMaxValue( 200 );
TextGapVal->setMinValue( 0 );
TextGapVal->setValue(ap->HaveDoc ? ap->doc->DGap : Vor->DGap);
2175,23 → 2204,28
{
double AltUmrech = Umrech;
QString einh;
int decimals;
Einheit = UnitCombo->currentItem();
switch (UnitCombo->currentItem())
{
case 0:
Umrech = 1.0;
decimals = 100;
einh = tr( " pt" );
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
einh = tr( " mm" );
break;
case 2:
Umrech = 1.0 / 72.0;
decimals = 10000;
einh = tr( " in" );
break;
case 3:
Umrech = 1.0 / 12.0;
decimals = 100;
einh = tr( " p" );
break;
}
2205,6 → 2239,18
LeftR->setSuffix(einh);
RightR->setSuffix(einh);
TextGapVal->setSuffix(einh);
 
Breite->setDecimals (decimals);
Hoehe->setDecimals (decimals);
TopR->setDecimals (decimals);
BottomR->setDecimals (decimals);
LeftR->setDecimals (decimals);
RightR->setDecimals (decimals);
TextGapVal->setDecimals (decimals);
SpinBox1->setDecimals (decimals);
SpinBox2->setDecimals (decimals);
SpinBox2g->setDecimals (decimals);
 
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
/trunk/Scribus/scribus/mspinbox.cpp
51,7 → 51,7
break;
case 4:
Decimals = 10000;
Width = 3;
Width = 4;
break;
default:
Decimals = 100;
/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
29,7 → 29,9
return NULL;
if (!Carrier->HaveDoc)
return PyInt_FromLong(0L);
return PyInt_FromLong(static_cast<long>(Carrier->DoSaveAsEps(QString(Name))));
bool ret = Carrier->DoSaveAsEps(QString(Name));
// qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
PyObject *scribus_deletepage(PyObject *self, PyObject* args)
44,6 → 46,7
if ((e < 0) || (e > static_cast<int>(Carrier->view->Pages.count())-1))
return Py_None;
Carrier->DeletePage2(e);
// qApp->processEvents();
return Py_None;
}
 
59,6 → 62,7
if ((e < 0) || (e > static_cast<int>(Carrier->view->Pages.count())-1))
return Py_None;
Carrier->view->GotoPage(e);
// qApp->processEvents();
return Py_None;
}
 
80,6 → 84,7
return Py_None;
Carrier->slotNewPageP(e, QString(name));
}
// qApp->processEvents();
return Py_None;
}
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
25,6 → 25,7
rr = ValToPts(rr, unit);
btr = ValToPts(btr, unit);
bool ret = Carrier->doFileNew(b, h, tpr, lr, rr, btr, 0, 1, false, ds, unit, fsl, ori, fNr);
// qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
55,7 → 56,9
if (!Carrier->HaveDoc)
return PyInt_FromLong(0L);
Carrier->doc->setUnModified();
return PyInt_FromLong(static_cast<long>(Carrier->slotFileClose()));
bool ret = Carrier->slotFileClose();
qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
PyObject *scribus_havedoc(PyObject *self, PyObject* args)
71,6 → 74,7
if (!PyArg_ParseTuple(args, "s", &Name))
return NULL;
bool ret = Carrier->LadeDoc(QString(Name));
// qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
81,6 → 85,7
if (!Carrier->HaveDoc)
return PyInt_FromLong(0L);
Carrier->slotFileSave();
// qApp->processEvents();
return PyInt_FromLong(0L);
}
 
91,7 → 96,9
return NULL;
if (!Carrier->HaveDoc)
return PyInt_FromLong(0L);
return PyInt_FromLong(static_cast<long>(Carrier->DoFileSave(QString(Name))));
bool ret = Carrier->DoFileSave(QString(Name));
// qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
PyObject *scribus_setinfo(PyObject *self, PyObject* args)
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
131,6 → 131,23
}
}
QDir::setCurrent(CurDirP);
if (Carrier->HaveDoc)
{
Carrier->Mpal->SetDoc(Carrier->doc);
Carrier->Mpal->updateCList();
Carrier->Mpal->Spal->SetFormats(Carrier->doc);
Carrier->Mpal->SetLineFormats(Carrier->doc);
Carrier->Mpal->Cpal->SetColors(Carrier->doc->PageColors);
Carrier->Lpal->setLayers(&Carrier->doc->Layers, &Carrier->doc->ActiveLayer);
Carrier->Tpal->BuildTree(Carrier->view);
Carrier->Sepal->SetView(Carrier->view);
Carrier->Sepal->Rebuild();
if (Carrier->doc->ActPage->SelItem.count() != 0)
Carrier->HaveNewSel(Carrier->doc->ActPage->SelItem.at(0)->PType);
else
Carrier->HaveNewSel(-1);
Carrier->doc->ActPage->repaint();
}
}
 
void MenuTest::RecentScript(int id)
149,10 → 166,28
return;
}
slotRunScriptFile(fn);
if (Carrier->HaveDoc)
{
Carrier->Mpal->SetDoc(Carrier->doc);
Carrier->Mpal->updateCList();
Carrier->Mpal->Spal->SetFormats(Carrier->doc);
Carrier->Mpal->SetLineFormats(Carrier->doc);
Carrier->Mpal->Cpal->SetColors(Carrier->doc->PageColors);
Carrier->Lpal->setLayers(&Carrier->doc->Layers, &Carrier->doc->ActiveLayer);
Carrier->Tpal->BuildTree(Carrier->view);
Carrier->Sepal->SetView(Carrier->view);
Carrier->Sepal->Rebuild();
if (Carrier->doc->ActPage->SelItem.count() != 0)
Carrier->HaveNewSel(Carrier->doc->ActPage->SelItem.at(0)->PType);
else
Carrier->HaveNewSel(-1);
Carrier->doc->ActPage->repaint();
}
}
 
void MenuTest::slotRunScriptFile(QString fileName)
{
Carrier->ScriptRunning = true;
char* comm[1];
QFileInfo fi(fileName);
QCString na = fi.fileName().latin1();
169,10 → 204,12
PyRun_SimpleString(cmd.data());
Py_EndInterpreter(state);
PyEval_RestoreThread(stateo);
Carrier->ScriptRunning = false;
}
 
QString MenuTest::slotRunScript(QString Script)
{
Carrier->ScriptRunning = true;
char* comm[1];
QString cm;
InValue = Script;
210,6 → 247,7
}
else
pcon->OutWin->Prompt = "...";
Carrier->ScriptRunning = false;
return RetString;
}
 
234,7 → 272,22
pcon->OutWin->scrollToBottom();
pcon->OutWin->ensureCursorVisible();
if (Carrier->HaveDoc)
{
Carrier->Mpal->SetDoc(Carrier->doc);
Carrier->Mpal->updateCList();
Carrier->Mpal->Spal->SetFormats(Carrier->doc);
Carrier->Mpal->SetLineFormats(Carrier->doc);
Carrier->Mpal->Cpal->SetColors(Carrier->doc->PageColors);
Carrier->Lpal->setLayers(&Carrier->doc->Layers, &Carrier->doc->ActiveLayer);
Carrier->Tpal->BuildTree(Carrier->view);
Carrier->Sepal->SetView(Carrier->view);
if (Carrier->doc->ActPage->SelItem.count() != 0)
Carrier->HaveNewSel(Carrier->doc->ActPage->SelItem.at(0)->PType);
else
Carrier->HaveNewSel(-1);
Carrier->Sepal->Rebuild();
Carrier->doc->ActPage->repaint();
}
}
 
void MenuTest::ReadPlugPrefs()
/trunk/Scribus/scribus/plugins/scriptplugin/samples/quote.py
1,24 → 1,15
#!/usr/bin/python
# -*- coding: ISO-8859-1 -*-
# DO NOT remove above line
from scribus import *
import os, re
import re
 
 
TITLE = "Text quoting"
BUTTON_OK = 1
ICON_INFORMATION = 1
ICON_WARNING = 2
QUOTE_START = "»"
QUOTE_END = "«"
 
 
 
def msgBox(msg):
# replace with "gdialog" or "xterm -e dialog" if needed
# it would be nice, if the plugin would provide a msgbox
# and a file selector
cmd = 'kdialog --msgbox "%s"'
os.system(cmd % msg)
 
 
 
def quote(textobj):
quoted_re = re.compile('"[^"]*"')
text = GetText(textobj)
55,7 → 46,9
for obj in GetAllObjects():
changed += quote(obj)
SetRedraw(1)
msgBox("%s quotations changed" % changed)
RedrawAll()
MessageBox(TITLE, "%s quotations changed" % changed,
ICON_INFORMATION, BUTTON_OK)
else:
msgBox("No document open")
msgBox(TITLE, "No document open", ICON_WARNING, BUTTON_OK)
/trunk/Scribus/scribus/plugins/scriptplugin/samples/htmlimport.py
1,13 → 1,11
from scribus import *
 
from sgmllib import SGMLParser
from htmlentitydefs import entitydefs
import os
 
 
DEFAULT_SIZE = 10
HEADERS = {'h1': 48, 'h2': 36, 'h3': 24,
'h4': 18, 'h5': 14, 'h6': 12 }
TITLE = "Import HTML"
BUTTON_OK = 1
ICON_WARNING = 2
NEWLINE = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6',
'br', 'p', 'li', 'div', 'tr']
 
18,8 → 16,10
SGMLParser.__init__(self)
self.in_body = 0
self.textbox = textbox
self.textbox.setSize(DEFAULT_SIZE)
 
def append(self, text):
InsertText(text, GetTextLength(self.textbox), self.textbox)
 
def start_body(self, attrs):
self.in_body = 1
 
28,15 → 28,11
 
def unknown_starttag(self, name, attrs):
if name in NEWLINE:
self.textbox.append('\n')
if name in HEADERS.keys():
self.textbox.setSize(HEADERS[name])
self.append('\n')
def unknown_endtag(self, name):
if name in HEADERS.keys():
self.textbox.setSize(DEFAULT_SIZE)
if name in NEWLINE:
self.textbox.append('\n')
self.append('\n')
 
def handle_data(self, raw_data):
if self.in_body:
46,52 → 42,25
data = ' ' + data
if raw_data.endswith(' ') and len(raw_data) > 1:
data = data + ' '
self.textbox.append(data)
self.append(data)
 
def unknown_entityref(self, entity):
self.handle_data(entitydefs.get(entity, ''))
 
 
 
def openFileDialog():
cmd = 'kdialog --getopenfilename "." "*.html|*.htm"'
pipe = os.popen(cmd)
filename = pipe.read()[:-1]
pipe.close()
return filename
 
 
def messageBox(msg):
cmd = 'kdialog --msgbox "%s"' % msg
os.system(cmd)
class TextBox:
 
def __init__(self, x, y, width, height):
self.boxid = CreateText(x, y, width, height)
 
def setSize(self, size):
# XXX: disabled, doesn't work like expected
pass #SetFontSize(size, self.boxid)
 
def append(self, text):
InsertText(text, GetTextLength(self.boxid),
self.boxid)
 
 
 
def main():
if HaveDoc():
filename = openFileDialog()
if filename:
SetUnit(1)
textbox = TextBox(20, 20, 70, 250)
parser = HTMLParser(textbox)
parser.feed(open(filename).read())
else:
messageBox("No document selected")
if HaveDoc():
filename = FileDialog(TITLE, "*.htm*", "", 0, 1)
if filename:
unit = GetUnit()
SetUnit(Millimeters)
textbox = CreateText(20, 20, 70, 250)
parser = HTMLParser(textbox)
parser.feed(open(filename).read())
SetUnit(unit)
else:
MessageBox(TITLE, "No document open", ICON_WARNING, BUTTON_OK)
 
 
main()
/trunk/Scribus/scribus/plugins/scriptplugin/samples/wordcount.py
1,18 → 1,15
#!/usr/bin/python
# -*- coding: ISO-8859-1 -*-
# DO NOT remove above line
from scribus import *
import os, re
import re
 
 
def msgBox(msg):
# replace with "gdialog" or "xterm -e dialog" if needed
# it would be nice, if the plugin would provide a msgbox
# and a file selector
cmd = 'kdialog --msgbox "%s"'
os.system(cmd % msg)
TITLE = "Word count"
BUTTON_OK = 1
ICON_INFORMATION = 1
ICON_WARNING = 2
 
 
 
def wordsplit(text):
word_pattern = "([A-Za-zäöüÄÖÜß]+)"
words = []
22,9 → 19,7
return words
 
 
 
if HaveDoc():
words = 0
sel_count = SelectionCount()
if sel_count:
42,7 → 37,8
words += len(wordsplit(text))
if words == 0: words = "No"
msgBox("%s words counted in %s" % (words, source))
MessageBox(TITLE, "%s words counted in %s" % (words, source),
ICON_INFORMATION, BUTTON_OK)
 
else:
msgBox("Not document open")
MessageBox(TITLE, "Not document open", ICON_WARNING, BUTTON_OK)
/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
8,6 → 8,7
if (!PyArg_ParseTuple(args, ""))
return NULL;
bool ret = Carrier->slotFileNew();
// qApp->processEvents();
return PyInt_FromLong(static_cast<long>(ret));
}
 
/trunk/Scribus/scribus/styleselect.cpp
71,7 → 71,7
connect(Supers, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(Outlined, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
resize(minimumSizeHint());
}
}
 
void StyleSelect::setStyle(int s)
{
/trunk/Scribus/scribus/fontprefs.cpp
192,7 → 192,8
PushButton1_2->setFocus();
Layout2->addWidget( PushButton1_2 );
FontPrefsLayout->addLayout( Layout2 );
setMinimumSize( sizeHint() );
resize(minimumSizeHint());
// setMinimumSize( sizeHint() );
 
// signals and slots connections
connect( PushButton1_2, SIGNAL( clicked() ), this, SLOT( LeaveDia() ) );
/trunk/Scribus/scribus/page.cpp
5991,9 → 5991,23
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->CurrentStyle;
}
a--;
}
if (cr)
6017,9 → 6031,23
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
nb->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
nb->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
nb->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
nb->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
nb->Ptext.at(a)->ccolor = nb->TxtFill;
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= doku->CurrentStyle;
}
if (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
6046,9 → 6074,23
{
b->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
b->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= doku->Vorlagen[s].FontEffect;
b->Ptext.at(a)->ccolor = doku->Vorlagen[s].FColor;
b->Ptext.at(a)->cshade = doku->Vorlagen[s].FShade;
b->Ptext.at(a)->cstroke = doku->Vorlagen[s].SColor;
b->Ptext.at(a)->cshade2 = doku->Vorlagen[s].SShade;
}
else
{
b->Ptext.at(a)->ccolor = b->TxtFill;
b->Ptext.at(a)->cshade = b->ShTxtFill;
b->Ptext.at(a)->cstroke = b->TxtStroke;
b->Ptext.at(a)->cshade2 = b->ShTxtStroke;
b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= doku->CurrentStyle;
}
}
}
}
/trunk/Scribus/scribus/scribus.h
159,6 → 159,7
QClipboard *ClipB;
QString LoadEnc;
bool singleClose;
bool ScriptRunning;
 
public slots:
void slotStoryEditor();
/trunk/Scribus/scribus/reformdoc.cpp
7,24 → 7,29
: QDialog( parent, "r", true, 0 )
{
QString ein;
einheit = Einh;
switch (Einh)
{
case 0:
int decimals;
einheit = Einh;
switch (Einh)
{
case 0:
ein = " pt";
break;
case 1:
decimals = 100;
break;
case 1:
ein = " mm";
break;
case 2:
decimals = 1000;
break;
case 2:
ein = " in";
break;
case 3:
decimals = 10000;
break;
case 3:
ein = " p";
break;
}
Breite = Pagebr * UmReFaktor;
Hoehe = Pageho * UmReFaktor;
decimals = 100;
break;
}
Breite = Pagebr * UmReFaktor;
Hoehe = Pageho * UmReFaktor;
setCaption( tr( "Document Setup" ) );
setIcon(loadIcon("AppIcon.png"));
ReformDocLayout = new QVBoxLayout( this );
45,8 → 50,9
TextLabel5 = new QLabel( GroupBox7, "TextLabel5" );
TextLabel5->setText( tr( "Top:" ) );
Layout4->addWidget( TextLabel5, 0, 0 );
TopR = new MSpinBox( GroupBox7, 2 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setSuffix( ein );
TopR->setDecimals( decimals );
TopR->setMaxValue(Hoehe);
TopR->setValue(t * UmReFaktor);
Layout4->addWidget( TopR, 0, 1 );
53,8 → 59,9
Links = new QLabel( GroupBox7, "Links" );
Links->setText( tr( "Left:" ) );
Layout4->addWidget( Links, 0, 2 );
LeftR = new MSpinBox( GroupBox7, 2 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setSuffix( ein );
LeftR->setDecimals( decimals );
LeftR->setMaxValue(Breite);
LeftR->setValue(l * UmReFaktor);
Layout4->addWidget( LeftR, 0, 3 );
61,8 → 68,9
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
Layout4->addWidget( TextLabel7, 1, 0 );
BottomR = new MSpinBox( GroupBox7, 2 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setSuffix( ein );
BottomR->setDecimals( decimals );
BottomR->setMaxValue(Hoehe);
BottomR->setValue(b * UmReFaktor);
Layout4->addWidget( BottomR, 1, 1 );
69,8 → 77,9
Rechts = new QLabel( GroupBox7, "Rechts" );
Rechts->setText( tr( "Right:" ) );
Layout4->addWidget( Rechts, 1, 2 );
RightR = new MSpinBox( GroupBox7, 2 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setSuffix( ein );
RightR->setDecimals( decimals );
RightR->setMaxValue(Breite);
RightR->setValue(r * UmReFaktor);
Layout4->addWidget( RightR, 1, 3 );
/trunk/Scribus/scribus/shadebutton.cpp
0,0 → 1,76
#include "shadebutton.h"
#include "shadebutton.moc"
#include "query.h"
 
 
ShadeButton::ShadeButton(QWidget* parent) : QToolButton(parent, "ShadeButton")
{
char *tmp[] = {"0 %", "10 %", "20 %", "30 %", "40 %", "50 %", "60 %", "70 %", "80 %", "90 %", "100 %"};
size_t array = sizeof(tmp) / sizeof(*tmp);
FillSh = new QPopupMenu();
FillSh->insertItem( tr("Other..."));
for (uint a = 0; a < array; ++a)
FillSh->insertItem(tmp[a]);
setBackgroundMode(PaletteBackground);
setPopup(FillSh);
setPopupDelay(1);
setText("100 %");
FillSh->setItemChecked(FillSh->idAt(11), true);
setAutoRaise(true);
connect( FillSh, SIGNAL(activated(int)), this, SLOT(setShade(int)));
}
 
void ShadeButton::setShade(int id)
{
bool ok = false;
uint a;
int c, b;
for (a = 0; a < FillSh->count(); ++a)
{
FillSh->setItemChecked(FillSh->idAt(a), false);
}
c = FillSh->indexOf(id);
FillSh->setItemChecked(id, true);
if (c > 0)
b = (c-1) * 10;
if (c == 0)
{
Query* dia = new Query(this, "New", 1, 0, "Shade:", "Shade");
if (dia->exec())
{
c = dia->Answer->text().toInt(&ok);
if (ok)
b = c;
else
b = 100;
delete dia;
}
else
{
delete dia;
return;
}
}
setText(QString::number(b)+" %");
emit clicked();
}
 
int ShadeButton::getValue()
{
return text().remove(" %").toInt();
}
 
void ShadeButton::setValue(int val)
{
for (uint a = 0; a < FillSh->count(); ++a)
{
FillSh->setItemChecked(FillSh->idAt(a), false);
}
if ((val % 10) == 0)
FillSh->setItemChecked(FillSh->idAt(val/10+1), true);
else
FillSh->setItemChecked(FillSh->idAt(0), true);
setText(QString::number(val)+" %");
}
 
 
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: Scribus/scribus/tree.cpp
===================================================================
--- Scribus/scribus/tree.cpp (revision 172)
+++ Scribus/scribus/tree.cpp (revision 173)
@@ -15,8 +15,9 @@
#include <qtooltip.h>
#include <qimage.h>
#include <qpixmap.h>
-// #include <iostream.h>
+#include "scribus.h"
extern QPixmap loadIcon(QString nam);
+extern ScribusApp* ScApp;
Tree::Tree( QWidget* parent, WFlags fl )
: QDialog( parent, "Tree", false, fl )
@@ -44,6 +45,8 @@
void Tree::slotShowSelect(uint SNr, int Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
if ((vie->Doc->TemplateMode) || (vie->Doc->loading))
return;
disconnect(ListView1, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelect(QListViewItem*)));
@@ -57,6 +60,8 @@
void Tree::slotRemoveElement(uint SNr, uint Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
if ((vie->Doc->TemplateMode) || (vie->Doc->loading))
return;
if (PageObj.count() != 0)
@@ -71,6 +76,8 @@
void Tree::slotUpdateElement(uint SNr, uint Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
QString cc, xp, yp, fon;
if ((vie->Doc->TemplateMode) || (vie->Doc->loading))
return;
@@ -113,6 +120,8 @@
void Tree::slotAddElement(uint SNr, uint Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
if ((vie->Doc->TemplateMode) || (vie->Doc->loading))
return;
PageObj.at(SNr)->Elemente.insert(Nr, new QListViewItem(Seiten.at(SNr), "Items"));
@@ -121,6 +130,8 @@
void Tree::slotMoveElement(uint SNr, uint NrOld, uint NrNew)
{
+ if (ScApp->ScriptRunning)
+ return;
if ((vie->Doc->TemplateMode) || (vie->Doc->loading))
return;
QListViewItem* tmp = PageObj.at(SNr)->Elemente.take(NrOld);
@@ -129,6 +140,8 @@
void Tree::slotAddPage(uint Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
QString cc;
if (ListView1->childCount() == 0)
return;
@@ -140,6 +153,8 @@
void Tree::slotDelPage(uint Nr)
{
+ if (ScApp->ScriptRunning)
+ return;
if (vie->Doc->TemplateMode)
return;
if (Seiten.count() != 0)
@@ -153,6 +168,8 @@
void Tree::rebuildPageD()
{
+ if (ScApp->ScriptRunning)
+ return;
QString cc;
for (uint e = 0; e < Seiten.count(); ++e)
{
@@ -162,6 +179,8 @@
void Tree::reopenTree(QValueList<int> op)
{
+ if (ScApp->ScriptRunning)
+ return;
if (op.count() == 0)
return;
if (op[0] == 1)
@@ -192,6 +211,8 @@
void Tree::slotSelect(QListViewItem* ite)
{
+ if (ScApp->ScriptRunning)
+ return;
int sref, oref;
if (vie->Doc->TemplateMode)
return;
@@ -230,6 +251,8 @@
void Tree::BuildTree(ScribusView *view)
{
+ if (ScApp->ScriptRunning)
+ return;
uint a, b;
QString cc;
PageObj.clear();
/trunk/Scribus/scribus/scribusdoc.cpp
73,6 → 73,11
vg.TabValues.clear();
vg.Drop = false;
vg.DropLin = 2;
vg.FontEffect = 0;
vg.FColor = Dbrush;
vg.FShade = Dshade;
vg.SColor = Dpen;
vg.SShade = Dshade2;
Vorlagen.append(vg);
vg.Vname = "Center Internal";
vg.Ausri = 1;
/trunk/Scribus/scribus/cpalette.h
31,6 → 31,7
#include <qlabel.h>
#include <qspinbox.h>
#include "scribusdoc.h"
#include "shadebutton.h"
 
/**
*@author Franz Schmid
45,8 → 46,7
QListBox *ListBox1;
QToolButton *Inhalt;
QToolButton *Innen;
QToolButton *PM1;
QPopupMenu *ShaMenu;
ShadeButton *PM1;
QComboBox* GradCombo;
QButtonGroup* GradGroup;
QRadioButton* GrColor1;
81,7 → 81,7
void setActFarben(QString p, QString b, int shp, int shb);
void setActGradient(QString p, QString b, int shp, int shb, int typ);
int SetMen(int c);
void setActShade(int);
void setActShade();
void setActTrans(double, double);
void slotTrans(int val);
void UseTrans(bool b);
/trunk/Scribus/scribus/editformats.cpp
97,10 → 97,15
sty.TabValues = TempVorl[sFnumber].TabValues;
sty.Drop = TempVorl[sFnumber].Drop;
sty.DropLin = TempVorl[sFnumber].DropLin;
sty.FontEffect = TempVorl[sFnumber].FontEffect;
sty.FColor = TempVorl[sFnumber].FColor;
sty.FShade = TempVorl[sFnumber].FShade;
sty.SColor = TempVorl[sFnumber].SColor;
sty.SShade = TempVorl[sFnumber].SShade;
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon,
static_cast<double>(Docu->AutoLine), Docu->Einheit);
static_cast<double>(Docu->AutoLine), Docu->Einheit, Docu);
if (!dia2->exec())
TempVorl.remove(TempVorl.fromLast());
delete dia2;
122,10 → 127,15
sty.TabValues.clear();
sty.Drop = false;
sty.DropLin = 2;
sty.FontEffect = 0;
sty.FColor = Docu->Dbrush;
sty.FShade = Docu->Dshade;
sty.SColor = Docu->Dpen;
sty.SShade = Docu->Dshade2;
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon,
static_cast<double>(Docu->AutoLine), Docu->Einheit);
static_cast<double>(Docu->AutoLine), Docu->Einheit, Docu);
if (!dia2->exec())
TempVorl.remove(TempVorl.fromLast());
delete dia2;
135,7 → 145,7
void StilFormate::editFormat()
{
EditStyle* dia = new EditStyle(this, &TempVorl[sFnumber], TempVorl, false, fon,
static_cast<double>(Docu->AutoLine), Docu->Einheit);
static_cast<double>(Docu->AutoLine), Docu->Einheit, Docu);
dia->exec();
delete dia;
UpdateFList();
195,6 → 205,11
sty.TabValues = ss->Vorlagen[xx].TabValues;
sty.Drop = TempVorl[xx].Drop;
sty.DropLin = TempVorl[xx].DropLin;
sty.FontEffect = TempVorl[xx].FontEffect;
sty.FColor = TempVorl[xx].FColor;
sty.FShade = TempVorl[xx].FShade;
sty.SColor = TempVorl[xx].SColor;
sty.SShade = TempVorl[xx].SShade;
TempVorl.append(sty);
}
}
/trunk/Scribus/scribus/po/scribus.fi.ts
916,7 → 916,7
</message>
<message>
<source>Template:</source>
<translation>Mallipohja:</translation>
<translation>Sivumalli:</translation>
</message>
<message>
<source>Cancel</source>
924,7 → 924,7
</message>
<message>
<source>Normal</source>
<translation>Normaali</translation>
<translation>Normal</translation>
</message>
<message>
<source>Apply from Page:</source>
932,7 → 932,7
</message>
<message>
<source>Apply Template</source>
<translation>Käytä mallipohjaa</translation>
<translation>Käytä sivumallia</translation>
</message>
<message>
<source>Apply to Current Page</source>
1719,7 → 1719,7
</message>
<message>
<source>Vertical Spaces</source>
<translation>Pystysuorat välit</translation>
<translation>Välistys</translation>
</message>
<message>
<source>Warning</source>
1743,7 → 1743,7
</message>
<message>
<source>Tabulators...</source>
<translation>Sarakkeet...</translation>
<translation>Sarkaimet...</translation>
</message>
</context>
<context>
2072,7 → 2072,7
</message>
<message>
<source>Possible Hyphenation</source>
<translation>Mahdolliset tavutukset</translation>
<translation>Mahdollinen tavutus</translation>
</message>
</context>
<context>
2087,7 → 2087,7
</message>
<message>
<source>Hyphenator Settings</source>
<translation>Tavuttajan asetukset</translation>
<translation>Tavutuksen asetukset</translation>
</message>
<message>
<source>Cancel</source>
2128,11 → 2128,11
</message>
<message>
<source>Template (Left Page):</source>
<translation>Mallipohja (vasen sivu):</translation>
<translation>Sivumalli (vasen sivu):</translation>
</message>
<message>
<source>Template:</source>
<translation>Mallipohja:</translation>
<translation>Sivumalli:</translation>
</message>
<message>
<source>Cancel</source>
2140,7 → 2140,7
</message>
<message>
<source>Normal</source>
<translation>Tavallinen</translation>
<translation>Normal</translation>
</message>
<message>
<source>page(s)</source>
2168,7 → 2168,7
</message>
<message>
<source>Template (Right Page):</source>
<translation>Mallipohja (oikea sivu):</translation>
<translation>Sivumalli (oikea sivu):</translation>
</message>
</context>
<context>
2226,7 → 2226,7
</message>
<message>
<source>User Defined Key</source>
<translation>Käytäjän määrittämät näppäimet</translation>
<translation>Käyttäjän määrittämä oikopolku</translation>
</message>
<message>
<source>Action</source>
2238,7 → 2238,7
</message>
<message>
<source>No Key</source>
<translation>Ei näppäintä</translation>
<translation>Ei oikopolkua</translation>
</message>
<message>
<source>Shift+</source>
2258,7 → 2258,7
</message>
<message>
<source>Select a Key for this Action</source>
<translation>Valitse näppäin tälle toiminnolle</translation>
<translation>Valitse näppäinoikopolku toiminnolle</translation>
</message>
<message>
<source>This Key-Sequence is already in use</source>
2643,7 → 2643,7
</message>
<message>
<source>Flip horizontal</source>
<translation>Käännä vaakasuorassa</translation>
<translation>Käännä vaakasuunnassa</translation>
</message>
<message>
<source>Absolute Colorimetric</source>
2655,7 → 2655,7
</message>
<message>
<source>Flip vertical</source>
<translation>Käännä pystysuorassa</translation>
<translation>Käännä pystysuunnassa</translation>
</message>
<message>
<source>Reverse Writing</source>
2945,7 → 2945,7
</message>
<message>
<source>Tabulators...</source>
<translation>Sarakkeet...</translation>
<translation>Sarkaimet...</translation>
</message>
<message>
<source>X-Pos.:</source>
3093,7 → 3093,7
</message>
<message>
<source>Do you really want do delete this Template?</source>
<translation>Haluatko poistaa tämän Mallipohjan?</translation>
<translation>Haluatko poistaa tämän sivumallin?</translation>
</message>
<message>
<source>Copy of %1</source>
3105,7 → 3105,7
</message>
<message>
<source>New Template</source>
<translation>Uusi mallipohja</translation>
<translation>Uusi sivumalli</translation>
</message>
<message>
<source>Edit Templates</source>
3192,7 → 3192,7
</message>
<message>
<source>Picas (p)</source>
<translation>Picaa (p)</translation>
<translation>Picat (p)</translation>
</message>
<message>
<source>Left Page first</source>
3430,7 → 3430,7
</message>
<message>
<source>to:</source>
<translation>minne:</translation>
<translation>mihin:</translation>
</message>
<message>
<source> dpi</source>
3758,7 → 3758,7
</message>
<message>
<source>Output intended for:</source>
<translation>Tuloste tarkoitettu:</translation>
<translation>Tuloste on tarkoitettu:</translation>
</message>
<message>
<source>Info String:</source>
4172,7 → 4172,7
</message>
<message>
<source>GUI</source>
<translation>GUI</translation>
<translation>Käyttöliittymä</translation>
</message>
<message>
<source>min</source>
4204,15 → 4204,15
</message>
<message>
<source>Paths</source>
<translation>Polut</translation>
<translation>Hakemistot</translation>
</message>
<message>
<source>Other</source>
<translation>Muu</translation>
<translation>Muut</translation>
</message>
<message>
<source>Inside:</source>
<translation>Sisällä:</translation>
<translation>Sisäpuoli:</translation>
</message>
<message>
<source>Size:</source>
4240,11 → 4240,11
</message>
<message>
<source>Minor Grid Color:</source>
<translation>Pikkuruudukon väri:</translation>
<translation>Apuruudukon väri:</translation>
</message>
<message>
<source>Keyboard Shortcuts...</source>
<translation>Näppäimistön oikopolut...</translation>
<translation>Näppäinoikopolut...</translation>
</message>
<message>
<source>Other Options</source>
4252,7 → 4252,7
</message>
<message>
<source>Convex Polygon</source>
<translation>Pyöreä monikulmio</translation>
<translation>Kupera monikulmio</translation>
</message>
<message>
<source>Page-Colors</source>
4276,7 → 4276,7
</message>
<message>
<source>Vertical Scaling</source>
<translation>Vaakasuora skaalaus</translation>
<translation>Pystysuora skaalaus</translation>
</message>
<message>
<source>Display Frames</source>
4292,7 → 4292,7
</message>
<message>
<source>Disp.:</source>
<translation>Näyttö:</translation>
<translation>Siirtymä:</translation>
</message>
<message>
<source>Landscape</source>
4544,7 → 4544,7
</message>
<message>
<source>Minor Grid Spacing:</source>
<translation>Pikkuruudukon välistys:</translation>
<translation>Apuruudukon välistys:</translation>
</message>
<message>
<source>Free Scaling</source>
4900,7 → 4900,7
</message>
<message>
<source>Group</source>
<translation>Ryhmä</translation>
<translation>Muodosta ryhmä</translation>
</message>
<message>
<source>Lower</source>
5272,7 → 5272,7
</message>
<message>
<source>Reading Scrapbook</source>
<translation>Lueataan leikekirjaa</translation>
<translation>Luetaan leikekirjaa</translation>
</message>
<message>
<source>Ghostscript : You cannot use EPS-Images</source>
5280,7 → 5280,7
</message>
<message>
<source>Hyphenator...</source>
<translation>Tavuttaja...</translation>
<translation>Tavutus...</translation>
</message>
<message>
<source>Document Setup...</source>
5324,7 → 5324,7
</message>
<message>
<source>Apply Template...</source>
<translation>Käytä mallipohjaa...</translation>
<translation>Käytä sivumallia...</translation>
</message>
<message>
<source>Subscript</source>
5472,7 → 5472,7
</message>
<message>
<source>Templates...</source>
<translation>Mallipohjat...</translation>
<translation>Sivumallit...</translation>
</message>
<message>
<source>Saving...</source>
5528,7 → 5528,7
</message>
<message>
<source>Init Hyphenator</source>
<translation>Alusta tavuttaja</translation>
<translation>Alusta tavutus</translation>
</message>
<message>
<source>Save Text...</source>
5570,7 → 5570,7
</message>
<message>
<source>Tabulators...</source>
<translation>Sarakkeet...</translation>
<translation>Sarkaimet...</translation>
</message>
<message>
<source>All Files (*)</source>
5653,7 → 5653,7
<name>SeView</name>
<message>
<source>Show Template Names</source>
<translation>Näytä mallipohjien nimet</translation>
<translation>Näytä sivumallien nimet</translation>
</message>
</context>
<context>
5743,7 → 5743,7
<name>SeitenPal</name>
<message>
<source>This previews all the pages of your Document.</source>
<translation>Tämä näyttää esikatselun kaikista dokumenttisi sivuista.</translation>
<translation>Tässä näet esikatselun kaikista dokumenttisi sivuista.</translation>
</message>
<message>
<source>Normal</source>
5752,12 → 5752,12
<message>
<source>Here are all your Templates, to create a new Page
drag a Template to the Pageview below.</source>
<translation>Tässä on kaikki mallipohjasi. Luodaksesi uuden sivun
raahaa pohja sivualueelle alhaalla.</translation>
<translation>Tässä on kaikki sivumallisi. Luodaksesi uuden sivun
raahaa malli sivualueelle.</translation>
</message>
<message>
<source>Available Templates:</source>
<translation>Käytettävät mallipohjat:</translation>
<translation>Sivumallit:</translation>
</message>
<message>
<source>Left Page first</source>
5765,7 → 5765,7
</message>
<message>
<source>Drag Pages or Template Pages onto the Trashbin to delete them.</source>
<translation>Raahaa sivu tai mallipohja roskakoriin tuhotaksesi sen.</translation>
<translation>Raahaa sivu tai sivumalli roskakoriin tuhotaksesi sen.</translation>
</message>
<message>
<source>Facing Pages</source>
6059,7 → 6059,7
<name>TabManager</name>
<message>
<source>Manage Tabulators</source>
<translation>Sarakkeiden hallinta</translation>
<translation>Sarkainten hallinta</translation>
</message>
<message>
<source>Position:</source>
/trunk/Scribus/scribus/search.h
17,6 → 17,7
class MSpinBox;
class FontCombo;
class StyleSelect;
class ShadeButton;
 
class SearchReplace : public QDialog
{
31,6 → 32,8
QGroupBox* Search;
QCheckBox* SStroke;
QCheckBox* SFill;
QCheckBox* SStrokeS;
QCheckBox* SFillS;
QCheckBox* SSize;
QCheckBox* SFont;
QCheckBox* SStyle;
42,10 → 45,14
FontCombo* SFontVal;
MSpinBox* SSizeVal;
QComboBox* SFillVal;
ShadeButton *SFillSVal;
QComboBox* SStrokeVal;
ShadeButton *SStrokeSVal;
QGroupBox* Replace;
QCheckBox* RStroke;
QCheckBox* RStrokeS;
QCheckBox* RFill;
QCheckBox* RFillS;
QCheckBox* RSize;
QCheckBox* RFont;
QCheckBox* RStyle;
55,7 → 62,9
FontCombo* RFontVal;
MSpinBox* RSizeVal;
QComboBox* RFillVal;
ShadeButton *RFillSVal;
QComboBox* RStrokeVal;
ShadeButton *RStrokeSVal;
StyleSelect* SEffVal;
StyleSelect* REffVal;
QCheckBox* Word;
79,7 → 88,9
virtual void enableSizeSearch();
virtual void enableEffSearch();
virtual void enableFillSearch();
virtual void enableFillSSearch();
virtual void enableStrokeSearch();
virtual void enableStrokeSSearch();
virtual void enableTxReplace();
virtual void enableStyleReplace();
virtual void enableFontReplace();
86,7 → 97,9
virtual void enableSizeReplace();
virtual void enableEffReplace();
virtual void enableFillReplace();
virtual void enableFillSReplace();
virtual void enableStrokeReplace();
virtual void enableStrokeSReplace();
 
signals:
void NewFont(QString);
/trunk/Scribus/scribus/scribusXml.cpp
195,6 → 195,11
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0")));
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2"));
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0"));
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush);
vg.FShade = QStoInt(pg.attribute("FSHADE", "100"));
vg.SColor = pg.attribute("SCOLOR", doc->Dpen);
vg.SShade = QStoInt(pg.attribute("SSHADE", "100"));
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
{
QString tmp = pg.attribute("TABS");
223,6 → 228,11
(vg.TabValues == Vorlagen[xx].TabValues) &&
(vg.Drop == Vorlagen[xx].Drop) &&
(vg.DropLin == Vorlagen[xx].DropLin) &&
(vg.FontEffect == Vorlagen[xx].FontEffect) &&
(vg.FColor == Vorlagen[xx].FColor) &&
(vg.FShade == Vorlagen[xx].FShade) &&
(vg.SColor == Vorlagen[xx].SColor) &&
(vg.SShade == Vorlagen[xx].SShade) &&
(vg.FontSize == Vorlagen[xx].FontSize))
fou = true;
else
449,6 → 459,11
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0")));
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2"));
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0"));
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush);
vg.FShade = QStoInt(pg.attribute("FSHADE", "100"));
vg.SColor = pg.attribute("SCOLOR", doc->Dpen);
vg.SShade = QStoInt(pg.attribute("SSHADE", "100"));
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
{
tmp = pg.attribute("TABS");
477,6 → 492,11
(vg.TabValues == doc->Vorlagen[xx].TabValues) &&
(vg.Drop == doc->Vorlagen[xx].Drop) &&
(vg.DropLin == doc->Vorlagen[xx].DropLin) &&
(vg.FontEffect == doc->Vorlagen[xx].FontEffect) &&
(vg.FColor == doc->Vorlagen[xx].FColor) &&
(vg.FShade == doc->Vorlagen[xx].FShade) &&
(vg.SColor == doc->Vorlagen[xx].SColor) &&
(vg.SShade == doc->Vorlagen[xx].SShade) &&
(vg.FontSize == doc->Vorlagen[xx].FontSize))
{
DoVorl[VorlC] = tmV.setNum(xx);
1091,6 → 1111,11
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10.0);
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0")));
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2"));
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0"));
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush);
vg.FShade = QStoInt(pg.attribute("FSHADE","100"));
vg.SColor = pg.attribute("SCOLOR", doc->Dpen);
vg.SShade = QStoInt(pg.attribute("SSHADE","100"));
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
{
tmp = pg.attribute("TABS");
1773,6 → 1798,11
vg.FontSize = qRound(QStodouble(pg.attribute("FONTSIZE","12")) * 10);
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0")));
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2"));
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0"));
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush);
vg.FShade = QStoInt(pg.attribute("FSHADE", "100"));
vg.SColor = pg.attribute("SCOLOR", doc->Dpen);
vg.SShade = QStoInt(pg.attribute("SSHADE", "100"));
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
{
tmp = pg.attribute("TABS");
1801,6 → 1831,11
(vg.TabValues == doc->Vorlagen[xx].TabValues) &&
(vg.Drop == doc->Vorlagen[xx].Drop) &&
(vg.DropLin == doc->Vorlagen[xx].DropLin) &&
(vg.FontEffect == doc->Vorlagen[xx].FontEffect) &&
(vg.FColor == doc->Vorlagen[xx].FColor) &&
(vg.FShade == doc->Vorlagen[xx].FShade) &&
(vg.SColor == doc->Vorlagen[xx].SColor) &&
(vg.SShade == doc->Vorlagen[xx].SShade) &&
(vg.FontSize == doc->Vorlagen[xx].FontSize))
{
DoVorl[VorlC] = tmV.setNum(xx);
2426,6 → 2461,7
fo.setAttribute("FONTSIZE",doc->Vorlagen[ff].FontSize / 10.0);
fo.setAttribute("DROP", static_cast<int>(doc->Vorlagen[ff].Drop));
fo.setAttribute("DROPLIN", doc->Vorlagen[ff].DropLin);
fo.setAttribute("EFFECT", doc->Vorlagen[ff].FontEffect);
fo.setAttribute("NUMTAB", static_cast<int>(doc->Vorlagen[ff].TabValues.count()));
QString tlp = "";
QValueList<double>::Iterator tax;
2432,6 → 2468,10
for (tax = doc->Vorlagen[ff].TabValues.begin(); tax != doc->Vorlagen[ff].TabValues.end(); ++tax)
tlp += tmp.setNum((*tax)) + " ";
fo.setAttribute("TABS", tlp);
fo.setAttribute("FCOLOR",doc->Vorlagen[ff].FColor);
fo.setAttribute("FSHADE",doc->Vorlagen[ff].FShade);
fo.setAttribute("SCOLOR",doc->Vorlagen[ff].SColor);
fo.setAttribute("SSHADE",doc->Vorlagen[ff].SShade);
elem.appendChild(fo);
}
}
2896,6 → 2936,7
fo.setAttribute("FONTSIZE",doc->Vorlagen[ff].FontSize / 10.0);
fo.setAttribute("DROP", static_cast<int>(doc->Vorlagen[ff].Drop));
fo.setAttribute("DROPLIN", doc->Vorlagen[ff].DropLin);
fo.setAttribute("EFFECT", doc->Vorlagen[ff].FontEffect);
fo.setAttribute("NUMTAB", static_cast<int>(doc->Vorlagen[ff].TabValues.count()));
QString tlp = "";
QString tmp = "";
2903,6 → 2944,10
for (tax = doc->Vorlagen[ff].TabValues.begin(); tax != doc->Vorlagen[ff].TabValues.end(); ++tax)
tlp += tmp.setNum((*tax)) + " ";
fo.setAttribute("TABS", tlp);
fo.setAttribute("FCOLOR",doc->Vorlagen[ff].FColor);
fo.setAttribute("FSHADE",doc->Vorlagen[ff].FShade);
fo.setAttribute("SCOLOR",doc->Vorlagen[ff].SColor);
fo.setAttribute("SSHADE",doc->Vorlagen[ff].SShade);
dc.appendChild(fo);
}
}
/trunk/Scribus/scribus/qm/scribus.fi.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus.kdevprj
101,7 → 101,7
type=DATA
 
[scribus/Makefile.am]
files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h,scribus/story.cpp,scribus/story.h,scribus/autoform.cpp,scribus/autoform.h,scribus/fparser.cpp,scribus/fparser.h,scribus/tabmanager.cpp,scribus/tabmanager.h,scribus/search.cpp,scribus/search.h,scribus/styleselect.cpp,scribus/styleselect.h
files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h,scribus/story.cpp,scribus/story.h,scribus/autoform.cpp,scribus/autoform.h,scribus/fparser.cpp,scribus/fparser.h,scribus/tabmanager.cpp,scribus/tabmanager.h,scribus/search.cpp,scribus/search.h,scribus/styleselect.cpp,scribus/styleselect.h,scribus/alignselect.cpp,scribus/alignselect.h,scribus/shadebutton.cpp,scribus/shadebutton.h
sub_dirs=icons,libabout,libprefs,plugins,libpostscript,profiles,libpdf,dicts,po,qm
type=prog_main
 
117,6 → 117,12
install_location=
type=HEADER
 
[scribus/alignselect.h]
dist=true
install=false
install_location=
type=HEADER
 
[scribus/annot.cpp]
dist=true
install=false
2719,6 → 2725,18
install_location=
type=HEADER
 
[scribus/shadebutton.cpp]
dist=true
install=false
install_location=
type=SOURCE
 
[scribus/shadebutton.h]
dist=true
install=false
install_location=
type=HEADER
 
[scribus/spalette.cpp]
dist=true
install=false