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

List:       kde-commits
Subject:    playground/office/kange/kange
From:       Klaas Freitag <freitag () suse ! de>
Date:       2005-07-03 20:24:28
Message-ID: 1120422268.504297.27245.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431285 by freitag:

use preferences framework, added a small database config dialog


 M  +9 -0      kange.cpp  
 M  +3 -0      kange.h  
 M  +6 -9      kangedb.cpp  


--- trunk/playground/office/kange/kange/kange.cpp #431284:431285
@@ -41,6 +41,8 @@
 #include "katalogview.h"
 #include "mateditor.h"
 
+#include "prefsdialog.h"
+
 #define ID_STATUS_MSG 1
 
 KangeApp::KangeApp(QWidget* , const char* name):KMainWindow(0, name)
@@ -88,6 +90,7 @@
   viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), \
actionCollection());  viewStatusBar = KStdAction::showStatusbar(this, \
SLOT(slotViewStatusBar()), actionCollection());  viewFlosTemplates = new \
KToggleAction( i18n("Show Floskel Templates"), 0,0,this,SLOT(slotShowTemplates()), \
actionCollection(), "file_show_templ"); +  KStdAction::preferences( this, SLOT( \
preferences() ), actionCollection() );  
   actOpenKatalog = new KAction(i18n("Open Catalog Window"), 0,0,this, \
SLOT(slotOpenKatalog()), actionCollection(), "open_katalog_window");  \
actOpenMatKatalog = new KAction(i18n("Open Material Catalog Window"), 0,0,this, \
SLOT(slotOpenMaterialKatalog()), actionCollection(), "open_matkat_window"); @@ -535,3 \
+538,9 @@  
     return re;
 }
+
+void KangeApp::preferences()
+{
+    PrefsDialog dlg( this );
+    dlg.exec();
+}
--- trunk/playground/office/kange/kange/kange.h #431284:431285
@@ -164,6 +164,9 @@
     void slotOpenKatalog(const QString& );
     void slotOpenKatalog();
     void slotOpenMaterialKatalog();
+
+    void preferences();
+    
   private:
     /** the configuration object of the application */
     KConfig *config;
--- trunk/playground/office/kange/kange/kangedb.cpp #431284:431285
@@ -19,13 +19,10 @@
 #include "kangedb.h"
 #include "dbids.h"
 
+#include "kangesettings.h"
+
 #define DB_DRIVER "QMYSQL3"
-#define DB_NAME "kange"
-#define DB_USER "root"
-#define DB_PASSWD ""
-#define DB_HOST "localhost"
 
-
 QSqlDatabase* KAngeDB::m_db = 0;
 
 KAngeDB::KAngeDB(){
@@ -42,10 +39,10 @@
             qWarning( "Failed to connect to the database driver" );
             return 0;
         }
-        m_db->setDatabaseName( DB_NAME );
-        m_db->setUserName( DB_USER );
-        m_db->setPassword( DB_PASSWD );
-        m_db->setHostName( DB_HOST );
+        m_db->setDatabaseName( KangeSettings::name() );
+        m_db->setUserName( KangeSettings::user() );
+        m_db->setPassword( KangeSettings::password() );
+        m_db->setHostName( KangeSettings::serverName() );
 
         if ( m_db->open() ) {
             // Database successfully opened; we can now issue SQL commands.


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