diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index 4c6b1a981..9a89a0ac0 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) # SUBDIRS = core interfaces ui buttons plugins . SUBDIRS = core interfaces ui buttons . -bin_PROGRAMS = kshowdesktop +bin_PROGRAMS = lib_LTLIBRARIES = kdeinit_LTLIBRARIES = kicker.la @@ -15,9 +15,6 @@ kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ kicker_la_SOURCES = dummy.cpp kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kshowdesktop_SOURCES = kshowdesktop.cpp -kshowdesktop_LDFLAGS = $(all_libraries) $(kicker_la_LIBADD) - autostart_DATA = panel.desktop autostartdir = $(datadir)/autostart diff --git a/kicker/kicker/kshowdesktop.cpp b/kicker/kicker/kshowdesktop.cpp deleted file mode 100644 index af5958de4..000000000 --- a/kicker/kicker/kshowdesktop.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/***************************************************************** - -Copyright (c) 2010 Timothy Pearson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -******************************************************************/ - -#include - -#include "core/showdesktop.h" - -int main() -{ - bool isDesktopShown; - isDesktopShown = ShowDesktop::the()->desktopShowing(); - ShowDesktop::the()->showDesktop(!isDesktopShown); -} \ No newline at end of file diff --git a/kwin/kcmkwin/showdesktop.desktop b/kwin/kcmkwin/showdesktop.desktop index 459bc035b..16c5566bc 100644 --- a/kwin/kcmkwin/showdesktop.desktop +++ b/kwin/kcmkwin/showdesktop.desktop @@ -126,7 +126,7 @@ Comment[vi]=Một nút cho phép bạn truy cập ngay đến màn hình nền m Comment[wa]=On boton ki dene raddimint accès å scribanne cwand il est tchôkî Comment[zh_CN]=按下可快速访问桌面的按钮 Comment[zh_TW]=按下去能快速顯示桌面的按鈕 -Exec=kshowdesktop +Exec=dcop kicker $(dcop kicker qt objects | grep ShowDesktop | head -n 1 | tr '(' ' ' | awk '{ print $1; }') toggle Icon=desktop Type=Application Categories=Qt;KDE;X-KDE-settings-desktop; \ No newline at end of file