From 0140d761d542c3cad2dc097397eb8e42251b278f Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 26 Jun 2012 10:56:56 -0500 Subject: Update TDE menu to reduce clutter and eliminate conflicts with KDE4. This partially resolves bug report 977. --- applnk/CMakeLists.txt | 9 +++++++++ applnk/Makefile.am | 27 ++++++++++++++++++++++++++- tdeprint/kjobviewer/kjobviewer.desktop | 2 +- tdeprint/tdeprintfax/tdeprintfax.desktop | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/applnk/CMakeLists.txt b/applnk/CMakeLists.txt index 106f463e8..91f1ae78d 100644 --- a/applnk/CMakeLists.txt +++ b/applnk/CMakeLists.txt @@ -48,4 +48,13 @@ install( FILES tde-utilities-peripherals.directory tde-utilities-file.directory tde-utilities-pim.directory tde-development-translation.directory tde-development-webdevelopment.directory + kde-development-webdevelopment.directory kde-development.directory + kde-editors.directory kde-edu-languages.directory kde-edu-mathematics.directory + kde-edu-miscellaneous.directory kde-edu-science.directory kde-games-arcade.directory + kde-games-board.directory kde-games-card.directory kde-games-kids.directory + kde-games-strategy.directory kde-games.directory kde-graphics.directory + kde-internet.directory kde-multimedia.directory kde-office.directory + kde-settingsmenu.directory kde-system.directory kde-toys.directory + kde-utilities-accessibility.directory kde-utilities-desktop.directory + kde-utilities-pim.directory kde-utilities.directory tde-office-pim.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} ) diff --git a/applnk/Makefile.am b/applnk/Makefile.am index 7b4049e22..f33dde84a 100644 --- a/applnk/Makefile.am +++ b/applnk/Makefile.am @@ -52,7 +52,32 @@ tde-utilities-peripherals.directory \ tde-utilities-file.directory \ tde-utilities-pim.directory \ tde-development-translation.directory \ -tde-development-webdevelopment.directory +tde-development-webdevelopment.directory \ +kde-development-webdevelopment.directory \ +kde-development.directory \ +kde-editors.directory \ +kde-edu-languages.directory \ +kde-edu-mathematics.directory \ +kde-edu-miscellaneous.directory \ +kde-edu-science.directory \ +kde-games-arcade.directory \ +kde-games-board.directory \ +kde-games-card.directory \ +kde-games-kids.directory \ +kde-games-strategy.directory \ +kde-games.directory \ +kde-graphics.directory \ +kde-internet.directory \ +kde-multimedia.directory \ +kde-office.directory \ +kde-settingsmenu.directory \ +kde-system.directory \ +kde-toys.directory \ +kde-utilities-accessibility.directory \ +kde-utilities-desktop.directory \ +kde-utilities-pim.directory \ +kde-utilities.directory \ +tde-office-pim.directory install-data-local: for file in `cat $(srcdir)/old_desktop_files` ; do \ diff --git a/tdeprint/kjobviewer/kjobviewer.desktop b/tdeprint/kjobviewer/kjobviewer.desktop index adafd26f4..0e736b1d3 100644 --- a/tdeprint/kjobviewer/kjobviewer.desktop +++ b/tdeprint/kjobviewer/kjobviewer.desktop @@ -89,4 +89,4 @@ GenericName[zh_CN]=打印任务 GenericName[zh_TW]=列印工作 X-DCOP-ServiceType=Unique -Categories=Qt;TDE;Utility +Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals; diff --git a/tdeprint/tdeprintfax/tdeprintfax.desktop b/tdeprint/tdeprintfax/tdeprintfax.desktop index 96c03334b..8cee446fb 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.desktop +++ b/tdeprint/tdeprintfax/tdeprintfax.desktop @@ -94,4 +94,4 @@ Exec=tdeprintfax -caption "%c" %i %m %u Icon=tdeprintfax Terminal=false X-DCOP-ServiceType=Multi -Categories=Qt;TDE;Utility +Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals; -- cgit v1.2.1