r14065 by jghali - #8477: graphical selection of link position in Annotation Properties doesn't work

[scribus-commit]

Revision: 14065
Author: jghali
Date: 2009-09-30T11:29:20.394601Z
Commit message: #8477: graphical selection of link position in Annotation Properties doesn't work

Changeset: 
M  /branches/Version135/Scribus/scribus/annota.cpp
M  /branches/Version135/Scribus/scribus/annota.h

Diffs:
Index: scribus/annota.h
===================================================================
--- scribus/annota.h	(revision 14064)
+++ scribus/annota.h	(revision 14065)
@@ -68,11 +68,11 @@
 	int MaxSeite;
 
 public slots:
-	void SetCo(qreal x, qreal y);
+	void SetCoords(double x, double y);
 	void SetPg(int v);
 	void SetCross();
 	void SetVals();
-	void SetZiel(int i);
+	void SetTarget(int i);
 	void GetFile();
 
 protected:
Index: scribus/annota.cpp
===================================================================
--- scribus/annota.cpp	(revision 14064)
+++ scribus/annota.cpp	(revision 14065)
@@ -197,20 +197,20 @@
 
 	connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetVals()));
 	connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
-	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetZiel(int)));
+	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetTarget(int)));
 	connect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
-	connect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
+	connect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
 	connect(SpinBox2, SIGNAL(valueChanged(int)), this, SLOT(SetCross()));
 	connect(SpinBox3, SIGNAL(valueChanged(int)), this, SLOT(SetCross()));
 	connect(ChFile, SIGNAL(clicked()), this, SLOT(GetFile()));
 	if (view->Doc->masterPageMode())
-		SetZiel(item->annotation().Type() - 1);
+		SetTarget(item->annotation().Type() - 1);
 	else
-		SetZiel(item->annotation().Type());
+		SetTarget(item->annotation().Type());
 	SetCross();
 }
 
-void Annota::SetCo(qreal x, qreal y)
+void Annota::SetCoords(double x, double y)
 {
 	SpinBox2->setValue(static_cast<int>(x*Breite));
 	SpinBox3->setValue(static_cast<int>(y*Hoehe));
@@ -247,11 +247,11 @@
 void Annota::SetCross()
 {
 	int x,y;
-	disconnect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
+	disconnect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
 	x = static_cast<int>(static_cast<double>(SpinBox2->value())/static_cast<double>(Breite)*Pg->pmx.width());
 	y = static_cast<int>(static_cast<double>(SpinBox3->value())/static_cast<double>(Hoehe)*Pg->pmx.height());
 	Pg->drawMark(x, y);
-	connect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
+	connect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
 }
 
 void Annota::SetVals()
@@ -297,10 +297,10 @@
 	accept();
 }
 
-void Annota::SetZiel(int it)
+void Annota::SetTarget(int it)
 {
 	int a = it;
-	disconnect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetZiel(int)));
+	disconnect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetTarget(int)));
 	if (view->Doc->masterPageMode())
 		a++;
 	Pg->show();
@@ -398,7 +398,7 @@
 		Fram->setCurrentIndex(0);
 		break;
 	}
-	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetZiel(int)));
+	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetTarget(int)));
 }
 
 void Annota::GetFile()