Changes

Line 82: Line 82:     
  [Activity]
 
  [Activity]
  name = Web
+
  name = Browse
  activity_version = 1
+
  activity_version = 156
host_version = 1
+
  bundle_id = org.laptop.WebActivity
  bundle_id = com.redhat.Sugar.BrowserActivity
  −
license = GPLv2+ and BSD
   
  icon = activity-web
 
  icon = activity-web
  exec = sugar-activity browseractivity.BrowserActivity -s
+
  exec = sugar-activity webactivity.WebActivity -s
  mime_types = application/pdf;image/tiff
+
  mime_types = image/png;image/gif;image/jpeg;text/html;text/uri-list;application/xhtml+xml;application/rss+xml;application/xml;text/css
 +
license = GPLv2+
 +
summary = Surf the world! Here you can do research, watch educational videos, take online courses, find books, connect with friends and more.
 
  update_url = http://host.net/bundles/FooBar
 
  update_url = http://host.net/bundles/FooBar
 
  tags = exploration;web
 
  tags = exploration;web
  single_instance = yes
+
  single_instance = no
summary = this is a short description of the activity
      
A more detailed explanation of the valid properties follows:
 
A more detailed explanation of the valid properties follows:
Line 100: Line 99:  
: The activity.info file must begin with [Activity], and only that, on the first line of the file
 
: The activity.info file must begin with [Activity], and only that, on the first line of the file
   −
  name = Web
+
  name = Browse
 
: This is the name is displayed in Sugar referring to the activity.  A 'name' key without a bracketed language code is the "en_US" localized name of the activity.  The activity.info file must have this key.
 
: This is the name is displayed in Sugar referring to the activity.  A 'name' key without a bracketed language code is the "en_US" localized name of the activity.  The activity.info file must have this key.
   −
  activity_version = 1
+
  activity_version = 156
: Each activity.info file must have a "activity_version" key.  The version is a single positive integer.  Larger versions are considered "newer".  The value assigned to this key should be considered '''opaque''' to the activity; the only requirement of the activity is that it must be larger for new activity builds.
+
: Each activity.info file must have a "activity_version" key.  The version is a single positive float.  Larger versions are considered "newer".  The value assigned to this key should be considered '''opaque''' to the activity; the only requirement of the activity is that it must be larger for new activity builds.
    
  host_version = 1
 
  host_version = 1
 
: This key is deprecated. This used to specify the version of the Sugar environment the activity is compatible with; however, it was never implemented.
 
: This key is deprecated. This used to specify the version of the Sugar environment the activity is compatible with; however, it was never implemented.
   −
  bundle_id = com.redhat.Sugar.BrowserActivity
+
  bundle_id = org.laptop.WebActivity
