diff options
| author |  Fabio Bas | 2012-01-01 16:43:23 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-01-01 16:43:23 +0000 |
| commit | b538ec203da0ad5f6ea00dc4340dac7af0169b90 (patch) | |
| tree | d6233eb4e8e2453aa9d3834135b5327fc66a3aee /src/modules/help/libkvihelp.cpp | |
| parent | refix #537 (diff) | |
| download | KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.tar.gz KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.tar.bz2 KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.zip | |
- Happy new year!
- Some parts of kvirc still refered to KviMainWindow as frame(), m_pFrm, etc.. => fixed
- Some parts of kvirc were still coded as if more than one KviMainWindows could exists => fixed, this involved changing KviWindows's ctor and removing KviWindow::frame(), thus the big change
- The trayicon module still called itself (and was called) dockextension, and was built to support more than one KviMainWindows => renamed and fixed
- Modified KviWindow::hasAttention so that is can be used everywhere instead of mixing different ways to check if a notificationm should popup
- should fix #1221 and hopefully introduce little to no bugs
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6010 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/help/libkvihelp.cpp')
| -rw-r--r-- | src/modules/help/libkvihelp.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index ff1f212a8..1162e97ee 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -177,7 +177,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) if(!c->switches()->find('n',"new")) { - HelpWidget * w = (HelpWidget *)c->window()->frame()->findChild<HelpWidget *>("help_widget"); + HelpWidget * w = (HelpWidget *)g_pMainWindow->findChild<HelpWidget *>("help_widget"); if(w) { @@ -191,16 +191,15 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) } if(c->switches()->find('m',"mdi")) { - HelpWindow *w = new HelpWindow(c->window()->frame(),"Help browser"); + HelpWindow *w = new HelpWindow("Help browser"); #ifdef COMPILE_WEBKIT_SUPPORT w->textBrowser()->load(QUrl::fromLocalFile(f.absoluteFilePath())); #else w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath())); #endif - c->window()->frame()->addWindow(w); + g_pMainWindow->addWindow(w); } else { - HelpWidget *w = new HelpWidget(c->window()->frame()->splitter(), - c->window()->frame(),true); + HelpWidget *w = new HelpWidget(g_pMainWindow->splitter(), true); #ifdef COMPILE_WEBKIT_SUPPORT w->textBrowser()->load(QUrl::fromLocalFile(f.absoluteFilePath())); #else |