r14774 by jghali - fix german naming of some variables in annotation related dialogs

scribus-commit scribus-commit at lists.scribus.net
Sat Feb 20 00:10:57 CET 2010


Revision: 14774
Author: jghali
Date: 2010-02-19T23:09:57.064252Z
Commit message: fix german naming of some variables in annotation related dialogs

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

Diffs:
Index: scribus/annota.h
===================================================================
--- scribus/annota.h	(revision 14773)
+++ scribus/annota.h	(revision 14774)
@@ -61,17 +61,17 @@
 	QPushButton* PushButton2;
 	PageItem* item;
 	ScribusView* view;
-	int Breite;
-	int Hoehe;
-	int OriBreite;
-	int OriHoehe;
+	int Width;
+	int Height;
+	int OriWidth;
+	int OriHeight;
 	int MaxSeite;
 
 public slots:
 	void SetCoords(double x, double y);
-	void SetPg(int v);
+	void SetPage(int v);
 	void SetCross();
-	void SetVals();
+	void SetValues();
 	void SetTarget(int i);
 	void GetFile();
 
Index: scribus/navigator.h
===================================================================
--- scribus/navigator.h	(revision 14773)
+++ scribus/navigator.h	(revision 14774)
@@ -49,11 +49,11 @@
 	void mouseReleaseEvent(QMouseEvent *m);
 	void paintEvent(QPaintEvent *e);
 	void drawMark(int x, int y);
-	bool SetSeite(int Seite, int Size, QString fn = "");
+	bool SetPage(int Seite, int Size, QString fn = "");
 	int Xp;
 	int Yp;
-	int Breite;
-	int Hoehe;
+	int Width;
+	int Height;
 	ScribusView* view;
 	QPixmap pmx;
 	
Index: scribus/navigator.cpp
===================================================================
--- scribus/navigator.cpp	(revision 14773)
+++ scribus/navigator.cpp	(revision 14774)
@@ -37,11 +37,11 @@
 	setAlignment(Qt::AlignLeft | Qt::AlignTop);
 	if (!fn.isEmpty())
 	{
-		QPixmap img = LoadPDF(fn, Seite, Size, &Breite, &Hoehe);
+		QPixmap img = LoadPDF(fn, Seite, Size, &Width, &Height);
 		if (!img.isNull())
 			pmx = img;
 		else
-			pmx = LoadPDF(fn, 1, Size, &Breite, &Hoehe);
+			pmx = LoadPDF(fn, 1, Size, &Width, &Height);
 	}
 	else
 		pmx=QPixmap::fromImage(vie->PageToPixmap(Seite, Size));
@@ -95,19 +95,19 @@
 	repaint();
 }
 
