Author: jghali
Date: Mon Jan 31 22:01:44 2022
New Revision: 24880
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24880
Log:
Qt6: fix a bunch of signal/slots connections
Modified:
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
trunk/Scribus/scribus/ui/alignselect.cpp
trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/directionselect.cpp
trunk/Scribus/scribus/ui/gradienteditor.cpp
trunk/Scribus/scribus/ui/newdocdialog.cpp
trunk/Scribus/scribus/ui/notesstyleseditor.cpp
trunk/Scribus/scribus/ui/notesstyleseditor.h
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_table.cpp
trunk/Scribus/scribus/ui/propertiespalette_table.h
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/proptree.cpp
trunk/Scribus/scribus/ui/scrspinbox.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/ui/transparencypalette.cpp
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Mon Jan
31 22:01:44 2022
@@ -313,8 +313,8 @@
paintBarcodeTimer->setSingleShot(true);
connect(paintBarcodeTimer, SIGNAL(timeout()), this,
SLOT(paintBarcode()));
- connect(ui.bcFamilyCombo, SIGNAL(activated(QString)), this,
SLOT(bcFamilyComboChanged()));
- connect(ui.bcCombo, SIGNAL(activated(QString)), this,
SLOT(bcComboChanged()));
+ connect(ui.bcFamilyCombo, SIGNAL(activated(int)), this,
SLOT(bcFamilyComboChanged()));
+ connect(ui.bcCombo, SIGNAL(activated(int)), this,
SLOT(bcComboChanged()));
connect(ui.bgColorButton, SIGNAL(clicked()), this,
SLOT(bgColorButton_pressed()));
connect(ui.lnColorButton, SIGNAL(clicked()), this,
SLOT(lnColorButton_pressed()));
connect(ui.txtColorButton, SIGNAL(clicked()), this,
SLOT(txtColorButton_pressed()));
Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp Mon Jan 31 22:01:44 2022
@@ -58,7 +58,7 @@
resize(minimumSizeHint());
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
- connect(buttonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(setTypeStyle(int)));
+ connect(buttonGroup, SIGNAL(idClicked(int)), this,
SLOT(setTypeStyle(int)));
}
void AlignSelect::setStyle(int s, int d)
Modified: trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.cpp (original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.cpp Mon Jan 31 22:01:44 2022
@@ -73,7 +73,7 @@
addMenu(menu3);
addMenu(menu4);
addMenu(menu5);
- connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(selForm(int)));
+ connect(signalMapper, SIGNAL(mappedInt(int)), this, SLOT(selForm(int)));
}
void AutoformButtonGroup::addShape(QMenu* menu, int shapenum)
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Mon Jan 31 22:01:44 2022
@@ -88,7 +88,7 @@
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(ignoreErrors, SIGNAL(clicked()), this,
SIGNAL(ignoreAllErrors()));
- connect(curCheckProfile, SIGNAL(activated(const QString&)), this,
SLOT(newScan(const QString&)));
+ connect(curCheckProfile, SIGNAL(textActivated(const QString&)), this,
SLOT(newScan(const QString&)));
connect(reScan, SIGNAL(clicked()), this, SLOT(doReScan()));
}
@@ -410,7 +410,7 @@
{
// bool resultError = false;
m_Doc = doc;
- disconnect(curCheckProfile, SIGNAL(activated(const QString&)), this,
SLOT(newScan(const QString&)));
+ disconnect(curCheckProfile, SIGNAL(textActivated(const QString&)),
this, SLOT(newScan(const QString&)));
curCheckProfile->clear();
clearErrorList();
@@ -756,7 +756,7 @@
reportDisplay->resizeColumnToContents(COLUMN_ITEM);
reportDisplay->resizeColumnToContents(COLUMN_PROBLEM);
reportDisplay->resizeColumnToContents(COLUMN_LAYER);
- connect(curCheckProfile, SIGNAL(activated(const QString&)), this,
SLOT(newScan(const QString&)));
+ connect(curCheckProfile, SIGNAL(textActivated(const QString&)), this,
SLOT(newScan(const QString&)));
connect(reportDisplay, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
this, SLOT(slotSelect(QTreeWidgetItem*)));
}
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Mon Jan 31 22:01:44 2022
@@ -224,8 +224,8 @@
disconnect(gradEditStroke, SIGNAL(gradientChanged()), this,
SLOT(handleStrokeGradient()));
disconnect(gradientType , SIGNAL(activated(int)), this,
SLOT(slotGradType(int)));
disconnect(gradientTypeStroke , SIGNAL(activated(int)), this,
SLOT(slotGradTypeStroke(int)));
- disconnect(namedGradient , SIGNAL(activated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
- disconnect(namedGradientStroke, SIGNAL(activated(const QString &)),
this, SLOT(setNamedGradientStroke(const QString &)));
+ disconnect(namedGradient , SIGNAL(textActivated(const QString &)),
this, SLOT(setNamedGradient(const QString &)));
+ disconnect(namedGradientStroke, SIGNAL(textActivated(const QString &)),
this, SLOT(setNamedGradientStroke(const QString &)));
disconnect(overPrintCombo , SIGNAL(activated(int)), this,
SIGNAL(NewOverprint(int)));
disconnect(patternBox , SIGNAL(itemClicked(QListWidgetItem*)),
this, SLOT(selectPattern(QListWidgetItem*)));
disconnect(patternBoxStroke , SIGNAL(itemClicked(QListWidgetItem*)),
this, SLOT(selectPatternS(QListWidgetItem*)));
Modified: trunk/Scribus/scribus/ui/directionselect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/directionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.cpp (original)
+++ trunk/Scribus/scribus/ui/directionselect.cpp Mon Jan 31 22:01:44 2022
@@ -38,7 +38,7 @@
resize(minimumSizeHint());
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
- connect(buttonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(setTypeStyle(int)));
+ connect(buttonGroup, SIGNAL(idClicked(int)), this,
SLOT(setTypeStyle(int)));
}
void DirectionSelect::setStyle(int s)
Modified: trunk/Scribus/scribus/ui/gradienteditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/gradienteditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradienteditor.cpp (original)
+++ trunk/Scribus/scribus/ui/gradienteditor.cpp Mon Jan 31 22:01:44 2022
@@ -39,7 +39,7 @@
stopOpacity->setDecimals(0);
stopShade->setDecimals(0);
connect(stopPos , SIGNAL(valueChanged(double)), this,
SLOT(changePos(double)));
- connect(stopColor , SIGNAL(activated(const QString&)), this,
SLOT(setStopColor(const QString&)));
+ connect(stopColor , SIGNAL(textActivated(const QString&)), this,
SLOT(setStopColor(const QString&)));
connect(stopOpacity, SIGNAL(valueChanged(double)), this,
SLOT(setStopTrans(double)));
connect(stopShade , SIGNAL(valueChanged(double)), this,
SLOT(setStopShade(double)));
connect(Preview, SIGNAL(selectedStop(VColorStop*)), this,
SLOT(slotDisplayStop(VColorStop*)));
Modified: trunk/Scribus/scribus/ui/newdocdialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/newdocdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newdocdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/newdocdialog.cpp Mon Jan 31 22:01:44 2022
@@ -164,7 +164,7 @@
// signals and slots connections
connect( OKButton, SIGNAL( clicked() ), this, SLOT( ExitOK() ) );
connect( CancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
- connect(pageSizeComboBox, SIGNAL(activated(const QString &)), this,
SLOT(setPageSize(const QString &)));
+ connect(pageSizeComboBox, SIGNAL(textActivated(const QString &)), this,
SLOT(setPageSize(const QString &)));
connect(pageOrientationComboBox, SIGNAL(activated(int)), this,
SLOT(setOrientation(int)));
connect(unitOfMeasureComboBox, SIGNAL(activated(int)), this,
SLOT(setUnit(int)));
connect(Distance, SIGNAL(valueChanged(double)), this,
SLOT(setDistance(double)));
Modified: trunk/Scribus/scribus/ui/notesstyleseditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/notesstyleseditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.cpp (original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.cpp Mon Jan 31 22:01:44 2022
@@ -229,7 +229,7 @@
setNotesStyle(NS);
}
-void NotesStylesEditor::on_NSlistBox_currentIndexChanged(const QString &arg1)
+void NotesStylesEditor::on_NSlistBox_currentTextChanged(const QString &arg1)
{
if (arg1 != tr("default"))
DeleteButton->setEnabled(true);
@@ -411,7 +411,7 @@
int index = NSlistBox->findText(newName);
NSlistBox->removeItem(index);
NSlistBox->setCurrentIndex(index-1);
- on_NSlistBox_currentIndexChanged(NSlistBox->currentText());
+ on_NSlistBox_currentTextChanged(NSlistBox->currentText());
}
else
{
Modified: trunk/Scribus/scribus/ui/notesstyleseditor.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/notesstyleseditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.h (original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.h Mon Jan 31 22:01:44 2022
@@ -38,7 +38,7 @@
void setNotesStyle(NotesStyle* NS);
private slots:
- void on_NSlistBox_currentIndexChanged(const QString &arg1);
+ void on_NSlistBox_currentTextChanged(const QString &arg1);
void on_ApplyButton_clicked();
void on_DeleteButton_clicked();
void on_OKButton_clicked();
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Mon Jan 31
22:01:44 2022
@@ -102,7 +102,7 @@
connect(cbProportional , SIGNAL(stateChanged(int)) , this,
SLOT(handleScaling()));
connect(imgEffectsButton , SIGNAL(clicked()) , this,
SLOT(handleImageEffects()));
connect(imgExtProperties , SIGNAL(clicked()) , this,
SLOT(handleExtImgProperties()));
- connect(inputProfiles , SIGNAL(activated(const QString&)), this,
SLOT(handleProfile(const QString&)));
+ connect(inputProfiles , SIGNAL(textActivated(const QString&)),
this, SLOT(handleProfile(const QString&)));
connect(renderIntent , SIGNAL(activated(int)) , this,
SLOT(handleIntent()));
connect(compressionMethod , SIGNAL(activated(int)) , this,
SLOT(handleCompressionMethod()));
connect(compressionQuality , SIGNAL(activated(int)) , this,
SLOT(handleCompressionQuality()));
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Mon Jan 31
22:01:44 2022
@@ -51,7 +51,7 @@
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(ScQApp, SIGNAL(localeChanged()), this, SLOT(localeChange()));
- connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)), this,
SLOT(handleTextFlow()));
+ connect(textFlowBtnGroup, SIGNAL(idClicked(int)), this,
SLOT(handleTextFlow()));
connect(editShape , SIGNAL(clicked()) , this,
SLOT(handleShapeEdit()));
connect(roundRect , SIGNAL(valueChanged(double)) , this,
SLOT(handleCornerRadius()));
connect(evenOdd , SIGNAL(clicked()) , this,
SLOT(handleFillRule()) );
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Mon Jan 31
22:01:44 2022
@@ -497,7 +497,7 @@
updateBorderLineListItem();
}
-void PropertiesPalette_Table::on_borderLineColor_activated(const QString&
colorName)
+void PropertiesPalette_Table::on_borderLineColor_textActivated(const QString&
colorName)
{
int index = borderLineList->currentRow();
TableBorderLine borderLine = m_currentBorder.borderLines().at(index);
@@ -522,7 +522,7 @@
updateBorderLineListItem();
}
-void PropertiesPalette_Table::on_fillColor_activated(const QString& colorName)
+void PropertiesPalette_Table::on_fillColor_textActivated(const QString&
colorName)
{
if (!m_item || !m_item->isTable())
return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertiespalette_table.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.h Mon Jan 31 22:01:44 2022
@@ -82,12 +82,12 @@
/// Handles border line width changes.
void on_borderLineWidth_valueChanged(double width);
/// Handles border line color changes.
- void on_borderLineColor_activated(const QString& colorName);
+ void on_borderLineColor_textActivated(const QString& colorName);
/// Handles border line style changes.
void on_borderLineStyle_activated(int style);
/// Handles table fill color changes.
- void on_fillColor_activated(const QString& colorName);
+ void on_fillColor_textActivated(const QString& colorName);
/// Handles table fill shade changes.
void on_fillShade_valueChanged(double shade);
void on_buttonClearTableStyle_clicked();
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Mon Jan 31 22:01:44 2022
@@ -103,7 +103,7 @@
connect(charStyleClear, SIGNAL(clicked()), this, SLOT(doClearCStyle()));
connect(paraStyleClear, SIGNAL(clicked()), this, SLOT(doClearPStyle()));
- connect(flopBox->flopGroup, SIGNAL(buttonClicked( int )), this,
SLOT(handleFirstLinePolicy(int)));
+ connect(flopBox->flopGroup, SIGNAL(idClicked(int)), this,
SLOT(handleFirstLinePolicy(int)));
connect(lineSpacingModeCombo, SIGNAL(currentIndexChanged(int)), this,
SLOT(handleLineSpacingMode(int)));
connect(langCombo, SIGNAL(currentIndexChanged(int)), this,
SLOT(changeLang(int)));
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Mon Jan 31
22:01:44 2022
@@ -315,7 +315,7 @@
connect(peCombo, SIGNAL(activated(int)), this,
SLOT(handleParEffectUse()), Qt::UniqueConnection);
connect(dropCapLines, SIGNAL(valueChanged(int)), this,
SLOT(handleDropCapLines(int)), Qt::UniqueConnection);
connect(bulletStrEdit, SIGNAL(editTextChanged(QString)), this,
SLOT(handleBulletStr(QString)), Qt::UniqueConnection);
- connect(numComboBox, SIGNAL(activated(QString)), this,
SLOT(handleNumName(QString)), Qt::UniqueConnection);
+ connect(numComboBox, SIGNAL(textActivated(QString)), this,
SLOT(handleNumName(QString)), Qt::UniqueConnection);
connect(numLevelSpin, SIGNAL(valueChanged(int)), this,
SLOT(handleNumLevel(int)), Qt::UniqueConnection);
connect(numFormatCombo, SIGNAL(activated(int)), this,
SLOT(handleNumFormat(int)), Qt::UniqueConnection);
connect(numPrefix, SIGNAL(textChanged(QString)), this,
SLOT(handleNumPrefix(QString)), Qt::UniqueConnection);
@@ -331,7 +331,7 @@
disconnect(peCombo, SIGNAL(activated(int)), this,
SLOT(handleParEffectUse()));
disconnect(dropCapLines, SIGNAL(valueChanged(int)), this,
SLOT(handleDropCapLines(int)));
disconnect(bulletStrEdit, SIGNAL(editTextChanged(QString)), this,
SLOT(handleBulletStr(QString)));
- disconnect(numComboBox, SIGNAL(activated(QString)), this,
SLOT(handleNumName(QString)));
+ disconnect(numComboBox, SIGNAL(textActivated(QString)), this,
SLOT(handleNumName(QString)));
disconnect(numLevelSpin, SIGNAL(valueChanged(int)), this,
SLOT(handleNumLevel(int)));
disconnect(numFormatCombo, SIGNAL(activated(int)), this,
SLOT(handleNumFormat(int)));
disconnect(numPrefix, SIGNAL(textChanged(QString)), this,
SLOT(handleNumPrefix(QString)));
Modified: trunk/Scribus/scribus/ui/proptree.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/proptree.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/proptree.cpp (original)
+++ trunk/Scribus/scribus/ui/proptree.cpp Mon Jan 31 22:01:44 2022
@@ -147,7 +147,7 @@
edito->setAutoFillBackground(true);
connect(editor, SIGNAL(activated(int)), this,
SLOT(valueHasChanged()));
connect(editor, SIGNAL(activated(int)), item,
SIGNAL(valueChanged(int)));
- connect(editor, SIGNAL(activated(QString)), item,
SIGNAL(valueChanged(QString)));
+ connect(editor, SIGNAL(textActivated(QString)), item,
SIGNAL(valueChanged(QString)));
}
else if (item->m_type == PropTreeItem::CheckBox)
{
@@ -165,7 +165,7 @@
edito->setAutoFillBackground(true);
connect(editor, SIGNAL(activated(int)), this,
SLOT(valueHasChanged()));
connect(editor, SIGNAL(activated(int)), item,
SIGNAL(valueChanged(int)));
- connect(editor, SIGNAL(activated(QString)), item,
SIGNAL(valueChanged(QString)));
+ connect(editor, SIGNAL(textActivated(QString)), item,
SIGNAL(valueChanged(QString)));
}
else
edito = nullptr;
Modified: trunk/Scribus/scribus/ui/scrspinbox.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/scrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrspinbox.cpp (original)
+++ trunk/Scribus/scribus/ui/scrspinbox.cpp Mon Jan 31 22:01:44 2022
@@ -45,8 +45,8 @@
setLocale(LocaleManager::instance().userPreferredLocale());
setSingleStep(1.0);
lineEdit()->setValidator(nullptr);
- disconnect(this, SIGNAL(valueChanged(const QString &)), this,
SLOT(textChanged()));
- connect(this, SIGNAL(valueChanged(const QString &)), this,
SLOT(textChanged()));
+ disconnect(this, SIGNAL(textChanged(const QString &)), this,
SLOT(textChanged()));
+ connect(this, SIGNAL(textChanged(const QString &)), this,
SLOT(textChanged()));
installEventFilter(this);
}
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Mon Jan 31 22:01:44 2022
@@ -1512,7 +1512,7 @@
connect(charScaleH, SIGNAL(valueChanged(double)), this,
SIGNAL(newScaleH(double)));
connect(charScaleV, SIGNAL(valueChanged(double)), this,
SIGNAL(newScaleV(double)));
- connect(Fonts, SIGNAL(activated(const QString &)), this,
SIGNAL(newFont(const QString &)));
+ connect(Fonts, SIGNAL(textActivated(const QString &)), this,
SIGNAL(newFont(const QString &)));
connect(Size, SIGNAL(valueChanged(double)), this,
SIGNAL(newSize(double)));
languageChange();
Modified: trunk/Scribus/scribus/ui/transparencypalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24880&path=/trunk/Scribus/scribus/ui/transparencypalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.cpp (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.cpp Mon Jan 31 22:01:44 2022
@@ -48,7 +48,7 @@
connect(fillOpacity, SIGNAL(valueChanged(double)), this,
SLOT(slotTransF(double)));
connect(blendModeFill, SIGNAL(activated(int)), this,
SIGNAL(NewBlend(int)));
connect(blendModeStroke, SIGNAL(activated(int)), this,
SIGNAL(NewBlendS(int)));
- connect(namedGradient, SIGNAL(activated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
+ connect(namedGradient, SIGNAL(textActivated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
connect(gradEdit, SIGNAL(gradientChanged()), this,
SIGNAL(gradientChanged()));
connect(gradEditButton, SIGNAL(clicked()), this,
SLOT(editGradientVector()));
connect(TGradDia,
SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)),
this,
SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)));
@@ -65,7 +65,7 @@
void TransparencyPalette::connectSignals()
{
connect(gradEdit, SIGNAL(gradientChanged()), this,
SIGNAL(gradientChanged()));
- connect(namedGradient, SIGNAL(activated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
+ connect(namedGradient, SIGNAL(textActivated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
connect(tabWidget, SIGNAL(currentChanged(int)), this,
SLOT(slotGrad(int)));
connect(gradientType, SIGNAL(activated(int)), this,
SLOT(slotGradType(int)));
connect(transpCalcGradient, SIGNAL(clicked()), this,
SLOT(switchGradientMode()));
@@ -76,7 +76,7 @@
void TransparencyPalette::disconnectSignals()
{
disconnect(gradEdit, SIGNAL(gradientChanged()), this,
SIGNAL(gradientChanged()));
- disconnect(namedGradient, SIGNAL(activated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
+ disconnect(namedGradient, SIGNAL(textActivated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
disconnect(tabWidget, SIGNAL(currentChanged(int)), this,
SLOT(slotGrad(int)));
disconnect(gradientType, SIGNAL(activated(int)), this,
SLOT(slotGradType(int)));
disconnect(transpCalcGradient, SIGNAL(clicked()), this,
SLOT(switchGradientMode()));
@@ -230,7 +230,7 @@
void TransparencyPalette::updateGradientList()
{
- disconnect(namedGradient, SIGNAL(activated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
+ disconnect(namedGradient, SIGNAL(textActivated(const QString &)), this,
SLOT(setNamedGradient(const QString &)));
namedGradient->clear();
namedGradient->setIconSize(QSize(48, 12));
namedGradient->addItem( tr("Custom"));
@@ -257,7 +257,7 @@
pm = QPixmap::fromImage(pixm);
namedGradient->addItem(pm, patK[i]);
}
- connect(namedGradient, SIGNAL(activated(const QString&)), this,
SLOT(setNamedGradient(const QString&)));
+ connect(namedGradient, SIGNAL(textActivated(const QString&)), this,
SLOT(setNamedGradient(const QString&)));
}
void TransparencyPalette::setGradients(QHash<QString, VGradient> *docGradients)
@@ -277,7 +277,7 @@
{
if (number == 1)
{
- disconnect(namedGradient, SIGNAL(activated(const QString &)),
this, SLOT(setNamedGradient(const QString &)));
+ disconnect(namedGradient, SIGNAL(textActivated(const QString
&)), this, SLOT(setNamedGradient(const QString &)));
if (!currentItem->gradientMask().isEmpty())
{
setCurrentComboItem(namedGradient,
currentItem->gradientMask());
@@ -304,7 +304,7 @@
else
emit NewGradient(GradMask_Radial);
}
- connect(namedGradient, SIGNAL(activated(const QString &)),
this, SLOT(setNamedGradient(const QString &)));
+ connect(namedGradient, SIGNAL(textActivated(const QString &)),
this, SLOT(setNamedGradient(const QString &)));
}
else if (number == 2)
{
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
