Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3542 → Rev 3543

/branches/Version13x/Scribus/scribus/customfdialog.cpp
23,6 → 23,7
#include <qdir.h>
#include <qdom.h>
#include <qtextcodec.h>
#include "sccombobox.h"
#include "scribusstructs.h"
#include "scimage.h"
#include <util.h>
274,7 → 275,7
Layout1C->setMargin( 4 );
TxCodeT = new QLabel(this);
TxCodeT->setText( tr("Encoding:"));
TxCodeM = new QComboBox(true, LayoutC, "Cod");
TxCodeM = new ScComboBox(true, LayoutC, "Cod");
TxCodeM->setEditable(false);
QString tmp_txc[] = {"ISO 8859-1", "ISO 8859-2", "ISO 8859-3", "ISO 8859-4", "ISO 8859-5", "ISO 8859-6",
"ISO 8859-7", "ISO 8859-8", "ISO 8859-9", "ISO 8859-10", "ISO 8859-13", "ISO 8859-14",
/branches/Version13x/Scribus/scribus/checkDocument.cpp
11,8 → 11,8
#include <qpixmap.h>
#include <qmap.h>
#include <qlabel.h>
#include <qcombobox.h>
 
#include "sccombobox.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "page.h"
127,7 → 127,7
layout1 = new QHBoxLayout( 0, 0, 5, "layout1");
textLabel1 = new QLabel( this, "textLabel1" );
layout1->addWidget( textLabel1 );
curCheckProfile = new QComboBox( true, this, "Profiles" );
curCheckProfile = new ScComboBox( true, this, "Profiles" );
curCheckProfile->setEditable(false);
layout1->addWidget( curCheckProfile );
checkDocumentLayout->addLayout( layout1 );
/branches/Version13x/Scribus/scribus/cpalette.cpp
27,9 → 27,9
#include <qlayout.h>
#include <qtoolbutton.h>
#include <qbuttongroup.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qspinbox.h>
#include "sccombobox.h"
#include "scribusdoc.h"
#include "shadebutton.h"
#include "mspinbox.h"
84,7 → 84,7
GradLayout = new QVBoxLayout( 0, 0, 6, "GradLayout");
QFont fo = QFont(font());
fo.setPointSize(fo.pointSize()-1);
gradientQCombo = new QComboBox( true, this, "gradientQCombo" );
gradientQCombo = new ScComboBox( true, this, "gradientQCombo" );
gradientQCombo->setEditable(false);
gradientQCombo->setFont(fo);
GradLayout->addWidget( gradientQCombo );
/branches/Version13x/Scribus/scribus/effectsdialog.cpp
8,11 → 8,11
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qimage.h>
#include <qcombobox.h>
#include <qtextstream.h>
#include <qwidgetstack.h>
#include <qwidget.h>
#include <qslider.h>
#include "sccombobox.h"
#include "scribusdoc.h"
#include "shadebutton.h"
#include "mspinbox.h"
68,7 → 68,7
textLabel3 = new QLabel( tr( "Color:" ), WStackPage_2, "textLabel3" );
layout17->addWidget( textLabel3 );
 
colData = new QComboBox(false, WStackPage_2, "colData");
colData = new ScComboBox(false, WStackPage_2, "colData");
ColorList::Iterator it;
QPixmap pm = QPixmap(15, 15);
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
/branches/Version13x/Scribus/scribus/charselect.cpp
15,6 → 15,7
#include "fontcombo.h"
#include "charselect.h"
#include "charselect.moc"
#include "sccombobox.h"
#include "scpainter.h"
 
#include "scconfig.h"
272,7 → 273,7
rangeLabel = new QLabel( this, "fontLabel" );
rangeLabel->setText( tr( "Character Class:" ) );
selectionsLayout->addWidget( rangeLabel );
rangeSelector = new QComboBox( true, this, "rangeSelector" );
rangeSelector = new ScComboBox( true, this, "rangeSelector" );
rangeSelector->setEditable(false);
characterClass = 0;
selectionsLayout->addWidget( rangeSelector );
831,4 → 832,4
for (int d = 0; d < zTabelle->numRows(); ++d)
zTabelle->setRowHeight(d, cellHeight);
zTabelle->updateScrollBars();
}
}
/branches/Version13x/Scribus/scribus/gtdialogs.cpp
23,6 → 23,7
#include "prefsmanager.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "sccombobox.h"
#include <qlabel.h>
#include "commonstrings.h"
 
