Author: jghali
Date: Tue Jul 28 02:09:37 2020
New Revision: 23951
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23951
Log:
Rename two ScribusView signals
Modified:
trunk/Scribus/scribus/canvasmode_editarc.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/scribusview.h
Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23951&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.cpp Tue Jul 28 02:09:37 2020
@@ -180,7 +180,7 @@
{
m_view->update();
}
- connect(m_view, SIGNAL(changeUN(int)), vectorDialog,
SLOT(unitChange(int)), Qt::UniqueConnection);
+ connect(m_view, SIGNAL(unitChanged(int)), vectorDialog,
SLOT(unitChange(int)), Qt::UniqueConnection);
connect(vectorDialog, SIGNAL(NewVectors(double,double,double,double)),
this, SLOT(applyValues(double,double,double,double)));
connect(vectorDialog, SIGNAL(endEdit()), this, SLOT(endEditing()));
connect(vectorDialog, SIGNAL(paletteShown(bool)), this,
SLOT(endEditing(bool)));
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23951&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Jul 28 02:09:37 2020
@@ -2823,8 +2823,8 @@
// #9275 : scripter must call HaveNewDoc() in case new doc has been
created in a script
// We may consequently have to call HaveNewDoc several times for the
same doc.
// Use Qt::UniqueConnection here to avoid multiple identical signal
connections
- connect(view, SIGNAL(changeUN(int)), this, SLOT(slotChangeUnit(int)),
Qt::UniqueConnection);
- connect(view, SIGNAL(changeLA(int)), layerPalette,
SLOT(markActiveLayer(int)), Qt::UniqueConnection);
+ connect(view, SIGNAL(unitChanged(int)), this,
SLOT(slotChangeUnit(int)), Qt::UniqueConnection);
+ connect(view, SIGNAL(layerChanged(int)), layerPalette,
SLOT(markActiveLayer(int)), Qt::UniqueConnection);
connect(this, SIGNAL(changeLayers(int)), layerPalette,
SLOT(markActiveLayer(int)), Qt::UniqueConnection);
connect(view->horizRuler, SIGNAL(MarkerMoved(double,double)), this,
SLOT(setStatusBarTextPosition(double,double)), Qt::UniqueConnection);
connect(view->horizRuler, SIGNAL(DocChanged(bool)), this,
SLOT(slotDocCh(bool)), Qt::UniqueConnection);
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23951&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Tue Jul 28 02:09:37 2020
@@ -2420,12 +2420,12 @@
m_doc->setActiveLayer(layerID);
//CB TODO fix this to use view calls after 1.3.2 release
m_ScMW->changeLayer(m_doc->activeLayer());
- emit changeLA(layerID);
-}
-
-void ScribusView::ChgUnit(int art)
-{
- emit changeUN(art);
+ emit layerChanged(layerID);
+}
+
+void ScribusView::ChgUnit(int unitIndex)
+{
+ emit unitChanged(unitIndex);
unitChange();
vertRuler->update();
horizRuler->update();
Modified: trunk/Scribus/scribus/scribusview.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23951&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Tue Jul 28 02:09:37 2020
@@ -354,8 +354,8 @@
int m_vhRulerHW;
signals:
- void changeUN(int);
- void changeLA(int);
+ void unitChanged(int);
+ void layerChanged(int);
void HaveSel();
void DocChanged();
void ItemGeom();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
