Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 224 → Rev 225

/trunk/Scribus/ChangeLogCVS
1,4 → 1,8
Changes since Version 1.1.5
08.03.2004 Fixed behaviour of the Icons of PDF-Buttons.
Fixed Bug #326.
Added more ToolTips.
 
07.04.2004 Added an Option to the Preferences to determine if the Contents of a Page
are clipped at the Margins or not.
Added a Folder for storing official approved Scripts.
/trunk/Scribus/scribus/lineformats.cpp
54,6 → 54,10
SaveB->setText( tr( "Save" ) );
Layout15->addWidget( SaveB );
 
ExitB = new QPushButton( this, "ExitB" );
ExitB->setText( tr( "Exit" ) );
Layout15->addWidget( ExitB );
 
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
Layout15->addWidget( CancelB );
63,7 → 67,8
 
// signals and slots connections
connect(CancelB, SIGNAL(clicked()), this, SLOT(reject()));
connect(SaveB, SIGNAL(clicked()), this, SLOT(accept()));
connect(SaveB, SIGNAL(clicked()), this, SLOT(saveIt()));
connect(ExitB, SIGNAL(clicked()), this, SLOT(accept()));
connect(LoadLS, SIGNAL(clicked()), this, SLOT(loadLStyles()));
connect(EditB, SIGNAL(clicked()), this, SLOT(editFormat()));
connect(NewB, SIGNAL(clicked()), this, SLOT(neuesFormat()));
74,6 → 79,11
UpdateFList();
}
 
void LineFormate::saveIt()
{
emit saveStyle(this);
}
 
void LineFormate::selFormat(QListBoxItem *c)
{
sFnumber = c->text();
/trunk/Scribus/scribus/buttonicon.cpp
96,7 → 96,7
 
SetAllVals();
 
connect(ScaleH, SIGNAL(activated(int)), this, SLOT(SetScaleHow(int)));
connect(ScaleW, SIGNAL(activated(int)), this, SLOT(SetScaleHow(int)));
connect(SliderX, SIGNAL(valueChanged(int)), this, SLOT(MoveIconX(int)));
connect(SliderY, SIGNAL(valueChanged(int)), this, SLOT(MoveIconY(int)));
connect(Cancel, SIGNAL(clicked()), this, SLOT(reject()));
123,17 → 123,9
Place->setCurrentItem(Item->AnIPlace);
ScaleW->setCurrentItem(Item->AnScaleW);
ScaleH->setCurrentItem(Item->LocalScX != Item->LocalScY ? 1 : 0);
SetScaleHow(ScaleH->currentItem());
if ((Item->Width/Item->LocalScX - Item->pixm.width()) != 0)
SliderX->setValue(static_cast<int>
(Item->LocalX / (Item->Width/Item->LocalScX - Item->pixm.width()) * 1000));
else
SliderX->setValue(0);
if ((Item->Height/Item->LocalScY - Item->pixm.height()) != 0)
SliderY->setValue(static_cast<int>
(Item->LocalY / (Item->Height/Item->LocalScY - Item->pixm.height()) * 1000));
else
SliderY->setValue(0);
SetScaleHow(ScaleW->currentItem());
SliderX->setValue(static_cast<int>(Item->LocalX / (Item->Width - Item->pixm.width()) * 1000));
SliderY->setValue(static_cast<int>(Item->LocalY / (Item->Height - Item->pixm.height()) * 1000));
TextLabel3->setGeometry(QRect(static_cast<int>(SliderX->value() / 1000.0 * 100),
static_cast<int>(SliderY->value() / 1000.0 * 100), 48, 48));
}
140,7 → 132,7
 
void ButtonIcon::SetScaleHow(int s)
{
bool setter = (s == 1) ? false : true;
bool setter = (s == 3) ? true : false;
GroupButton->setEnabled(setter);
TextLabel3->setEnabled(setter);
SliderX->setEnabled(setter);
/trunk/Scribus/scribus/pageitem.cpp
264,8 → 264,6
}
Doc->Vorlagen[0].Ausri = Ausrich;
pf.begin(Parent);
// pf.translate(qRound(Xpos*sc), qRound(Ypos*sc));
// pf.scale(sc, sc);
pf.translate(Xpos*sc, Ypos*sc);
pf.rotate(Rot);
pf.scale(sc, sc);
560,6 → 558,7
DrawPoly(&pd, Clip, pd.brush().color());
}
}
pd.scale(LocalScX, LocalScY);
if (!pixm.isNull())
pd.drawImage(static_cast<int>(LocalX*LocalScX), static_cast<int>(LocalY*LocalScY), pixm);
pd.end();
1838,7 → 1837,7
 
