Browse Source

Change naming prefix of XDG menu related files from kde -> tde.

Avoids potential conflicts with other XDG menuing schemes.
Partially resolves bug report 892.
tags/r14.0.0
Darrell Anderson 8 years ago
parent
commit
56f943b3df
53 changed files with 94 additions and 94 deletions
  1. +25
    -25
      applnk/CMakeLists.txt
  2. +49
    -49
      applnk/Makefile.am
  3. +0
    -0
      applnk/tde-development-translation.directory
  4. +0
    -0
      applnk/tde-development-webdevelopment.directory
  5. +0
    -0
      applnk/tde-development.directory
  6. +0
    -0
      applnk/tde-editors.directory
  7. +0
    -0
      applnk/tde-edutainment.directory
  8. +6
    -6
      applnk/tde-essential.menu
  9. +0
    -0
      applnk/tde-games-arcade.directory
  10. +0
    -0
      applnk/tde-games-board.directory
  11. +0
    -0
      applnk/tde-games-card.directory
  12. +0
    -0
      applnk/tde-games-kids.directory
  13. +0
    -0
      applnk/tde-games-roguelikes.directory
  14. +0
    -0
      applnk/tde-games-strategy.directory
  15. +0
    -0
      applnk/tde-games.directory
  16. +0
    -0
      applnk/tde-graphics.directory
  17. +0
    -0
      applnk/tde-information.directory
  18. +1
    -1
      applnk/tde-information.menu
  19. +0
    -0
      applnk/tde-internet-terminal.directory
  20. +0
    -0
      applnk/tde-internet.directory
  21. +0
    -0
      applnk/tde-main.directory
  22. +0
    -0
      applnk/tde-more.directory
  23. +0
    -0
      applnk/tde-multimedia.directory
  24. +0
    -0
      applnk/tde-office.directory
  25. +0
    -0
      applnk/tde-science.directory
  26. +1
    -1
      applnk/tde-screensavers.menu
  27. +0
    -0
      applnk/tde-settings-accessibility.directory
  28. +0
    -0
      applnk/tde-settings-components.directory
  29. +0
    -0
      applnk/tde-settings-desktop.directory
  30. +0
    -0
      applnk/tde-settings-hardware.directory
  31. +0
    -0
      applnk/tde-settings-looknfeel.directory
  32. +0
    -0
      applnk/tde-settings-network.directory
  33. +0
    -0
      applnk/tde-settings-peripherals.directory
  34. +0
    -0
      applnk/tde-settings-power.directory
  35. +0
    -0
      applnk/tde-settings-security.directory
  36. +0
    -0
      applnk/tde-settings-sound.directory
  37. +0
    -0
      applnk/tde-settings-system.directory
  38. +0
    -0
      applnk/tde-settings-webbrowsing.directory
  39. +0
    -0
      applnk/tde-settings.directory
  40. +12
    -12
      applnk/tde-settings.menu
  41. +0
    -0
      applnk/tde-settingsmenu.directory
  42. +0
    -0
      applnk/tde-system-screensavers.directory
  43. +0
    -0
      applnk/tde-system-terminal.directory
  44. +0
    -0
      applnk/tde-system.directory
  45. +0
    -0
      applnk/tde-toys.directory
  46. +0
    -0
      applnk/tde-unknown.directory
  47. +0
    -0
      applnk/tde-utilities-accessibility.directory
  48. +0
    -0
      applnk/tde-utilities-desktop.directory
  49. +0
    -0
      applnk/tde-utilities-file.directory
  50. +0
    -0
      applnk/tde-utilities-peripherals.directory
  51. +0
    -0
      applnk/tde-utilities-pim.directory
  52. +0
    -0
      applnk/tde-utilities-xutils.directory
  53. +0
    -0
      applnk/tde-utilities.directory

+ 25
- 25
applnk/CMakeLists.txt View File

