Ticket #4446: patch

build/jam/HaikuImage

@@ -648 +648 @@
 AddFilesToHaikuImage system add-ons media plugins
     : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
 AddFilesToHaikuImage system add-ons Tracker
-    : FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
-    Open\ Terminal-T ZipOMatic-Z ;
+    : FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder
+    Open\ Terminal ZipOMatic ;
 AddSymlinkToHaikuImage system add-ons Tracker
-    : /boot/system/preferences/Backgrounds : Background-B ;
+    : /boot/system/preferences/Backgrounds : Background ;
 AddSymlinkToHaikuImage system add-ons Tracker
-    : /boot/system/apps/TextSearch : TextSearch-G ;
+    : /boot/system/apps/TextSearch : TextSearch ;
 AddSymlinkToHaikuImage system add-ons Tracker
-    : /boot/system/apps/DiskUsage : DiskUsage-I ;
+    : /boot/system/apps/DiskUsage : DiskUsage ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : Background : string : _trk/shortcut : B ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : TextSearch : string : _trk/shortcut : G ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : DiskUsage : string : _trk/shortcut : I ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : FileType : string : _trk/shortcut : F ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : Open\ Terminal : string : _trk/shortcut : T ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : Open\ Target\ Folder : string : _trk/shortcut : O ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : Mark\ as\ Read : string : _trk/shortcut : R ;
+AddAttributeToHaikuImage system add-ons Tracker
+    : ZipOMatic : string : _trk/shortcut : Z ;
 AddFilesToHaikuImage system add-ons input_server devices
     : <input>keyboard <input>mouse <input>tablet <input>wacom ;
 AddFilesToHaikuImage system add-ons input_server filters

build/jam/ImageRules

@@ -216 +216 @@
     return ;
 }
 
+rule AddAttributeToContainer container : directoryTokens : file : attrType
+    : attrName : value
+{
+    local containerGrist =
+        [ on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_CONTAINER_GRIST) ] ;
+
+    local directory = [ AddDirectoryToContainer $(container)
+        : $(directoryTokens) ] ;
+
+    directory = $(directory:G=$(containerGrist)) ;
+
+    local attribute = $(directory)/$(file) ;
+    ATTR_NAME on $(attribute) = $(attrName) ;
+    ATTR_TYPE on $(attribute) = $(attrType) ;
+    ATTR_VALUE on $(attribute) = $(value) ;
+    ATTRIBUTES_TO_INSTALL on $(directory) += $(attribute) ;
+}
+
 rule AddSymlinkToContainer container : directoryTokens : linkTarget : linkName
 {
     # AddSymlinkToContainer <container> : <directory> : <link target>
@@ -550 +568 @@
             AddDirectoryToContainerCopyFilesScript $(targetDir)
                 : $(initScript) ;
         }
+
+        local attributes = [ on $(dir) return $(ATTRIBUTES_TO_INSTALL) ] ;
+        local attribute ;
+        for attribute in $(attributes) {
+            Depends $(script) : $(attribute) ;
+            Depends $(attribute) : $(initScript) $(serializationDependency) ;
+            AddAttributeToContainerCopyFilesScript $(attribute)
+                : $(initScript) ;
+        }
     }
 }
 
@@ -573 +600 @@
     echo \$ln -sfn "\"$(SYMLINK_TARGET)\"" "\"\${tPrefix}$(1:G=)\"" >> $(2[1])
 }
 
+actions AddAttributeToContainerCopyFilesScript
+{
+    echo tempAttrs=\"\$tmpDir/$(1:B)\" >> $(2[1])
+    echo \$rmAttrs -f \"\$tempAttrs\" >> $(2[1])
+    echo touch \"\$tempAttrs\" >> $(2[1])
+    echo \$addattr -t $(ATTR_TYPE) $(ATTR_NAME) $(ATTR_VALUE) \"\$tempAttrs\" >> $(2[1])
+    echo \$copyAttrs \"\${sPrefix}\$tempAttrs\" "\"\${tPrefix}$(1:G=)\"" >> $(2[1])
+}
 
 actions AddDirectoryToContainerCopyFilesScript
 {
@@ -693 +728 @@
         : $(linkTarget) : $(linkName) ;
 }
 
