[haiku-commits] r41148 - in haiku/trunk: build/jam data/common/boot/post_install src/apps/deskbar src/apps/mail src/kits/tracker

• From: jonas@xxxxxxxxxxx
• To: haiku-commits@xxxxxxxxxxxxx
• Date: Thu, 31 Mar 2011 09:31:57 +0200 (CEST)

Author: kirilla
Date: 2011-03-31 09:31:56 +0200 (Thu, 31 Mar 2011)
New Revision: 41148
Changeset: https://dev.haiku-os.org/changeset/41148

Added:
   haiku/trunk/data/common/boot/post_install/add_catalog_entry_attributes.sh
   haiku/trunk/src/apps/deskbar/LocalizedFolders.h
   haiku/trunk/src/apps/mail/LocalizedFolders.h
   haiku/trunk/src/kits/tracker/LocalizedFolders.h
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/apps/deskbar/Jamfile
   haiku/trunk/src/apps/mail/Jamfile
   haiku/trunk/src/kits/tracker/Jamfile
Log:
Localization of the most user-visible folders. Ignoring subfolders of common/, 
system/ and home/config/.

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2011-03-31 07:17:05 UTC (rev 41147)
+++ haiku/trunk/build/jam/HaikuImage    2011-03-31 07:31:56 UTC (rev 41148)
@@ -487,7 +487,8 @@
 AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
 
 # post install scripts and fresh install indicator file
-local postInstallFiles = mime_update.sh default_deskbar_items.sh ;
+local postInstallFiles = add_catalog_entry_attributes.sh
+       default_deskbar_items.sh mime_update.sh ;
 postInstallFiles = $(postInstallFiles:G=post-install) ;
 SEARCH on $(postInstallFiles)
        = [ FDirName $(HAIKU_TOP) data common boot post_install ] ;

Added: haiku/trunk/data/common/boot/post_install/add_catalog_entry_attributes.sh
===================================================================
--- haiku/trunk/data/common/boot/post_install/add_catalog_entry_attributes.sh   
                        (rev 0)
+++ haiku/trunk/data/common/boot/post_install/add_catalog_entry_attributes.sh   
2011-03-31 07:31:56 UTC (rev 41148)
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+WriteCatalogEntryAttribute()
+{
+       # $1 : signature
+       # $2 : path
+       # $3 : context
+       
+       if ! [ -e "$2" ]
+       then
+               mkdir "$2"
+       fi
+
+       addattr -t string SYS:NAME "$1:$3:$(basename "$2")" "$2"
+}
+
+
+WriteTrackerCatalogEntryAttribute()
+{
+       WriteCatalogEntryAttribute "x-vnd.Haiku-libtracker" "$1" "$2"
+}
+
+
+WriteDeskbarCatalogEntryAttribute()
+{
+       WriteCatalogEntryAttribute "x-vnd.Be-TSKB" "$1" "$2"
+}
+
+
+WriteMailCatalogEntryAttribute()
+{
+       WriteCatalogEntryAttribute "x-vnd.Be-MAIL" "$1" "$2"
+}
+
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_APPS_DIRECTORY)" B_APPS_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_COMMON_DIRECTORY)" B_COMMON_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_COMMON_DEVELOP_DIRECTORY)" B_COMMON_DEVELOP_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)" B_USER_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_DESKTOP_DIRECTORY)" B_DESKTOP_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_USER_CONFIG_DIRECTORY)" B_USER_CONFIG_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_USER_SETTINGS_DIRECTORY)/Tracker/Tracker New Templates" \
+       "B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates"
+
+WriteTrackerCatalogEntryAttribute "/boot/optional" "/boot/optional"
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_PREFERENCES_DIRECTORY)" B_PREFERENCES_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_SYSTEM_DIRECTORY)" B_SYSTEM_DIRECTORY
+
+WriteTrackerCatalogEntryAttribute \
+       "$(finddir B_TRASH_DIRECTORY)" B_TRASH_DIRECTORY
+
+
+
+WriteDeskbarCatalogEntryAttribute \
+       "$(finddir B_USER_DESKBAR_DIRECTORY)/Applications" 
"B_USER_DESKBAR_DIRECTORY/Applications"
+
+WriteDeskbarCatalogEntryAttribute \
+       "$(finddir B_USER_DESKBAR_DIRECTORY)/Demos" 
"B_USER_DESKBAR_DIRECTORY/Demos"
+
+WriteDeskbarCatalogEntryAttribute \
+       "$(finddir B_USER_DESKBAR_DIRECTORY)/Desktop applets" 
"B_USER_DESKBAR_DIRECTORY/Desktop applets"
+
+WriteDeskbarCatalogEntryAttribute \
+       "$(finddir B_USER_DESKBAR_DIRECTORY)/Preferences" 
"B_USER_DESKBAR_DIRECTORY/Preferences"
+
+
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail" "B_USER_DIRECTORY/mail"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/draft" "B_USER_DIRECTORY/mail/draft"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/in" "B_USER_DIRECTORY/mail/in"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/out" "B_USER_DIRECTORY/mail/out"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/queries" 
"B_USER_DIRECTORY/mail/queries"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/sent" "B_USER_DIRECTORY/mail/sent"
+
+WriteMailCatalogEntryAttribute \
+       "$(finddir B_USER_DIRECTORY)/mail/spam" "B_USER_DIRECTORY/mail/spam"
+


