From c0204667f92962525e70e68683b1e9d8c31ab713 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Tue, 15 Feb 2011 02:39:24 +0000 Subject: sugar-toolkit:sl#2608 fix --- diff --git a/rpms/sugar-toolkit/sugar-toolkit-Cursor-moves-to-beginning-while-trying-to-edit-activity-instance-name-2608.patch b/rpms/sugar-toolkit/sugar-toolkit-Cursor-moves-to-beginning-while-trying-to-edit-activity-instance-name-2608.patch new file mode 100644 index 0000000..0459395 --- /dev/null +++ b/rpms/sugar-toolkit/sugar-toolkit-Cursor-moves-to-beginning-while-trying-to-edit-activity-instance-name-2608.patch @@ -0,0 +1,34 @@ +From patchwork Mon Feb 14 22:23:25 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [sugar-toolkit] Cursor moves to beginning while trying to edit + activity instance name #2608 +Date: Tue, 15 Feb 2011 03:23:25 -0000 +From: Aleksey Lim +X-Patchwork-Id: 665 +Message-Id: <1297722205-19735-1-git-send-email-alsroot@activitycentral.org> +To: sugar-devel@lists.sugarlabs.org +Cc: dextrose@lists.sugarlabs.org + +This issue is not the same as #1948 but #1948 triggers this one. +In some cases set_text doesn't change cursor position but not in all cases. + +--- +src/sugar/activity/widgets.py | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py +index a8664d9..8d34855 100644 +--- a/src/sugar/activity/widgets.py ++++ b/src/sugar/activity/widgets.py +@@ -201,7 +201,9 @@ class TitleEntry(gtk.ToolItem): + self.entry.modify_bg(state, color) + + def __jobject_updated_cb(self, jobject): ++ prev_pos = self.entry.props.cursor_position + self.entry.set_text(jobject['title']) ++ self.entry.set_position(prev_pos) + + def __title_changed_cb(self, entry, activity): + if self._update_title_sid is not None: diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec index 64b0678..3a7ce71 100644 --- a/rpms/sugar-toolkit/sugar-toolkit.spec +++ b/rpms/sugar-toolkit/sugar-toolkit.spec @@ -3,7 +3,7 @@ Summary: Sugar toolkit Name: sugar-toolkit Version: 0.88.1 -Release: 4.15dxo%{?dist} +Release: 4.16dxo%{?dist} URL: http://wiki.laptop.org/go/Sugar Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar @@ -64,6 +64,9 @@ patch1101: set-ctime-workaround.patch #get rid of ipython patch1201: sugar-toolkit-Get-rid-of-IPython.patch +#sl#2608 fix +patch1301: sugar-toolkit-Cursor-moves-to-beginning-while-trying-to-edit-activity-instance-name-2608.patch + License: LGPLv2+ Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -139,6 +142,8 @@ to interact with system services like presence and the datastore. %patch1201 -p1 +%patch1301 -p1 + %build autoreconf %configure @@ -167,6 +172,9 @@ rm -rf %{buildroot} %{_sysconfdir}/rpm/macros.sugar %changelog +* Mon Feb 14 2011 Anish Mangal - 0.88.1-4.16 +- sl#2608 fix + * Sat Feb 12 2011 Anish Mangal - 0.88.1-4.15 - Get rid of ipython -- cgit v0.9.1