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

Avoids potential conflicts with other XDG menuing schemes.
Partially resolves bug report 892.
pull/2/head
Darrell Anderson 12 years ago
parent a34c15dc83
commit 56f943b3df

@ -12,11 +12,11 @@
add_subdirectory( compat ) add_subdirectory( compat )
install( FILES 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} ) DESTINATION ${XDG_MENU_INSTALL_DIR} )
install( FILES install( FILES
kde-essential.menu tde-essential.menu
DESTINATION ${XDG_MENU_INSTALL_DIR}/applications-merged ) DESTINATION ${XDG_MENU_INSTALL_DIR}/applications-merged )
install( FILES install( FILES
@ -25,27 +25,27 @@ install( FILES
RENAME .directory ) RENAME .directory )
install( FILES install( FILES
kde-main.directory kde-development.directory kde-editors.directory tde-main.directory tde-development.directory tde-editors.directory
kde-edutainment.directory kde-games-arcade.directory tde-edutainment.directory tde-games-arcade.directory
kde-games-board.directory kde-games-card.directory tde-games-board.directory tde-games-card.directory
kde-games-kids.directory kde-games-roguelikes.directory tde-games-kids.directory tde-games-roguelikes.directory
kde-games-strategy.directory kde-games.directory tde-games-strategy.directory tde-games.directory
kde-graphics.directory kde-information.directory tde-graphics.directory tde-information.directory
kde-internet-terminal.directory kde-internet.directory tde-internet-terminal.directory tde-internet.directory
kde-more.directory kde-multimedia.directory kde-office.directory tde-more.directory tde-multimedia.directory tde-office.directory
kde-science.directory kde-settings-accessibility.directory tde-science.directory tde-settings-accessibility.directory
kde-settings-components.directory kde-settings-desktop.directory tde-settings-components.directory tde-settings-desktop.directory
kde-settings-looknfeel.directory kde-settings-network.directory tde-settings-looknfeel.directory tde-settings-network.directory
kde-settings-peripherals.directory kde-settings-hardware.directory tde-settings-peripherals.directory tde-settings-hardware.directory
kde-settings-power.directory kde-settings-security.directory tde-settings-power.directory tde-settings-security.directory
kde-settings-sound.directory kde-settings-system.directory tde-settings-sound.directory tde-settings-system.directory
kde-settings-webbrowsing.directory kde-settings.directory tde-settings-webbrowsing.directory tde-settings.directory
kde-settingsmenu.directory kde-system-screensavers.directory tde-settingsmenu.directory tde-system-screensavers.directory
kde-system-terminal.directory kde-system.directory tde-system-terminal.directory tde-system.directory
kde-toys.directory kde-unknown.directory tde-toys.directory tde-unknown.directory
kde-utilities-xutils.directory kde-utilities.directory tde-utilities-xutils.directory tde-utilities.directory
kde-utilities-accessibility.directory kde-utilities-desktop.directory tde-utilities-accessibility.directory tde-utilities-desktop.directory
kde-utilities-peripherals.directory kde-utilities-file.directory tde-utilities-peripherals.directory tde-utilities-file.directory
kde-utilities-pim.directory kde-development-translation.directory tde-utilities-pim.directory tde-development-translation.directory
kde-development-webdevelopment.directory tde-development-webdevelopment.directory
DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} ) DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )

@ -1,58 +1,58 @@
SUBDIRS = compat 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_mergedmenudir = $(xdg_menudir)/applications-merged
xdg_directory_DATA = \ xdg_directory_DATA = \
kde-main.directory \ tde-main.directory \
kde-development.directory \ tde-development.directory \
kde-editors.directory \ tde-editors.directory \
kde-edutainment.directory \ tde-edutainment.directory \
kde-games-arcade.directory \ tde-games-arcade.directory \
kde-games-board.directory \ tde-games-board.directory \
kde-games-card.directory \ tde-games-card.directory \
kde-games-kids.directory \ tde-games-kids.directory \
kde-games-roguelikes.directory \ tde-games-roguelikes.directory \
kde-games-strategy.directory \ tde-games-strategy.directory \
kde-games.directory \ tde-games.directory \
kde-graphics.directory \ tde-graphics.directory \
kde-information.directory \ tde-information.directory \
kde-internet-terminal.directory \ tde-internet-terminal.directory \
kde-internet.directory \ tde-internet.directory \
kde-more.directory \ tde-more.directory \
kde-multimedia.directory \ tde-multimedia.directory \
kde-office.directory \ tde-office.directory \
kde-science.directory \ tde-science.directory \
kde-settings-accessibility.directory \ tde-settings-accessibility.directory \
kde-settings-components.directory \ tde-settings-components.directory \
kde-settings-desktop.directory \ tde-settings-desktop.directory \
kde-settings-looknfeel.directory \ tde-settings-looknfeel.directory \
kde-settings-network.directory \ tde-settings-network.directory \
kde-settings-peripherals.directory \ tde-settings-peripherals.directory \
kde-settings-hardware.directory \ tde-settings-hardware.directory \
kde-settings-power.directory \ tde-settings-power.directory \
kde-settings-security.directory \ tde-settings-security.directory \
kde-settings-sound.directory \ tde-settings-sound.directory \
kde-settings-system.directory \ tde-settings-system.directory \
kde-settings-webbrowsing.directory \ tde-settings-webbrowsing.directory \
kde-settings.directory \ tde-settings.directory \
kde-settingsmenu.directory \ tde-settingsmenu.directory \
kde-system-screensavers.directory \ tde-system-screensavers.directory \
kde-system-terminal.directory \ tde-system-terminal.directory \
kde-system.directory \ tde-system.directory \
kde-toys.directory \ tde-toys.directory \
kde-unknown.directory \ tde-unknown.directory \
kde-utilities-xutils.directory \ tde-utilities-xutils.directory \
kde-utilities.directory \ tde-utilities.directory \
kde-utilities-accessibility.directory \ tde-utilities-accessibility.directory \
kde-utilities-desktop.directory \ tde-utilities-desktop.directory \
kde-utilities-peripherals.directory \ tde-utilities-peripherals.directory \
kde-utilities-file.directory \ tde-utilities-file.directory \
kde-utilities-pim.directory \ tde-utilities-pim.directory \
kde-development-translation.directory \ tde-development-translation.directory \
kde-development-webdevelopment.directory tde-development-webdevelopment.directory
install-data-local: install-data-local:
for file in `cat $(srcdir)/old_desktop_files` ; do \ for file in `cat $(srcdir)/old_desktop_files` ; do \

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

@ -3,7 +3,7 @@
<Menu> <Menu>
<Name>Information</Name> <Name>Information</Name>
<Directory>kde-information.directory</Directory> <Directory>tde-information.directory</Directory>
<Include> <Include>
<Category>X-KDE-information</Category> <Category>X-KDE-information</Category>
</Include> </Include>

@ -3,7 +3,7 @@
<Menu> <Menu>
<Name>ScreenSavers</Name> <Name>ScreenSavers</Name>
<Directory>kde-system-screensavers.directory</Directory> <Directory>tde-system-screensavers.directory</Directory>
<Include> <Include>
<Category>X-KDE-ScreenSaver</Category> <Category>X-KDE-ScreenSaver</Category>
</Include> </Include>

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