-bool Navigator::SetSeite(int Seite, int Size, QString fn)
+bool Navigator::SetPage(int Seite, int Size, QString fn)
 {
 	bool ret = false;
 	if (!fn.isEmpty())
 	{
-		QPixmap img = LoadPDF(fn, Seite, Size, &Breite, &Hoehe);
+		QPixmap img = LoadPDF(fn, Seite, Size, &Width, &Height);
 		if (!img.isNull())
 		{
 			pmx = img;
 			ret = true;
 		}
 		else
-			pmx = LoadPDF(fn, 1, Size, &Breite, &Hoehe);
+			pmx = LoadPDF(fn, 1, Size, &Width, &Height);
 	}
 	else
 	{
Index: scribus/annot.cpp
===================================================================
--- scribus/annot.cpp	(revision 14773)
+++ scribus/annot.cpp	(revision 14774)
@@ -61,10 +61,10 @@
 	setWindowTitle( tr( "Field Properties" ) );
 	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
 	item = it;
-	Breite = b;
-	Hoehe = h;
-	OriBreite = b;
-	OriHoehe = h;
+	Width = b;
+	Height = h;
+	OriWidth = b;
+	OriHeight = h;
 	view = vie;
 	MaxSeite = Seite;
 	QStringList tl;
@@ -647,16 +647,16 @@
 	GroupBox11Layout->addWidget( TextLabel41, 3, 0 );
 	SpinBox21 = new QSpinBox( GroupBox11 );
 	SpinBox21->setSuffix( tr( " pt" ) );
-	SpinBox21->setMaximum(Breite);
+	SpinBox21->setMaximum(Width);
 	SpinBox21->setValue(tl[0].toInt());
 	GroupBox11Layout->addWidget( SpinBox21, 3, 1 );
 	TextLabel51 = new QLabel( GroupBox11 );
 	TextLabel51->setText( tr( "Y-Pos:" ) );
 	GroupBox11Layout->addWidget( TextLabel51, 4, 0 );
 	SpinBox31 = new QSpinBox( GroupBox11 );
-	SpinBox31->setMaximum(Hoehe);
+	SpinBox31->setMaximum(Height);
 	SpinBox31->setSuffix( tr( " pt" ) );
-	SpinBox31->setValue(Hoehe-tl[1].toInt());
+	SpinBox31->setValue(Height-tl[1].toInt());
 	GroupBox11Layout->addWidget( SpinBox31, 4, 1 );
 	Fram2->addWidget(GroupBox11);
 
@@ -719,8 +719,8 @@
 		LExtern->setChecked(true);
 		if (!Destfile->text().isEmpty())
 		{
-			Breite = Pg1->Breite;
-			Hoehe = Pg1->Hoehe;
+			Width = Pg1->Width;
+			Height = Pg1->Height;
 		}
 		else
 		{
@@ -1123,7 +1123,7 @@
 	Frame9->setFrameShadow( QFrame::Plain );
 	Fram->addWidget(Frame9);
 
-	SetZiel(item->annotation().Type()-2);
+	SetAnnotationType(item->annotation().Type()-2);
 	Layout1_2 = new QHBoxLayout;
 	Layout1_2->setSpacing( 5 );
 	Layout1_2->setMargin( 0 );
@@ -1138,7 +1138,7 @@
 	PushButton2->setText( tr( "Cancel" ) );
 	Layout1_2->addWidget( PushButton2 );
 	AnnotLayout->addLayout( Layout1_2 );
-	connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetVals()));
+	connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetValues()));
 	connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
 	connect(EditFormat, SIGNAL(clicked()), this, SLOT(editFormatSc()));
 	connect(EditKeystr, SIGNAL(clicked()), this, SLOT(editKeySc()));
@@ -1148,11 +1148,11 @@
 	connect(SeField, SIGNAL(clicked()), this, SLOT(SelectFelder()));
 	connect(Format0c, SIGNAL(activated(const QString&)), this, SLOT(setDateSample(const QString&)));
 	connect(TxFormat, SIGNAL(activated(int)), this, SLOT(SetFoScript(int)));
-	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetZiel(int)));
-	connect(ActionCombo, SIGNAL(activated(int)), this, SLOT(SetActTyp(int)));
-	connect(SelAction, SIGNAL(activated(int)), this, SLOT(SetActScript(int)));
-	connect(Pg1, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
-	connect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	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(Pg1, 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()));
 	connect(Limit, SIGNAL(clicked()), this, SLOT(SetLimit()));
@@ -1184,13 +1184,13 @@
 	connect(UseIcons, SIGNAL(clicked()), this, SLOT(IconsEin()));
 	connect(PlaceIcon, SIGNAL(clicked()), this, SLOT(IPlace()));
 	connect(ChFile, SIGNAL(clicked()), this, SLOT(GetFile()));
-	connect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternL()));
+	connect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternLink()));
 	connect(Name, SIGNAL(Leaved()), this, SLOT(NewName()));
 	NoSpell->setToolTip( tr( "Flag is ignored for PDF 1.3" ) );
 	NoScroll->setToolTip( tr( "Flag is ignored for PDF 1.3" ) );
 	CalcFields->setToolTip( tr( "Enter a comma separated list of fields here" ) );
 	IconNR->setToolTip( tr("You need at least the Icon for Normal to use Icons for Buttons"));
