Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2438 → Rev 2439

/branches/Version13x/Scribus/scribus/mpalette.cpp
2992,6 → 2992,7
 
void Mpalette::updateCList()
{
static QMap<QRgb, QPixmap*> pxCache;
if (ScApp->ScriptRunning)
return;
if (!HaveDoc)
2999,14 → 3000,19
TxFill->clear();
TxStroke->clear();
ColorList::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());
QColor rgb = doc->PageColors[it.key()].getRGBColor();
QPixmap * pm = pxCache[rgb.rgb()];
if (!pm) {
pm = new QPixmap(15, 15);
pm->fill(rgb);
pxCache[rgb.rgb()] = pm;
}
TxFill->insertItem(*pm, it.key());
TxStroke->insertItem(*pm, it.key());
}
TxFill->listBox()->setMinimumWidth(TxFill->listBox()->maxItemWidth()+24);
TxStroke->listBox()->setMinimumWidth(TxStroke->listBox()->maxItemWidth()+24);
/branches/Version13x/Scribus/scribus/prefs.cpp
86,7 → 86,7
selectedGUILang=prefsData->guiLanguage;
guiLangLabel = new QLabel(guiLangCombo, tr("&Language:"), ButtonGroup1, "guiLangLabel");
ButtonGroup1Layout->addWidget( guiLangLabel, 0, 0 );
ButtonGroup1Layout->addWidget( guiLangCombo, 0, 1, Qt::AlignLeft );
ButtonGroup1Layout->addWidget( guiLangCombo, 0, 1 );
 
GUICombo = new QComboBox( true, ButtonGroup1, "GUICombo" );
QStringList STtest;
97,7 → 97,7
GUICombo->setCurrentText(prefsData->GUI);
TextGstil = new QLabel(GUICombo, tr("&Theme:"), ButtonGroup1, "dd");
ButtonGroup1Layout->addWidget( TextGstil, 1, 0 );
ButtonGroup1Layout->addWidget( GUICombo, 1, 1, Qt::AlignLeft );
ButtonGroup1Layout->addWidget( GUICombo, 1, 1 );
 
GFsize = new QSpinBox(8, 22, 1, ButtonGroup1, "gfs" );
GFsize->setSuffix( tr( " pt" ) );
/branches/Version13x/Scribus/scribus/muster.h
4,7 → 4,7
#include <qdialog.h>
class QListBox;
class QListBoxItem;
class QPushButton;
class QToolButton;
class QHBoxLayout;
class QVBoxLayout;
 
29,11 → 29,11
 
