Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 223 → Rev 224

/trunk/Scribus/configure.in
167,6 → 167,7
AC_CONFIG_FILES([scribus/plugins/scriptplugin/doc/Makefile])
AC_CONFIG_FILES([scribus/plugins/scriptplugin/doc/en/Makefile])
AC_CONFIG_FILES([scribus/plugins/scriptplugin/samples/Makefile])
AC_CONFIG_FILES([scribus/plugins/scriptplugin/scripts/Makefile])
AC_CONFIG_FILES([scribus/plugins/Makefile])
AC_CONFIG_FILES([scribus/libpostscript/Makefile])
AC_CONFIG_FILES([scribus/profiles/Makefile])
/trunk/Scribus/scribus/colorm.cpp
150,9 → 150,20
{
connect(CSets, SIGNAL(activated(int)), this, SLOT(loadDefaults(int)));
connect(SaveColSet, SIGNAL( clicked() ), this, SLOT( saveDefaults() ) );
QToolTip::add( LoadColSet, tr( "Choose a color set to load" ) );
QToolTip::add( SaveColSet, tr( "Save the current color set" ) );
}
else
{
connect(DelU, SIGNAL( clicked() ), this, SLOT( delUnused() ) );
QToolTip::add( DelU, tr( "Remove unused colors from current document" ) );
}
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" ) );
QToolTip::add( EditF, tr( "Edit the currently selected color" ) );
QToolTip::add( DupF, tr( "Make a copy of the currently selected color" ) );
QToolTip::add( DelF, tr( "Delete the currently selected color" ) );
QToolTip::add( SaveF, tr( "Make the current colorset the default color set" ) );
connect( SaveF, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( CancF, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( NewF, SIGNAL( clicked() ), this, SLOT( neueFarbe() ) );
339,7 → 350,8
UsedC.insert(it.key(), it.data());
continue;
}
if ((it.key() == ScApp->doc->Dbrush) || (it.key() == ScApp->doc->Dpen) || (it.key() == ScApp->doc->DbrushPict)
if ((it.key() == ScApp->doc->Dbrush) || (it.key() == ScApp->doc->Dpen) ||
(it.key() == ScApp->doc->DbrushPict)
|| (it.key() == ScApp->doc->DpenLine) || (it.key() == ScApp->doc->DpenText))
{
UsedC.insert(it.key(), it.data());
362,14 → 374,10
break;
}
}
if (it.key() == ite->Pcolor)
/* PFJ - 29.02.04 - merged if's to one line */
if ((it.key() == ite->Pcolor) || (it.key() == ite->Pcolor2) ||
(it.key() == ite->GrColor) || (it.key() == ite->GrColor2))
found = true;
if (it.key() == ite->Pcolor2)
found = true;
if (it.key() == ite->GrColor)
found = true;
if (it.key() == ite->GrColor2)
found = true;
if (found)
break;
}
390,22 → 398,18
{
for (uint d=0; d<ite->Ptext.count(); ++d)
{
if (it.key() == ite->Ptext.at(d)->ccolor)
/* PFJ - 29.02.04 - Merged if's */
if ((it.key() == ite->Ptext.at(d)->ccolor) ||
(it.key() == ite->Ptext.at(d)->cstroke))
found = true;
if (it.key() == ite->Ptext.at(d)->cstroke)
found = true;
if (found)
break;
}
}
if (it.key() == ite->Pcolor)
/* PFJ - 29.02.04 - Merged if's */
if ((it.key() == ite->Pcolor) || (it.key() == ite->Pcolor2) ||
(it.key() == ite->GrColor) || (it.key() == ite->GrColor2))
found = true;
if (it.key() == ite->Pcolor2)
found = true;
if (it.key() == ite->GrColor)
found = true;
if (it.key() == ite->GrColor2)
found = true;
if (found)
break;
}
412,10 → 416,10
if (found)
break;
}
if (it.key() == ScApp->doc->CurrTextFill)
/* PFJ - 29.02.04 - Merged if's */
if ((it.key() == ScApp->doc->CurrTextFill) ||
(it.key() == ScApp->doc->CurrTextStroke))
found = true;
if (it.key() == ScApp->doc->CurrTextStroke)
found = true;
if (found)
{
UsedC.insert(it.key(), it.data());
424,10 → 428,10
}
EditColors = UsedC;
if (EditColors.count() == 0)
{
{
EditColors.insert("White", CMYKColor(0, 0, 0, 0));
EditColors.insert("Black", CMYKColor(0, 0, 0, 255));
}
}
updateCList();
}
 
/trunk/Scribus/scribus/dcolor.cpp
25,7 → 25,7
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "OK to delete Color:" ) );
TextLabel1->setText( tr( "Delete color:" ) );
Layout4->addWidget( TextLabel1, 0, 0 );
DColor = new QLabel( this, "DColor" );
DColor->setText( Fnam );