-	SetPg(qMin(SpinBox11->value(), MaxSeite));
+	SetPage(qMin(SpinBox11->value(), MaxSeite));
 	SetCross();
 	resize( minimumSizeHint() );
 }
@@ -1757,50 +1757,50 @@
 	item->annotation().setFormat(it);
 }
 
-void Annot::SetCo(qreal x, qreal y)
+void Annot::SetCoords(double x, double y)
 {
-	SpinBox21->setValue(static_cast<int>(x*Breite));
-	SpinBox31->setValue(static_cast<int>(y*Hoehe));
+	SpinBox21->setValue(static_cast<int>(x*Width));
+	SpinBox31->setValue(static_cast<int>(y*Height));
 }
 
-void Annot::SetPg(int v)
+void Annot::SetPage(int v)
 {
-	disconnect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	disconnect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
 	if ((item->annotation().ActionType() == 7) || (item->annotation().ActionType() == 9))
 	{
-		if (!Pg1->SetSeite(v, 100, Destfile->text()))
+		if (!Pg1->SetPage(v, 100, Destfile->text()))
 		{
 			SpinBox11->setValue(1);
-			Pg1->SetSeite(1, 100, Destfile->text());
+			Pg1->SetPage(1, 100, Destfile->text());
 		}
-		Breite = Pg1->Breite;
-		Hoehe = Pg1->Hoehe;
-		//		SetCo(0,0);
+		Width = Pg1->Width;
+		Height = Pg1->Height;
+		//		SetCoords(0,0);
 	}
 	else
 	{
-		Pg1->SetSeite(qMin(v-1, MaxSeite-1), 100);
+		Pg1->SetPage(qMin(v-1, MaxSeite-1), 100);
 		SpinBox11->setValue(qMin(v, MaxSeite));
-		Breite = OriBreite;
-		Hoehe = OriHoehe;
-		//		SetCo(0,0);
+		Width = OriWidth;
+		Height = OriHeight;
+		//		SetCoords(0,0);
 	}
-	SpinBox21->setMaximum(Breite);
-	SpinBox31->setMaximum(Hoehe);
-	connect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	SpinBox21->setMaximum(Width);
+	SpinBox31->setMaximum(Height);
+	connect(SpinBox11, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
 }
 
 void Annot::SetCross()
 {
 	int x,y;
-	disconnect(Pg1, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
-	x = static_cast<int>(static_cast<double>(SpinBox21->value())/static_cast<double>(Breite)*Pg1->pmx.width());
-	y = static_cast<int>(static_cast<double>(SpinBox31->value())/static_cast<double>(Hoehe)*Pg1->pmx.height());
+	disconnect(Pg1, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
+	x = static_cast<int>(static_cast<double>(SpinBox21->value())/static_cast<double>(Width)*Pg1->pmx.width());
+	y = static_cast<int>(static_cast<double>(SpinBox31->value())/static_cast<double>(Height)*Pg1->pmx.height());
 	Pg1->drawMark(x, y);
-	connect(Pg1, SIGNAL(Coords(double, double)), this, SLOT(SetCo(double, double)));
+	connect(Pg1, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
 }
 
-void Annot::SetVals()
+void Annot::SetValues()
 {
 	QString tmp, tmp2;
 	QString Nfo("");
@@ -1998,7 +1998,7 @@
 				item->annotation().setActionType(2);
 			}
 			item->annotation().setZiel(SpinBox11->value()-1);
-			item->annotation().setAction(tmp.setNum(SpinBox21->value())+" "+tmp2.setNum(Hoehe-SpinBox31->value())+" 0");
+			item->annotation().setAction(tmp.setNum(SpinBox21->value())+" "+tmp2.setNum(Height-SpinBox31->value())+" 0");
 			break;
 		case 3:
 			item->annotation().setActionType(3);
@@ -2036,9 +2036,9 @@
 	accept();
 }
 
-void Annot::SetZiel(int it)
+void Annot::SetAnnotationType(int it)
 {
-	disconnect(ActionCombo, SIGNAL(activated(int)), this, SLOT(SetActTyp(int)));
+	disconnect(ActionCombo, SIGNAL(activated(int)), this, SLOT(SetActionType(int)));
 	disconnect(TxFormat, SIGNAL(activated(int)), this, SLOT(SetFoScript(int)));
 	int tmpac = item->annotation().ActionType();
 	if ((tmpac == 7) || (tmpac == 9))
@@ -2080,7 +2080,7 @@
 			setter = ((item->annotation().ActionType() != 7) && (item->annotation().ActionType() != 9)) ? true : false;
 			Destfile->setEnabled(setter);
 			ChFile->setEnabled(setter);
-			SetActTyp(tmpac);
+			SetActionType(tmpac);
 			break;
 		}
 	case 3:
@@ -2110,7 +2110,7 @@
 		ActionCombo->addItem( tr( "None" ) );
 		ActionCombo->addItem( tr( "JavaScript" ) );
 		ActionCombo->setCurrentIndex(qMin(tmpac, 1));
-		SetActTyp(tmpac);
+		SetActionType(tmpac);
 		break;
 	default:
 		Fram->setCurrentIndex(2);
@@ -2127,7 +2127,7 @@
 	MaxChars->setValue(setter == true ? item->annotation().MaxChar() : 0);
 	Limit->setChecked(setter);
 	MaxChars->setEnabled(setter);
-	connect(ActionCombo, SIGNAL(activated(int)), this, SLOT(SetActTyp(int)));
+	connect(ActionCombo, SIGNAL(activated(int)), this, SLOT(SetActionType(int)));
 	connect(TxFormat, SIGNAL(activated(int)), this, SLOT(SetFoScript(int)));
 }
 
@@ -2136,9 +2136,9 @@
 	Limit->isChecked() ? MaxChars->setEnabled(true) :MaxChars->setEnabled(false);
 }
 
-void Annot::SetExternL()
+void Annot::SetExternLink()
 {
-	disconnect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternL()));
+	disconnect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternLink()));
 	bool enable;
 	if (!LExtern->isChecked())
 	{
@@ -2146,7 +2146,7 @@
 		enable = false;
 		//		Destfile->setEnabled(false);
 		//		ChFile->setEnabled(false);
-		SetPg(qMin(SpinBox11->value(), MaxSeite));
+		SetPage(qMin(SpinBox11->value(), MaxSeite));
 	}
 	else
 	{
@@ -2169,14 +2169,14 @@
 				LExtern->setChecked(false);
 			}
 		}