49,7 → 50,7
importerLayout->setSpacing(10);
importerLayout->setMargin(0);
 
importerCombo = new QComboBox(0, importerFrame, "importerCombo");
importerCombo = new ScComboBox(0, importerFrame, "importerCombo");
importerCombo->setMinimumSize(QSize(150, 0));
QToolTip::add(importerCombo, tr("Choose the importer to use"));
importerCombo->insertItem( tr("Automatic"));
72,7 → 73,7
encodingLayout->setSpacing(10);
encodingLayout->setMargin(0);
 
encodingCombo = new QComboBox(true, encodingFrame, "encodingCombo");
encodingCombo = new ScComboBox(true, encodingFrame, "encodingCombo");
encodingCombo->setEditable(false);
QString tmp_txc[] = {"ISO 8859-1", "ISO 8859-2", "ISO 8859-3", "ISO 8859-4", "ISO 8859-5", "ISO 8859-6",
"ISO 8859-7", "ISO 8859-8", "ISO 8859-9", "ISO 8859-10", "ISO 8859-13", "ISO 8859-14",
135,7 → 136,7
layout->addLayout(llayout);
 
QBoxLayout* ilayout = new QHBoxLayout(0, 5, 5, "dlayout2");
importerCombo = new QComboBox(0, this, "importerCombo2");
importerCombo = new ScComboBox(0, this, "importerCombo2");
importerCombo->setMinimumSize(QSize(150, 0));
QToolTip::add(importerCombo, tr("Choose the importer to use"));
importerCombo->insertStringList(importers);
/branches/Version13x/Scribus/scribus/extimageprops.cpp
5,7 → 5,6
#include <qtabwidget.h>
#include <qwidget.h>
#include <qlabel.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qtable.h>
14,6 → 13,7
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qheader.h>
#include "sccombobox.h"
#include "scpainter.h"
#include "util.h"
 
69,7 → 69,7
textLabel1 = new QLabel( tab, "textLabel1" );
textLabel1->setText( tr( "Blend Mode:" ) );
layout1->addWidget( textLabel1 );
blendMode = new QComboBox( true, tab, "blendMode" );
blendMode = new ScComboBox( true, tab, "blendMode" );
blendMode->setEditable(false);
blendMode->clear();
blendMode->insertItem( tr("Normal"));
/branches/Version13x/Scribus/scribus/hysettings.cpp
1,5 → 1,6
#include "hysettings.h"
#include "hysettings.moc"
#include "sccombobox.h"
 
HySettings::HySettings( QWidget* parent, QMap<QString,QString>* langs ) : QWidget( parent, "Settings" )
{
12,7 → 13,7
input = new QCheckBox( tr("Hyphenate Text Automatically &During Typing"), this, "inp");
layout3->addMultiCellWidget(input, 1, 1, 0, 1);
language = new QComboBox( true, this, "Language" );
language = new ScComboBox( true, this, "Language" );
QMap<QString,QString>::Iterator it;
for (it = langs->begin(); it != langs->end(); ++it)
lada.append(it.data());
/branches/Version13x/Scribus/scribus/cmykfw.cpp
9,6 → 9,7
#include <cstdlib>
 
#include "commonstrings.h"
#include "sccombobox.h"
#include "scconfig.h"
#include "scpaths.h"
#ifdef HAVE_CMS
81,7 → 82,7
TextLabel3->setMinimumSize( QSize( 100, 22 ) );
Layout23->addWidget( TextLabel3 );
 
ComboBox1 = new QComboBox( true, this, "ComboBox1" );
ComboBox1 = new ScComboBox( true, this, "ComboBox1" );
ComboBox1->setEditable(false);
ComboBox1->insertItem( tr( "CMYK" ) );
ComboBox1->insertItem( tr( "RGB" ) );
162,7 → 163,7
Frame4Layout->setSpacing( 6 );
Frame4Layout->setMargin( 0 );
Swatches = new QComboBox( true, Frame4, "ComboBox1" );
Swatches = new ScComboBox( true, Frame4, "ComboBox1" );
Swatches->setEditable(false);
Swatches->insertItem( tr( "HSV-Colormap" ) );
Swatches->insertItem("X11 RGB-Set");