r15098 by cbradney - Bring forward some tooltips and minor tweaks to prefs/docs setup

scribus-commit scribus-commit at lists.scribus.net
Sat May 22 00:00:29 CEST 2010


Revision: 15098
Author: cbradney
Date: 2010-05-21T21:51:30.868918Z
Commit message: Bring forward some tooltips and minor tweaks to prefs/docs setup

Changeset: 
M  /trunk/Scribus/scribus/ui/prefs_operatortools.cpp
M  /trunk/Scribus/scribus/ui/prefs_tableofcontents.h
M  /trunk/Scribus/scribus/ui/prefs_guides.cpp
M  /trunk/Scribus/scribus/ui/prefs_scrapbook.cpp
M  /trunk/Scribus/scribus/ui/prefs_fonts.cpp
M  /trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp

Diffs:
Index: scribus/ui/prefs_tableofcontents.h
===================================================================
--- scribus/ui/prefs_tableofcontents.h	(revision 15097)
+++ scribus/ui/prefs_tableofcontents.h	(revision 15098)
@@ -58,7 +58,7 @@
 		QString trStrPNEnd;
 		QString trStrPNBeginning;
 		ToCSetupVector localToCSetupVector;
-		ScribusDoc* currDoc;
+		ScribusDoc* m_Doc;
 		QString selectedTOCAttrName;
 		QStringList paragraphStyleList;
 
Index: scribus/ui/prefs_guides.cpp
===================================================================
--- scribus/ui/prefs_guides.cpp	(revision 15097)
+++ scribus/ui/prefs_guides.cpp	(revision 15098)
@@ -36,6 +36,23 @@
 	guidePlacementComboBox->addItem( tr ("In the Background") );
 	guidePlacementComboBox->addItem( tr ("In the Foreground") );
 	guidePlacementComboBox->setCurrentIndex(i<0?0:i);
+
+	guidePlacementComboBox->setToolTip( tr( "Place guides in front of or behind objects on the page" ) );
+	minorGridSpacingSpinBox->setToolTip( tr( "Distance between the minor grid lines" ) );
+	majorGridSpacingSpinBox->setToolTip( tr( "Distance between the major grid lines" ) );
+	guideSnapDistanceSpinBox->setToolTip(  "<qt>" + tr( "Distance within which an object will snap to your placed guides. After setting this you will need to restart Scribus to set this setting." ) + "</qt>");
+	guideGrabRadiusSpinBox->setToolTip( "<qt>" + tr( "Radius of the area where Scribus will allow you to grab an objects handles.After setting this you will need to restart Scribus to set this setting." ) + "</qt>");
+	minorGridColorPushButton->setToolTip( tr( "Color of the minor grid lines" ) );
+	majorGridColorPushButton->setToolTip( tr( "Color of the major grid lines" ) );
+	guideColorPushButton->setToolTip( tr( "Color of the guide lines you insert" ) );
+	marginColorPushButton->setToolTip( tr( "Color for the margin lines" ) );
+	baselineGridColorPushButton->setToolTip( tr( "Color for the baseline grid" ) );
+	visibilityBaselineGridCheckBox->setToolTip( tr("Turns the basegrid on or off"));
+	baselineGridSpacingSpinBox->setToolTip( tr("Distance between the lines of the baseline grid"));
+	baselineGridOffsetSpinBox->setToolTip( tr("Distance from the top of the page for the first baseline"));
+	visibilityGridCheckBox->setToolTip( tr("Turns the gridlines on or off"));
+	visibilityGuidesCheckBox->setToolTip( tr("Turns the guides on or off"));
+	visibilityMarginsCheckBox->setToolTip( tr("Turns the margins on or off"));
 }
 
 void Prefs_Guides::unitChange(int unitIndex)
Index: scribus/ui/prefs_scrapbook.cpp
===================================================================
--- scribus/ui/prefs_scrapbook.cpp	(revision 15097)
+++ scribus/ui/prefs_scrapbook.cpp	(revision 15098)
@@ -22,9 +22,10 @@
 
 void Prefs_Scrapbook::languageChange()
 {
-	autoSendCopiedToScrapCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>");
-	keepCopiedAcrossSessionsCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>" );
-	itemCountKeptInScrapbookSpinBox->setToolTip( "<qt>" + tr("") + "</qt>");
+	autoSendCopiedToScrapCheckBox->setToolTip( "<qt>" + tr( "This enables the scrapbook to be used an extension to the copy/paste buffers. Simply copying an object or grouped object will send this to the Scrapbook automatically" ) + "</qt>");
+	keepCopiedAcrossSessionsCheckBox->setToolTip( "<qt>" + tr( "This enables copied items to be kept permanently in the scrapbook" ) + "</qt>" );
+	writePreviewsCheckBox->setToolTip( "<qt>" + tr("Save generated scrapbook previews in the scrapbook directory") + "</qt>");
+	itemCountKeptInScrapbookSpinBox->setToolTip( "<qt>" + tr("The minimum number is 1; the maximum us 100") + "</qt>");
 }
 
 void Prefs_Scrapbook::restoreDefaults(struct ApplicationPrefs *prefsData)
