Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 359 → Rev 360

/trunk/Scribus/ChangeLogCVS
1,8 → 1,11
Changes since Version 1.1.7
 
04.08.2004
* bug #790: Update Picture From Right-Click Menu Does Not Work
* bug #927: layer chooser on the bottom of scribus isnt updated after adding a new layer immediately
* bug #930: different width of opacity and shade text fields on the property palette, colors
* feature #767: enter shouldnt close guideline dialog
* feature #890: changing the level of of objects with pageup / pagedown keys
 
03.08.2004
* bug #926: with disabled guidelines the guide line cursor is shown when clicking onto a ruler
/trunk/Scribus/scribus/mpalette.cpp
769,7 → 769,8
QToolTip::add( NoResize, tr( "Lock or unlock the size of the object" ) );
QToolTip::add( NoPrint, tr( "Enable or disable printing of the object" ) );
QToolTip::add( Textflow, tr( "Make text in lower frames flow around the object shape" ) );
QToolTip::add( Textflow2, tr( "Use the frame shape instead of the object one" ) );
QToolTip::add( Textflow2, tr( "Use a surrounding box instead of the frame's shape for text flow" ) );
QToolTip::add( Textflow3, tr( "Use a second line originally based on the frame's shape for text flow" ) );
 
QToolTip::add( Fonts, tr( "Font of selected text or object" ) );
QToolTip::add( Size, tr( "Font Size" ) );
/trunk/Scribus/scribus/story.cpp
980,7 → 980,7
Mcopy = emenu->insertItem(loadIcon("editcut.png"), tr("Cu&t"), this, SLOT(Do_cut()), CTRL+Key_X);
Mcut = emenu->insertItem(loadIcon("editcopy.png"), tr("&Copy"), this, SLOT(Do_copy()), CTRL+Key_C);
Mpaste = emenu->insertItem(loadIcon("editpaste.png"), tr("&Paste"), this, SLOT(Do_paste()), CTRL+Key_V);
Mdel = emenu->insertItem(loadIcon("editdelete.png"), tr("C&lear"), this, SLOT(Do_del()), CTRL+Key_V);
Mdel = emenu->insertItem(loadIcon("editdelete.png"), tr("C&lear"), this, SLOT(Do_del()), Key_Delete);
emenu->insertSeparator();
emenu->insertItem(loadIcon("find16.png"), tr("&Search/Replace..."), this, SLOT(SearchText()));
emenu->insertItem( tr("&Insert Special..."), this , SLOT(Do_insSp()));
1120,6 → 1120,7
connect(Editor, SIGNAL(clicked(int, int)), this, SLOT(updateStatus()));
connect(Editor, SIGNAL(setProps(int, int)), this, SLOT(updateProps(int, int)));
connect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int)));
connect(Editor, SIGNAL(copyAvailable(bool)), this, SLOT(CopyAvail(bool )));
connect(AlignTools, SIGNAL(NewStyle(int)), this, SLOT(newAlign(int)));
connect(AlignTools, SIGNAL(NewAlign(int)), this, SLOT(newAlign(int)));
connect(FillTools, SIGNAL(NewColor(int, int)), this, SLOT(newTxFill(int, int)));
1517,11 → 1518,14
 
