aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/core/kvi_string.cpp2
-rw-r--r--src/kvirc/kernel/kvi_app.cpp2
-rw-r--r--src/kvirc/module/kvi_modulemanager.cpp5
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt4.cpp37
-rw-r--r--src/modules/notifier/notifier_QT4_vc05.vcproj8
-rw-r--r--src/modules/notifier/notifierwindow.cpp4
6 files changed, 42 insertions, 16 deletions
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index a97360d4e..d5568dae9 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2862,7 +2862,7 @@ KviStr & KviStr::stripRightWhiteSpace()
{
register char *right=m_ptr+m_len-1;
const char *start=right;
- while((right >= m_ptr) && isspace(*right))right--;
+ while((right >= m_ptr) && isspace( *right ))right--;
if(right != start)
{
m_len = (right - m_ptr) + 1;
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 18d60a429..8ecffdf58 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -660,8 +660,6 @@ void KviApp::notifierMessage(KviWindow * pWnd,int iIconId,const QString &szMsg,u
KviModule * m = g_pModuleManager->getModule("notifier");
if(!m)return;
- debug("notifier call");
-
NotifierMessageSupaDupaParameterStruct s;
s.pWindow = pWnd;
s.szIcon.sprintf("%d",iIconId);
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 83c44da1b..711aec155 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -134,7 +134,7 @@ KviModule * KviModuleManager::getModule(const char * modName)
KviModule * m = m_pModuleDict->find(modName);
if(!m)
{
- loadModule(modName);
+ if(!loadModule(modName)) return 0;
m = m_pModuleDict->find(modName);
}
if(m)m->updateAccessTime();
@@ -175,7 +175,8 @@ bool KviModuleManager::loadModule(const char * modName)
{
g_pApp->getGlobalKvircDirectory(tmp,KviApp::Plugins,szName);
}
-
+
+ if(!KviFileUtils::fileExists(tmp)) return false;
kvi_library_t handle = kvi_library_open(tmp.local8Bit().data());
if(!handle)
{
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index b16375a77..26d866fba 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -132,7 +132,7 @@ void KviDockWidget::die()
void KviDockWidget::flashingTimerShot()
{
m_bFlashed=!m_bFlashed;
- updateIcon();
+ refresh();
}
#define NIDLEMSGS 18
@@ -326,10 +326,10 @@ void KviDockWidget::refresh()
{
grabActivityInfo();
-
if( (m_iChannels == 2) || (m_iQueries == 2) )
{
- if(!m_pFlashingTimer->isActive() && KVI_OPTION_BOOL(KviOption_boolEnableTrayIconFlashing) ) m_pFlashingTimer->start(1000);
+ if(!m_pFlashingTimer->isActive() && KVI_OPTION_BOOL(KviOption_boolEnableTrayIconFlashing) )
+ m_pFlashingTimer->start(1000);
} else {
if(m_pFlashingTimer->isActive()) m_pFlashingTimer->stop();
m_bFlashed=false;
@@ -343,12 +343,29 @@ void KviDockWidget::refresh()
{
thisRestrictionOfQt4IsNotNice.drawPixmap((ICON_SIZE-16)/2,(ICON_SIZE-16)/2,16,16,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),0,0,16,16);
} else {
- thisRestrictionOfQt4IsNotNice.drawPixmap(0,0,ICON_SIZE/2,ICON_SIZE/2,m_iOther ? ((m_iOther == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,0,0,ICON_SIZE/2,ICON_SIZE/2);
- thisRestrictionOfQt4IsNotNice.drawPixmap(0,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,m_iConsoles ? ((m_iConsoles == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,0,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2);
- thisRestrictionOfQt4IsNotNice.drawPixmap(ICON_SIZE/2,0,ICON_SIZE/2,ICON_SIZE/2,m_iQueries ? ((m_iQueries == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,ICON_SIZE/2,0,ICON_SIZE/2,ICON_SIZE/2);
- thisRestrictionOfQt4IsNotNice.drawPixmap(ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,m_iChannels ? ((m_iChannels == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2);
+ thisRestrictionOfQt4IsNotNice.drawPixmap(0,0,ICON_SIZE/2,ICON_SIZE/2,
+ m_iOther ?
+ ((m_iOther == 2) ? *g_pDock3 : *g_pDock2)
+ : *g_pDock1,0,0,ICON_SIZE/2,ICON_SIZE/2);
+
+ thisRestrictionOfQt4IsNotNice.drawPixmap(0,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,
+ m_iConsoles ?
+ ((m_iConsoles == 2) ? *g_pDock3 : *g_pDock2)
+ : *g_pDock1,0,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2);
+
+ thisRestrictionOfQt4IsNotNice.drawPixmap(ICON_SIZE/2,0,ICON_SIZE/2,ICON_SIZE/2,
+ m_iQueries ?
+ ((m_iQueries == 2)
+ ? *g_pDock3 : *g_pDock2)
+ : *g_pDock1,ICON_SIZE/2,0,ICON_SIZE/2,ICON_SIZE/2);
+
+ thisRestrictionOfQt4IsNotNice.drawPixmap(ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,
+ m_iChannels ?
+ ((m_iChannels == 2) ? *g_pDock3 : *g_pDock2)
+ : *g_pDock1
+ ,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2,ICON_SIZE/2);
+
}
-
updateIcon();
}
@@ -614,7 +631,9 @@ static bool dockwidget_module_init(KviModule * m)
g_pApp->findImage(buffer,"kvi_dock_win32-2.png");
#else
g_pApp->findImage(buffer,"kvi_dock_part-2.png");
-#endif g_pDock3 = new QPixmap(buffer);
+#endif
+
+ g_pDock3 = new QPixmap(buffer);
g_pDockWidgetList = new KviPtrList<KviDockWidget>;
diff --git a/src/modules/notifier/notifier_QT4_vc05.vcproj b/src/modules/notifier/notifier_QT4_vc05.vcproj
index 21430b259..dcb520b27 100644
--- a/src/modules/notifier/notifier_QT4_vc05.vcproj
+++ b/src/modules/notifier/notifier_QT4_vc05.vcproj
@@ -231,6 +231,10 @@
>
</File>
<File
+ RelativePath=".\notifierwindowprogressbar.cpp"
+ >
+ </File>
+ <File
RelativePath=".\notifierwindowtabs.cpp"
>
</File>
@@ -279,6 +283,10 @@
>
</File>
<File
+ RelativePath=".\notifierwindowprogressbar.h"
+ >
+ </File>
+ <File
RelativePath=".\notifierwindowtabs.h"
>
<FileConfiguration
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 73b7bd2e9..94ced105e 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -473,13 +473,13 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
if((!bDoAnimate) || (x() != m_pWndBorder->x()) || (y() != m_pWndBorder->y()))
{
- debug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
+ //debug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
// the user asked to not animate or
// the window has been moved and the animation would suck anyway
// just hide quickly
hideNow();
} else {
- debug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
+ //debug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
m_pShowHideTimer = new QTimer();
connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
m_dOpacity = 1.0 - OPACITY_STEP;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 07:48:52 +0000