From 4e0cfa02a4f884b3f54f476d596bacd1f34d6a50 Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Tue, 4 Mar 2008 17:48:09 +0000 Subject: some little fixes around; fixed docs; bumped version to 3.4.0 git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1183 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 34 ++++++++++++------------- src/modules/dockwidget/libkvidockwidget_qt4.cpp | 27 ++++++++++---------- 2 files changed, 31 insertions(+), 30 deletions(-) (limited to 'src/modules/dockwidget') diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 9283907c2..798718709 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -321,7 +321,7 @@ void KviDockWidget::enterEvent( QEvent* ) qt_x_time = 1; g_pApp->x11ProcessEvent( &ev ); qt_x_time = time; - } + } #endif } @@ -503,7 +503,7 @@ void KviDockWidget::refresh() bitBlt(g_pCurrentPixmap,0,8,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,Qt::ClearROP); bitBlt(g_pCurrentPixmap,8,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,Qt::ClearROP); bitBlt(g_pCurrentPixmap,8,8,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,Qt::ClearROP); -#endif +#endif if( (m_iChannels == 2) || (m_iQueries == 2) ) { @@ -682,11 +682,11 @@ static KviDockWidget * dockwidget_find(KviFrame *f) The dock widget is currently working in KDE compilation mode only: it relies on the KWin implementation of the Window Manager interaction protocol. @seealso: - [cmd]dockwidget.hide[/doc] + [cmd]dockwidget.hide[/cmd] */ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) -{ +{ if(!(dockwidget_find(c->window()->frame()))) { KviDockWidget * w = new KviDockWidget(c->window()->frame(),"dock_widget"); @@ -712,11 +712,11 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) @description: Hides the dock widget for the current frame window @seealso: - [cmd]dockwidget.show[/doc] + [cmd]dockwidget.show[/cmd] */ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) -{ +{ KviDockWidget * w= dockwidget_find(c->window()->frame()); if(w)delete w; // show the parent frame.. otherwise there will be no way to get it back @@ -740,11 +740,11 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) @description: Hides the window, assotiated with dockwidget @seealso: - [cmd]dockwidget.show[/cmd] [cmd]dockwidget.hide[/cmd] + [cmd]dockwidget.show[/cmd], [cmd]dockwidget.hide[/cmd] */ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) -{ +{ KviDockWidget * w= dockwidget_find(c->window()->frame()); if(w) { @@ -757,7 +757,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) } /* - @doc: dockwidget.isvisible + @doc: dockwidget.isVisible @type: function @title: @@ -773,7 +773,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) */ static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c) -{ +{ c->returnValue()->setBoolean(dockwidget_find(c->window()->frame())); return true; } @@ -818,18 +818,18 @@ static bool dockwidget_module_cleanup(KviModule *m) { while(g_pDockWidgetList->first())delete g_pDockWidgetList->first(); delete g_pDockWidgetList; - g_pDockWidgetList = 0; + g_pDockWidgetList = 0; #ifdef COMPILE_ON_WINDOWS DestroyIcon(g_pCurrentIcon); #endif delete g_pDock1; - g_pDock1 = 0; + g_pDock1 = 0; delete g_pDock2; - g_pDock2 = 0; + g_pDock2 = 0; delete g_pDock3; - g_pDock3 = 0; + g_pDock3 = 0; return true; } @@ -843,12 +843,12 @@ static bool dockwidget_module_can_unload(KviModule *) // plugin definition structure // ======================================= KVIRC_MODULE( - "KVIrc dock widget implementation", + "KVIrc dock widget implementation", "1.0.0", "Szymon Stefanek " , "exports the /dockwidget.* interface\n", - dockwidget_module_init , - dockwidget_module_can_unload, + dockwidget_module_init , + dockwidget_module_can_unload, 0, dockwidget_module_cleanup ) diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp index 997c8c8a1..c017ecd9e 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -129,6 +129,7 @@ void KviDockWidget::die() { delete this; } + void KviDockWidget::flashingTimerShot() { m_bFlashed=!m_bFlashed; @@ -516,11 +517,11 @@ static KviDockWidget * dockwidget_find(KviFrame *f) The dock widget is currently working in KDE compilation mode only: it relies on the KWin implementation of the Window Manager interaction protocol. @seealso: - [cmd]dockwidget.hide[/doc] + [cmd]dockwidget.hide[/cmd] */ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) -{ +{ if(!(dockwidget_find(c->window()->frame()))) { KviDockWidget * w = new KviDockWidget(c->window()->frame()); @@ -542,11 +543,11 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) @description: Hides the dock widget for the current frame window @seealso: - [cmd]dockwidget.show[/doc] + [cmd]dockwidget.show[/cmd] */ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) -{ +{ KviDockWidget * w= dockwidget_find(c->window()->frame()); if(w)delete w; // show the parent frame.. otherwise there will be no way to get it back @@ -570,11 +571,11 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) @description: Hides the window, assotiated with dockwidget @seealso: - [cmd]dockwidget.show[/cmd] [cmd]dockwidget.hide[/cmd] + [cmd]dockwidget.show[/cmd], [cmd]dockwidget.hide[/cmd] */ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) -{ +{ KviDockWidget * w= dockwidget_find(c->window()->frame()); if(w) { @@ -584,7 +585,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) } /* - @doc: dockwidget.isvisible + @doc: dockwidget.isVisible @type: function @title: @@ -600,7 +601,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) */ static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c) -{ +{ c->returnValue()->setBoolean(dockwidget_find(c->window()->frame())); return true; } @@ -631,7 +632,7 @@ 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 +#endif g_pDock3 = new QPixmap(buffer); @@ -652,7 +653,7 @@ static bool dockwidget_module_cleanup(KviModule *m) { while(g_pDockWidgetList->first())delete g_pDockWidgetList->first(); delete g_pDockWidgetList; - g_pDockWidgetList = 0; + g_pDockWidgetList = 0; delete g_pDock1; g_pDock1 = 0; @@ -675,12 +676,12 @@ static bool dockwidget_module_can_unload(KviModule *) // plugin definition structure // ======================================= KVIRC_MODULE( - "KVIrc dock widget implementation", + "KVIrc dock widget implementation", "2.0.0", "Szymon Stefanek and Alexey Uzhva " , "exports the /dockwidget.* interface\n", - dockwidget_module_init , - dockwidget_module_can_unload, + dockwidget_module_init , + dockwidget_module_can_unload, 0, dockwidget_module_cleanup ) -- cgit v1.3.1-10-gc9f91