[rkward-cvs] SF.net SVN: rkward: [2180] branches/KDE4_port

[tfry at users.sourceforge.net]

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

Log Message:
-----------
Merge rev 2179 from trunk

Revision Links:
--------------
    http://rkward.svn.sourceforge.net/rkward/?rev=2179&view=rev

Modified Paths:
--------------
    branches/KDE4_port/ChangeLog
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/robjectviewer.cpp
    branches/KDE4_port/rkward/windows/rkcommandlog.cpp

Modified: branches/KDE4_port/ChangeLog
===================================================================
--- branches/KDE4_port/ChangeLog	2007-11-05 12:12:59 UTC (rev 2179)
+++ branches/KDE4_port/ChangeLog	2007-11-05 12:18:08 UTC (rev 2180)
@@ -4,7 +4,9 @@
 
 ---- KDE 3 versions
 
+- 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: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-11-05 12:12:59 UTC (rev 2179)
+++ branches/KDE4_port/TODO_KDE4	2007-11-05 12:18:08 UTC (rev 2180)
@@ -100,8 +100,7 @@
 		- does not update on typed input
 
 rkobjectlistview:
-	- do the tool-tips for the objects work?
-	- implement sorting / filtering
+	- test everything
 
 rkconsole:
 	- check whether all selection, editing, navigating really works as expected
@@ -125,3 +124,4 @@
 		-* may be have a drop down menu for the available mirrors instead of tcl/tk which can be fetched just once
 	-* in administrator mode KdeSudo instead of kdesu or option of both? it is a 'fashion' these days not to have root password (ala *ubuntu)!!
 	-* any means of fetching a description of the package before installing?
+	- when adding vars to a multi varslot, these should become selected (so you can removed them again with a single click)

Modified: branches/KDE4_port/rkward/robjectviewer.cpp
===================================================================
--- branches/KDE4_port/rkward/robjectviewer.cpp	2007-11-05 12:12:59 UTC (rev 2179)
+++ branches/KDE4_port/rkward/robjectviewer.cpp	2007-11-05 12:18:08 UTC (rev 2180)
@@ -29,6 +29,7 @@
 #include <QCloseEvent>
 
 #include <klocale.h>
+#include <kglobalsettings.h>
 
 #include "rbackend/rinterface.h"
 #include "rkglobals.h"
@@ -58,8 +59,6 @@
 	setPart (new RKDummyPart (this, wrapper));
 	initializeActivationSignals ();
 
-	QFont font ("Courier");
-
 	Q3HBox *toprow = new Q3HBox (box);
 	description_label = new QLabel (toprow);
 	Q3VBox *statusbox = new Q3VBox (toprow);
@@ -79,7 +78,6 @@
 	summary_area = new Q3TextEdit (box);
 	summary_area->setTextFormat (Qt::PlainText);
 	summary_area->setReadOnly (true);
-	summary_area->setCurrentFont (font);
 	summary_area->setWordWrap (Q3TextEdit::NoWrap);
 
 	row = new Q3HBox (box);
@@ -91,7 +89,6 @@
 	print_area = new Q3TextEdit (box);
 	print_area->setTextFormat (Qt::PlainText);
 	print_area->setReadOnly (true);
-	print_area->setCurrentFont (font);
 	print_area->setWordWrap (Q3TextEdit::NoWrap);
 
 	setCaption (i18n("Object Viewer: ") + object->getShortName ());
@@ -145,6 +142,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: branches/KDE4_port/rkward/windows/rkcommandlog.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandlog.cpp	2007-11-05 12:12:59 UTC (rev 2179)
+++ branches/KDE4_port/rkward/windows/rkcommandlog.cpp	2007-11-05 12:18:08 UTC (rev 2180)
@@ -33,6 +33,7 @@
 
 #include <klocale.h>
 #include <kactioncollection.h>
+#include <kglobalsettings.h>
 
 #include "../debug.h"
 
@@ -218,7 +219,7 @@
 	log_view->setPlainText (QString ());
 
 	// set a fixed width font
-	QFont font ("Courier");
+	QFont font = KGlobalSettings::fixedFont ();
 	log_view->setCurrentFont (font);
 }
 


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