r14107 by cbradney - #8491: Move FontCombo tooltips to the fontcombo to allow split tooltips

scribus-commit scribus-commit at lists.scribus.net
Wed Oct 7 00:04:49 CEST 2009


Revision: 14107
Author: cbradney
Date: 2009-10-06T21:39:58.971728Z
Commit message: #8491: Move FontCombo tooltips to the fontcombo to allow split tooltips

Changeset: 
M  /branches/Version135/Scribus/scribus/propertiespalette.cpp
M  /branches/Version135/Scribus/scribus/fontcombo.cpp

Diffs:
Index: scribus/fontcombo.cpp
===================================================================
--- scribus/fontcombo.cpp	(revision 14106)
+++ scribus/fontcombo.cpp	(revision 14107)
@@ -148,6 +148,8 @@
 		fontFaceLabel->setText( tr("Family:"));
 		fontStyleLabel->setText( tr("Style:"));
 	}
+	fontFamily->setToolTip( tr("Font Family of Selected Text or Text Frame"));
+	fontStyle->setToolTip( tr("Font Style of Selected Text or Text Frame"));
 }
 
 void FontComboH::familySelected(int id)
Index: scribus/propertiespalette.cpp
===================================================================
--- scribus/propertiespalette.cpp	(revision 14106)
+++ scribus/propertiespalette.cpp	(revision 14107)
@@ -5375,7 +5375,7 @@
 	textFlowUsesContourLine2->setToolTip("");
 	textFlowUsesImageClipping2->setToolTip("");
 
-	Fonts->setToolTip("");
+	//Fonts->setToolTip("");
 	Size->setToolTip("");
 	ChBase->setToolTip("");
 	ChScale->setToolTip("");
@@ -5467,7 +5467,7 @@
 	textFlowUsesContourLine2->setToolTip(  "<qt>" + tr("When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object. T") + "</qt>" );
 	textFlowUsesImageClipping2->setToolTip(  "<qt>" + tr("Use the clipping path of the image") + "</qt>" );
 
-	Fonts->setToolTip( tr("Font of selected text or object"));
+	//Fonts->setToolTip( tr("Font of selected text or object"));
 	Size->setToolTip( tr("Font Size"));
 	ChBase->setToolTip( tr("Offset to baseline of characters"));
 	ChScale->setToolTip( tr("Scaling width of characters"));




More information about the scribus-commit mailing list