Merge lp:~jonobacon/ubuntu-accomplishments-viewer/publishonline into lp:ubuntu-accomplishments-viewer

[Jono Bacon]

This branch adds support to the desktop client for a user to publish their trophies to the web application that will be landing as part of the 0.3 release. Please note, you will also need to have lp:~jonobacon/ubuntu-accomplishments-daemon/publishonline to use this.

This is how it works:

 * The user loads Edit -> Preferences and can click a Publish button to share their trophies online. If they are currently publishing they instead see a Stop Publishing button.

Publishing involves the following:

 * We scan the list of shared directories for ones that are shared with the validation server.
 * For the share that is active, we create a WEBVIEW file in the trophy dir (this is used by the web app to show publishing.
 * We also generate a URL with the share name and share id for the user to set up their online trophy cabinet.

This feature should now be complete to land in trunk.

[lp:~jonobacon/ubuntu-accomplishments-viewer/publishonline]

118. By Jono Bacon on 2012-06-25

 * Launch browser fromt he client now. A better, cleaner way of doing things.

=== modified file 'accomplishments_viewer/AccomplishmentsViewerWindow.py'
--- accomplishments_viewer/AccomplishmentsViewerWindow.py	2012-06-23 14:05:24 +0000
+++ accomplishments_viewer/AccomplishmentsViewerWindow.py	2012-06-25 22:37:19 +0000
@@ -263,6 +263,9 @@
             object.connect_to_signal("trophy_recieved",
                 self.trophy_received,
                 dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
+            object.connect_to_signal("publish_trophies_online_completed",
+                self.publish_trophies_online_completed,
+                dbus_interface="org.ubuntu.accomplishments", arg0="Hello")                
             object.connect_to_signal("scriptrunner_start",
                 self.scriptrunner_start,
                 dbus_interface="org.ubuntu.accomplishments")
@@ -272,6 +275,7 @@
             object.connect_to_signal("ubuntu_one_account_ready",
                 self.ubuntu_one_account_ready,
                 dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
+        
         except dbus.DBusException:
             traceback.print_exc()
             print usage
@@ -280,6 +284,9 @@
         bus.add_signal_receiver(self.trophy_received,
             dbus_interface = "org.ubuntu.accomplishments",
             signal_name = "trophy_received")
+        bus.add_signal_receiver(self.publish_trophies_online_completed,
+            dbus_interface = "org.ubuntu.accomplishments",
+            signal_name = "publish_trophies_online_completed")
         bus.add_signal_receiver(self.scriptrunner_start,
             dbus_interface = "org.ubuntu.accomplishments",
             signal_name = "scriptrunner_start")
@@ -296,6 +303,9 @@
         
         return True
 
+    def publish_trophies_online_completed(self, url):
+        webbrowser.open(url)
+
     def ubuntu_one_account_ready(self):        
         if not self.has_u1 == 1:
             self.register_with_verif(None)
 
=== modified file 'accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py'
--- accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py	2012-05-24 13:22:01 +0000
+++ accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py	2012-06-25 22:37:19 +0000
@@ -34,6 +34,12 @@
         super(PreferencesAccomplishmentsViewerDialog, self).finish_initializing(builder)
         self.cb_daemonsessionstart = self.builder.get_object("cb_daemonsessionstart")
         self.cb_hideu1bubbles = self.builder.get_object("cb_hideu1bubbles")
+        self.pref_publish = self.builder.get_object("pref_publish")
+        self.pref_publish_label = self.builder.get_object("pref_publish_label")
+        self.pref_publish_icon = self.builder.get_object("pref_publish_icon")
+        self.publishedstatus = None
+        
+        #trophydir = self.libaccom.get_config_value("config", "trophypath")
         
         # Bind each preference widget to gsettings
         #settings = Gio.Settings("net.launchpad.accomplishments-viewer")
@@ -45,7 +51,14 @@
     def prepare(self,daemon_handle):
         self.libaccom = daemon_handle
         self.populate_settings()
-
+        
+        self.publishedstatus = self.libaccom.get_published_status()
+        
+        if self.publishedstatus == 0:
+            self.pref_publish.set_label(_("Publish..."))
+        else:
+            self.pref_publish.set_label(_("Stop Publishing"))
+        
     def populate_settings(self):
         self.cb_daemonsessionstart.handler_block_by_func(self.cb_daemonsessionstart_toggled)
         self.cb_hideu1bubbles.handler_block_by_func(self.cb_hideu1bubbles_toggled)
@@ -64,3 +77,17 @@
 
     def cb_hideu1bubbles_toggled(self, widget):
         self.libaccom.set_block_ubuntuone_notification_bubbles( widget.get_active() )
+
+    def on_pref_publish_clicked(self, widget):
+        if self.publishedstatus == 0:
+            self.libaccom.publish_trophies_online()
+            self.pref_publish_label.set_text(_("Please see your web browser to continue..."))
+            self.pref_publish.set_label(_("Stop Publishing"))
+            self.pref_publish_icon.set_visible(True)
+            self.publishedstatus = 1
+        else:
+            self.libaccom.unpublish_trophies_online()
+            self.pref_publish_label.set_text(_("Trophies are no longer published."))
+            self.pref_publish.set_label(_("Publish..."))
+            self.pref_publish_icon.set_visible(True)
+            self.publishedstatus = 0
 
=== modified file 'data/ui/PreferencesAccomplishmentsViewerDialog.ui'
--- data/ui/PreferencesAccomplishmentsViewerDialog.ui	2012-05-24 11:04:14 +0000
+++ data/ui/PreferencesAccomplishmentsViewerDialog.ui	2012-06-25 22:37:19 +0000
@@ -156,6 +156,125 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFrame" id="frame3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkBox" id="box2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_top">10</property>
+                            <property name="margin_bottom">10</property>
+                            <property name="label" translatable="yes">To publish your trophies online for others to see, click the &lt;i&gt;Publish&lt;/i&gt; button.
+You can &lt;i&gt;Unpublish&lt;/i&gt; later if you want to.</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkImage" id="pref_publish_icon">
+                                <property name="can_focus">False</property>
+                                <property name="margin_right">5</property>
+                                <property name="stock">gtk-ok</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="pref_publish_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <attributes>
+                                  <attribute name="style" value="italic"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButtonBox" id="buttonbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="layout_style">end</property>
+                                <child>
+                                  <object class="GtkButton" id="pref_publish">
+                                    <property name="label" translatable="yes">Publish...</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Publish Trophies Online&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">5</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
 
=== modified file 'po/accomplishments-viewer.pot'
--- po/accomplishments-viewer.pot	2012-06-08 17:40:09 +0000
+++ po/accomplishments-viewer.pot	2012-06-25 22:37:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-08 10:40-0700\n"
+"POT-Creation-Date: 2012-06-25 00:47-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,25 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:58
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:91
+#: ../data/ui/PreferencesAccomplishmentsViewerDialog.ui.h:8
+msgid "Publish..."
+msgstr ""
+
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:60
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:85
+msgid "Stop Publishing"
+msgstr ""
+
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:84
+msgid "Please see your web browser to continue..."
+msgstr ""
+
+#: ../accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py:90
+msgid "Trophies are no longer published."
+msgstr ""
+
 #: ../accomplishments_viewer/AboutAccomplishmentsViewerDialog.py:37
 msgid "Collection Authors:"
 msgstr ""
@@ -52,7 +71,7 @@
 #: ../accomplishments_viewer/__init__.py:29
 msgid ""
 "Display information about the provided accomplishment ID (e.g. 'ubuntu-"
-"community/registered-on-launchpad'"
+"community/registered-on-launchpad')"
 msgstr ""
 
 #: ../data/ui/PreferencesAccomplishmentsViewerDialog.ui.h:1
@@ -75,95 +94,106 @@
 msgid "<b>Notification Bubbles</b>"
 msgstr ""
 
+#: ../data/ui/PreferencesAccomplishmentsViewerDialog.ui.h:6
+msgid ""
+"To publish your trophies online for others to see, click the <i>Publish</i> "
+"button.\n"
+"You can <i>Unpublish</i> later if you want to."
+msgstr ""
+
+#: ../data/ui/PreferencesAccomplishmentsViewerDialog.ui.h:9
+msgid "<b>Publish Trophies Online</b>"
+msgstr ""
+
 #. Add 'All' button
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:410
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:409
 msgid "All"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:691
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:704
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:690
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:703
 msgid "everything"
 msgstr ""
 
 #. # summary table
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:906
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:917
 msgid "Opportunity Information"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:914
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:925
 msgid "No information available."
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:924
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:935
 msgid "Getting Help"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:933
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:944
 msgid "No help available."
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:948
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:959
 msgid "This opportunity is locked. You need to complete"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:948
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:953
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:959
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:964
 msgid "from"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:948
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:959
 msgid "first"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:950
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:961
 msgid ""
 "This opportunity is locked. You need to complete the following opportunities "
 "first:"
 msgstr ""
 
 #. achieved
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:957
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:968
 msgid "This trophy <strong>was awarded</strong>"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:961
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:972
 msgid "on"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:965
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:976
 msgid "using the following credentials"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:975
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:986
 msgid "This trophy has been verified"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:982
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:993
 msgid "This opportunity requires verification"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:992
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1003
 msgid "Accomplishment Details"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1014
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1025
 msgid "How to accomplish this opportunity"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1049
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1060
 msgid "Tips and Tricks"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1059
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1079
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1070
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1090
 msgid "None."
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1069
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1080
 msgid "Pitfalls To Avoid"
 msgstr ""
 
-#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1092
+#: ../accomplishments_viewer/AccomplishmentsViewerWindow.py:1103
 msgid "Further Reading"
 msgstr ""