r15675 by fschmid - Fixed Bug #7939: "Path effects need tooltips"

[scribus-commit]

Author: fschmid
Date: Thu Oct 28 21:37:43 2010
New Revision: 15675

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15675
Log:
Fixed Bug #7939: "Path effects need tooltips"

Modified:
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
    trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15675&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp Thu Oct 28 21:37:43 2010
@@ -67,6 +67,7 @@
 	m_actionInfo.name = "PathAlongPath";
 	// Action text for menu, including accel
 	m_actionInfo.text = tr("Path Along Path...");
+	m_actionInfo.helpText = tr("Bends a Polygon along a Path.");
 	// Menu
 	m_actionInfo.menu = "ItemPathOps";
 	m_actionInfo.parentMenu = "Item";

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15675&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp Thu Oct 28 21:37:43 2010
@@ -65,6 +65,7 @@
 	m_actionInfo.name = "PathConnect";
 	// Action text for menu, including accel
 	m_actionInfo.text = tr("Connect Paths");
+	m_actionInfo.helpText = tr("Connects two Paths.");
 	// Menu
 	m_actionInfo.menu = "ItemPathOps";
 	m_actionInfo.parentMenu = "Item";

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15675&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp Thu Oct 28 21:37:43 2010
@@ -70,6 +70,7 @@
 	m_actionInfo.name = "PathCutter";
 	// Action text for menu, including accel
 	m_actionInfo.text = tr("Cut Polygon");
+	m_actionInfo.helpText = tr("Cuts a Polygon with a Path.");
 	// Menu
 	m_actionInfo.icon1 = loadIcon("transform-crop-and-resize.png");
 	m_actionInfo.icon2 = loadIcon("transform-crop-and-resize.png");

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15675&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Oct 28 21:37:43 2010
@@ -1024,6 +1024,7 @@
 	statusBar()->addPermanentWidget(mainWindowXPosDataLabel, 1);
 	statusBar()->addPermanentWidget(mainWindowYPosLabel, 0);
 	statusBar()->addPermanentWidget(mainWindowYPosDataLabel, 1);
+	connect(statusBar(), SIGNAL(messageChanged(const QString &)), this, SLOT(setTempStatusBarText(const QString &)));
 }
 
 
@@ -1048,12 +1049,22 @@
 	mainWindowYPosDataLabel->setText("-");
 }
 
-
+void ScribusMainWindow::setTempStatusBarText(const QString &text)
+{
+	if (mainWindowStatusLabel)
+	{
+		if (text.isEmpty())
+			mainWindowStatusLabel->setText(statusLabelText);
+		else
+			mainWindowStatusLabel->setText(text);
+	}
+}
 
 void ScribusMainWindow::setStatusBarInfoText(QString newText)
 {
 	if (mainWindowStatusLabel)
 		mainWindowStatusLabel->setText(newText);
+	statusLabelText = newText;
 }
 
 

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15675&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Thu Oct 28 21:37:43 2010
@@ -270,6 +270,7 @@
 	//void setItemLineTransparency(double t);
 	void setStatusBarMousePosition(double xp, double yp);
 	void setStatusBarTextPosition(double base, double xp);
+	void setTempStatusBarText(const QString &text);
 	void setStatusBarInfoText(QString newText);
 	bool DoFileClose();
 	//bool DoSaveClose();
@@ -607,6 +608,7 @@
 	int ScriptRunning;
 
 	QLabel* mainWindowStatusLabel;
+	QString statusLabelText;
 	QPixmap noIcon;
 	EditToolBar *editToolBar;
 	FileToolBar *fileToolBar;