-		SetPg(qMin(SpinBox11->value(), MaxSeite));
+		SetPage(qMin(SpinBox11->value(), MaxSeite));
 	}
 	Destfile->setEnabled(enable);
 	ChFile->setEnabled(enable);
-	connect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternL()));
+	connect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternLink()));
 }
 
-void Annot::SetActTyp(int it)
+void Annot::SetActionType(int it)
 {
 	bool setter;
 	switch (it)
@@ -2196,7 +2196,7 @@
 		setter = item->annotation().ActionType() != 7 ? true : false;
 		Destfile->setEnabled(setter);
 		ChFile->setEnabled(setter);
-		SetPg(qMin(SpinBox11->value(), MaxSeite));
+		SetPage(qMin(SpinBox11->value(), MaxSeite));
 		break;
 	case 1:
 		Fram2->setCurrentIndex(1);
@@ -2208,7 +2208,7 @@
 	}
 }
 
-void Annot::SetActScript(int it)
+void Annot::SetActionScript(int it)
 {
 	switch (ScrEdited)
 	{
@@ -2277,7 +2277,7 @@
 			Destfile->setText(fn);
 			SpinBox11->setValue(1);
 			SpinBox11->setMaximum(1000);
-			SetPg(1);
+			SetPage(1);
 		}
 	}
 }
Index: scribus/annota.cpp
===================================================================
--- scribus/annota.cpp	(revision 14773)
+++ scribus/annota.cpp	(revision 14774)
@@ -46,10 +46,10 @@
 	setModal(true);
 	setWindowTitle( tr( "Annotation Properties" ) );
 	item = it;
