diff options
| author |  Noldor | 2008-03-28 14:57:20 +0000 |
|---|---|---|
| committer | Noldor | 2008-03-28 14:57:20 +0000 |
| commit | 85695b91a38f15e403f6e5d285d10e4914f54255 (patch) | |
| tree | 8bae70ecc95697dc4a49fe5ab0bf7101a6a3199d /src | |
| parent | removed useless files (diff) | |
| download | KVIrc-85695b91a38f15e403f6e5d285d10e4914f54255.tar.gz KVIrc-85695b91a38f15e403f6e5d285d10e4914f54255.tar.bz2 KVIrc-85695b91a38f15e403f6e5d285d10e4914f54255.zip | |
fix trayicon module and doc.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1316 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/kvilib_QT4_vc05.vcproj | 209 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_internalcmd.cpp | 4 | ||||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 32 |
3 files changed, 23 insertions, 222 deletions
diff --git a/src/kvilib/kvilib_QT4_vc05.vcproj b/src/kvilib/kvilib_QT4_vc05.vcproj index 99fc0582b..7f7ba156b 100644 --- a/src/kvilib/kvilib_QT4_vc05.vcproj +++ b/src/kvilib/kvilib_QT4_vc05.vcproj @@ -1800,28 +1800,6 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tal\kvi_tal_filedialog_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\tal\kvi_tal_grid.h"
>
<FileConfiguration
@@ -1838,28 +1816,6 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_grid_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -1906,28 +1862,6 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_hbox_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -1994,33 +1928,10 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_listbox_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- AdditionalDependencies=""
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\tal\kvi_tal_listview.h"
@@ -2107,24 +2018,13 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tal\kvi_tal_mainwindow_qt4.h"
+ RelativePath=".\tal\kvi_tal_mainwindow_qt.h"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -2257,28 +2157,6 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_scrollview_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -2389,6 +2267,8 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
+ CommandLine=""
+ Outputs=""
/>
</FileConfiguration>
</File>
@@ -2413,24 +2293,13 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tal\kvi_tal_toolbar_qt4.h"
+ RelativePath=".\tal\kvi_tal_toolbar_qt.h"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -2499,28 +2368,6 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_vbox_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
@@ -2543,29 +2390,7 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_widgetstack_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)""
Outputs="$(InputDir)\$(InputName).moc"
/>
</FileConfiguration>
@@ -2607,30 +2432,6 @@ <Tool
Name="VCCustomBuildTool"
Description="Performing Custom Build Step $(InputName)"
- CommandLine=""
- Outputs=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\tal\kvi_tal_wizard_qt4.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step For $(InputName)"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step $(InputName)"
CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
Outputs="$(InputDir)\$(InputName).moc"
/>
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp index 7e23b570d..e175b215f 100644 --- a/src/kvirc/kernel/kvi_internalcmd.cpp +++ b/src/kvirc/kernel/kvi_internalcmd.cpp @@ -37,8 +37,8 @@ static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= "socketspy.open", "links.open", "if($option(boolShowRegisteredUsersDialogAsToplevel))reguser.edit -t; else reguser.edit", - "dockwidget.show", - "dockwidget.hide", + "trayicon.show", + "trayicon.hide", "toolbareditor.open", "aliaseditor.open", "term.open -m", diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index af71388be..8dbe141bc 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -482,17 +482,17 @@ static KviTrayIcon * dockwidget_find(KviFrame *f) } /* - @doc: dockwidget.show + @doc: trayicon.show @type: command @title: - dockwidget.show + trayicon.show @short: Shows the dock widget for the current frame window @keyterms: dock widget , system tray @syntax: - dockwidget.show + trayicon.show @description: Shows the dock widget for the current frame window.[br] The dock widget is a small widget that docks in the KDE panel.[br] @@ -512,7 +512,7 @@ static KviTrayIcon * 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[/cmd] + [cmd]trayicon.hide[/cmd] */ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) @@ -526,19 +526,19 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c) } /* - @doc: dockwidget.hide + @doc: trayicon.hide @type: command @title: - dockwidget.hide + trayicon.hide @short: Hides the dock widget for the current frame window @syntax: - dockwidget.hide + trayicon.hide @description: Hides the dock widget for the current frame window @seealso: - [cmd]dockwidget.show[/cmd] + [cmd]trayicon.show[/cmd] */ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) @@ -554,19 +554,19 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c) } /* - @doc: dockwidget.hidewindow + @doc: trayicon.hidewindow @type: command @title: - dockwidget.hidewindow + trayicon.hidewindow @short: Returns the state of the dock widget @syntax: - dockwidget.hidewindow + trayicon.hidewindow @description: Hides the window, assotiated with dockwidget @seealso: - [cmd]dockwidget.show[/cmd], [cmd]dockwidget.hide[/cmd] + [cmd]trayicon.show[/cmd], [cmd]trayicon.hide[/cmd] */ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) @@ -580,11 +580,11 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) } /* - @doc: dockwidget.isVisible + @doc: trayicon.isVisible @type: function @title: - $dockwidget.isVisible + $trayicon.isVisible @short: Returns the state of the dock widget @syntax: @@ -592,7 +592,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c) @description: Returns 1 if the dock widget is actually visible , 0 otherwise. @seealso: - [cmd]dockwidget.show[/cmd] + [cmd]trayicon.show[/cmd] */ static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c) @@ -674,7 +674,7 @@ KVIRC_MODULE( "KVIrc dock widget implementation", "4.0.0", "Szymon Stefanek <pragma at kvirc dot net> and Alexey Uzhva <alexey at kvirc dot ru>", - "exports the /dockwidget.* interface\n", + "exports the /trayicon.* interface\n", dockwidget_module_init , dockwidget_module_can_unload, 0, |