Index: scribus/ui/prefs_fonts.cpp
===================================================================
--- scribus/ui/prefs_fonts.cpp	(revision 15097)
+++ scribus/ui/prefs_fonts.cpp	(revision 15098)
@@ -38,7 +38,7 @@
 
 Prefs_Fonts::Prefs_Fonts(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent),
-	m_doc(NULL)
+	m_doc(doc)
 {
 	setupUi(this);
 
Index: scribus/ui/prefs_operatortools.cpp
===================================================================
--- scribus/ui/prefs_operatortools.cpp	(revision 15097)
+++ scribus/ui/prefs_operatortools.cpp	(revision 15098)
@@ -33,7 +33,12 @@
 
 void Prefs_OperatorTools::languageChange()
 {
-
+	zoomMinimumSpinBox->setToolTip( tr( "Minimum magnification allowed" ) );
+	zoomMaximumSpinBox->setToolTip( tr( "Maximum magnification allowed" ) );
+	zoomSteppingSpinBox->setToolTip( tr( "Change in magnification for each zoom operation" ) );
+	itemDuplicateXDispSpinBox->setToolTip( tr( "Horizontal displacement of page items") );
+	itemDuplicateYDispSpinBox->setToolTip( tr( "Vertical displacement of page items" ) );
+	rotationConstraintSpinBox->setToolTip( tr( "Constrain value for the rotation tool when the Control key is pressed" ) );
 }
 
 void Prefs_OperatorTools::restoreDefaults(struct ApplicationPrefs *prefsData)
Index: scribus/ui/prefs_tableofcontents.cpp
===================================================================
--- scribus/ui/prefs_tableofcontents.cpp	(revision 15097)
+++ scribus/ui/prefs_tableofcontents.cpp	(revision 15098)
@@ -15,7 +15,7 @@
 
 Prefs_TableOfContents::Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent),
-	currDoc(NULL)
+	m_Doc(doc)
 {
 	setupUi(this);
 	languageChange();
@@ -56,7 +56,6 @@
 void Prefs_TableOfContents::restoreDefaults(struct ApplicationPrefs *prefsData)
 {
 	localToCSetupVector=prefsData->tocPrefs.defaultToCSetups;
-	//FIXME for when handling doc prefs:	currDoc=doc;
 	generatePageItemList();
 	bool enabled=(localToCSetupVector.count()>0);
 	if (enabled)
@@ -105,12 +104,12 @@
 {
 	itemDestFrameComboBox->clear();
 	itemDestFrameComboBox->addItem(CommonStrings::tr_None);
-	if (currDoc!=NULL)
+	if (m_Doc!=NULL)
 	{
-		for (int d = 0; d < currDoc->DocItems.count(); ++d)
+		for (int d = 0; d < m_Doc->DocItems.count(); ++d)
 		{
-			if (currDoc->DocItems.at(d)->itemType()==PageItem::TextFrame)
-				itemDestFrameComboBox->addItem(currDoc->DocItems.at(d)->itemName());
+			if (m_Doc->DocItems.at(d)->itemType()==PageItem::TextFrame)
+				itemDestFrameComboBox->addItem(m_Doc->DocItems.at(d)->itemName());
 		}
 	}
 	else
@@ -162,7 +161,7 @@
 		setCurrentComboItem(itemNumberPlacementComboBox, trStrPNEnd);
 
 	itemListNonPrintingCheckBox->setChecked(localToCSetupVector[numSelected].listNonPrintingFrames);
-	if (currDoc!=NULL)
+	if (m_Doc!=NULL)
 	{
 		if (localToCSetupVector[numSelected].frameName==CommonStrings::None)
 			setCurrentComboItem(itemDestFrameComboBox, CommonStrings::tr_None);
@@ -235,10 +234,10 @@
 	paragraphStyleList.clear();
 	paragraphStyleList.append(CommonStrings::tr_None);
 
-	if(currDoc!=NULL) // && currDoc->docParagraphStyles.count()>5)
+	if(m_Doc!=NULL) // && m_Doc->docParagraphStyles.count()>5)
 	{
-		for (int i = 0; i < currDoc->paragraphStyles().count(); ++i)
-			paragraphStyleList.append(currDoc->paragraphStyles()[i].name());
+		for (int i = 0; i < m_Doc->paragraphStyles().count(); ++i)
+			paragraphStyleList.append(m_Doc->paragraphStyles()[i].name());
 	}
 	itemParagraphStyleComboBox->clear();
 	itemParagraphStyleComboBox->addItems(paragraphStyleList);
@@ -252,7 +251,7 @@
 	tocDeleteButton->setEnabled(enabled);
 	itemAttrComboBox->setEnabled(enabled);
 	itemNumberPlacementComboBox->setEnabled(enabled);
-	bool haveDoc=enabled && currDoc!=NULL;
+	bool haveDoc=enabled && m_Doc!=NULL;
 	itemDestFrameComboBox->setEnabled(haveDoc);
 	itemParagraphStyleComboBox->setEnabled(haveDoc);
 }




More information about the scribus-commit mailing list