Author: craig
Date: Wed Feb 9 19:43:04 2022
New Revision: 24930
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24930
Log:
Clean up some slot connection normalisation
Modified:
trunk/Scribus/scribus/iconmanager.h
trunk/Scribus/scribus/ui/annot.cpp
trunk/Scribus/scribus/ui/annota.cpp
trunk/Scribus/scribus/ui/bookmwin.cpp
trunk/Scribus/scribus/ui/charselect.cpp
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/cmykfw.cpp
trunk/Scribus/scribus/ui/colorlistbox.cpp
trunk/Scribus/scribus/ui/colorsandfills.cpp
trunk/Scribus/scribus/ui/guidemanager.cpp
trunk/Scribus/scribus/ui/helpbrowser.cpp
Modified: trunk/Scribus/scribus/iconmanager.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/iconmanager.h
==============================================================================
--- trunk/Scribus/scribus/iconmanager.h (original)
+++ trunk/Scribus/scribus/iconmanager.h Wed Feb 9 19:43:04 2022
@@ -18,6 +18,7 @@
#include <QMap>
#include <QObject>
#include <QString>
+#include <QStringView>
#include "prefsstructs.h"
#include "scribusapi.h"
Modified: trunk/Scribus/scribus/ui/annot.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Wed Feb 9 19:43:04 2022
@@ -411,7 +411,7 @@
connect(ComboBox1, SIGNAL(activated(int)), this,
SLOT(SetAnnotationType(int)));
connect(ActionCombo, SIGNAL(activated(int)), this,
SLOT(SetActionType(int)));
connect(SelAction, SIGNAL(activated(int)), this,
SLOT(SetActionScript(int)));
- connect(m_navig, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ connect(m_navig, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
connect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
connect(SpinBox21, SIGNAL(valueChanged(int)), this, SLOT(SetCross()));
connect(SpinBox31, SIGNAL(valueChanged(int)), this, SLOT(SetCross()));
@@ -1068,11 +1068,11 @@
void ScAnnot::SetCross()
{
int x, y;
- disconnect(m_navig, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ disconnect(m_navig, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
x = static_cast<int>(static_cast<double>(SpinBox21->value()) /
static_cast<double>(Width) * m_navig->pmx.width());
y = static_cast<int>(static_cast<double>(SpinBox31->value()) /
static_cast<double>(Height) * m_navig->pmx.height());
m_navig->drawMark(x, y);
- connect(m_navig, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ connect(m_navig, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
}
void ScAnnot::SetValues()
Modified: trunk/Scribus/scribus/ui/annota.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/annota.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annota.cpp (original)
+++ trunk/Scribus/scribus/ui/annota.cpp Wed Feb 9 19:43:04 2022
@@ -235,7 +235,7 @@
connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
connect(typeCombo, SIGNAL(activated(int)), this, SLOT(SetTarget(int)));
connect(pageSpin, SIGNAL(valueChanged(double)), this,
SLOT(SetPage(double)));
- connect(navigator, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ connect(navigator, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
connect(xSpin, SIGNAL(valueChanged(double)), this, SLOT(SetCross()));
connect(ySpin, SIGNAL(valueChanged(double)), this, SLOT(SetCross()));
connect(changeFile, SIGNAL(clicked()), this, SLOT(GetFile()));
@@ -281,11 +281,11 @@
void Annota::SetCross()
{
int x,y;
- disconnect(navigator, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ disconnect(navigator, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
x = static_cast<int>(xSpin->value() / static_cast<double>(m_width) *
navigator->pmx.width());
y = static_cast<int>(ySpin->value() / static_cast<double>(m_height) *
navigator->pmx.height());
navigator->drawMark(x, y);
- connect(navigator, SIGNAL(Coords(double, double)), this,
SLOT(SetCoords(double, double)));
+ connect(navigator, SIGNAL(Coords(double,double)), this,
SLOT(SetCoords(double,double)));
}
void Annota::SetValues()
Modified: trunk/Scribus/scribus/ui/bookmwin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/bookmwin.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/bookmwin.cpp (original)
+++ trunk/Scribus/scribus/ui/bookmwin.cpp Wed Feb 9 19:43:04 2022
@@ -123,7 +123,7 @@
setRootIsDecorated(true);
header()->hide();
- connect(this, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this,
SLOT(selectPageItem(QTreeWidgetItem *, int)));
+ connect(this, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this,
SLOT(selectPageItem(QTreeWidgetItem*,int)));
}
void BookmarkView::addPageItem(PageItem* ite)
Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp (original)
+++ trunk/Scribus/scribus/ui/charselect.cpp Wed Feb 9 19:43:04 2022
@@ -43,7 +43,7 @@
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(m_userTable, SIGNAL(selectChar(uint,QString)), this,
SLOT(userNewChar(uint,QString)));
- connect(m_userTable->selectionModel(), SIGNAL(selectionChanged(const
QItemSelection&,const QItemSelection&)), this, SLOT(slot_selectionChanged(const
QItemSelection&,const QItemSelection&)));
+ connect(m_userTable->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,
SLOT(slot_selectionChanged(QItemSelection,QItemSelection)));
connect(m_userTableModel, SIGNAL(rowAppended()),m_userTable,
SLOT(resizeLastRow()));
connect(unicodeButton, SIGNAL(chosenUnicode(QString)),
m_userTableModel, SLOT(appendUnicode(QString)));
connect(enhancedDialogButton, SIGNAL(toggled(bool)), this,
SLOT(enhancedDialogButton_toggled(bool)));
@@ -197,7 +197,7 @@
QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
m_enhanced = new CharSelectEnhanced(this);
- connect(m_enhanced, SIGNAL(insertSpecialChars(const QVector<uint> &)),
this, SLOT(slot_insertSpecialChars(const QVector<uint> &)));
+ connect(m_enhanced, SIGNAL(insertSpecialChars(QVector<uint>)), this,
SLOT(slot_insertSpecialChars(QVector<uint>)));
connect(m_enhanced, SIGNAL(paletteShown(bool)), enhancedDialogButton,
SLOT(setChecked(bool)));
m_enhanced->setDoc(m_doc);
m_enhanced->setEnabled(this->isEnabled());
@@ -214,7 +214,7 @@
enhancedDialogButton->setChecked(false);
enhancedDialogButton->blockSignals(false);
- disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QVector<uint>
&)), this, SLOT(slot_insertSpecialChars(const QVector<uint> &)));
+ disconnect(m_enhanced, SIGNAL(insertSpecialChars(QVector<uint>)), this,
SLOT(slot_insertSpecialChars(QVector<uint>)));
disconnect(m_enhanced, SIGNAL(paletteShown(bool)),
enhancedDialogButton, SLOT(setChecked(bool)));
m_enhanced->close();
m_enhanced->deleteLater();
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Wed Feb 9 19:43:04 2022
@@ -755,7 +755,7 @@
reportDisplay->resizeColumnToContents(COLUMN_PROBLEM);
reportDisplay->resizeColumnToContents(COLUMN_LAYER);
connect(curCheckProfile, SIGNAL(textActivated(QString)), this,
SLOT(newScan(QString)));
- connect(reportDisplay, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
this, SLOT(slotSelect(QTreeWidgetItem*)));
+ connect(reportDisplay, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this,
SLOT(slotSelect(QTreeWidgetItem*)));
}
void CheckDocument::setIgnoreEnabled(bool state)
Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Wed Feb 9 19:43:04 2022
@@ -63,16 +63,16 @@
CurrSwatch.clear();
alertIcon = IconManager::instance().loadPixmap("alert.png");
imageA = QPixmap(50,50);
- imageA.fill( ScColorEngine::getDisplayColor(orig, m_doc) );
- if ( ScColorEngine::isOutOfGamut(orig, m_doc) )
+ imageA.fill( ScColorEngine::getDisplayColor(orig, m_doc));
+ if ( ScColorEngine::isOutOfGamut(orig, m_doc))
paintAlert(alertIcon,imageA, 2, 2, false);
imageN = QPixmap(50,50);
- imageN.fill( ScColorEngine::getDisplayColor(orig, m_doc) );
- if ( ScColorEngine::isOutOfGamut(orig, m_doc) )
+ imageN.fill( ScColorEngine::getDisplayColor(orig, m_doc));
+ if ( ScColorEngine::isOutOfGamut(orig, m_doc))
paintAlert(alertIcon, imageN, 2, 2, false);
resize( 498, 306 );
- setWindowTitle( tr( "Edit Color" ) );
+ setWindowTitle( tr( "Edit Color" ));
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setupUi(this);
@@ -80,11 +80,11 @@
ColorName->setText(name);
ColorSwatch->setPixmapType(ColorListBox::fancyPixmap);
- ComboBox1->addItem( tr( "CMYK" ) );
- ComboBox1->addItem( tr( "RGB" ) );
- ComboBox1->addItem( tr( "Web Safe RGB" ) );
- ComboBox1->addItem( tr( "Lab" ) );
- ComboBox1->addItem( tr( "HLC" ) );
+ ComboBox1->addItem( tr( "CMYK" ));
+ ComboBox1->addItem( tr( "RGB" ));
+ ComboBox1->addItem( tr( "Web Safe RGB" ));
+ ComboBox1->addItem( tr( "Lab" ));
+ ComboBox1->addItem( tr( "HLC" ));
Separations->setChecked(orig.isSpotColor());
@@ -95,7 +95,7 @@
buttonOK->setDefault( true );
buttonCancel->setText(CommonStrings::tr_Cancel);
- hsvSelector = Swatches->addTopLevelItem( tr( "Color Map" ) );
+ hsvSelector = Swatches->addTopLevelItem( tr( "Color Map" ));
hsvSelector->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled);
csm.findPaletteLocations();
systemSwatches = Swatches->addTopLevelItem( tr("Scribus Swatches"));
@@ -213,28 +213,28 @@
// signals and slots connections
// Regist->setToolTip( "<qt>" + tr( "Choosing this will enable printing
this on all plates. Registration colors are used for printer marks such as crop
marks, registration marks and the like. These are not typically used in the
layout itself." ) + "</qt>");
Separations->setToolTip( "<qt>" + tr( "Choosing this will make this
color a spot color, thus creating another spot when creating plates or
separations. This is used most often when a logo or other color needs exact
representation or cannot be replicated with CMYK inks. Metallic and fluorescent
inks are good examples which cannot be easily replicated with CMYK inks." ) +
"</qt>");
- connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
- connect( buttonOK, SIGNAL( clicked() ), this, SLOT( leave() ) );
- connect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( BlackSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() )
);
- connect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor()
) );
- connect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor()
) );
- connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() )
);
- connect( ColorMap, SIGNAL( ColorVal(int, int, bool)), this, SLOT(
setColor2(int, int, bool)));
+ connect( buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
+ connect( buttonOK, SIGNAL(clicked()), this, SLOT(leave()));
+ connect( CyanSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( MagentaSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( YellowSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( BlackSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( CyanSL, SIGNAL(valueChanged(int)), this, SLOT(setValueS(int)));
+ connect( MagentaSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( YellowSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( BlackSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( CyanSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( MagentaSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( YellowSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( BlackSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( ColorMap, SIGNAL(ColorVal(int,int,bool)), this,
SLOT(setColor2(int,int,bool)));
connect( ComboBox1, SIGNAL(textActivated(QString)), this,
SLOT(selModel(QString)));
// connect( Swatches, SIGNAL(activated(int)), this, SLOT(selSwatch(int)));
connect(Swatches, SIGNAL(activated(QString)), this, SLOT(selSwatch()));
- connect(ColorSwatch, SIGNAL(itemClicked(int) ), this, SLOT(
selFromSwatch(int) ) );
+ connect(ColorSwatch, SIGNAL(itemClicked(int)), this,
SLOT(selFromSwatch(int)));
connect(Separations, SIGNAL(clicked()), this, SLOT(setSpot()));
// connect(Regist, SIGNAL(clicked()), this, SLOT(setRegist()));
- connect(this, SIGNAL(customContextMenuRequested (const QPoint &)),
this, SLOT(slotRightClick()));
+ connect(this, SIGNAL(customContextMenuRequested(QPoint)), this,
SLOT(slotRightClick()));
layout()->activate();
}
@@ -275,10 +275,10 @@
void CMYKChoose::setValueS(int val)
{
- disconnect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( BlackSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
+ disconnect( CyanSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( MagentaSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( YellowSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( BlackSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
if (CyanSL == sender())
CyanSp->setValue(val / 1000.0);
if (MagentaSL == sender())
@@ -288,10 +288,10 @@
if (BlackSL == sender())
BlackSp->setValue(val / 1000.0);
setColor();
- connect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( BlackSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
+ connect( CyanSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( MagentaSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( YellowSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( BlackSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
}
void CMYKChoose::toggleSL()
@@ -506,9 +506,9 @@
for (int x = 0; x < 255; x += 5)
{
if (dynamic)
- p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(c,
m, y, x), m_doc) );
+ p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(c,
m, y, x), m_doc));
else
- p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(0,
0, 0, x), m_doc) );
+ p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(0,
0, 0, x), m_doc));
p.drawRect(x, 0, 5, 10);
val -= 5;
}
@@ -577,18 +577,18 @@
{
int h, s, v;
- disconnect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( BlackSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- disconnect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- disconnect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- disconnect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- disconnect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- disconnect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor()
) );
- disconnect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT(
setColor() ) );
- disconnect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT(
setColor() ) );
- disconnect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT(
setColor() ) );
+ disconnect( CyanSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( MagentaSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( YellowSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( BlackSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ disconnect( CyanSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ disconnect( MagentaSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ disconnect( YellowSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ disconnect( BlackSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ disconnect( CyanSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ disconnect( MagentaSL, SIGNAL(valueChanged(int)), this,
SLOT(setColor()));
+ disconnect( YellowSL, SIGNAL(valueChanged(int)), this,
SLOT(setColor()));
+ disconnect( BlackSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
isHLC = false;
if (mod == tr("CMYK"))
{
@@ -820,25 +820,25 @@
ColorMap->drawPalette(L * 2.55);
ColorMap->setMark(a, b);
}
- imageN.fill( ScColorEngine::getDisplayColor(Farbe, m_doc) );
+ imageN.fill( ScColorEngine::getDisplayColor(Farbe, m_doc));
if (ScColorEngine::isOutOfGamut(Farbe, m_doc))
paintAlert(alertIcon, imageN, 2, 2, false);
NewC->setPixmap( imageN );
NewC->setToolTip( "<qt>" + tr( "If color management is enabled, an
exclamation mark indicates that the color may be outside of the color gamut of
the current printer profile selected. What this means is the color may not
print exactly as indicated on screen. More hints about gamut warnings are in
the online help under Color Management." ) + "</qt>");
OldC->setToolTip( "<qt>" + tr( "If color management is enabled, an
exclamation mark indicates that the color may be outside of the color gamut of
the current printer profile selected. What this means is the color may not
print exactly as indicated on screen. More hints about gamut warnings are in
the online help under Color Management." ) + "</qt>");
- connect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( BlackSp, SIGNAL( valueChanged(double) ), this, SLOT(
setValSLiders(double) ) );
- connect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT(
setValueS(int) ) );
- connect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() )
);
- connect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor()
) );
- connect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor()
) );
- connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() )
);
+ connect( CyanSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( MagentaSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( YellowSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( BlackSp, SIGNAL(valueChanged(double)), this,
SLOT(setValSLiders(double)));
+ connect( CyanSL, SIGNAL(valueChanged(int)), this, SLOT(setValueS(int)));
+ connect( MagentaSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( YellowSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( BlackSL, SIGNAL(valueChanged(int)), this,
SLOT(setValueS(int)));
+ connect( CyanSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( MagentaSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( YellowSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
+ connect( BlackSL, SIGNAL(valueChanged(int)), this, SLOT(setColor()));
}
void CMYKChoose::setColor()
@@ -940,8 +940,8 @@
ColorMap->drawPalette(L * 2.55);
ColorMap->setMark(a, b);
}
- imageN.fill(ScColorEngine::getDisplayColor(tmp, m_doc) );
- if ( ScColorEngine::isOutOfGamut(tmp, m_doc) )
+ imageN.fill(ScColorEngine::getDisplayColor(tmp, m_doc));
+ if ( ScColorEngine::isOutOfGamut(tmp, m_doc))
paintAlert(alertIcon, imageN, 2, 2, false);
NewC->setPixmap( imageN );
}
@@ -972,7 +972,7 @@
tmp.setColorF(cmyk.c, cmyk.m, cmyk.y, cmyk.k);
}
}
- imageN.fill( ScColorEngine::getDisplayColor(tmp, m_doc) );
+ imageN.fill( ScColorEngine::getDisplayColor(tmp, m_doc));
if (ScColorEngine::isOutOfGamut(tmp, m_doc))
paintAlert(alertIcon, imageN, 2, 2, false);
NewC->setPixmap( imageN );
@@ -1010,8 +1010,8 @@
selModel( tr("Lab"));
}
}
- imageN.fill( ScColorEngine::getDisplayColor(tmp, m_doc) );
- if ( ScColorEngine::isOutOfGamut(tmp, m_doc) )
+ imageN.fill( ScColorEngine::getDisplayColor(tmp, m_doc));
+ if ( ScColorEngine::isOutOfGamut(tmp, m_doc))
paintAlert(alertIcon, imageN, 2, 2, false);
NewC->setPixmap( imageN );
Farbe = tmp;
Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Wed Feb 9 19:43:04 2022
@@ -203,12 +203,10 @@
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
- connect(this, SIGNAL(clicked(QModelIndex)), this,
SLOT(emitItemClicked(QModelIndex)));
+ connect(this, SIGNAL(clicked(QModelIndex)), this,
SLOT(emitItemClicked(QModelIndex)));
connect(this, SIGNAL(doubleClicked(QModelIndex)), this,
SLOT(emitItemDoubleClicked(QModelIndex)));
- connect(this->selectionModel(), SIGNAL(currentChanged(QModelIndex,
QModelIndex)),
- this, SLOT(emitCurrentChanged(QModelIndex, QModelIndex)));
- connect(this->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
- this, SIGNAL(itemSelectionChanged()));
+ connect(this->selectionModel(),
SIGNAL(currentChanged(QModelIndex,QModelIndex)), this,
SLOT(emitCurrentChanged(QModelIndex,QModelIndex)));
+ connect(this->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,
SIGNAL(itemSelectionChanged()));
connect(this, SIGNAL(contextMenuRequested()), this,
SLOT(slotRightClick()));
}
Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp (original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp Wed Feb 9 19:43:04 2022
@@ -1752,7 +1752,6 @@
if ((Rc == hR) && (Gc == hG) && (Bc == hB))
{
colorName = it.key();
- found = true;
return;
}
}
Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp Wed Feb 9 19:43:04 2022
@@ -72,12 +72,8 @@
connect(addVerButton, SIGNAL(clicked()), this,
SLOT(addVerButton_clicked()));
connect(delVerButton, SIGNAL(clicked()), this,
SLOT(delVerButton_clicked()));
connect(verticalView, SIGNAL(deleteKeyPressed()), this,
SLOT(delVerButton_clicked()));
- connect(horizontalView->selectionModel(),
- SIGNAL(selectionChanged(const QItemSelection &, const
QItemSelection &)),
- this, SLOT(forceDrawGuides(const QItemSelection &,
const QItemSelection &)));
- connect(verticalView->selectionModel(),
- SIGNAL(selectionChanged(const QItemSelection &, const
QItemSelection &)),
- this, SLOT(forceDrawGuides(const QItemSelection &,
const QItemSelection &)));
+ connect(horizontalView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
SLOT(forceDrawGuides(QItemSelection, QItemSelection)));
+ connect(verticalView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
SLOT(forceDrawGuides(QItemSelection, QItemSelection)));
connect(applyToAllStdButton, SIGNAL(clicked()), this,
SLOT(applyToAllStdButton_clicked()));
connect(horizontalAutoCountSpin, SIGNAL(valueChanged(double)), this,
SLOT(horizontalAutoCountSpin_valueChanged(double)));
Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24930&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp (original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp Wed Feb 9 19:43:04 2022
@@ -293,12 +293,12 @@
// searching
connect(helpNav->searchingEdit, SIGNAL(returnPressed()), this,
SLOT(searchingButton_clicked()));
connect(helpNav->searchingButton, SIGNAL(clicked()), this,
SLOT(searchingButton_clicked()));
- connect(helpNav->searchingView, SIGNAL(itemClicked( QTreeWidgetItem *,
int)), this, SLOT(itemSearchSelected(QTreeWidgetItem *, int)));
+ connect(helpNav->searchingView,
SIGNAL(itemClicked(QTreeWidgetItem*,int)), this,
SLOT(itemSearchSelected(QTreeWidgetItem*,int)));
// bookmarks
connect(helpNav->bookmarkButton, SIGNAL(clicked()), this,
SLOT(bookmarkButton_clicked()));
connect(helpNav->deleteBookmarkButton, SIGNAL(clicked()), this,
SLOT(deleteBookmarkButton_clicked()));
connect(helpNav->deleteAllBookmarkButton, SIGNAL(clicked()), this,
SLOT(deleteAllBookmarkButton_clicked()));
- connect(helpNav->bookmarksView, SIGNAL(itemClicked( QTreeWidgetItem *,
int)), this, SLOT(itemBookmarkSelected(QTreeWidgetItem *, int)));
+ connect(helpNav->bookmarksView,
SIGNAL(itemClicked(QTreeWidgetItem*,int)), this,
SLOT(itemBookmarkSelected(QTreeWidgetItem*,int)));
// links hoover
// connect(textBrowser, SIGNAL(overLink(QString)), this,
SLOT(showLinkContents(QString)));
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