private:
QListBox* masterPageData;
QPushButton* importButton;
QPushButton* newButton;
QPushButton* duplicateButton;
QPushButton* deleteButton;
QPushButton* closeButton;
QToolButton* importButton;
QToolButton* newButton;
QToolButton* duplicateButton;
QToolButton* deleteButton;
QToolButton* closeButton;
ScribusDoc *currentDoc;
ScribusView *currentView;
QString sMuster;
/branches/Version13x/Scribus/scribus/cpalette.cpp
223,14 → 223,20
disconnect(colorListQLBox, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
disconnect(colorListQLBox, SIGNAL(selected(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
colorListQLBox->clear();
static QMap<QRgb, QPixmap*> pxCache;
ColorList::Iterator it;
QPixmap pm = QPixmap(30, 15);
if ((!GradientMode) || (Mode == 1))
colorListQLBox->insertItem( tr("None"));
for (it = colorList.begin(); it != colorList.end(); ++it)
{
pm.fill(colorList[it.key()].getRGBColor());
colorListQLBox->insertItem(pm, it.key());
QColor rgb = colorList[it.key()].getRGBColor();
QPixmap * pm = pxCache[rgb.rgb()];
if (!pm) {
pm = new QPixmap(30, 15);
pm->fill(rgb);
pxCache[rgb.rgb()] = pm;
}
colorListQLBox->insertItem(*pm, it.key());
}
colorListQLBox->setSelected(colorListQLBox->currentItem(), false);
connect(colorListQLBox, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
/branches/Version13x/Scribus/scribus/styleselect.cpp
224,10 → 224,18
buttonGroup2Layout->addWidget( smallcapsButton );
ssLayout->addWidget( buttonGroup2 );
 
buttonGroup4 = new QGroupBox( this, "buttonGroup" );
buttonGroup4->setFrameShape( QGroupBox::NoFrame );
buttonGroup4->setTitle("");
buttonGroup4->setColumnLayout(0, Qt::Vertical );
buttonGroup4->layout()->setSpacing( 0 );
buttonGroup4->layout()->setMargin( 0 );
buttonGroup4Layout = new QHBoxLayout( buttonGroup4->layout() );
buttonGroup4Layout->setAlignment( Qt::AlignTop );
StrikeVal = new StrikeValues( NULL );
StrikePop = new QPopupMenu();
StrikePop->insertItem(StrikeVal);
strikeoutButton = new QToolButton( this, "strikeoutButton" );
strikeoutButton = new QToolButton( buttonGroup4, "strikeoutButton" );
strikeoutButton->setText( "" );
strikeoutButton->setMaximumSize( QSize( 22, 22 ) );
strikeoutButton->setPixmap(loadIcon("Strike.xpm"));
234,12 → 242,12
strikeoutButton->setToggleButton( true );
strikeoutButton->setPopup(StrikePop);
strikeoutButton->setPopupDelay(400);
ssLayout->addWidget( strikeoutButton );
buttonGroup4Layout->addWidget( strikeoutButton );
 
OutlineVal = new OutlineValues( NULL );
OutlinePop = new QPopupMenu();
OutlinePop->insertItem(OutlineVal);
outlineButton = new QToolButton( this, "outlineButton" );
outlineButton = new QToolButton( buttonGroup4, "outlineButton" );
outlineButton->setText( "" );
outlineButton->setMaximumSize( QSize( 22, 22 ) );
outlineButton->setPixmap(loadIcon("outlined.png"));
246,12 → 254,12
outlineButton->setToggleButton( true );
outlineButton->setPopup(OutlinePop);
outlineButton->setPopupDelay(400);
ssLayout->addWidget( outlineButton );
buttonGroup4Layout->addWidget( outlineButton );
 
ShadowVal = new ShadowValues( NULL );
ShadowPop = new QPopupMenu();
ShadowPop->insertItem(ShadowVal);
shadowButton = new QToolButton( this, "shadowButton" );
shadowButton = new QToolButton( buttonGroup4, "shadowButton" );
shadowButton->setText( "" );
shadowButton->setMaximumSize( QSize( 22, 22 ) );
shadowButton->setPixmap(loadIcon("shadow.png"));
258,8 → 266,9
shadowButton->setToggleButton( true );
shadowButton->setPopup(ShadowPop);
shadowButton->setPopupDelay(400);
ssLayout->addWidget( shadowButton );
 
buttonGroup4Layout->addWidget( shadowButton );
ssLayout->addWidget( buttonGroup4 );
languageChange();
 
connect(allcapsButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
/branches/Version13x/Scribus/scribus/tabpdfoptions.cpp
131,7 → 131,7
PDFVersionCombo->setCurrentItem(1);
if (Optionen->Version == PDFOptions::PDFVersion_15)
PDFVersionCombo->setCurrentItem(2);
GroupBox1Layout->addMultiCellWidget( PDFVersionCombo, 0, 0, 1, 2, AlignLeft );
GroupBox1Layout->addMultiCellWidget( PDFVersionCombo, 0, 0, 1, 2 );
TextLabel1x = new QLabel( tr( "&Binding:" ), GroupBox1, "TextLabel1" );
TextLabel1x->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
GroupBox1Layout->addWidget( TextLabel1x, 1, 0 );
141,7 → 141,7
ComboBind->setEditable(false);
ComboBind->setCurrentItem(Optionen->Binding);
TextLabel1x->setBuddy(ComboBind);
GroupBox1Layout->addMultiCellWidget( ComboBind, 1, 1, 1, 2, AlignLeft );
GroupBox1Layout->addMultiCellWidget( ComboBind, 1, 1, 1, 2 );
CheckBox1 = new QCheckBox( tr( "Generate &Thumbnails" ), GroupBox1, "CheckBox1" );
CheckBox1->setChecked(Optionen->Thumbnails);
GroupBox1Layout->addMultiCellWidget( CheckBox1, 2, 2, 0, 2 );
/branches/Version13x/Scribus/scribus/styleselect.h
111,9 → 111,11
QHBoxLayout* buttonGroupLayout;
QHBoxLayout* buttonGroup2Layout;
QHBoxLayout* buttonGroup3Layout;
QHBoxLayout* buttonGroup4Layout;
QGroupBox* buttonGroup;
QGroupBox* buttonGroup2;
QGroupBox* buttonGroup3;
QGroupBox* buttonGroup4;
QToolButton* underlineButton;
QToolButton* underlineWordButton;
QToolButton* subscriptButton;
/branches/Version13x/Scribus/scribus/muster.cpp
26,13 → 26,13
buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing( 5 );
buttonLayout->setMargin( 0 );
importButton = new QPushButton(this, "importButton" );
importButton = new QToolButton(this, "importButton" );
importButton->setPixmap(loadIcon("fileopen.png"));
newButton = new QPushButton(this, "newButton" );
newButton = new QToolButton(this, "newButton" );
newButton->setPixmap(loadIcon("filenew.png"));
duplicateButton = new QPushButton(this, "DublicateB" );
duplicateButton = new QToolButton(this, "DublicateB" );
duplicateButton->setPixmap(loadIcon("editcopy22.png"));
deleteButton = new QPushButton(this, "deleteButton" );
deleteButton = new QToolButton(this, "deleteButton" );
deleteButton->setPixmap(loadIcon("edittrash.png"));
buttonLayout->addWidget( newButton );
buttonLayout->addWidget( duplicateButton );
/branches/Version13x/Scribus/scribus/scribus.cpp
3405,14 → 3405,20
{
int a;
ColorList::Iterator it;
QPixmap pm = QPixmap(15, 15);
a = 0;
static QMap<QRgb, QPixmap*> pxCache;
ColorMenC->clear();
ColorMenC->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
ColorMenC->insertItem(pm, it.key());
QColor rgb = doc->PageColors[it.key()].getRGBColor();
QPixmap * pm = pxCache[rgb.rgb()];
if (!pm) {
pm = new QPixmap(15, 15);
pm->fill(rgb);
pxCache[rgb.rgb()] = pm;
}
ColorMenC->insertItem(*pm, it.key());
if (it.key() == doc->toolSettings.dBrush)
ColorMenC->setCurrentItem(a);
a++;