: This is the activity bundle identifier.  It is required. The name should conform to the [http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names D-Bus spec] - in particular, hyphens are not allowed (although this wasn't enforced in earlier builds, see [http://dev.laptop.org/ticket/6226 Trac 6226]).  It is recommended that [http://en.wikipedia.org/wiki/Java_package#Package_naming_conventions Java package naming conventions] are used when chosing bundle identifiers, to ensure uniqueness.  Briefly, your name should begin with the reversed domain name of an organization you belong to.
+
: This is the activity bundle identifier.  It is required. The name should conform to the [http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names D-Bus spec] - in particular, hyphens are not allowed (although this wasn't enforced in earlier builds, see [http://dev.laptop.org/ticket/6226 Trac 6226]).  It is recommended that [http://en.wikipedia.org/wiki/Java_package#Package_naming_conventions Java package naming conventions] are used when choosing bundle identifiers, to ensure uniqueness.  Briefly, your name should begin with the reversed domain name of an organization you belong to.
 
: The reversed domain name part is supposed to be rooted in some actual DNS-rooted namespace.  You don't need to own this domain; you just need to have a reasonable claim on some ''unique'' name at that domain. There are several ways to derive one:
 
: The reversed domain name part is supposed to be rooted in some actual DNS-rooted namespace.  You don't need to own this domain; you just need to have a reasonable claim on some ''unique'' name at that domain. There are several ways to derive one:
 
:* If your email address is ''yourname''@''somemailhost''.com, then you could use ''com.somemailhost.yourname''.''YourActivity''.
 
:* If your email address is ''yourname''@''somemailhost''.com, then you could use ''com.somemailhost.yourname''.''YourActivity''.
 
:* You could set up a web page on a free hosting service with information about your activity, and use a name derived from its URL.  For example, if you create a page at http://www.geocities.com/xotumusica for your activity, then com.geocities.www.xotumusica is a reasonable bundle_id.
 
:* You could set up a web page on a free hosting service with information about your activity, and use a name derived from its URL.  For example, if you create a page at http://www.geocities.com/xotumusica for your activity, then com.geocities.www.xotumusica is a reasonable bundle_id.
 
:* If nothing else is available, even org.sugarlabs.wiki.''Your Activity Page Title'' is probably a reasonable bundle_id, provided that you create the 'Your Activity Page Title' page.  Remember, bundle_ids should be unique, so you should double check that the 'Your Activity Page Title' page doesn't already exist (and then create it) before using this as your bundle_id.
 
:* If nothing else is available, even org.sugarlabs.wiki.''Your Activity Page Title'' is probably a reasonable bundle_id, provided that you create the 'Your Activity Page Title' page.  Remember, bundle_ids should be unique, so you should double check that the 'Your Activity Page Title' page doesn't already exist (and then create it) before using this as your bundle_id.
: In the Python bindings, the bundle_id is also used as the activity's default service type when the activity is shared on the network.  To determine this type, the distinct parts (separated by the '.' character) are reversed, any '.' is replaced by a '_' character, and the type is prefixed by a '_' character.  So in this example, the default service type would be "_BrowserActivity_Sugar_redhat_com".
+
: In the Python bindings, the bundle_id is also used as the activity's default service type when the activity is shared on the network.  To determine this type, the distinct parts (separated by the '.' character) are reversed, any '.' is replaced by a '_' character, and the type is prefixed by a '_' character.  So in this example, the default service type would be "_WebActivity_laptop_org".
   −
  license = GPLv2+ and BSD
+
  license = GPLv2+
 
: This field names the license used for the activity bundle (the binary .xo file).  The contents of this field should conform to the same guidelines as the [http://fedoraproject.org/wiki/Packaging/LicensingGuidelines#License:_field <code>License:</code> field] of an RPM package; consult the [http://fedoraproject.org/wiki/Packaging/LicensingGuidelines Fedora Licensing Guidelines] for more information.  A 'license' field naming an entry or entries in the "Good Licenses" table at [http://fedoraproject.org/wiki/Licensing Fedora's Licensing list] is required for any activities distributed by OLPC.
 
: This field names the license used for the activity bundle (the binary .xo file).  The contents of this field should conform to the same guidelines as the [http://fedoraproject.org/wiki/Packaging/LicensingGuidelines#License:_field <code>License:</code> field] of an RPM package; consult the [http://fedoraproject.org/wiki/Packaging/LicensingGuidelines Fedora Licensing Guidelines] for more information.  A 'license' field naming an entry or entries in the "Good Licenses" table at [http://fedoraproject.org/wiki/Licensing Fedora's Licensing list] is required for any activities distributed by OLPC.
   Line 123: Line 122:  
: It points to the activity's icon.  The icon is looked up in the activity bundle's 'activity' directory (the same directory the activity.info file is in).  It cannot contain a path.  When searching for the icon in the activity bundle's 'activity' directory, only a file with the icon name and the extension '.svg' will be looked for.  This property is required unless 'show_launcher' is 'no' (see below).
 
: It points to the activity's icon.  The icon is looked up in the activity bundle's 'activity' directory (the same directory the activity.info file is in).  It cannot contain a path.  When searching for the icon in the activity bundle's 'activity' directory, only a file with the icon name and the extension '.svg' will be looked for.  This property is required unless 'show_launcher' is 'no' (see below).
   −
  exec = sugar-activity webactivity.WebActivity
+
  exec = sugar-activity webactivity.WebActivity -s
 
: The exec key specifies the executable which [[Sugar]] runs to start the activity instances. Environment variables given on the exec line are expanded. Executable files should be placed into the bin/ directory in the bundle. It should support the following arguments:
 
: The exec key specifies the executable which [[Sugar]] runs to start the activity instances. Environment variables given on the exec line are expanded. Executable files should be placed into the bin/ directory in the bundle. It should support the following arguments: