[Knode-devel] kdepim/knode

[Volker Krause]

CVS commit by vkrause: 

Help knode to find the .rc files for the reader window and the composer when running in kontact.

Reviewed by Roberto Selbach Teixeira.


  M +3 -0      knarticlewindow.cpp   1.50
  M +3 -0      kncomposer.cpp   1.185
  M +2 -0      knglobals.h   1.22
  M +1 -0      knode.cpp   1.126
  M +2 -0      knode_part.cpp   1.8


--- kdepim/knode/knarticlewindow.cpp  #1.49:1.50
@@ -92,4 +92,7 @@ KNArticleWindow::KNArticleWindow(KNArtic
   : KMainWindow(0, "articleWindow")
 {
+  if(knGlobals.instance)
+    setInstance(knGlobals.instance);
+
   if(art)
     setCaption(art->subject()->asUnicodeString());

--- kdepim/knode/kncomposer.cpp  #1.184:1.185
@@ -148,4 +148,7 @@ KNComposer::KNComposer(KNLocalArticle *a
     m_listAction.setAutoDelete( true );
 
+  if(knGlobals.instance)
+    setInstance(knGlobals.instance);
+
   // activate dnd of attachments...
   setAcceptDrops(true);

--- kdepim/knode/knglobals.h  #1.21:1.22
@@ -20,4 +20,5 @@
 #include <kconfig.h>
 
+class KInstance;
 class KNConfigManager;
 class KNNetAccess;
@@ -65,4 +66,5 @@ class KNGlobals {
     Kpgp::Module          *pgp;
     KConfig               *config();
+    KInstance             *instance;
 private:
     KSharedConfig::Ptr c_onfig;

--- kdepim/knode/knode.cpp  #1.125:1.126
@@ -51,4 +51,5 @@ KNMainWindow::KNMainWindow( QWidget* pWi
   setCentralWidget( m_mainWidget );
   createGUI( "knodeui.rc" );
+  knGlobals.instance = 0;
 
   applyMainWindowSettings(KGlobal::config(),"mainWindow_options");

--- kdepim/knode/knode_part.cpp  #1.7:1.8
@@ -24,4 +24,5 @@
 
 #include "knode_part.h"
+#include "knglobals.h"
 #include "knmainwidget.h"
 #include "aboutdata.h"
@@ -59,4 +60,5 @@ KNodePart::KNodePart(QWidget *parentWidg
   kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
   KGlobal::iconLoader()->addAppDir("knode");
+  knGlobals.instance = KNodeFactory::instance();
 
   // create a canvas to insert our widget