Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10507 → Rev 10508

/trunk/Scribus/scribus/multiprogressdialog.h
46,7 → 46,7
Q_OBJECT
 
public:
MultiProgressDialog(QWidget* parent=0, const char*name=0, bool modal=false, Qt::WFlags f=0);
MultiProgressDialog(QWidget* parent=0, Qt::WFlags f=0);
/**
* Create a multi progress bar dialog for long operations with multiple steps. The dialog includes
* one standard progress bar, typically for the overall progress and others may be added easily.
58,7 → 58,7
* @param f
* @return
*/
MultiProgressDialog(const QString& titleText, const QString & cancelButtonText, QWidget* parent=0, const char*name=0, bool modal=true, Qt::WFlags f=0);
MultiProgressDialog(const QString& titleText, const QString & cancelButtonText, QWidget* parent=0, Qt::WFlags f=0);
~MultiProgressDialog();
/**
/trunk/Scribus/scribus/checkDocument.cpp
135,7 → 135,7
layout1->setSpacing(5);
textLabel1 = new QLabel( this );
layout1->addWidget( textLabel1 );
curCheckProfile = new ScComboBox( false, this );
curCheckProfile = new ScComboBox( this );
layout1->addWidget( curCheckProfile );
checkDocumentLayout->addLayout( layout1 );
reportDisplay = new QTreeWidget( this );
/trunk/Scribus/scribus/cpalette.cpp
95,7 → 95,7
GradLayout->setSpacing(5);
QFont fo = QFont(font());
fo.setPointSize(fo.pointSize()-1);
gradientQCombo = new ScComboBox( false, this, "gradientQCombo" );
gradientQCombo = new ScComboBox( this );
gradientQCombo->setFont(fo);
GradLayout->addWidget( gradientQCombo );
gradEdit = new GradientEditor(this);
214,7 → 214,7
Layout1t->addWidget(TransSpin, 0, 1);
TransTxt2 = new QLabel( TransGroup );
Layout1t->addWidget( TransTxt2, 1, 0 );
blendMode = new ScComboBox( false, TransGroup );
blendMode = new ScComboBox( TransGroup );
Layout1t->addWidget( blendMode, 1, 1 );
Form1Layout->addWidget(TransGroup);
 
/trunk/Scribus/scribus/newfile.cpp
248,7 → 248,7
layoutLabel1 = new QLabel( pageSizeGroupBox, "layoutLabel1" );
layoutLabel1->setText( tr( "First Page is:" ) );
pageSizeGroupBoxLayout->addWidget( layoutLabel1, 4, 1 );
firstPage = new ScComboBox( false, pageSizeGroupBox, "firstPage" );
firstPage = new ScComboBox( pageSizeGroupBox );
firstPage->clear();
pageSizeGroupBoxLayout->addWidget( firstPage, 4, 2 );
selectItem(prefsManager->appPrefs.FacingPages);
/trunk/Scribus/scribus/sccombobox.cpp
31,7 → 31,7
};
#endif
 
ScComboBox::ScComboBox( QWidget* parent, const char* name ) : QComboBox(false, parent, name)
ScComboBox::ScComboBox( QWidget* parent ) : QComboBox(parent)
{
#ifdef QT_WS_MAC
setStyle( new ScMacStyle );
39,10 → 39,3
//Qt4 setListBox( new Q3ListBox( this, "in-combo", Qt::WType_Popup ) );
}
 
ScComboBox::ScComboBox( bool rw, QWidget* parent, const char* name ) :QComboBox(rw, parent, name)
{
#ifdef QT_WS_MAC
setStyle( new ScMacStyle );
#endif
//Qt4 setListBox( new Q3ListBox( this, "in-combo", Qt::WType_Popup ) );
}
/trunk/Scribus/scribus/layers.cpp
46,7 → 46,7
layout1->setSpacing(2);
textLabel1 = new QLabel( this);
layout1->addWidget( textLabel1 );
blendMode = new ScComboBox( false, this);
blendMode = new ScComboBox( this);
layout1->addWidget( blendMode );
textLabel2 = new QLabel( this);
textLabel2->setText( tr( "Opacity:" ) );
/trunk/Scribus/scribus/smsccombobox.h
14,8 → 14,7
{
Q_OBJECT
public:
SMScComboBox(QWidget *parent, const char *name=0);
SMScComboBox(bool rw, QWidget* parent, const char* name);
SMScComboBox(QWidget *parent);
~SMScComboBox() {};
 
void setCurrentItem(int i);
/trunk/Scribus/scribus/scplugin.cpp
53,7 → 53,7
return tr("Action", "plugin manager plugin type");
else
{
qDebug("Unknown plugin type: %s", className());
qDebug("Unknown plugin type: %s", metaObject()->className());
return tr("Unknown");
}
}
/trunk/Scribus/scribus/scribusXml.cpp
196,7 → 196,7
if ((!OB->m_annotation.Extern().isEmpty()) && (OB->m_annotation.ActionType() != 8))
{
QFileInfo efp(OB->m_annotation.Extern());
OB->m_annotation.setExtern(efp.absFilePath());
OB->m_annotation.setExtern(efp.absoluteFilePath());
}
OB->m_annotation.setZiel (attrAsInt(attrs, "ANZIEL", 0));
OB->AnName = attrAsString(attrs, "ANNAME","");
941,7 → 941,7
ff = QString::fromUtf8(f.data());
else
ff = f;
fileDir = QFileInfo(fileName).dirPath(true);
fileDir = QFileInfo(fileName).absolutePath();
}
else
{
1208,23 → 1208,23
if (!OB.Pfile.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile));
QFileInfo pfi2(test);
OB.Pfile = pfi2.absFilePath();
OB.Pfile = pfi2.absoluteFilePath();
}
if (!OB.Pfile2.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile2));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile2));
QFileInfo pfi2(test);
OB.Pfile2 = pfi2.absFilePath();
OB.Pfile2 = pfi2.absoluteFilePath();
}
if (!OB.Pfile3.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile3));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile3));
QFileInfo pfi2(test);
OB.Pfile3 = pfi2.absFilePath();
OB.Pfile3 = pfi2.absoluteFilePath();
}
}
if (tagName1 == "PatternItem" && sReader1.isEndElement())
1398,23 → 1398,23
if (!OB.Pfile.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile));
QFileInfo pfi2(test);
OB.Pfile = pfi2.absFilePath();
OB.Pfile = pfi2.absoluteFilePath();
}
if (!OB.Pfile2.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile2));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile2));
QFileInfo pfi2(test);
OB.Pfile2 = pfi2.absFilePath();
OB.Pfile2 = pfi2.absoluteFilePath();
}
if (!OB.Pfile3.isEmpty())
{
QFileInfo pfi(fileName);
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.dirPath(true)+"/"+OB.Pfile3));
QString test = QDir::cleanPath(QDir::convertSeparators(pfi.absolutePath()+"/"+OB.Pfile3));
QFileInfo pfi2(test);
OB.Pfile3 = pfi2.absFilePath();
OB.Pfile3 = pfi2.absoluteFilePath();
}
}
if (sReader.isEndElement() && (tagName == "ITEM"))
1481,7 → 1481,7
QMap<PageItem*, int>::Iterator it;
for (it = groupID.begin(); it != groupID.end(); ++it)
{
it.key()->groupsLastItem = doc->Items->at(it.data());
it.key()->groupsLastItem = doc->Items->at(it.value());
}
}
doc->GroupCounter = GrMax + 1;
/trunk/Scribus/scribus/tabtools.cpp
117,7 → 117,7
subTabTextLayout->addWidget( fontComboText, 1, 1, 1, 2, Qt::AlignLeft );
textLabel1b = new QLabel( fontComboText, tr( "Font:" ), subTabText, "textLabel1b" );
subTabTextLayout->addWidget( textLabel1b, 1, 0 );
sizeComboText = new ScComboBox( false, subTabText, "SizeCombo" );
sizeComboText = new ScComboBox( subTabText );
 
subTabTextLayout->addWidget( sizeComboText, 2, 1, 1, 2, Qt::AlignLeft );
textLabel2b = new QLabel(sizeComboText, tr( "Size:" ), subTabText, "textLabel2b" );
178,7 → 178,7
textLabelTSL = new QLabel( shadingTextLine, tr( "Shading:" ), subTabText, "textLabelTSL" );
subTabTextLayout->addWidget( textLabelTSL, 6, 2 );
 
tabFillCombo = new ScComboBox( false, subTabText, "tabFillCombo" );
tabFillCombo = new ScComboBox( subTabText );
 
subTabTextLayout->addWidget( tabFillCombo, 7, 1, Qt::AlignLeft );
textLabel3b2t = new QLabel(tabFillCombo, tr( "Tab Fill Character:" ), subTabText, "textLabel3b2t" );
/trunk/Scribus/scribus/scpageoutput.cpp
876,7 → 876,7
if ( imageMode == ScPainterExBase::cmykImages )
useCmyk = true;
QFileInfo fInfo(item->Pfile);
QString ext = fInfo.extension(false);
QString ext = fInfo.suffix();
CMSettings cmsSettings(item->doc(), item->IProfile, item->IRender);
scImg.imgInfo.valid = false;
scImg.imgInfo.clipPath = "";
/trunk/Scribus/scribus/extimageprops.cpp
92,7 → 92,7
textLabel1 = new QLabel( tab );
textLabel1->setText( tr( "Blend Mode:" ) );
layout1->addWidget( textLabel1 );
blendMode = new ScComboBox( false, tab, "blendMode" );
blendMode = new ScComboBox( tab );
blendMode->clear();
blendMode->addItem( tr("Normal"));
blendMode->addItem( tr("Darken"));
/trunk/Scribus/scribus/fontcombo.cpp
119,9 → 119,9
fontComboLayout->setColStretch(1,10);
col=1;
}
fontFamily = new ScComboBox( false, this, "fontFamily" );
fontFamily = new ScComboBox(this);
fontComboLayout->addWidget(fontFamily,0,col);
fontStyle = new ScComboBox( false, this, "fontStyle" );
fontStyle = new ScComboBox(this);
fontComboLayout->addWidget(fontStyle,1,col);
RebuildList(0);
connect(fontFamily, SIGNAL(activated(int)), this, SLOT(familySelected(int)));
/trunk/Scribus/scribus/styles/charstyle.h
147,7 → 147,7
/** getter: validates and returns the attribute's value */
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
const attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
#include "charstyle.attrdefs.cxx"
#undef ATTRDEF
/trunk/Scribus/scribus/styles/linestyle.h
73,7 → 73,7
/** getter: validates and returns the attribute's value */
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
const attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
#include "linestyle.attrdefs.cxx"
#undef ATTRDEF
/trunk/Scribus/scribus/styles/paragraphstyle.h
110,7 → 110,7
/** getter: validates and returns the attribute's value */
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
const attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
attr_TYPE attr_GETTER() const { validate(); return m_##attr_NAME; }
#include "paragraphstyle.attrdefs.cxx"
#undef ATTRDEF
/trunk/Scribus/scribus/units.cpp
26,7 → 26,7
/*!
* @brief Returns the ratio to points for the selected unit of measure. Ratios are for: PT, MM, IN, P, CM, C. DEG and PCT return 1.0 as they will never convert
*/
const double unitGetRatioFromIndex(const int index)
double unitGetRatioFromIndex(const int index)
{
//PT, MM, IN, P, CM, C (Cicero)
//NOTE: Calling functions that divide by this value will crash on divide by 0. They shouldnt be getting
39,7 → 39,7
return ratio[index];
}
 
const int SCRIBUS_API unitGetBaseFromIndex(const int index)
int SCRIBUS_API unitGetBaseFromIndex(const int index)
{
if (index==SC_P)
return 12;
49,7 → 49,7
/*!
* @brief Strip the text from a value and return the double value for the unit
*/
const double unitValueFromString(const QString& value)
double unitValueFromString(const QString& value)
{
QString lowerValue = value.toLower();
QString dbl = "0.0";
177,7 → 177,7
/*!
* @brief Returns the decimals for the units
*/
const int unitGetDecimalsFromIndex(const int index)
int unitGetDecimalsFromIndex(const int index)
{
if (index<UNITMIN || index>UNITMAX)
return 0;
189,7 → 189,7
/*!
* @brief Returns the precision for the units
*/
const int unitGetPrecisionFromIndex(const int index)
int unitGetPrecisionFromIndex(const int index)
{
if (index<UNITMIN || index>UNITMAX)
return 0;
219,7 → 219,7
/*!
* @brief Returns the maximum index of the units we have now
*/
const int unitGetMaxIndex()
int unitGetMaxIndex()
{
return UNITMAX;
}
227,7 → 227,7
/*!
* @brief Returns the pts value from the mm value supplied
*/
const double mm2pts(double mm)
double mm2pts(double mm)
{
return mm / unitGetRatioFromIndex(SC_MM);
}
235,7 → 235,7
/*!
* @brief Returns the pts value from the in value supplied
*/
const double in2pts(double in)
double in2pts(double in)
{
return in / unitGetRatioFromIndex(SC_IN);
}
243,7 → 243,7
/*!
* @brief Returns the pts value from the pica value supplied
*/
const double p2pts(double p)
double p2pts(double p)
{
return p / unitGetRatioFromIndex(SC_P);
}
251,7 → 251,7
/*!
* @brief Returns the pts value from the cm value supplied
*/
const double cm2pts(double cm)
double cm2pts(double cm)
{
return cm / unitGetRatioFromIndex(SC_CM);
}
259,7 → 259,7
/*!
* @brief Returns the pts value from the cm value supplied
*/
const double c2pts(double c)
double c2pts(double c)
{
return c / unitGetRatioFromIndex(SC_C);
}
267,7 → 267,7
/*!
* @brief Returns the mm value from the pt value supplied
*/
const double pts2mm(double pts)
double pts2mm(double pts)
{
return pts * unitGetRatioFromIndex(SC_MM);
}
275,7 → 275,7
/*!
* @brief Returns the in value from the pt value supplied
*/
const double pts2in(double pts)
double pts2in(double pts)
{
return pts * unitGetRatioFromIndex(SC_IN);
}
283,7 → 283,7
/*!
* @brief Returns the pica value from the pt value supplied
*/
const double pts2p(double pts)
double pts2p(double pts)
{
return pts * unitGetRatioFromIndex(SC_P);
}
291,7 → 291,7
/*!
* @brief Returns the cm value from the pt value supplied
*/
const double pts2cm(double pts)
double pts2cm(double pts)
{
return pts * unitGetRatioFromIndex(SC_CM);
}
299,7 → 299,7
/*!
* @brief Returns the c value from the pt value supplied
*/
const double pts2c(double pts)
double pts2c(double pts)
{
return pts * unitGetRatioFromIndex(SC_C);
}
/trunk/Scribus/scribus/sccombobox.h
23,11 → 23,11
\brief The ScComboBox widget always uses a listbox instead of a popup,
independent of any QStyle.
*/
class ScComboBox : public QComboBox {
class ScComboBox : public QComboBox
{
 
public:
ScComboBox( QWidget* parent=0, const char* name=0 );
ScComboBox( bool rw, QWidget* parent=0, const char* name=0 );
ScComboBox( QWidget* parent=0);
};
 
#endif
/trunk/Scribus/scribus/cmykfw.cpp
110,7 → 110,7
TextLabel3->setMinimumSize( QSize( 100, 22 ) );
Layout23->addWidget( TextLabel3 );
 
ComboBox1 = new ScComboBox( false, this );
ComboBox1 = new ScComboBox( this );
ComboBox1->addItem( tr( "CMYK" ) );
ComboBox1->addItem( tr( "RGB" ) );
ComboBox1->addItem( tr( "Web Safe RGB" ) );
190,7 → 190,7
Frame4Layout->setSpacing( 5 );
Frame4Layout->setMargin( 0 );
 
Swatches = new ScComboBox( false, Frame4 );
Swatches = new ScComboBox( Frame4 );
Swatches->addItem( tr( "HSV-Colormap" ) );
/*
Swatches->insertItem("X11 RGB-Set");
/trunk/Scribus/scribus/units.h
48,27 → 48,27
SC_PCT = 7
};
 
const double SCRIBUS_API unitGetRatioFromIndex(const int index);
const int SCRIBUS_API unitGetBaseFromIndex(const int index);
double SCRIBUS_API unitGetRatioFromIndex(const int index);
int SCRIBUS_API unitGetBaseFromIndex(const int index);
const QString SCRIBUS_API unitGetStrFromIndex(const int index);
const QString SCRIBUS_API unitGetUntranslatedStrFromIndex(const int index);
const QString SCRIBUS_API unitGetSuffixFromIndex(const int index);
const int SCRIBUS_API unitGetDecimalsFromIndex(const int index);
const int SCRIBUS_API unitGetPrecisionFromIndex(const int index);
const double SCRIBUS_API unitValueFromString(const QString& value);
int SCRIBUS_API unitGetDecimalsFromIndex(const int index);
int SCRIBUS_API unitGetPrecisionFromIndex(const int index);
double SCRIBUS_API unitValueFromString(const QString& value);
const scUnit SCRIBUS_API unitIndexFromString(const QString& value);
const QStringList SCRIBUS_API unitGetTextUnitList();
const int SCRIBUS_API unitGetMaxIndex();
const double SCRIBUS_API mm2pts(double mm);
const double SCRIBUS_API in2pts(double in);
const double SCRIBUS_API p2pts(double p);
const double SCRIBUS_API cm2pts(double cm);
const double SCRIBUS_API c2pts(double c);
const double SCRIBUS_API pts2mm(double pts);
const double SCRIBUS_API pts2in(double pts);
const double SCRIBUS_API pts2p(double pts);
const double SCRIBUS_API pts2cm(double pts);
const double SCRIBUS_API pts2c(double pts);
int SCRIBUS_API unitGetMaxIndex();
double SCRIBUS_API mm2pts(double mm);
double SCRIBUS_API in2pts(double in);
double SCRIBUS_API p2pts(double p);
double SCRIBUS_API cm2pts(double cm);
double SCRIBUS_API c2pts(double c);
double SCRIBUS_API pts2mm(double pts);
double SCRIBUS_API pts2in(double pts);
double SCRIBUS_API pts2p(double pts);
double SCRIBUS_API pts2cm(double pts);
double SCRIBUS_API pts2c(double pts);
double SCRIBUS_API pts2value(double Val, int unit);
double SCRIBUS_API value2pts(double unitValue, int unit);
double SCRIBUS_API value2value(double unitValue, int primaryUnit, int secondaryUnit);
/trunk/Scribus/scribus/pdflib_core.cpp
116,7 → 116,7
KeyGen[a] = kg_array[a];
if (usingGUI)
{
progressDialog = new MultiProgressDialog( tr("Saving PDF"), CommonStrings::tr_Cancel, doc.scMW(), "pdfexportprogress");
progressDialog = new MultiProgressDialog( tr("Saving PDF"), CommonStrings::tr_Cancel, doc.scMW());
Q_CHECK_PTR(progressDialog);
QStringList barNames, barTexts;
barNames << "EMP" << "EP" << "ECPI";
/trunk/Scribus/scribus/fontreplacedialog.cpp
32,7 → 32,7
FontReplaceDialogLayout->setMargin(10);
FontReplaceDialogLayout->setSpacing(5);
 
textLabel1 = new QLabel( this, "textLabel1" );
textLabel1 = new QLabel(this);
textLabel1->setAlignment(Qt::AlignVCenter);
textLabel1->setWordWrap(true);
textLabel1->setText( "<qt>" + tr("This document contains some fonts that are not installed on your system, please choose a suitable replacement for them. Cancel will stop the document from loading.") + "</qt>" );
57,7 → 57,7
{
replacementTable->setItem(a, 0, new QTableWidgetItem(itfsu.key()));
FontCombo* item = new FontCombo(this);
item->setCurrentText(itfsu.value());
item->setItemText(item->currentIndex(), itfsu.value());
replacementTable->setCellWidget(a, 1, item);
a++;
}
/trunk/Scribus/scribus/customfdialog.cpp
342,7 → 342,7
TxCodeT = new QLabel(this);
TxCodeT->setText( tr("Encoding:"));
Layout1C->addWidget(TxCodeT);
TxCodeM = new ScComboBox(true, LayoutC, "Cod");
TxCodeM = new ScComboBox(LayoutC);
TxCodeM->setEditable(false);
QString tmp_txc[] = {"ISO 8859-1", "ISO 8859-2", "ISO 8859-3",
"ISO 8859-4", "ISO 8859-5", "ISO 8859-6",
/trunk/Scribus/scribus/mpalette.cpp
191,7 → 191,7
GeoGroupLayout->addWidget( heightLabel, 3, 0 );
 
keepFrameWHRatioButton = new LinkButton( GeoGroup );
keepFrameWHRatioButton->setToggleButton( true );
keepFrameWHRatioButton->setCheckable( true );
keepFrameWHRatioButton->setAutoRaise( true );
keepFrameWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
keepFrameWHRatioButton->setOn(true);
456,7 → 456,7
dGap = new ScrSpinBox( 0, 300, Distance, 0 );
// colgapLabel = new LabelButton( Distance, "&Gap:", "&Width:");
// colgapLabel->setBuddy(dGap);
colgapLabel = new ScComboBox( false, Distance, "colgapLabel" );
colgapLabel = new ScComboBox( Distance );
DistanceLayout->addWidget( colgapLabel, 1, 0, Qt::AlignLeft );
DistanceLayout->addWidget( dGap, 1, 1 );
 
496,7 → 496,7
DistanceLayout2->setMargin( 5 );
DistanceLayout2->setAlignment( Qt::AlignTop );
 
pathTextType = new ScComboBox( false, Distance2, "pathTextType" );
pathTextType = new ScComboBox( Distance2 );
DistanceLayout2->addWidget( pathTextType, 0, 1);
pathTextTypeLabel = new QLabel( "Type:", Distance2 );
DistanceLayout2->addWidget( pathTextTypeLabel, 0, 0);
635,7 → 635,7
Layout1t->addWidget(TransSpin, 0, 1);
TransTxt2 = new QLabel( TransGroup );
Layout1t->addWidget( TransTxt2, 1, 0 );
blendMode = new ScComboBox( false, TransGroup, "blendMode" );
blendMode = new ScComboBox( TransGroup );
Layout1t->addWidget( blendMode, 1, 1 );
page_group_layout->addWidget(TransGroup);
QSpacerItem* spacerTr2 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
753,7 → 753,7
Revert->setMaximumSize( QSize( 22, 22 ) );
Revert->setText("");
Revert->setPixmap(loadIcon("Revers.png"));
Revert->setToggleButton( true );
Revert->setCheckable( true );
Layout1->addWidget( Revert );
QSpacerItem* spacer7 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer7 );
830,7 → 830,7
glyphExtensionHLayout->add(maxGlyphExtSpinBox);
GroupBox3aLayout->addLayout(glyphExtensionHLayout, 6, 0, 1, 2);
/* langCombo = new ScComboBox( false, page_3, "Lang" );
/* langCombo = new ScComboBox( page_3 );
langLabel = new QLabel( langCombo, "Lan&guage:", page_3, "langLabel" );
GroupBox3aLayout->addWidget( langLabel, 1, 0 );
GroupBox3aLayout->addWidget( langCombo, 1, 1 ); */
873,7 → 873,7
layout43->addWidget( yscaleLabel, 3, 0 );
layout43->addWidget( imageYScaleSpinBox, 3, 1 );
keepImageWHRatioButton = new LinkButton( page_4 );
keepImageWHRatioButton->setToggleButton( true );
keepImageWHRatioButton->setCheckable( true );
keepImageWHRatioButton->setAutoRaise( true );
keepImageWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
layout43->addWidget( keepImageWHRatioButton, 2, 2, 2, 1 );
888,7 → 888,7
layout43->addWidget( imgDPIYLabel, 5, 0 );
layout43->addWidget( imgDpiY, 5, 1 );
keepImageDPIRatioButton = new LinkButton( page_4 );
keepImageDPIRatioButton->setToggleButton( true );
keepImageDPIRatioButton->setCheckable( true );
keepImageDPIRatioButton->setAutoRaise( true );
keepImageDPIRatioButton->setMaximumSize( QSize( 15, 32767 ) );
layout43->addWidget( keepImageDPIRatioButton, 4, 2, 2, 1 );
937,11 → 937,11
GroupBoxCMLayout->setAlignment( Qt::AlignTop );
TextCms1 = new QLabel( GroupBoxCM, "xposLabel" );
GroupBoxCMLayout->addWidget( TextCms1 );
InputP = new ScComboBox( false, GroupBoxCM, "InputP" );
InputP = new ScComboBox( GroupBoxCM );
GroupBoxCMLayout->addWidget(InputP);
TextCms2 = new QLabel( GroupBoxCM, "TextCms2" );
GroupBoxCMLayout->addWidget(TextCms2);
MonitorI = new ScComboBox( false, GroupBoxCM, "MonitorI" );
MonitorI = new ScComboBox( GroupBoxCM );
GroupBoxCMLayout->addWidget(MonitorI);
pageLayout_4->addWidget(GroupBoxCM);
 
960,7 → 960,7
Layout12_2->setSpacing( 3 );
Layout12_2->setMargin( 0 );
LStyle = new LineCombo(page_5);
LineMode = new ScComboBox( false, page_5, "LMode" );
LineMode = new ScComboBox( page_5 );
LineModeT = new QLabel( LineMode, "&Basepoint:", page_5, "LModeText" );
Layout12_2->addWidget( LineModeT, 0, 0 );
Layout12_2->addWidget( LineMode, 0, 1 );
979,11 → 979,11
linewidthLabel = new QLabel(LSize, "Line &Width:", page_5, "linewidthLabel" );
Layout12_2->addWidget( linewidthLabel, 4, 0 );
Layout12_2->addWidget( LSize, 4, 1 );
LJoinStyle = new ScComboBox( false, page_5, "LJoin" );
LJoinStyle = new ScComboBox( page_5 );
edgesLabel = new QLabel( LJoinStyle, "Ed&ges:", page_5, "edgesLabel" );
Layout12_2->addWidget( edgesLabel, 5, 0 );
Layout12_2->addWidget( LJoinStyle, 5, 1 );
LEndStyle = new ScComboBox( false, page_5, "LCap" );
LEndStyle = new ScComboBox( page_5 );
endingsLabel = new QLabel( LEndStyle, "&Endings:", page_5, "endingsLabel" );
Layout12_2->addWidget( endingsLabel, 6, 0 );
Layout12_2->addWidget( LEndStyle, 6, 1 );
1706,8 → 1706,8
NameEdit->setEnabled(false);
TabStack->setItemEnabled(idLineItem, true);
TabStack->setItemEnabled(idColorsItem, true);
FlipH->setToggleButton( false );
FlipV->setToggleButton( false );
FlipH->setCheckable( false );
FlipV->setCheckable( false );
FlipH->setOn(false);
FlipV->setOn(false);
}
1754,13 → 1754,13
//It then gets reset below for items where its valid
if ((nr>4) && (nr<9))
{
FlipH->setToggleButton(true);
FlipV->setToggleButton(true);
FlipH->setCheckable(true);
FlipV->setCheckable(true);
FlipH->setOn(false);
FlipV->setOn(false);
}
FlipH->setToggleButton((nr>=0) && (nr<5));
FlipV->setToggleButton((nr>=0) && (nr<5));
FlipH->setCheckable((nr>=0) && (nr<5));
FlipV->setCheckable((nr>=0) && (nr<5));
//CB Why cant we do this for lines?
// FlipH->setEnabled((nr!=-1) && (nr!=5));
// FlipV->setEnabled((nr!=-1) && (nr!=5));
1881,8 → 1881,8
NameEdit->setEnabled(!isMultiple);
if (doc->m_Selection->count() > 1)
{
FlipH->setToggleButton( false );
FlipV->setToggleButton( false );
FlipH->setCheckable( false );
FlipV->setCheckable( false );
PageItem *i;
uint lowestItem = 999999;
for (int a=0; a<doc->m_Selection->count(); ++a)
/trunk/Scribus/scribus/mergedoc.cpp
56,7 → 56,7
if (masterPages)
{
importPageLabel->setText( tr("&Import Master Page") );
masterPageNameData = new ScComboBox( false, this, "masterPageNameData" );
masterPageNameData = new ScComboBox(this);
masterPageNameData->setEnabled(false);
importPageLabel->setBuddy( masterPageNameData );
fromInfoLayout->addWidget( masterPageNameData, 1, 1 );
76,7 → 76,7
createPageData = new QCheckBox( this, "createPageData" );
createPageData->setText( tr("Create Page(s)"));
fromInfoLayout->addWidget( createPageData, 2, 0 );
importWhereData = new ScComboBox( false, this, "positionCombo" );
importWhereData = new ScComboBox( this );
importWhereData->setEnabled(false);
importWhereData->insertItem( tr("Before Page"));
importWhereData->insertItem( tr("After Page"));
/trunk/Scribus/scribus/scribusdoc.cpp
3116,7 → 3116,7
#endif
}
 
const bool ScribusDoc::copyPageToMasterPage(const int pageNumber, const int leftPage, const int maxLeftPage, const QString& masterPageName)
bool ScribusDoc::copyPageToMasterPage(const int pageNumber, const int leftPage, const int maxLeftPage, const QString& masterPageName)
{
assert(!masterPageMode());
if (masterPageMode())
3940,7 → 3940,7
}
}
 
const double ScribusDoc::getXOffsetForPage(const int pageNumber)
double ScribusDoc::getXOffsetForPage(const int pageNumber)
{
if (Pages->at(pageNumber)!=NULL)
return Pages->at(pageNumber)->xOffset();
3947,7 → 3947,7
return -1.0;
}
 
const double ScribusDoc::getYOffsetForPage(const int pageNumber)
double ScribusDoc::getYOffsetForPage(const int pageNumber)
{
if (Pages->at(pageNumber)!=NULL)
return Pages->at(pageNumber)->yOffset();
4212,7 → 4212,7
return newItem;
}
 
const int ScribusDoc::currentPageNumber()
int ScribusDoc::currentPageNumber()
{
return currentPage()->pageNr();
}
/trunk/Scribus/scribus/charselect.cpp
65,7 → 65,7
rangeLabel->setText( tr("Character Class:"));
bigLayout->addWidget(rangeLabel, 0, 2, 1, 2);
 
rangeSelector = new ScComboBox(false, m_bigPalette);
rangeSelector = new ScComboBox(m_bigPalette);
bigLayout->addWidget(rangeSelector, 0, 4, 1, 1);
 
m_characterClass = 0;
/trunk/Scribus/scribus/gtdialogs.cpp
58,7 → 58,7
layout->addLayout(llayout);
 
QBoxLayout* ilayout = new QHBoxLayout(0, 5, 5, "dlayout2");
importerCombo = new ScComboBox(0, this, "importerCombo2");
importerCombo = new ScComboBox(this);
importerCombo->setMinimumSize(QSize(150, 0));
importerCombo->setToolTip( tr("Choose the importer to use"));
importerCombo->insertStringList(importers);
/trunk/Scribus/scribus/scinputdialog.cpp
67,9 → 67,9
setWindowTitle( tr( "Input Dialog" ) );
entryLabel->setText( tr( "InputDialog" ) );
buttonOk->setText( tr( "&OK" ) );
buttonOk->setAccel( QKeySequence( QString::null ) );
buttonOk->setShortcut( QKeySequence( QString::null ) );
buttonCancel->setText( tr( "&Cancel" ) );
buttonCancel->setAccel( QKeySequence( QString::null ) );
buttonCancel->setShortcut( QKeySequence( QString::null ) );
}
 
double ScInputDialog::getDouble( const QString &caption, const QString &label, double num,
/trunk/Scribus/scribus/scimagestructs.cpp
19,13 → 19,13
ExposureTime = 0;
ApertureFNumber = 0;
ISOequivalent = 0;
cameraName.setLength(0);
cameraVendor.setLength(0);
comment.setLength(0);
userComment.setLength(0);
artist.setLength(0);
copyright.setLength(0);
dateTime.setLength(0);
cameraName.resize(0);
cameraVendor.resize(0);
comment.resize(0);
userComment.resize(0);
artist.resize(0);
copyright.resize(0);
dateTime.resize(0);
thumbnail = QImage();
}
 
51,9 → 51,9
lowResScale = 1.0;
PDSpathData.clear();
RequestProps.clear();
clipPath.setLength(0);
usedPath.setLength(0);
profileName.setLength(0);
clipPath.resize(0);
usedPath.resize(0);
profileName.resize(0);
layerInfo.clear();
duotoneColors.clear();
exifInfo.init();
/trunk/Scribus/scribus/multiprogressdialog.cpp
26,15 → 26,15
 
#include "multiprogressdialog.h"
 
MultiProgressDialog::MultiProgressDialog(QWidget* parent, const char*name, bool modal, Qt::WFlags f)
: QDialog(parent, name, modal, f)
MultiProgressDialog::MultiProgressDialog(QWidget* parent, Qt::WFlags f)
: QDialog(parent, f)
{
setupUi(this);
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(emitCancel()));
}
 
MultiProgressDialog::MultiProgressDialog(const QString& titleText, const QString & cancelButtonText, QWidget* parent, const char*name, bool modal, Qt::WFlags f)
: QDialog(parent, name, modal, f)
MultiProgressDialog::MultiProgressDialog(const QString& titleText, const QString & cancelButtonText, QWidget* parent, Qt::WFlags f)
: QDialog(parent, f)
{
setupUi(this);
setWindowTitle(titleText);
62,7 → 62,7
uint barCount=barsList.count();
if (barCount==0)
return false;
int gridLayoutRow=gridLayout->numRows();
int gridLayoutRow=gridLayout->rowCount();
for (uint i=0; i<barCount; ++i)
{
QString barName(barsList[i]);
72,7 → 72,7
progressBars.insert(barName, new QProgressBar(this));
if (barsNumerical[i])
progressBars[barName]->setFormat(tr("%v of %m"));
progressLabels.insert(barName, new QLabel(barsTexts[i], this, barName));
progressLabels.insert(barName, new QLabel(barsTexts[i], this));
gridLayout->addWidget(progressLabels[barName], gridLayoutRow, 0);
gridLayout->addWidget(progressBars[barName], gridLayoutRow, 1);
++gridLayoutRow;
/trunk/Scribus/scribus/scribusdoc.h
509,7 → 509,7
/**
* @brief Copies a normal page to be a master pages
*/
const bool copyPageToMasterPage(const int, const int, const int, const QString&);
bool copyPageToMasterPage(const int, const int, const int, const QString&);
/**
* @brief Paste an item to the document.
* The bulk of a paste item process runs here for want of a better place, but its a better place
637,8 → 637,8
* @retval double containing the offset. Returns -1.0 if page not in Pages list (as -ve is not possible).
* Mostly saves bringing in extra includes into files that already have scribusdoc.h
*/
const double getXOffsetForPage(const int);
const double getYOffsetForPage(const int);
double getXOffsetForPage(const int);
double getYOffsetForPage(const int);
void getBleeds(int pageNumber, double *bleedTop, double *bleedBottom, double *bleedLeft, double *bleedRight);
void getBleeds(Page* page, double *bleedTop, double *bleedBottom, double *bleedLeft, double *bleedRight);
650,7 → 650,7
/**
* @brief The page number of the current page
*/
const int currentPageNumber();
int currentPageNumber();
/**
* @brief Return true iff the passed name is not used by any existing PageItem
/trunk/Scribus/scribus/muster.cpp
45,13 → 45,13
buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing( 5 );
buttonLayout->setMargin( 0 );
importButton = new QToolButton(this, "importButton" );
importButton = new QToolButton(this);
importButton->setIcon(QIcon(loadIcon("16/document-open.png")));
newButton = new QToolButton(this, "newButton" );
newButton = new QToolButton(this);
newButton->setIcon(QIcon(loadIcon("16/document-new.png")));
duplicateButton = new QToolButton(this, "DublicateB" );
duplicateButton = new QToolButton(this);
duplicateButton->setIcon(QIcon(loadIcon("16/edit-copy.png")));
deleteButton = new QToolButton(this, "deleteButton" );
deleteButton = new QToolButton(this);
deleteButton->setIcon(QIcon(loadIcon("16/edit-delete.png")));
buttonLayout->addWidget( newButton );
buttonLayout->addWidget( duplicateButton );
151,7 → 151,7
Page* destination = currentDoc->addMasterPage(nr, MasterPageName);
if (currentDoc->currentPageLayout != singlePage)
{
int lp = dia->Links->currentItem();
int lp = dia->Links->currentIndex();
if (lp == 0)
lp = 1;
else if (lp == static_cast<int>(dia->Links->count()-1))
244,7 → 244,7
currentDoc->setCurrentPage(currentDoc->addMasterPage(nr, MasterPageName));
if (currentDoc->currentPageLayout != singlePage)
{
int lp = dia->Links->currentItem();
int lp = dia->Links->currentIndex();
if (lp == 0)
lp = 1;
else if (lp == static_cast<int>(dia->Links->count()-1))
367,7 → 367,7
return;
}
bool ok;
QString newName = QInputDialog::getText( tr("Rename Master Page"), tr("New Name:"), QLineEdit::Normal, oldName, &ok, this );
QString newName = QInputDialog::getText( this, tr("Rename Master Page"), tr("New Name:"), QLineEdit::Normal, oldName, &ok);
if (ok && !newName.isEmpty())
{
if (currentDoc->renameMasterPage( oldName, newName))
/trunk/Scribus/scribus/smalignselect.cpp
16,7 → 16,7
{
parentButton = new QToolButton(this, "parentButton");
parentButton->setMaximumSize( QSize( 22, 22 ) );
parentButton->setToggleButton( true );
parentButton->setCheckable( true );
parentButton->setText( tr("P", "P as in Parent"));
parentButton->setToolTip( tr("Use parent style's alignment instead of overriding it"));
GroupAlignLayout->addWidget( parentButton );
/trunk/Scribus/scribus/plugins/aiimplugin/importai.cpp
111,7 → 111,7
if ( showProgress )
{
ScribusMainWindow* mw=(m_Doc==0) ? ScCore->primaryMainWindow() : m_Doc->scMW();
progressDialog = new MultiProgressDialog( tr("Importing: %1").arg(fi.fileName()), CommonStrings::tr_Cancel, mw, "psexportprogress");
progressDialog = new MultiProgressDialog( tr("Importing: %1").arg(fi.fileName()), CommonStrings::tr_Cancel, mw );
QStringList barNames, barTexts;
barNames << "GI";
barTexts << tr("Analyzing File:");
/trunk/Scribus/scribus/plugins/psimport/importps.cpp
68,7 → 68,7
if ( showProgress )
{
ScribusMainWindow* mw=(m_Doc==0) ? ScCore->primaryMainWindow() : m_Doc->scMW();
progressDialog = new MultiProgressDialog( tr("Importing: %1").arg(fi.fileName()), CommonStrings::tr_Cancel, mw, "psexportprogress");
progressDialog = new MultiProgressDialog( tr("Importing: %1").arg(fi.fileName()), CommonStrings::tr_Cancel, mw);
QStringList barNames, barTexts;
barNames << "GI";
barTexts << tr("Analyzing PostScript:");
/trunk/Scribus/scribus/fontprefs.cpp
431,7 → 431,7
for (itfsu = RList.begin(); itfsu != RList.end(); ++itfsu)
{
Table3->setItem(a, 0, new QTableWidgetItem(itfsu.key()));
ScComboBox *item = new ScComboBox( true, Table3, "Replace" );
ScComboBox *item = new ScComboBox(Table3);
item->setEditable(false);
item->insertStringList(UsedFonts);
item->setCurrentText(itfsu.data());
/trunk/Scribus/scribus/smsccombobox.cpp
8,8 → 8,8
#include "smsccombobox.h"
 
 
SMScComboBox::SMScComboBox(QWidget *parent, const char *name)
: ScComboBox(parent, name),
SMScComboBox::SMScComboBox(QWidget *parent)
: ScComboBox(parent),
hasParent_(false),
useParentValue_(false),
pItem_(0)
17,15 → 17,6
}
 
SMScComboBox::SMScComboBox(bool rw, QWidget* parent, const char* name)
: ScComboBox(rw, parent, name),
hasParent_(false),
useParentValue_(false),
pItem_(0)
{
}
 
void SMScComboBox::setCurrentItem(int i)
{
disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
/trunk/Scribus/scribus/pslib.cpp
1663,7 → 1663,7
QString title=QObject::tr("Exporting PostScript File");
if (Art)
title=QObject::tr("Printing File");
progressDialog=new MultiProgressDialog(title, CommonStrings::tr_Cancel, Doc->scMW(), "psexportprogress");
progressDialog=new MultiProgressDialog(title, CommonStrings::tr_Cancel, Doc->scMW());
if (progressDialog==0)
usingGUI=false;
else
/trunk/Scribus/scribus/pagelayout.cpp
73,12 → 73,12
}
else
{
layoutsCombo = new ScComboBox( false, this, "layoutsCombo" );
layoutsCombo = new ScComboBox( this );
layoutGroupLayout->addWidget( layoutsCombo );
}
layoutLabel1 = new QLabel( this, "layoutLabel1" );
layoutGroupLayout->addWidget( layoutLabel1 );
firstPage = new ScComboBox( false, this, "firstPage" );
firstPage = new ScComboBox( this );
layoutGroupLayout->addWidget( firstPage );
languageChange();
setMaximumWidth(minimumSizeHint().width());
/trunk/Scribus/scribus/pageselector.cpp
98,7 → 98,8
PageSelectorLayout->addWidget( Back );
 
v = new PageValidator(1, LastPG, this);
PageCombo = new ScComboBox( true, this, "PageCombo" );
PageCombo = new ScComboBox( this );
PageCombo->setEditable(true);
PageCombo->setDuplicatesEnabled( false );
PageCombo->lineEdit()->setAlignment(Qt::AlignHCenter);
QString tmp;