[rkward-cvs] SF.net SVN: rkward:[3801] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 3801
          http://rkward.svn.sourceforge.net/rkward/?rev=3801&view=rev
Author:   tfry
Date:     2011-09-20 08:41:42 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Add some explanation to number of recent files setting.

Modified Paths:
--------------
    trunk/rkward/rkward/misc/rkcommonfunctions.cpp
    trunk/rkward/rkward/misc/rkcommonfunctions.h
    trunk/rkward/rkward/settings/rksettingsmodulecommandeditor.cpp

Modified: trunk/rkward/rkward/misc/rkcommonfunctions.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkcommonfunctions.cpp	2011-09-19 19:32:01 UTC (rev 3800)
+++ trunk/rkward/rkward/misc/rkcommonfunctions.cpp	2011-09-20 08:41:42 UTC (rev 3801)
@@ -21,6 +21,7 @@
 #include <qregexp.h>
 #include <QDir>
 
+#include <klocale.h>
 #include <kxmlguiclient.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -209,4 +210,9 @@
 			w->setWhatsThis (tip);
 		}
 	}
+
+	QString noteSettingsTakesEffectAfterRestart () {
+		return (i18n ("<p><em>Note:</em> This setting does not take effect until you restart RKWard.</p>"));
+	}
+
 }	// namespace

Modified: trunk/rkward/rkward/misc/rkcommonfunctions.h
===================================================================
--- trunk/rkward/rkward/misc/rkcommonfunctions.h	2011-09-19 19:32:01 UTC (rev 3800)
+++ trunk/rkward/rkward/misc/rkcommonfunctions.h	2011-09-20 08:41:42 UTC (rev 3801)
@@ -54,6 +54,7 @@
 
 /** simultaneously sets tool tips and what's this tips on up to three QWidgets */
 	void setTips (const QString tip, QWidget *first, QWidget *second=0, QWidget *third=0);
+	QString noteSettingsTakesEffectAfterRestart ();
 };
 
 #endif

Modified: trunk/rkward/rkward/settings/rksettingsmodulecommandeditor.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmodulecommandeditor.cpp	2011-09-19 19:32:01 UTC (rev 3800)
+++ trunk/rkward/rkward/settings/rksettingsmodulecommandeditor.cpp	2011-09-20 08:41:42 UTC (rev 3801)
@@ -119,6 +119,7 @@
 	label = new QLabel (i18n ("Number of scripts in recent file lists (*)"), group);
 	num_recent_files_box = new RKSpinBox (group);
 	num_recent_files_box->setIntMode (1, INT_MAX, num_recent_files);
+	RKCommonFunctions::setTips (i18n ("<p>The number of recent files to remember (in the Open Recent R Script File menu).</p>") + RKCommonFunctions::noteSettingsTakesEffectAfterRestart (), num_recent_files_box, label);
 	connect (num_recent_files_box, SIGNAL (valueChanged(int)), this, SLOT (settingChanged()));
 	box_layout->addWidget (label);
 	box_layout->addWidget (num_recent_files_box);
@@ -127,7 +128,7 @@
 	label = new QLabel (i18n ("R script file filters (separated by spaces)"), group);
 	script_file_filter_box = new QLineEdit (group);
 	script_file_filter_box->setText (script_file_filter);
-	RKCommonFunctions::setTips (i18n ("A list of filters (file name extensions) that should be treated as R script files. Most importantly, files matching one of these filters will always be opened with R syntax highlighting.<br>Filters are case insensitive."), script_file_filter_box, label);
+	RKCommonFunctions::setTips (i18n ("<p>A list of filters (file name extensions) that should be treated as R script files. Most importantly, files matching one of these filters will always be opened with R syntax highlighting.</p><p>Filters are case insensitive.</p>"), script_file_filter_box, label);
 	connect (script_file_filter_box, SIGNAL (textChanged(QString)), this, SLOT (settingChanged()));
 	box_layout->addWidget (label);
 	box_layout->addWidget (script_file_filter_box);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.