Property changes on: 
haiku/trunk/data/common/boot/post_install/add_catalog_entry_attributes.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: haiku/trunk/src/apps/deskbar/Jamfile
===================================================================
--- haiku/trunk/src/apps/deskbar/Jamfile        2011-03-31 07:17:05 UTC (rev 
41147)
+++ haiku/trunk/src/apps/deskbar/Jamfile        2011-03-31 07:31:56 UTC (rev 
41148)
@@ -47,6 +47,7 @@
        :
        BarWindow.cpp
        BeMenu.cpp
+       LocalizedFolders.h
        PreferencesWindow.cpp
        StatusView.cpp
        TimeView.cpp

Added: haiku/trunk/src/apps/deskbar/LocalizedFolders.h
===================================================================
--- haiku/trunk/src/apps/deskbar/LocalizedFolders.h                             
(rev 0)
+++ haiku/trunk/src/apps/deskbar/LocalizedFolders.h     2011-03-31 07:31:56 UTC 
(rev 41148)
@@ -0,0 +1,15 @@
+#include <Catalog.h>
+
+
+B_TRANSLATE_MARK_ALL("Applications",
+       "B_USER_DESKBAR_DIRECTORY/Applications", "");
+
+B_TRANSLATE_MARK_ALL("Demos",
+       "B_USER_DESKBAR_DIRECTORY/Demos", "");
+
+B_TRANSLATE_MARK_ALL("Desktop applets",
+       "B_USER_DESKBAR_DIRECTORY/Desktop applets", "");
+
+B_TRANSLATE_MARK_ALL("Preferences",
+       "B_USER_DESKBAR_DIRECTORY/Preferences", "");
+

Modified: haiku/trunk/src/apps/mail/Jamfile
===================================================================
--- haiku/trunk/src/apps/mail/Jamfile   2011-03-31 07:17:05 UTC (rev 41147)
+++ haiku/trunk/src/apps/mail/Jamfile   2011-03-31 07:31:56 UTC (rev 41148)
@@ -45,6 +45,7 @@
        Enclosures.cpp
        FindWindow.cpp
        Header.cpp
+       LocalizedFolders.h
        MailApp.cpp
        MailPopUpMenu.cpp
        MailWindow.cpp

Added: haiku/trunk/src/apps/mail/LocalizedFolders.h
===================================================================
--- haiku/trunk/src/apps/mail/LocalizedFolders.h                                
(rev 0)
+++ haiku/trunk/src/apps/mail/LocalizedFolders.h        2011-03-31 07:31:56 UTC 
(rev 41148)
@@ -0,0 +1,11 @@
+#include <Catalog.h>
+
+
+B_TRANSLATE_MARK_ALL("mail", "B_USER_DIRECTORY/mail", "");
+B_TRANSLATE_MARK_ALL("draft", "B_USER_DIRECTORY/mail/draft", "");
+B_TRANSLATE_MARK_ALL("in", "B_USER_DIRECTORY/mail/in", "");
+B_TRANSLATE_MARK_ALL("out", "B_USER_DIRECTORY/mail/out", "");
+B_TRANSLATE_MARK_ALL("queries", "B_USER_DIRECTORY/mail/queries", "");
+B_TRANSLATE_MARK_ALL("sent", "B_USER_DIRECTORY/mail/sent", "");
+B_TRANSLATE_MARK_ALL("spam", "B_USER_DIRECTORY/mail/spam", "");
+

Modified: haiku/trunk/src/kits/tracker/Jamfile
===================================================================
--- haiku/trunk/src/kits/tracker/Jamfile        2011-03-31 07:17:05 UTC (rev 
41147)
+++ haiku/trunk/src/kits/tracker/Jamfile        2011-03-31 07:31:56 UTC (rev 
41148)
@@ -108,6 +108,7 @@
        FSClipboard.cpp
        FSUtils.cpp
        InfoWindow.cpp
+       LocalizedFolders.h
        Model.cpp
        MountMenu.cpp
        NavMenu.cpp

Added: haiku/trunk/src/kits/tracker/LocalizedFolders.h
===================================================================
--- haiku/trunk/src/kits/tracker/LocalizedFolders.h                             
(rev 0)
+++ haiku/trunk/src/kits/tracker/LocalizedFolders.h     2011-03-31 07:31:56 UTC 
(rev 41148)
@@ -0,0 +1,19 @@
+#include <Catalog.h>
+
+
+B_TRANSLATE_MARK_ALL("apps", "B_APPS_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("common", "B_COMMON_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("develop", "B_COMMON_DEVELOP_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("optional", "/boot/optional", "");
+B_TRANSLATE_MARK_ALL("preferences", "B_PREFERENCES_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("system", "B_SYSTEM_DIRECTORY", "");
+
+B_TRANSLATE_MARK_ALL("home", "B_USER_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("config", "B_USER_CONFIG_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("Tracker New Templates",
+       "B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates", "");
+
+// these are currently special-cased in Tracker
+B_TRANSLATE_MARK_ALL("trash", "B_TRASH_DIRECTORY", "");
+B_TRANSLATE_MARK_ALL("Desktop", "B_DESKTOP_DIRECTORY", "");
+

Other related posts:

• » [haiku-commits] r41148 - in haiku/trunk: build/jam data/common/boot/post_install src/apps/deskbar src/apps/mail src/kits/tracker - jonas

1. Home
2. haiku-commits
3. Archive
4. 03-2011

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---