-	Breite = b;
-	Hoehe = h;
-	OriBreite = b;
-	OriHoehe = h;
+	Width = b;
+	Height = h;
+	OriWidth = b;
+	OriHeight = h;
 	view = vie;
 	MaxSeite = Seite;
 	QStringList tl;
@@ -166,16 +166,16 @@
 
 	SpinBox2 = new QSpinBox( GroupBox1);
 	SpinBox2->setSuffix( tr( " pt" ) );
-	SpinBox2->setMaximum(Breite);
+	SpinBox2->setMaximum(Width);
 	SpinBox2->setValue(tl[0].toInt());
 	TextLabel4 = new QLabel( tr("&X-Pos"), GroupBox1 );
 	TextLabel4->setBuddy(SpinBox2);
 	GroupBox1Layout->addWidget( TextLabel4, 3, 0 );
 	GroupBox1Layout->addWidget( SpinBox2, 3, 1 );
 	SpinBox3 = new QSpinBox( GroupBox1 );
-	SpinBox3->setMaximum(Hoehe);
+	SpinBox3->setMaximum(Height);
 	SpinBox3->setSuffix( tr( " pt" ) );
-	SpinBox3->setValue(Hoehe-tl[1].toInt());
+	SpinBox3->setValue(Height-tl[1].toInt());
 	TextLabel5 = new QLabel( tr("&Y-Pos:"), GroupBox1 );
 	TextLabel5->setBuddy(SpinBox3);
 	GroupBox1Layout->addWidget( TextLabel5, 4, 0 );
@@ -195,10 +195,10 @@
 	Layout1_2->addWidget( PushButton2 );
 	AnnotLayout->addLayout( Layout1_2 );
 
-	connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetVals()));
+	connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetValues()));
 	connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
 	connect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetTarget(int)));
-	connect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	connect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
 	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()));
@@ -212,49 +212,49 @@
 
 void Annota::SetCoords(double x, double y)
 {
-	SpinBox2->setValue(static_cast<int>(x*Breite));
-	SpinBox3->setValue(static_cast<int>(y*Hoehe));
+	SpinBox2->setValue(static_cast<int>(x*Width));
+	SpinBox3->setValue(static_cast<int>(y*Height));
 }
 
-void Annota::SetPg(int v)
+void Annota::SetPage(int v)
 {
-	disconnect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	disconnect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
 	int link = 2;
 	if (view->Doc->masterPageMode())
 		link = 1;
 	if (ComboBox1->currentIndex() == link)
 	{
-		if (!Pg->SetSeite(v, 100, Destfile->text()))
+		if (!Pg->SetPage(v, 100, Destfile->text()))
 		{
 			SpinBox1->setValue(1);
-			Pg->SetSeite(1, 100, Destfile->text());
+			Pg->SetPage(1, 100, Destfile->text());
 		}
-		Breite = Pg->Breite;
-		Hoehe = Pg->Hoehe;
+		Width = Pg->Width;
+		Height = Pg->Height;
 	}
 	else
 	{
-		Pg->SetSeite(qMin(v-1, MaxSeite-1), 100);
+		Pg->SetPage(qMin(v-1, MaxSeite-1), 100);
 		SpinBox1->setValue(qMin(v, MaxSeite));
-		Breite = OriBreite;
-		Hoehe = OriHoehe;
+		Width = OriWidth;
+		Height = OriHeight;
 	}
-	SpinBox2->setMaximum(Breite);
-	SpinBox3->setMaximum(Hoehe);
-	connect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPg(int)));
+	SpinBox2->setMaximum(Width);
+	SpinBox3->setMaximum(Height);
+	connect(SpinBox1, SIGNAL(valueChanged(int)), this, SLOT(SetPage(int)));
 }
 
 void Annota::SetCross()
 {
 	int x,y;
 	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());