@@ -12,11 +12,11 @@
add_subdirectory( compat )

install( FILES
kde-settings.menu kde-information.menu kde-screensavers.menu
tde-settings.menu tde-information.menu tde-screensavers.menu
DESTINATION ${XDG_MENU_INSTALL_DIR} )

install( FILES
kde-essential.menu
tde-essential.menu
DESTINATION ${XDG_MENU_INSTALL_DIR}/applications-merged )

install( FILES
@@ -25,27 +25,27 @@ install( FILES
RENAME .directory )

install( FILES
kde-main.directory kde-development.directory kde-editors.directory
kde-edutainment.directory kde-games-arcade.directory
kde-games-board.directory kde-games-card.directory
kde-games-kids.directory kde-games-roguelikes.directory
kde-games-strategy.directory kde-games.directory
kde-graphics.directory kde-information.directory
kde-internet-terminal.directory kde-internet.directory
kde-more.directory kde-multimedia.directory kde-office.directory
kde-science.directory kde-settings-accessibility.directory
kde-settings-components.directory kde-settings-desktop.directory
kde-settings-looknfeel.directory kde-settings-network.directory
kde-settings-peripherals.directory kde-settings-hardware.directory
kde-settings-power.directory kde-settings-security.directory
kde-settings-sound.directory kde-settings-system.directory
kde-settings-webbrowsing.directory kde-settings.directory
kde-settingsmenu.directory kde-system-screensavers.directory
kde-system-terminal.directory kde-system.directory
kde-toys.directory kde-unknown.directory
kde-utilities-xutils.directory kde-utilities.directory
kde-utilities-accessibility.directory kde-utilities-desktop.directory
kde-utilities-peripherals.directory kde-utilities-file.directory
kde-utilities-pim.directory kde-development-translation.directory
kde-development-webdevelopment.directory
tde-main.directory tde-development.directory tde-editors.directory
tde-edutainment.directory tde-games-arcade.directory
tde-games-board.directory tde-games-card.directory
tde-games-kids.directory tde-games-roguelikes.directory
tde-games-strategy.directory tde-games.directory
tde-graphics.directory tde-information.directory
tde-internet-terminal.directory tde-internet.directory
tde-more.directory tde-multimedia.directory tde-office.directory
tde-science.directory tde-settings-accessibility.directory
tde-settings-components.directory tde-settings-desktop.directory
tde-settings-looknfeel.directory tde-settings-network.directory
tde-settings-peripherals.directory tde-settings-hardware.directory
tde-settings-power.directory tde-settings-security.directory
tde-settings-sound.directory tde-settings-system.directory
tde-settings-webbrowsing.directory tde-settings.directory
tde-settingsmenu.directory tde-system-screensavers.directory
tde-system-terminal.directory tde-system.directory
tde-toys.directory tde-unknown.directory
tde-utilities-xutils.directory tde-utilities.directory
tde-utilities-accessibility.directory tde-utilities-desktop.directory
tde-utilities-peripherals.directory tde-utilities-file.directory
tde-utilities-pim.directory tde-development-translation.directory
tde-development-webdevelopment.directory
DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )

+ 49
- 49
applnk/Makefile.am View File

@@ -1,58 +1,58 @@
SUBDIRS = compat

xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
xdg_menu_DATA = tde-settings.menu tde-information.menu tde-screensavers.menu

xdg_mergedmenu_DATA = kde-essential.menu
xdg_mergedmenu_DATA = tde-essential.menu
xdg_mergedmenudir = $(xdg_menudir)/applications-merged

xdg_directory_DATA = \
kde-main.directory \
kde-development.directory \
kde-editors.directory \
kde-edutainment.directory \
kde-games-arcade.directory \
kde-games-board.directory \
kde-games-card.directory \
kde-games-kids.directory \
kde-games-roguelikes.directory \
kde-games-strategy.directory \
kde-games.directory \
kde-graphics.directory \
kde-information.directory \
kde-internet-terminal.directory \
kde-internet.directory \
kde-more.directory \
kde-multimedia.directory \
kde-office.directory \
kde-science.directory \
kde-settings-accessibility.directory \
kde-settings-components.directory \
kde-settings-desktop.directory \
kde-settings-looknfeel.directory \
kde-settings-network.directory \
kde-settings-peripherals.directory \
kde-settings-hardware.directory \
kde-settings-power.directory \
kde-settings-security.directory \
kde-settings-sound.directory \
kde-settings-system.directory \
kde-settings-webbrowsing.directory \
kde-settings.directory \
kde-settingsmenu.directory \
kde-system-screensavers.directory \
kde-system-terminal.directory \
kde-system.directory \
kde-toys.directory \
kde-unknown.directory \
kde-utilities-xutils.directory \
kde-utilities.directory \
kde-utilities-accessibility.directory \
kde-utilities-desktop.directory \
kde-utilities-peripherals.directory \
kde-utilities-file.directory \
kde-utilities-pim.directory \
kde-development-translation.directory \
kde-development-webdevelopment.directory
tde-main.directory \
tde-development.directory \
tde-editors.directory \
tde-edutainment.directory \
tde-games-arcade.directory \
tde-games-board.directory \
tde-games-card.directory \
tde-games-kids.directory \
tde-games-roguelikes.directory \
tde-games-strategy.directory \
tde-games.directory \
tde-graphics.directory \
tde-information.directory \
tde-internet-terminal.directory \
tde-internet.directory \
tde-more.directory \
tde-multimedia.directory \
tde-office.directory \
tde-science.directory \
tde-settings-accessibility.directory \
tde-settings-components.directory \
tde-settings-desktop.directory \
tde-settings-looknfeel.directory \
tde-settings-network.directory \
tde-settings-peripherals.directory \
tde-settings-hardware.directory \
tde-settings-power.directory \
tde-settings-security.directory \
tde-settings-sound.directory \
tde-settings-system.directory \
tde-settings-webbrowsing.directory \
tde-settings.directory \
tde-settingsmenu.directory \
tde-system-screensavers.directory \
tde-system-terminal.directory \
tde-system.directory \
tde-toys.directory \
tde-unknown.directory \
tde-utilities-xutils.directory \
tde-utilities.directory \
tde-utilities-accessibility.directory \
tde-utilities-desktop.directory \
tde-utilities-peripherals.directory \
tde-utilities-file.directory \
tde-utilities-pim.directory \
tde-development-translation.directory \
tde-development-webdevelopment.directory

install-data-local:
for file in `cat $(srcdir)/old_desktop_files` ; do \


applnk/kde-development-translation.directory → applnk/tde-development-translation.directory View File


applnk/kde-development-webdevelopment.directory → applnk/tde-development-webdevelopment.directory View File


applnk/kde-development.directory → applnk/tde-development.directory View File


applnk/kde-editors.directory → applnk/tde-editors.directory View File


applnk/kde-edutainment.directory → applnk/tde-edutainment.directory View File


applnk/kde-essential.menu → applnk/tde-essential.menu View File

@@ -5,13 +5,13 @@
<!-- The following menus are hidden by default -->
<Menu>
<Name>Settings</Name>
<Directory>kde-settings.directory</Directory>
<MergeFile>../kde-settings.menu</MergeFile>
<Directory>tde-settings.directory</Directory>
<MergeFile>../tde-settings.menu</MergeFile>
</Menu>
<Menu>
<Name>Information</Name>
<Directory>kde-information.directory</Directory>
<MergeFile>../kde-information.menu</MergeFile>
<Directory>tde-information.directory</Directory>
<MergeFile>../tde-information.menu</MergeFile>
</Menu>
<Move>
<Old>Settings/Information</Old><New>Information</New>
@@ -20,8 +20,8 @@
<Name>System</Name>
<Menu>
<Name>ScreenSavers</Name>
<Directory>kde-system-screensavers.directory</Directory>
<MergeFile>../kde-screensavers.menu</MergeFile>
<Directory>tde-system-screensavers.directory</Directory>
<MergeFile>../tde-screensavers.menu</MergeFile>
</Menu>
</Menu>
</Menu>

applnk/kde-games-arcade.directory → applnk/tde-games-arcade.directory View File


applnk/kde-games-board.directory → applnk/tde-games-board.directory View File


applnk/kde-games-card.directory → applnk/tde-games-card.directory View File


applnk/kde-games-kids.directory → applnk/tde-games-kids.directory View File


applnk/kde-games-roguelikes.directory → applnk/tde-games-roguelikes.directory View File


applnk/kde-games-strategy.directory → applnk/tde-games-strategy.directory View File


applnk/kde-games.directory → applnk/tde-games.directory View File


applnk/kde-graphics.directory → applnk/tde-graphics.directory View File


applnk/kde-information.directory → applnk/tde-information.directory View File


applnk/kde-information.menu → applnk/tde-information.menu View File

@@ -3,7 +3,7 @@

<Menu>
<Name>Information</Name>
<Directory>kde-information.directory</Directory>
<Directory>tde-information.directory</Directory>
<Include>
<Category>X-KDE-information</Category>
</Include>

applnk/kde-internet-terminal.directory → applnk/tde-internet-terminal.directory View File


applnk/kde-internet.directory → applnk/tde-internet.directory View File


applnk/kde-main.directory → applnk/tde-main.directory View File


applnk/kde-more.directory → applnk/tde-more.directory View File


applnk/kde-multimedia.directory → applnk/tde-multimedia.directory View File


applnk/kde-office.directory → applnk/tde-office.directory View File


applnk/kde-science.directory → applnk/tde-science.directory View File


applnk/kde-screensavers.menu → applnk/tde-screensavers.menu View File

@@ -3,7 +3,7 @@

<Menu>
<Name>ScreenSavers</Name>
<Directory>kde-system-screensavers.directory</Directory>
<Directory>tde-system-screensavers.directory</Directory>
<Include>
<Category>X-KDE-ScreenSaver</Category>
</Include>

applnk/kde-settings-accessibility.directory → applnk/tde-settings-accessibility.directory View File


applnk/kde-settings-components.directory → applnk/tde-settings-components.directory View File


applnk/kde-settings-desktop.directory → applnk/tde-settings-desktop.directory View File


applnk/kde-settings-hardware.directory → applnk/tde-settings-hardware.directory View File


applnk/kde-settings-looknfeel.directory → applnk/tde-settings-looknfeel.directory View File


applnk/kde-settings-network.directory → applnk/tde-settings-network.directory View File


applnk/kde-settings-peripherals.directory → applnk/tde-settings-peripherals.directory View File


applnk/kde-settings-power.directory → applnk/tde-settings-power.directory View File


applnk/kde-settings-security.directory → applnk/tde-settings-security.directory View File


applnk/kde-settings-sound.directory → applnk/tde-settings-sound.directory View File


applnk/kde-settings-system.directory → applnk/tde-settings-system.directory View File


applnk/kde-settings-webbrowsing.directory → applnk/tde-settings-webbrowsing.directory View File


applnk/kde-settings.directory → applnk/tde-settings.directory View File


applnk/kde-settings.menu → applnk/tde-settings.menu View File

@@ -5,41 +5,41 @@
<Name>Settings</Name>
<Menu>
<Name>Accessibility</Name>
<Directory>kde-settings-accessibility.directory</Directory>
<Directory>tde-settings-accessibility.directory</Directory>
<Include>
<Category>X-KDE-settings-accessibility</Category>
</Include>
</Menu>
<Menu>
<Name>Components</Name>
<Directory>kde-settings-components.directory</Directory>
<Directory>tde-settings-components.directory</Directory>
<Include>
<Category>X-KDE-settings-components</Category>
</Include>
</Menu>
<Menu>
<Name>Desktop</Name>
<Directory>kde-settings-desktop.directory</Directory>
<Directory>tde-settings-desktop.directory</Directory>
<Include>
<Category>X-KDE-settings-desktop</Category>
</Include>
</Menu>
<Menu>
<Name>LookNFeel</Name>
<Directory>kde-settings-looknfeel.directory</Directory>
<Directory>tde-settings-looknfeel.directory</Directory>
<Include>
<Category>X-KDE-settings-looknfeel</Category>
</Include>
</Menu>
<Menu>
<Name>Network</Name>
<Directory>kde-settings-network.directory</Directory>
<Directory>tde-settings-network.directory</Directory>
<Include>
<Category>X-KDE-settings-network</Category>
</Include>
<Menu>
<Name>WebBrowsing</Name>
<Directory>kde-settings-webbrowsing.directory</Directory>
<Directory>tde-settings-webbrowsing.directory</Directory>
<Include>
<Category>X-KDE-settings-webbrowsing</Category>
</Include>
@@ -47,14 +47,14 @@
</Menu>
<Menu>
<Name>Hardware</Name>
<Directory>kde-settings-hardware.directory</Directory>
<Directory>tde-settings-hardware.directory</Directory>
<Include>
<Category>X-KDE-settings-peripherals</Category>
<Category>X-KDE-settings-hardware</Category>
</Include>
<Menu>
<Name>Information</Name>
<Directory>kde-settings-information.directory</Directory>
<Directory>tde-settings-information.directory</Directory>
<Include>
<Category>X-KDE-settings-information</Category>
</Include>
@@ -62,28 +62,28 @@
</Menu>
<Menu>
<Name>PowerControl</Name>
<Directory>kde-settings-power.directory</Directory>
<Directory>tde-settings-power.directory</Directory>
<Include>
<Category>X-KDE-settings-power</Category>
</Include>
</Menu>
<Menu>
<Name>Security</Name>
<Directory>kde-settings-security.directory</Directory>
<Directory>tde-settings-security.directory</Directory>
<Include>
<Category>X-KDE-settings-security</Category>
</Include>
</Menu>
<Menu>
<Name>Sound</Name>
<Directory>kde-settings-sound.directory</Directory>
<Directory>tde-settings-sound.directory</Directory>
<Include>
<Category>X-KDE-settings-sound</Category>
</Include>
</Menu>
<Menu>
<Name>System</Name>
<Directory>kde-settings-system.directory</Directory>
<Directory>tde-settings-system.directory</Directory>
<Include>
<Category>X-KDE-settings-system</Category>
</Include>

applnk/kde-settingsmenu.directory → applnk/tde-settingsmenu.directory View File


applnk/kde-system-screensavers.directory → applnk/tde-system-screensavers.directory View File


applnk/kde-system-terminal.directory → applnk/tde-system-terminal.directory View File


applnk/kde-system.directory → applnk/tde-system.directory View File


applnk/kde-toys.directory → applnk/tde-toys.directory View File


applnk/kde-unknown.directory → applnk/tde-unknown.directory View File


applnk/kde-utilities-accessibility.directory → applnk/tde-utilities-accessibility.directory View File


applnk/kde-utilities-desktop.directory → applnk/tde-utilities-desktop.directory View File


applnk/kde-utilities-file.directory → applnk/tde-utilities-file.directory View File


applnk/kde-utilities-peripherals.directory → applnk/tde-utilities-peripherals.directory View File


applnk/kde-utilities-pim.directory → applnk/tde-utilities-pim.directory View File


applnk/kde-utilities-xutils.directory → applnk/tde-utilities-xutils.directory View File


applnk/kde-utilities.directory → applnk/tde-utilities.directory View File


Loading…
Cancel
Save