[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kturtle
From:       Cies Breijs <kde () showroommama ! nl>
Date:       2004-01-05 23:05:18
Message-ID: 20040105230518.DDEAF1420 () office ! kde ! org
[Download RAW message or body]

CVS commit by cies: 

crap!


  M +6 -4      TODO   1.11
  M +1 -1      src/kturtle.cpp   1.9
  M +15 -2     src/lexer.cpp   1.4


--- kdenonbeta/kturtle/TODO  #1.10:1.11
@@ -79,6 +79,11 @@
 04/01/2003 we'll see after the editor part is done
 
+
+
 annma: color-picker: maybe the code could be pasted directly in the editor at the \
cursor point (see after the editor part is done)  
+
+
+
 cies: a press-F1-for-context-help...
 Press F1 while in a command and see help on it
@@ -97,8 +102,4 @@
 
 
-cies: Get us bugs.kde.org entity
-// done
-
-
 cies: rename the resized() signal in canvas.* to CanvasResized() or any apropriate \
other letter combi, to stop the clash with QWidgets resized() signal.  Off course the \
connect() in kturtle.cpp should follow. [while typing this i could have fixed it :-)] \
@@ -112,4 +113,5 @@  
 
+
 cies: remove some debug crap from the canvas.cpp, I refer to leave it there till \
mid.03.2003.  

--- kdenonbeta/kturtle/src/kturtle.cpp  #1.8:1.9
@@ -534,5 +534,5 @@ void MainWindow::checkTranslationFile() 
         kdDebug(0)<<"--1--"<<endl;
         if ( !locate("appdata", "data/logokeywords.en_US.xml").isNull() ) {
-            KConfig *config=kapp->config();
+            KConfig *config = kapp->config();
             config->setGroup("language");
             config->writeEntry("TranslationFile", locate("appdata", \
"data/logokeywords.en_US.xml") );

--- kdenonbeta/kturtle/src/lexer.cpp  #1.3:1.4
@@ -2,5 +2,8 @@
 #include <qfile.h>
 
-#include "settings.h"
+#include <kapp.h>
+#include <kconfig.h>
+
+//#include "settings.h"
 #include "lexer.h"
 
@@ -84,5 +87,15 @@ void Lexer::getKeywords() {
     QDomDocument KeywordsXML;
     
-    QFile xmlfile( Settings::translationFilePath() ); // Read the specified \
translation file +    KConfig *config = kapp->config();
+    
+    // if no translationfile is specified -> return
+    if ( config->readPathEntry("TranslationFile").isNull() ) {
+        return;
+    }    
+        
+    QFile xmlfile( config->readPathEntry("TranslationFile") ); // Read the specified \
translation file +//     if ( xmlfile.exists() ) { // if no xmlfile is specified -> \
return +//         return;
+//     }
     if ( !xmlfile.open(IO_ReadOnly) ) {
         return;


[prev in list] [next in list] [prev in thread] [next in thread]