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

[tfry at users.sourceforge.net]

Revision: 2179
          http://rkward.svn.sourceforge.net/rkward/?rev=2179&view=rev
Author:   tfry
Date:     2007-11-05 04:12:59 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
Use KDE default fixed spacing font in command log and object viewer

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/robjectviewer.cpp
    trunk/rkward/rkward/windows/rkcommandlog.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-11-04 23:57:15 UTC (rev 2178)
+++ trunk/rkward/ChangeLog	2007-11-05 12:12:59 UTC (rev 2179)
@@ -1,3 +1,6 @@
+- Use the KDE default fixed spacing font for command log and object viewer
+
+--- Version 0.4.8a - Nov-XX-2007
 - More reliable C stack limit detection on some systems
 - Fixed: Console accepted pasted input while a command is running
 - Fixed: Analysis->Moments->Moment plugin did not use the order-parameter

Modified: trunk/rkward/rkward/robjectviewer.cpp
===================================================================
--- trunk/rkward/rkward/robjectviewer.cpp	2007-11-04 23:57:15 UTC (rev 2178)
+++ trunk/rkward/rkward/robjectviewer.cpp	2007-11-05 12:12:59 UTC (rev 2179)
@@ -25,6 +25,7 @@
 #include <qfont.h>
 
 #include <klocale.h>
+#include <kglobalsettings.h>
 
 #include "rbackend/rinterface.h"
 #include "rkglobals.h"
@@ -54,8 +55,6 @@
 	setPart (new RKDummyPart (this, wrapper));
 	initializeActivationSignals ();
 
-	QFont font ("Courier");
-
 	QHBox *toprow = new QHBox (box);
 	description_label = new QLabel (toprow);
 	QVBox *statusbox = new QVBox (toprow);
@@ -75,7 +74,6 @@
 	summary_area = new QTextEdit (box);
 	summary_area->setTextFormat (PlainText);
 	summary_area->setReadOnly (true);
-	summary_area->setCurrentFont (font);
 	summary_area->setWordWrap (QTextEdit::NoWrap);
 
 	row = new QHBox (box);
@@ -87,7 +85,6 @@
 	print_area = new QTextEdit (box);
 	print_area->setTextFormat (PlainText);
 	print_area->setReadOnly (true);
-	print_area->setCurrentFont (font);
 	print_area->setWordWrap (QTextEdit::NoWrap);
 
 	setCaption (i18n("Object Viewer: ") + object->getShortName ());
@@ -141,6 +138,9 @@
 
 	summary_area->setText (QString::null);
 	print_area->setText (QString::null);
+	QFont font = KGlobalSettings::fixedFont ();
+	summary_area->setCurrentFont (font);
+	print_area->setCurrentFont (font);
 
 	RCommand *command = new RCommand ("print(summary(" + _object->getFullName () + "))", RCommand::App, QString::null, this, SUMMARY_COMMAND);
 	RKGlobals::rInterface ()->issueCommand (command, 0);

Modified: trunk/rkward/rkward/windows/rkcommandlog.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.cpp	2007-11-04 23:57:15 UTC (rev 2178)
+++ trunk/rkward/rkward/windows/rkcommandlog.cpp	2007-11-05 12:12:59 UTC (rev 2179)
@@ -34,6 +34,7 @@
 
 #include <klocale.h>
 #include <kstdaction.h>
+#include <kglobalsettings.h>
 
 #include "../debug.h"
 
@@ -215,7 +216,7 @@
 	log_view->setText (QString::null);
 
 	// set a fixed width font
-	QFont font ("Courier");
+	QFont font = KGlobalSettings::fixedFont ();
 	log_view->setCurrentFont (font);
 	log_view->setWordWrap (QTextEdit::NoWrap);
 }


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