void PageItem::DrawPoly(QPainter *p, QPointArray pts, QColor BackF, bool bitm)
{
if ((Pcolor != "None") || (GrType != 0) || (PType == 2))
if ((Pcolor != "None") || (GrType != 0) || (PType == 2) || (PType == 4))
{
QBitmap bm(static_cast<int>(Width), static_cast<int>(Height));
bm.fill(Qt::color0);
/trunk/Scribus/scribus/muster.cpp
148,7 → 148,6
for (uint a=0; a<View->Pages.at(inde)->Items.count(); ++a)
{
CopyPageItem(&Buffer, View->Pages.at(inde)->Items.at(a));
// View->Pages.at(inde)->Items.at(a)->CopyIt(&Buffer);
Doc->ActPage->PasteItem(&Buffer, true, true);
}
Doc->ActPage->Deselect(true);
257,11 → 256,6
QMap<QString,int>::Iterator it;
for (it = View->MasterNames.begin(); it != View->MasterNames.end(); ++it)
ListBox1->insertItem(it.key() == "Normal" ? tr("Normal") : it.key());
/* if (it.key() == "Normal")
ListBox1->insertItem( tr("Normal"));
else
ListBox1->insertItem(it.key());
}*/
DeleteB->setEnabled(View->MasterNames.count() == 1 ? false : true);
if (nam == "Normal")
{
/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(06).arg(tr("March")).arg(2004);
QString bu = tr("%1. %2 %3 ").arg(8).arg(tr("March")).arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
4751,12 → 4751,20
 
void ScribusApp::slotEditLineStyles()
{
PageItem* ite;
if (HaveDoc)
{
LineFormate *dia = new LineFormate(this, doc);
connect(dia, SIGNAL(saveStyle(LineFormate *)), this, SLOT(saveLStyles(LineFormate *)));
if (dia->exec())
saveLStyles(dia);
disconnect(dia, SIGNAL(saveStyle(LineFormate *)), this, SLOT(saveLStyles(LineFormate *)));
delete dia;
}
}
 
void ScribusApp::saveLStyles(LineFormate *dia)
{
PageItem* ite;
doc->MLineStyles = dia->TempStyles;
for (uint c = 0; c < view->DocPages.count(); ++c)
{
4779,9 → 4787,6
Mpal->SetLineFormats(doc);
view->DrawNew();
}
delete dia;
}
}
 
void ScribusApp::slotEditStyles()
{
/trunk/Scribus/scribus/javadocs.cpp
8,7 → 8,7
JavaDocs::JavaDocs(QWidget* parent, ScribusDoc *doc, ScribusView* vie)
: QDialog( parent, "Javadocs", true, 0 )
{
setCaption( tr( "Global JavaScripts" ) );
setCaption( tr( "Edit JavaScripts" ) );
setIcon(loadIcon("AppIcon.png"));
Doc = doc;
View = vie;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2328,7 → 2328,7
if (ite->Pfile3 != "")
{
img2 = LoadPict(ite->Pfile3);
IconOb = img2.hasAlphaBuffer() ? 3 : 2;
IconOb += img2.hasAlphaBuffer() ? 3 : 2;
PutDoc("/RI "+IToStr(ObjCounter+IconOb-1)+" 0 R ");
}
PutDoc("/TP "+IToStr(ite->AnIPlace)+" ");
2789,7 → 2789,7
double aufl = Options->Resolution / 72.0;
int ImRes, ImWid, ImHei;
struct ShIm ImInfo;
if (!SharedImages.contains(fn))
if ((!SharedImages.contains(fn)) || (fromAN))
{
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles2))
/trunk/Scribus/scribus/annot.cpp
114,6 → 114,7
Schrift = new QComboBox( true, GroupBox40, "Schrift" );
/* PFJ - 28/02/04 - Altered from char* to QString. Renamed to fonts and the
loop changed from uint to int and the name to propogate */
/* FS - 08.03.04 - loop variable must be uint otherwise you get a compiler warning */
QString fonts[]={"Courier", "Courier Bold", "Courier Italic",
"Courier Bold Italic", "Helvetica",
"Helvetica Bold", "Helvetica Italic", "Helvetica Bold Italic",
1080,8 → 1081,7
}
 
Annot::~Annot()
{
}
{}
 
void Annot::IPlace()
{
1092,11 → 1092,10
int h = item->pixm.height();
double sw = item->Width / w;
double sh = item->Height / h;
double sc = QMIN(sw,sh);
item->LocalScX = dia->IcScaleH == 0 ? sc : sw;
item->LocalScY = dia->IcScaleH == 0 ? sc : sh;
item->LocalX = dia->IcScaleH == 0 ? item->Width * dia->IcPlaceX : 0;
item->LocalY = dia->IcScaleH == 0 ? item->Height * dia->IcPlaceY : 0;
item->LocalScX = dia->IcScaleH == 3 ? 1 : sw;
item->LocalScY = dia->IcScaleH == 3 ? 1 : sh;
item->LocalX = dia->IcScaleH == 3 ? (item->Width - w) * dia->IcPlaceX : 0;
item->LocalY = dia->IcScaleH == 3 ? (item->Height - h) * dia->IcPlaceY : 0;
item->AnIPlace = dia->Place->currentItem();
item->AnScaleW = dia->ScaleW->currentItem();
}
1191,6 → 1190,7
pmI1.convertFromImage(im);
PiconPrev->setPixmap(pmI1);
item->Pfile2 = fileName;
IconPR->setEnabled(true);
}
}
 
1211,6 → 1211,7
pmI1.convertFromImage(im);
RiconPrev->setPixmap(pmI1);
item->Pfile3 = fileName;
IconRR->setEnabled(true);
}
}
 