bool StoryEditor::Do_new()
{
int t = QMessageBox::warning(this, tr("Warning"),
if (Editor->length() != 0)
{
int t = QMessageBox::warning(this, tr("Warning"),
tr("Do you really want to clear all your Text?"),
QMessageBox::No, QMessageBox::Yes, QMessageBox::NoButton);
if (t == QMessageBox::No)
return false;
if (t == QMessageBox::No)
return false;
}
Editor->StyledText.clear();
Editor->clear();
Editor->setUndoRedoEnabled(false);
1579,15 → 1583,19
 
void StoryEditor::Do_del()
{
/* SEditor *cp = dynamic_cast<SEditor*>(table1->cellWidget(table1->currentRow(), 1));
cp->del();
table1->adjHeight(table1->currentRow()); */
if (Editor->StyledText.count() == 0)
return;
if (Editor->hasSelectedText())
{
Editor->deleteSel();
Editor->removeSelectedText();
}
}
 
void StoryEditor::CopyAvail(bool u)
{
emenu->setItemEnabled(Mcopy, u);
emenu->setItemEnabled(Mcut, u);
// emenu->setItemEnabled(Mcopy, u);
// emenu->setItemEnabled(Mcut, u);
emenu->setItemEnabled(Mdel, u);
}
 
/trunk/Scribus/scribus/guidemanager.cpp
172,11 → 172,12
Layout5->addItem(spacer);
OK = new QPushButton( tr( "&OK" ), this, "OK");
OK->setDefault(true);
OK->setAutoDefault(false);
Layout5->addWidget(OK );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel");
Cancel->setAccel(QKeySequence("Esc"));
Layout5->addWidget(Cancel);
Cancel->setAutoDefault(false);
GuideManagerLayout->addLayout(Layout5);
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("03").arg("August").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("04").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
1111,7 → 1111,7
ButtonState buttonState = k->state();
if ((HaveDoc) && (!view->LE->hasFocus()) && (!view->PGS->PageCombo->hasFocus()))
{
if (doc->AppMode != 7)
if ((doc->AppMode != 7) && (doc->ActPage->SelItem.count() == 0))
{
switch (kk)
{
1178,6 → 1178,7
case 1:
switch (kk)
{
case Key_Backspace:
case Key_Delete:
if (!doc->EditClip)
{
1185,6 → 1186,14
doc->ActPage->DeleteItem();
}
break;
case Key_Prior:
if (!b->Locked)
doc->ActPage->RaiseItem();
break;
case Key_Next:
if (!b->Locked)
doc->ActPage->LowerItem();
break;
case Key_Left:
if (!k->isAutoRepeat())
{
8225,15 → 8234,15
switch (doc->UnData.UnCode)
{
case 0:
editMenu->changeItem(edUndo, tr("Undo Delete Object"));
editMenu->changeItem(edUndo, tr("&Undo Delete Object"));
break;
case 1:
case 4:
editMenu->changeItem(edUndo, tr("Undo Object Move"));
editMenu->changeItem(edUndo, tr("&Undo Object Move"));
break;
case 2:
case 3:
editMenu->changeItem(edUndo, tr("Undo Object Change"));
editMenu->changeItem(edUndo, tr("&Undo Object Change"));
break;
}
editMenu->setItemEnabled(edUndo, doc->UnDoValid ? 1 : 0);
/trunk/Scribus/scribus/polyprops.cpp
24,110 → 24,114
 
PolygonProps::PolygonProps(QWidget* parent) : QDialog( parent, "poly", true, 0 )
{
setCaption( tr( "Polygon Properties" ) );
setIcon(loadIcon("AppIcon.png"));
setCaption( tr( "Polygon Properties" ) );
setIcon(loadIcon("AppIcon.png"));
Pre = new QPixmap(101, 101);
Pre->fill(white);
PolygonPropsLayout = new QVBoxLayout( this, 10, 5, "PolygonPropsLayout");
Layout11 = new QHBoxLayout( 0, 0, 5, "Layout11");
Layout10 = new QVBoxLayout( 0, 0, 5, "Layout10");
Layout2 = new QHBoxLayout( 0, 0, 5, "Layout2");
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Corners:" ) );
Layout2->addWidget( Text1 );
Ecken = new QSpinBox( this, "Ecken" );
Ecken->setMaxValue( 999 );
Ecken->setMinValue( 3 );
PolygonPropsLayout = new QVBoxLayout( this, 10, 5, "PolygonPropsLayout");
Layout11 = new QHBoxLayout( 0, 0, 5, "Layout11");
Layout10 = new QVBoxLayout( 0, 0, 5, "Layout10");
Layout2 = new QHBoxLayout( 0, 0, 5, "Layout2");
Ecken = new QSpinBox( this, "Ecken" );
Ecken->setMaxValue( 999 );
Ecken->setMinValue( 3 );
Ecken->setValue(PolyC);
Layout2->addWidget( Ecken );
Layout10->addLayout( Layout2 );
Layout2->addWidget( Ecken );
Text1 = new QLabel( Ecken, tr("Corn&ers:"), this, "Text1" );
Layout2->addWidget( Text1 );
Layout10->addLayout( Layout2 );
 
Layout9_2 = new QHBoxLayout( 0, 0, 5, "Layout9_2");
Layout8_2 = new QVBoxLayout( 0, 0, 5, "Layout8_2");
Layout7_2 = new QHBoxLayout( 0, 0, 5, "Layout7_2");
Text2_2 = new QLabel( this, "Text2_2" );
Text2_2->setText( tr( "Rotation:" ) );
Layout7_2->addWidget( Text2_2 );
Faktor2 = new QSpinBox( this, "Faktor_2" );
Faktor2->setSuffix(" ");
Faktor2->setMaxValue( 180 );
Faktor2->setMinValue( -180 );
Layout9_2 = new QHBoxLayout( 0, 0, 5, "Layout9_2");
Layout8_2 = new QVBoxLayout( 0, 0, 5, "Layout8_2");
Layout7_2 = new QHBoxLayout( 0, 0, 5, "Layout7_2");
Faktor2 = new QSpinBox( this, "Faktor_2" );
Faktor2->setSuffix(" ");
Faktor2->setMaxValue( 180 );
Faktor2->setMinValue( -180 );
Faktor2->setValue(static_cast<int>(PolyR));
Layout7_2->addWidget( Faktor2 );
Layout8_2->addLayout( Layout7_2 );
Slider2 = new QSlider( this, "Slider1_2" );
Slider2->setMinValue( -180 );
Slider2->setMaxValue( 180 );
Layout7_2->addWidget( Faktor2 );
Text2_2 = new QLabel( Faktor2, tr("&Rotation:"), this, "Text2_2" );
Layout7_2->addWidget( Text2_2 );
Layout8_2->addLayout( Layout7_2 );
Slider2 = new QSlider( this, "Slider1_2" );
Slider2->setMinValue( -180 );
Slider2->setMaxValue( 180 );
Slider2->setValue(static_cast<int>(PolyR));
Slider2->setOrientation( QSlider::Horizontal );
Slider2->setTickmarks( QSlider::Right );
Layout8_2->addWidget( Slider2 );
Layout9_2->addLayout( Layout8_2 );
Layout10->addLayout( Layout9_2 );
Slider2->setOrientation( QSlider::Horizontal );
Slider2->setTickmarks( QSlider::Right );
Layout8_2->addWidget( Slider2 );
Layout9_2->addLayout( Layout8_2 );
Layout10->addLayout( Layout9_2 );
 
Konvex = new QCheckBox( this, "Konvex" );
Konvex->setText( tr( "Convex Polygon" ) );
Konvex = new QCheckBox( this, "Konvex" );
Konvex->setText( tr( "Conve&x Polygon" ) );
Konvex->setChecked(PolyS);
Layout10->addWidget( Konvex );
Layout9 = new QHBoxLayout( 0, 0, 5, "Layout9");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout9->addItem( spacer );
Layout8 = new QVBoxLayout( 0, 0, 5, "Layout8");
Layout7 = new QHBoxLayout( 0, 0, 5, "Layout7");
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Factor:" ) );
Layout7->addWidget( Text2 );
Faktor = new QSpinBox( this, "Faktor" );
Faktor->setSuffix( tr( " %" ) );
Faktor->setMaxValue( 100 );
Faktor->setMinValue( -100 );
Layout10->addWidget( Konvex );
Layout9 = new QHBoxLayout( 0, 0, 5, "Layout9");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout9->addItem( spacer );
Layout8 = new QVBoxLayout( 0, 0, 5, "Layout8");
Layout7 = new QHBoxLayout( 0, 0, 5, "Layout7");
Faktor = new QSpinBox( this, "Faktor" );
Faktor->setSuffix( tr( " %" ) );
Faktor->setMaxValue( 100 );
Faktor->setMinValue( -100 );
Faktor->setValue(PolyFd);
Layout7->addWidget( Faktor );
Layout8->addLayout( Layout7 );
Slider1 = new QSlider( this, "Slider1" );
Slider1->setMinValue( -100 );
Slider1->setMaxValue( 100 );
Slider1->setOrientation( QSlider::Horizontal );
Slider1->setTickmarks( QSlider::Right );
Layout7->addWidget( Faktor );
Text2 = new QLabel( Faktor, tr("&Factor:"), this, "Text2" );
Layout7->addWidget( Text2 );
Layout8->addLayout( Layout7 );
Slider1 = new QSlider( this, "Slider1" );
Slider1->setMinValue( -100 );
Slider1->setMaxValue( 100 );
Slider1->setOrientation( QSlider::Horizontal );
Slider1->setTickmarks( QSlider::Right );
Slider1->setValue(PolyFd);
Layout8->addWidget( Slider1 );
Layout9->addLayout( Layout8 );
Layout10->addLayout( Layout9 );
Layout11->addLayout( Layout10 );
Preview = new QLabel( this, "Preview" );
Preview->setMinimumSize( QSize( 106, 106 ) );
Preview->setMaximumSize( QSize( 106, 106 ) );
Preview->setFrameShape( QLabel::Panel );
Preview->setFrameShadow( QLabel::Sunken );
Layout8->addWidget( Slider1 );
Layout9->addLayout( Layout8 );
Layout10->addLayout( Layout9 );
Layout11->addLayout( Layout10 );
Preview = new QLabel( this, "Preview" );
Preview->setMinimumSize( QSize( 106, 106 ) );
Preview->setMaximumSize( QSize( 106, 106 ) );
Preview->setFrameShape( QLabel::Panel );
Preview->setFrameShadow( QLabel::Sunken );
Preview->setLineWidth(2);
Preview->setAlignment(AlignCenter);
Preview->setPixmap(*Pre);
Layout11->addWidget( Preview );
PolygonPropsLayout->addLayout( Layout11 );
Preview->setPixmap(*Pre);
Layout11->addWidget( Preview );
PolygonPropsLayout->addLayout( Layout11 );
 
Layout1_2 = new QHBoxLayout( 0, 0, 6, "Layout1_2");
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setMinimumSize( QSize( 90, 0 ) );
PushButton1->setText( tr( "OK" ) );
PushButton1->setDefault( true );
Layout1_2->addWidget( PushButton1 );
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1_2->addItem( spacer_2 );
PushButton2 = new QPushButton( this, "PushButton2" );
PushButton2->setText( tr( "Cancel" ) );
Layout1_2->addWidget( PushButton2 );
PolygonPropsLayout->addLayout( Layout1_2 );
Layout1_2 = new QHBoxLayout( 0, 0, 6, "Layout1_2");
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1_2->addItem( spacer_2 );
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "&OK" ) );
PushButton1->setDefault( true );
Layout1_2->addWidget( PushButton1 );
PushButton2 = new QPushButton( this, "PushButton2" );
PushButton2->setText( tr( "&Cancel" ) );
Layout1_2->addWidget( PushButton2 );
PolygonPropsLayout->addLayout( Layout1_2 );
 
UpdatePreView();
// signals and slots connections
connect(PushButton1, SIGNAL(clicked()), this, SLOT(accept()));
connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
connect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
connect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
connect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
connect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
connect(Slider2, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
UpdatePreView();
//tooltips
QToolTip::add( Ecken, tr( "Number of corners for polygons" ) );
QToolTip::add( Faktor2, tr( "Degrees of rotation for polygons" ) );
QToolTip::add( Slider2, tr( "Degrees of rotation for polygons" ) );
QToolTip::add( Konvex, tr( "Polygons will be convex rather than concave" ) );
QToolTip::add( Preview, tr( "Sample Polygon" ) );
QToolTip::add( Faktor, tr( "Change the angles at which lines of the polygon join" ) );
QToolTip::add( Slider1, tr( "Change the angles at which lines of the polygon join" ) );
// signals and slots connections
connect(PushButton1, SIGNAL(clicked()), this, SLOT(accept()));
connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
connect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
connect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
connect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
connect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
connect(Slider2, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
connect(Ecken, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
connect(Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView()));
}
/trunk/Scribus/scribus/page.cpp
9690,7 → 9690,7
inI2 = ProofPict(&inI, Items.at(ItNr)->IProfile, Items.at(ItNr)->IRender);
Items.at(ItNr)->pixm = inI2.copy();
Items.at(ItNr)->pixmOrg = QImage();
if (Items.at(ItNr)->Pfile != fn)
if ((Items.at(ItNr)->Pfile != fn) || (Items.at(ItNr)->dpiX != dpiX))
{
Items.at(ItNr)->LocalScX = 72.0 / dpiX;
Items.at(ItNr)->LocalScY = 72.0 / dpiY;
/trunk/Scribus/scribus/frameedit.cpp
157,12 → 157,12
NodePaletteLayout->addWidget( AbsMode );
 
Layout2 = new QGridLayout( 0, 1, 1, 0, 5, "Layout2");
XSpin = new MSpinBox( this, 2 );
XSpin->setMaxValue(3000);
XSpin->setEnabled(false);
YSpin = new MSpinBox( this, 2 );
YSpin->setMaxValue(3000);
YSpin->setEnabled(false);
XSpin = new MSpinBox( this, 2 );
XSpin->setMaxValue(3000);
XSpin->setEnabled(false);
TextLabel1 = new QLabel( XSpin, tr( "&X-Pos:" ), this, "TextLabel1" );
TextLabel2 = new QLabel( YSpin, tr( "&Y-Pos:"), this, "TextLabel2" );
Layout2->addWidget( TextLabel1, 0, 0 );