From f88a4906317f0d02f9b2f145e13d7b44e16abfb0 Mon Sep 17 00:00:00 2001 From: Ajay Garg Date: Mon, 25 Feb 2013 11:42:24 +0000 Subject: Initial commit. --- diff --git a/do_it_all.sh b/do_it_all.sh new file mode 100644 index 0000000..655fb3f --- /dev/null +++ b/do_it_all.sh @@ -0,0 +1,23 @@ +set -e + +git_url="git://git.sugarlabs.org/record/mainline.git" + + +# Remove the upstream cloned-directory, if any. +if [ -d "activity" ]; then + sudo rm -r activity +fi + +# Clone a fresh copy of the upstream. +git clone "$git_url" activity + +# Build the activity (to generate "generated" files such as locale files). +cd activity +python setup.py build + +# Now, apply the AC patches. +git am ../patches/*.patch + +# Finally, build the bundle (to be retrieved from "activity/dist"). +python setup.py dist_xo + diff --git a/patches/0001-sdxo-3034-Now-Copy-to-Clipboard-works-fine-after-the.patch b/patches/0001-sdxo-3034-Now-Copy-to-Clipboard-works-fine-after-the.patch new file mode 100644 index 0000000..943b0b8 --- /dev/null +++ b/patches/0001-sdxo-3034-Now-Copy-to-Clipboard-works-fine-after-the.patch @@ -0,0 +1,61 @@ +From c51b97435a9535c85fd22bcebdc8846e3e457fa1 Mon Sep 17 00:00:00 2001 +From: Ajay Garg +Date: Sat, 23 Feb 2013 16:48:14 +0530 +Subject: [PATCH] sdxo#3034: Now, Copy-to-Clipboard works fine, after the + recipient clicks on the thumbnail, and the complete-data is + fetched. +Organization: Sugar Labs Foundation + + +Signed-off-by: Ajay Garg +--- + activity/activity.info | 2 +- + button.py | 12 ++++++++++-- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/activity/activity.info b/activity/activity.info +index be9c97e..ab70a60 100644 +--- a/activity/activity.info ++++ b/activity/activity.info +@@ -3,7 +3,7 @@ name = Record + bundle_id = org.laptop.RecordActivity + exec = sugar-activity record.Record + icon = activity-record +-activity_version = 97 ++activity_version = 97.1 + show_launcher = yes + license = MIT + summary = Unleash the visual artist inside you! Take pictures, make movies and use them to recreate your world. The only limit is your imagination. +diff --git a/button.py b/button.py +index 66cf80b..be32b60 100644 +--- a/button.py ++++ b/button.py +@@ -28,7 +28,13 @@ class RecdButton(TrayButton): + palette.menu.append(self._rem_menu_item) + self._rem_menu_item.show() + +- self._add_copy_menu_item() ++ self._copy_menu_item_added = False ++ ++ def do_expose_event(self, event): ++ if not self._copy_menu_item_added: ++ self._add_copy_menu_item() ++ ++ TrayButton.do_expose_event(self, event) + + def _add_copy_menu_item( self ): + if self._recd.buddy and not self._recd.downloadedFromBuddy: +@@ -38,7 +44,9 @@ class RecdButton(TrayButton): + self._copy_menu_item_handler = self._copy_menu_item.connect('activate', self._copy_clipboard_clicked) + self.get_palette().menu.append(self._copy_menu_item) + self._copy_menu_item.show() +- ++ ++ self._copy_menu_item_added = True ++ + def get_recd(self): + return self._recd + +-- +1.7.11.7 + -- cgit v0.9.1