1644,6 → 1645,22
item->AnBColor = BorderC->currentText();
if (item->AnBColor == tr("None"))
item->AnBColor = "None";
item->Pcolor2 = item->AnBColor;
switch (item->AnBwid)
{
case 0:
item->Pwidth = 0;
break;
case 1:
item->Pwidth = 1;
break;
case 2:
item->Pwidth = 2;
break;
case 3:
item->Pwidth = 4;
break;
}
Limit->isChecked() ? item->AnMaxChar = MaxChars->value() : item->AnMaxChar = -1;
if (item->AnType == 2)
{
1650,6 → 1667,8
item->AnFlag += 65536;
if (item->Pfile == "")
item->AnUseIcons = false;
else
item->AnUseIcons = true;
}
else
{
/trunk/Scribus/scribus/scribus.h
61,6 → 61,7
class Autoforms;
class FontCombo;
class StilFormate;
class LineFormate;
 
/**
* This Class is the base class for your application. It sets up the main
369,6 → 370,7
void slotEditStyles();
void saveStyles(StilFormate *dia);
void slotEditLineStyles();
void saveLStyles(LineFormate *dia);
void setNewAbStyle(int a);
void setAbsValue(int a);
void SelectFromOutl(int Page, int Item);
/trunk/Scribus/scribus/editformats.cpp
55,7 → 55,7
Layout15->addWidget( SaveB );
 
ExitB = new QPushButton( this, "ExitB" );
ExitB->setText( tr( "Leave" ) );
ExitB->setText( tr( "Exit" ) );
Layout15->addWidget( ExitB );
 
CancelB = new QPushButton( this, "CancelB" );
/trunk/Scribus/scribus/colorm.cpp
156,7 → 156,7
else
{
connect(DelU, SIGNAL( clicked() ), this, SLOT( delUnused() ) );
QToolTip::add( DelU, tr( "Remove unused colors from current document" ) );
QToolTip::add( DelU, tr( "Remove unused colors from current document's color set" ) );
}
QToolTip::add( LoadF, tr( "Append colors to the current set from an existing document" ) );
QToolTip::add( NewF, tr( "Create a new color within the current set" ) );
/trunk/Scribus/scribus/lineformats.h
23,6 → 23,7
QPushButton* DublicateB;
QPushButton* DeleteB;
QPushButton* SaveB;
QPushButton* ExitB;
QPushButton* CancelB;
QString sFnumber;
QMap<QString,multiLine> TempStyles;
30,6 → 31,7
void UpdateFList();
 
public slots:
void saveIt();
void selFormat(QListBoxItem *c);
void editFormat();
void neuesFormat();
37,9 → 39,12
void deleteFormat();
void loadLStyles();
 
signals:
void saveStyle(LineFormate *);
protected:
QHBoxLayout* StilFormateLayout;
QVBoxLayout* Layout15;
};
 
#endif // STILFORMATE_H
#endif