+	x = static_cast<int>(static_cast<double>(SpinBox2->value())/static_cast<double>(Width)*Pg->pmx.width());
+	y = static_cast<int>(static_cast<double>(SpinBox3->value())/static_cast<double>(Height)*Pg->pmx.height());
 	Pg->drawMark(x, y);
 	connect(Pg, SIGNAL(Coords(double, double)), this, SLOT(SetCoords(double, double)));
 }
 
-void Annota::SetVals()
+void Annota::SetValues()
 {
 	QString tmp, tmp2;
 	item->annotation().setZiel(SpinBox1->value()-1);
@@ -268,12 +268,12 @@
 		item->annotation().setActionType(0);
 		break;
 	case 11:
-		item->annotation().setAction(tmp.setNum(SpinBox2->value())+" "+ tmp2.setNum(Hoehe-SpinBox3->value())+" 0");
+		item->annotation().setAction(tmp.setNum(SpinBox2->value())+" "+ tmp2.setNum(Height-SpinBox3->value())+" 0");
 		item->annotation().setExtern("");
 		item->annotation().setActionType(2);
 		break;
 	case 12:
-		item->annotation().setAction(tmp.setNum(SpinBox2->value())+" "+ tmp2.setNum(Hoehe-SpinBox3->value())+" 0");
+		item->annotation().setAction(tmp.setNum(SpinBox2->value())+" "+ tmp2.setNum(Height-SpinBox3->value())+" 0");
 		if (!Destfile->text().isEmpty())
 		{
 			item->annotation().setExtern(Destfile->text());
@@ -319,7 +319,7 @@
 		ChFile->hide();
 		useAbsolute->hide();
 		item->annotation().setActionType(2);
-		SetPg(qMin(SpinBox1->value(), MaxSeite));
+		SetPage(qMin(SpinBox1->value(), MaxSeite));
 		break;
 	case 2:
 		Fram->setCurrentIndex(1);
@@ -351,7 +351,7 @@
 			else
 				item->annotation().setActionType(7);
 		}
-		SetPg(qMin(SpinBox1->value(), MaxSeite));
+		SetPage(qMin(SpinBox1->value(), MaxSeite));
 		break;
 	case 3:
 		Fram->setCurrentIndex(1);
@@ -392,7 +392,7 @@
 			SpinBox3->hide();
 		}
 		if (Pg->isVisible())
-			SetPg(qMin(SpinBox1->value(), MaxSeite));
+			SetPage(qMin(SpinBox1->value(), MaxSeite));
 		break;
 	default:
 		Fram->setCurrentIndex(0);
@@ -418,7 +418,7 @@
 			Destfile->setText(fn);
 			SpinBox1->setValue(1);
 			SpinBox1->setMaximum(1000);
-			SetPg(1);
+			SetPage(1);
 		}
 	}
 }
Index: scribus/annot.h
===================================================================
--- scribus/annot.h	(revision 14773)
+++ scribus/annot.h	(revision 14774)
@@ -206,10 +206,10 @@
 	QPushButton* PushButton2;
 	PageItem* item;
 	ScribusView* view;
-	int Breite;
-	int Hoehe;
-	int OriBreite;
-	int OriHoehe;
+	int Width;
+	int Height;
+	int OriWidth;
+	int OriHeight;
 	int ScrEdited;
 	int FormNum;
 	QString JavaScr;
@@ -239,17 +239,17 @@
 	void HandleCalc();
 	void SetCalc();
 	void SetFoScript ( int it );
-	void SetCo ( qreal x, qreal y );
-	void SetPg ( int v );
+	void SetCoords ( double x, double y );
+	void SetPage ( int v );
 	void SetCross();
-	void SetVals();
-	void SetZiel ( int i );
+	void SetValues();
+	void SetAnnotationType ( int i );
 	void GetFile();
-	void SetActTyp ( int it );
+	void SetActionType ( int it );
 	void SetLimit();
-	void SetActScript ( int it );
+	void SetActionScript ( int it );
 	void setDateSample ( const QString& ds );
-	void SetExternL();
+	void SetExternLink();
 
 protected:
 	QVBoxLayout* AnnotLayout;




More information about the scribus-commit mailing list