diff options
| author |  Alexey Uzhva | 2007-04-21 12:48:28 +0000 |
|---|---|---|
| committer | Alexey Uzhva | 2007-04-21 12:48:28 +0000 |
| commit | 40d6f4bd826a1aa10ded1168b2c6f3163b2a13ba (patch) | |
| tree | ccfdcec5cfa4ba9c44a2da9fda9d6be4e0789fa1 /src/modules/dockwidget | |
| parent | Compilation fixes (diff) | |
| download | KVIrc-40d6f4bd826a1aa10ded1168b2c6f3163b2a13ba.tar.gz KVIrc-40d6f4bd826a1aa10ded1168b2c6f3163b2a13ba.tar.bz2 KVIrc-40d6f4bd826a1aa10ded1168b2c6f3163b2a13ba.zip | |
evil crash fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@521 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dockwidget')
| -rw-r--r-- | src/modules/dockwidget/libkvidockwidget_qt4.cpp | 37 |
1 files changed, 28 insertions, 9 deletions
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>; |