From 2d10f1e09471790795a1b39884d4d972020d6f7b Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 27 Sep 2010 02:07:33 +0000 Subject: Fix broken show desktop shortcut git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1180115 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/kicker/buttons/Makefile.am | 5 +++++ kicker/kicker/buttons/kshowdesktop.cpp | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 kicker/kicker/buttons/kshowdesktop.cpp (limited to 'kicker') diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 1ec3d42d6..e100025e6 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/kicker/kicker/buttons/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I$(srcdir)/../core -I$(srcdir)/../../libkicker -I../../libkicker \ -I../ui -I$(srcdir)/../ui -I$(top_srcdir)/libkonq $(all_includes) $(LIBBEAGLE_CFLAGS) $(GLIB_CFLAGS) +bin_PROGRAMS = kshowdesktop noinst_LTLIBRARIES = libkicker_buttons.la libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \ @@ -13,6 +14,10 @@ libkicker_buttons_la_LDFLAGS = $(all_libraries) libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB) libkicker_buttons_la_METASOURCES = AUTO +kshowdesktop_SOURCES = kshowdesktop.cpp +kshowdesktop_LDFLAGS = $(all_libraries) +kshowdesktop_LDADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB) + desktopmenu_DATA = bookmarks.desktop browser.desktop desktop.desktop \ exec.desktop kmenu.desktop windowlist.desktop desktopmenudir = $(kde_datadir)/kicker/builtins diff --git a/kicker/kicker/buttons/kshowdesktop.cpp b/kicker/kicker/buttons/kshowdesktop.cpp new file mode 100644 index 000000000..4f9dcd2e2 --- /dev/null +++ b/kicker/kicker/buttons/kshowdesktop.cpp @@ -0,0 +1,41 @@ +/***************************************************************** + +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 + +#include +#include +#include +#include + +#include "showdesktop.h" +#include "kicker.h" +#include "kickerSettings.h" + +int main() +{ + bool isDesktopShown; + isDesktopShown = ShowDesktop::the()->desktopShowing(); + ShowDesktop::the()->showDesktop(!isDesktopShown); +} \ No newline at end of file -- cgit v1.2.1