diff options
| author |  Szymon Tomasz Stefanek | 2008-03-13 03:05:44 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-03-13 03:05:44 +0000 |
| commit | fd4869b626a2462db9c609ebf411776aed6daa8d (patch) | |
| tree | f8e203bcf729a231083692e8311245225e657b3c /src | |
| parent | Fix for ticket #37 (diff) | |
| download | KVIrc-fd4869b626a2462db9c609ebf411776aed6daa8d.tar.gz KVIrc-fd4869b626a2462db9c609ebf411776aed6daa8d.tar.bz2 KVIrc-fd4869b626a2462db9c609ebf411776aed6daa8d.zip | |
Fixes for other tickets
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1214 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 6 | ||||
| -rw-r--r-- | src/modules/help/libkvihelp.cpp | 7 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindow.cpp | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index a1a8a6dec..8fa4cfcc1 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -40,6 +40,8 @@ #include <qtooltip.h> #include "kvi_valuelist.h" +#include "kvi_sourcesdate.h" + extern Index * g_pDocIndex; extern KviPointerList<KviHelpWindow> * g_pHelpWindowList; extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList; @@ -53,8 +55,8 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) { QString szDoclist,szDict; - g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist"); - g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict"); + g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); + g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE); if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index ccbcbadf2..db8fef16e 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -24,6 +24,7 @@ #include "kvi_module.h" +#include "kvi_sourcesdate.h" #include "helpwidget.h" #include "helpwindow.h" @@ -186,17 +187,15 @@ static bool help_module_init(KviModule * m) { QString szHelpDir,szDocList; - g_pApp->getLocalKvircDirectory(szDocList,KviApp::Help,"help.doclist"); + g_pApp->getLocalKvircDirectory(szDocList,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help); g_pDocIndex = new Index(szHelpDir,szDocList); g_pDocIndex->setDocListFile(szDocList); - g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help,"help.dict"); + g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help,"help.dict." KVI_SOURCES_DATE); g_pDocIndex->setDictionaryFile(szHelpDir); - - g_pHelpWidgetList = new KviPointerList<KviHelpWidget>; g_pHelpWidgetList->setAutoDelete(false); g_pHelpWindowList = new KviPointerList<KviHelpWindow>; diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 9169a110a..0c05e23e0 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -263,7 +263,6 @@ int KviNotifierWindow::textWidth() { void KviNotifierWindow::stopShowHideTimer() { if(!m_pShowHideTimer)return; - debug ("Deleting show/hide timer"); delete m_pShowHideTimer; m_pShowHideTimer = 0; } @@ -452,7 +451,7 @@ void KviNotifierWindow::heartbeat() targetOpacity/=100; bIncreasing = targetOpacity>m_dOpacity; m_dOpacity += bIncreasing ? OPACITY_STEP : -(OPACITY_STEP); - debug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity)); + //debug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity)); if( (bIncreasing && (m_dOpacity >= targetOpacity) ) || (!bIncreasing && (m_dOpacity <= targetOpacity) ) ) @@ -951,7 +950,7 @@ void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e) if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) { - debug ("hide now from release event"); + //debug ("hide now from release event"); hideNow(); } else { update(); |