+rule AddAttributeToHaikuImage directoryTokens : file : attrType : attrName : value
+{
+    AddAttributeToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(directoryTokens)
+        : $(file) : $(attrType) : $(attrName) : $(value) ;
+}
+
 rule FSymlinksInHaikuImageDirectory directoryTokens
 {
     return [ FSymlinksInContainerDirectory $(HAIKU_IMAGE_CONTAINER_NAME)

src/add-ons/tracker/filetype/Jamfile

@@ -3 +3 @@
 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

src/add-ons/tracker/mark_as/Jamfile

@@ -5 +5 @@
 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
 ;

src/add-ons/tracker/opentargetfolder/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src add-ons tracker opentargetfolder ;
 
-Application Open\ Target\ Folder-O : 
+Application Open\ Target\ Folder : 
     opentargetfolder.cpp
 
     : be tracker $(TARGET_LIBSUPC++)

src/add-ons/tracker/openterminal/Jamfile

@@ -2 +2 @@
 
 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++)

src/add-ons/tracker/zipomatic/Jamfile

@@ -2 +2 @@
 
 UsePrivateHeaders shared ;
 
-Application ZipOMatic-Z :
+Application ZipOMatic :
     GenericThread.cpp
     ZipOMatic.cpp
     ZipOMaticActivity.cpp
@@ -13 +13 @@
     : ZipOMatic.rdef
 ;
 
-DoCatalogs ZipOMatic-Z :
+DoCatalogs ZipOMatic :
     x-vnd.haiku.zip-o-matic
     :
     ZipOMatic.cpp

src/apps/diskusage/Jamfile

@@ -28 +28 @@
     StatusView.cpp
     VolumeView.cpp
 ;
-

src/kits/tracker/Attributes.h

@@ -51 +51 @@
 #define kAttrAppVersion                     "_trk/app_version"
 #define kAttrSystemVersion                  "_trk/system_version"
 #define kAttrOpenWithRelation               "_trk/open_with_relation"
+#define kAttrShortcut                       "_trk/shortcut"
 
 // private attributes
 #define kAttrWindowFrame                    "_trk/windframe"

src/kits/tracker/ContainerWindow.cpp

@@ -577 +577 @@
     fIsTrash(false),
     fInTrash(false),
     fIsPrinters(false),
+    fIsAddons(false),
     fContainerWindowFlags(containerWindowFlags),
     fBackgroundImage(NULL),
     fSavedZoomRect(0, 0, -1, -1),
@@ -766 +767 @@
         fIsTrash = model->IsTrash();
         fInTrash = FSInTrashDir(model->EntryRef());
         fIsPrinters = FSIsPrintersDir(&entry);
+        fIsAddons = FSIsAddonsDir(&entry);
     }
 }
 
@@ -3011 +3013 @@
             }
         }
 
+        BNode node(model->EntryRef());
+        uint32 key = '\0';
         char name[B_FILE_NAME_LENGTH];
-        uint32 key;
-        StripShortcut(model, name, key);
+        if (node.ReadAttr(kAttrShortcut, 
+                B_CHAR_TYPE, 0, &key, 1) > 0) {
+            strlcpy(name, model->Name(), B_FILE_NAME_LENGTH);
+        } else
+            StripShortcut(model, name, key);
 
         // do a uniqueness check
         if (uniqueList->EachElement(MatchOne, name)) {
@@ -3354 +3361 @@
             B_STRING_TYPE, 225, B_ALIGN_LEFT, false, false));
     }
 
+    if (IsAddonsDir()) {
+        menu->AddItem(NewAttributeMenuItem(B_TRANSLATE("Shortcut"),
+            kAttrShortcut, B_CHAR_TYPE, 60, B_ALIGN_LEFT, true,
+            false));
+    }
+
 #ifdef OWNER_GROUP_ATTRIBUTES
     menu->AddItem(NewAttributeMenuItem(B_TRANSLATE("Owner"), kAttrStatOwner,
         B_STRING_TYPE, 60, B_ALIGN_LEFT, false, true));

src/kits/tracker/ContainerWindow.h

@@ -116 +116 @@
         bool IsTrash() const;
         bool InTrash() const;
         bool IsPrintersDir() const;
+        bool IsAddonsDir() const;
 
         virtual bool IsShowing(const node_ref*) const;
         virtual bool IsShowing(const entry_ref*) const;
@@ -287 +288 @@
         bool fIsTrash;
         bool fInTrash;
         bool fIsPrinters;
+        bool fIsAddons;
 
         uint32 fContainerWindowFlags;
         BackgroundImage* fBackgroundImage;
@@ -390 +392 @@
     return fIsPrinters;
 }
 
+inline bool
+BContainerWindow::IsAddonsDir() const
+{
+    return fIsAddons;
+}
+
 inline void
 BContainerWindow::SetUpDiskMenu(BMenu*)
 {

src/kits/tracker/DeskWindow.cpp

@@ -96 +96 @@
     BMessage* runAddon = new BMessage(kLoadAddOn);
     runAddon->AddRef("refs", model->EntryRef());
 
+    TTracker::WatchNode(model->NodeRef(), B_WATCH_ATTR, params->window);
     params->window->AddShortcut(shortcut, B_OPTION_KEY | B_COMMAND_KEY,
         runAddon);
     params->currentAddonShortcuts->insert(shortcut);

src/kits/tracker/FSUtils.cpp

@@ -2657 +2657 @@
 
 
 bool
+FSIsAddonsDir(const BEntry* entry)
+{
+    BEntry parent;
+    char name[B_FILE_NAME_LENGTH];
+    if (entry->GetName(name) != B_OK || entry->GetParent(&parent) != B_OK)
+        return false;
+    return strcmp(name, "Tracker") == 0
+        && (FSIsDirFlavor(&parent, B_SYSTEM_ADDONS_DIRECTORY)
+            || FSIsDirFlavor(&parent, B_COMMON_ADDONS_DIRECTORY)
+            || FSIsDirFlavor(&parent, B_USER_ADDONS_DIRECTORY));
+}
+
+
+bool
 DirectoryMatchesOrContains(const BEntry* entry, directory_which which)
 {
     BPath path;

src/kits/tracker/FSUtils.h

@@ -176 +176 @@
 _IMPEXP_TRACKER bool FSIsDeskDir(const BEntry*);
 _IMPEXP_TRACKER bool FSIsHomeDir(const BEntry*);
 _IMPEXP_TRACKER bool FSIsRootDir(const BEntry*);
+_IMPEXP_TRACKER bool FSIsAddonsDir(const BEntry*);
 _IMPEXP_TRACKER void FSMoveToTrash(BObjectList<entry_ref>* srcList,
     BList* pointList = NULL, bool async = true);
     // Deprecated