From 41e6527c1f3ad44721041c02bb19eecc0a1198bd Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Thu, 11 Jul 2013 12:30:10 -0400 Subject: [PATCH] Tracker addons: strip shortcut from name, instead use resource --- src/add-ons/tracker/filetype/FileType.rdef | 1 + src/add-ons/tracker/filetype/Jamfile | 4 ++-- src/add-ons/tracker/mark_as/Jamfile | 4 ++-- src/add-ons/tracker/mark_as/MarkAsRead.rdef | 1 + src/add-ons/tracker/opentargetfolder/Jamfile | 2 +- src/add-ons/tracker/opentargetfolder/opentargetfolder.rdef | 2 ++ src/add-ons/tracker/openterminal/Jamfile | 4 ++-- src/add-ons/tracker/openterminal/OpenTerminal.rdef | 1 + src/add-ons/tracker/zipomatic/Jamfile | 4 ++-- src/add-ons/tracker/zipomatic/ZipOMatic.rdef | 1 + src/apps/diskusage/DiskUsage.rdef | 2 ++ src/apps/text_search/TextSearch.rdef | 1 + src/preferences/backgrounds/Backgrounds.rdef | 2 ++ 13 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/add-ons/tracker/filetype/FileType.rdef b/src/add-ons/tracker/filetype/FileType.rdef index f51396ce1c..329d14092b 100644 --- a/src/add-ons/tracker/filetype/FileType.rdef +++ b/src/add-ons/tracker/filetype/FileType.rdef @@ -110,3 +110,4 @@ resource mini_icon array { #endif // HAIKU_TARGET_PLATFORM_HAIKU +resource(100, "default_shortcut") "F"; diff --git a/src/add-ons/tracker/filetype/Jamfile b/src/add-ons/tracker/filetype/Jamfile index 8ca02274ce..f2209a6476 100644 --- a/src/add-ons/tracker/filetype/Jamfile +++ b/src/add-ons/tracker/filetype/Jamfile @@ -3,9 +3,9 @@ SubDir HAIKU_TOP src add-ons tracker filetype ; SetSubDirSupportedPlatformsBeOSCompatible ; # TODO: does not seem to work: -AddResources FileType-F : FileType.rdef ; +AddResources FileType : FileType.rdef ; -Addon FileType-F : +Addon FileType : FileType.cpp : be tracker diff --git a/src/add-ons/tracker/mark_as/Jamfile b/src/add-ons/tracker/mark_as/Jamfile index 0a22ea12b0..f8492aafc7 100644 --- a/src/add-ons/tracker/mark_as/Jamfile +++ b/src/add-ons/tracker/mark_as/Jamfile @@ -5,14 +5,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders mail ; AddResources Mark\ as… : MarkAs.rdef ; -AddResources Mark\ as\ Read-R : MarkAsRead.rdef ; +AddResources Mark\ as\ Read : MarkAsRead.rdef ; Addon Mark\ as… : MarkAs.cpp : be tracker $(TARGET_LIBSUPC++) libmail.so ; -Addon Mark\ as\ Read-R : +Addon Mark\ as\ Read : MarkAsRead.cpp : be tracker $(TARGET_LIBSUPC++) libmail.so ; diff --git a/src/add-ons/tracker/mark_as/MarkAsRead.rdef b/src/add-ons/tracker/mark_as/MarkAsRead.rdef index 8ebf49e3de..ec62047e1e 100644 --- a/src/add-ons/tracker/mark_as/MarkAsRead.rdef +++ b/src/add-ons/tracker/mark_as/MarkAsRead.rdef @@ -32,3 +32,4 @@ resource vector_icon { $"000A020105000A03010200" }; +resource(100, "default_shortcut") "R"; diff --git a/src/add-ons/tracker/opentargetfolder/Jamfile b/src/add-ons/tracker/opentargetfolder/Jamfile index c44dfd8560..0fcc931ed7 100644 --- a/src/add-ons/tracker/opentargetfolder/Jamfile +++ b/src/add-ons/tracker/opentargetfolder/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons tracker opentargetfolder ; -Application Open\ Target\ Folder-O : +Application Open\ Target\ Folder : opentargetfolder.cpp : be tracker $(TARGET_LIBSUPC++) diff --git a/src/add-ons/tracker/opentargetfolder/opentargetfolder.rdef b/src/add-ons/tracker/opentargetfolder/opentargetfolder.rdef index c9afdf1269..8d525a5ed6 100644 --- a/src/add-ons/tracker/opentargetfolder/opentargetfolder.rdef +++ b/src/add-ons/tracker/opentargetfolder/opentargetfolder.rdef @@ -92,3 +92,5 @@ resource mini_icon array { }; #endif // HAIKU_TARGET_PLATFORM_HAIKU + +resource(100, "default_shortcut") "O"; diff --git a/src/add-ons/tracker/openterminal/Jamfile b/src/add-ons/tracker/openterminal/Jamfile index 63f6c2641e..93a8d35437 100644 --- a/src/add-ons/tracker/openterminal/Jamfile +++ b/src/add-ons/tracker/openterminal/Jamfile @@ -2,9 +2,9 @@ SubDir HAIKU_TOP src add-ons tracker openterminal ; SetSubDirSupportedPlatformsBeOSCompatible ; -AddResources Open\ Terminal-T : OpenTerminal.rdef ; +AddResources Open\ Terminal : OpenTerminal.rdef ; -Addon Open\ Terminal-T : +Addon Open\ Terminal : OpenTerminal.cpp : be tracker $(TARGET_LIBSTDC++) diff --git a/src/add-ons/tracker/openterminal/OpenTerminal.rdef b/src/add-ons/tracker/openterminal/OpenTerminal.rdef index e413574c5d..fae9ae61e8 100644 --- a/src/add-ons/tracker/openterminal/OpenTerminal.rdef +++ b/src/add-ons/tracker/openterminal/OpenTerminal.rdef @@ -42,3 +42,4 @@ resource vector_icon { $"B30CB30C0A0C0110000A0B010F2032290A09010D2032BA450A09010D2036BB11" }; +resource("default_shortcut") "T"; diff --git a/src/add-ons/tracker/zipomatic/Jamfile b/src/add-ons/tracker/zipomatic/Jamfile index f974e054c1..4c84ea6f7d 100644 --- a/src/add-ons/tracker/zipomatic/Jamfile +++ b/src/add-ons/tracker/zipomatic/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons tracker zipomatic ; UsePrivateHeaders shared ; -Application ZipOMatic-Z : +Application ZipOMatic : GenericThread.cpp ZipOMatic.cpp ZipOMaticActivity.cpp @@ -13,7 +13,7 @@ Application ZipOMatic-Z : : ZipOMatic.rdef ; -DoCatalogs ZipOMatic-Z : +DoCatalogs ZipOMatic : x-vnd.haiku.zip-o-matic : ZipOMatic.cpp diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.rdef b/src/add-ons/tracker/zipomatic/ZipOMatic.rdef index 052f62ecc4..d817c0e012 100644 --- a/src/add-ons/tracker/zipomatic/ZipOMatic.rdef +++ b/src/add-ons/tracker/zipomatic/ZipOMatic.rdef @@ -59,3 +59,4 @@ resource vector_icon { $"0111000A0B010E000A0C010F000A0B011000" }; +resource(100, "default_shortcut") "Z"; diff --git a/src/apps/diskusage/DiskUsage.rdef b/src/apps/diskusage/DiskUsage.rdef index 0205feb105..7e5158c423 100644 --- a/src/apps/diskusage/DiskUsage.rdef +++ b/src/apps/diskusage/DiskUsage.rdef @@ -49,3 +49,5 @@ resource vector_icon { $"18001501178600040A01010B1815FF01178400040A08010C000A09010D000A0A" $"010E00" }; + +resource(100, "default_shortcut") "I"; diff --git a/src/apps/text_search/TextSearch.rdef b/src/apps/text_search/TextSearch.rdef index 3bad6e533e..7beffcd4dc 100644 --- a/src/apps/text_search/TextSearch.rdef +++ b/src/apps/text_search/TextSearch.rdef @@ -45,3 +45,4 @@ resource vector_icon { $"000A09010C023C00000000000000003C000048B00048F000" }; +resource(100, "default_shortcut") "G"; diff --git a/src/preferences/backgrounds/Backgrounds.rdef b/src/preferences/backgrounds/Backgrounds.rdef index 668c8238b8..2099c292d5 100644 --- a/src/preferences/backgrounds/Backgrounds.rdef +++ b/src/preferences/backgrounds/Backgrounds.rdef @@ -58,3 +58,5 @@ resource vector_icon { $"000A0D0114000A00011500" }; +resource(100, "default_shortcut") "B"; +