Merge lp:~nicolozilio/software-center/lp842706 into lp:software-center

[Nicolò Zilio]

Make a mistake during resolving the conflict.
This is a new branch with all updated

[dobey (dobey)]

Hi Nicolo, can you please sign the Contributor Agreement by filling the on-line form at http://www.canonical.com/contributors and list the Canonical Contact as Roberto Alsina so that we may be able to accept patches from you?

Also, please remove the changes to debian/changelog in your branches, as we'll add them when we release, changing them in proposals like this creates unnecessary conflicts, and the version string and your e-mail address are not valid, there is a missing space character between the asterisk and text of that line, and you don't need to list your name twice. The [Name] entries are only used when someone else is listing the changes in the package.

Thanks.

review: Needs Fixing

[lp:~nicolozilio/software-center/lp842706]

3285. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog

[Nicolò Zilio (nicolozilio)]

> Also, please remove the changes to debian/changelog in your branches, as we'll add them when we release, changing them
> in proposals like this creates unnecessary conflicts, and the version string and your e-mail address are not valid,
> there is a missing space character between the asterisk and text of that line, and you don't need to list your name
> twice. The [Name] entries are only used when someone else is listing the changes in the package.

Sorry, but I have to remove all changes leaving debian/changelog as the original branch one?

Thanks
Nicolò

[lp:~nicolozilio/software-center/lp842706]

3286. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog & bugfix code

[dobey (dobey)]

On Mon, 2013-01-14 at 16:25 +0000, Nicolò Zilio wrote:
> Sorry, but I have to remove all changes leaving debian/changelog as the original branch one?

Yes, please leave debian/changelog unchanged in your merge proposals.
Thanks.

[lp:~nicolozilio/software-center/lp842706]

3287. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog & bugfix code

[Nicolò Zilio (nicolozilio)]

Updated the branch eliminating changes in debian/changelog.
Hoping to help.
Tell me for other problems about that branch.

[Kiwinote (kiwinote)]

Hi Nicolò!

Thanks a lot for your branch - I took a quick initial look at it and bumped into the following issues:
- previously, clicking the magnifying glass icon selected the search text, this no longer works (in LTR mode),
- when using software-center in RTL mode (./software-center --force-rtl) the clear button no longer works,
- when pressing the clear button, then dragging the mouse to the grey area just below the search box, then releasing the mouse button the clear action is still triggered.

From a more general point of view, hard coding values like 17 and 192 is a little random, as the height / width of a widget is variable rather than constant. Also we try to follow the pep8 guidelines for style formatting (see [0]) - you will note that line 83 of searchentry.py is longer than 79 characters - in this case we prefer to split the clause over two lines.

Hope this helps, and thanks a lot for helping to improve software-center!

[0] http://www.python.org/dev/peps/pep-0008/

review: Needs Fixing

Unmerged revisions

3287. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog & bugfix code

3286. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog & bugfix code

3285. By Nicolò Zilio on 2013-01-14

Updated debian/chagelog

3284. By Nicolò Zilio on 2013-01-05

*lp:~nicolozilio/software-center/lp842706:
- fix claning bug on SearchEntry.py (LP: #842706)

=== modified file 'softwarecenter/ui/gtk3/widgets/searchentry.py'
--- softwarecenter/ui/gtk3/widgets/searchentry.py	2012-11-28 15:54:20 +0000
+++ softwarecenter/ui/gtk3/widgets/searchentry.py	2013-01-14 17:36:22 +0000
@@ -42,7 +42,8 @@
         """
         Gtk.Entry.__init__(self)
         self.set_width_chars(25)
-        self.set_size_request(0, em(1.7))
+        self.set_size_request(230, em(1.7))
+        self.is_pressed = False
 
         if not icon_theme:
             icon_theme = Gtk.IconTheme.get_default()
@@ -51,6 +52,7 @@
                                                    self._on_changed)
 
         self.connect("icon-press", self._on_icon_pressed)
+        self.connect("icon-release", self._on_icon_released)
 
         self.set_icon_from_icon_name(Gtk.EntryIconPosition.PRIMARY,
             'edit-find-symbolic')
@@ -66,20 +68,30 @@
         self._redo_stack = []
 
     def _on_icon_pressed(self, widget, icon, mouse_button):
+         self.is_pressed = True
+         
+    def _on_icon_released(self, widget, icon, mouse_button):
         """
         Emit the terms-changed signal without any time out when the clear
         button was clicked
-        """
-        if icon == Gtk.EntryIconPosition.SECONDARY:
-            # clear with no signal and emit manually to avoid the
-            # search-timeout
-            self.clear_with_no_signal()
-            self.grab_focus()
-            self.emit("terms-changed", "")
+         """
+        # things for checking if user have clicked (press and release) and 
+        # if the mouse is in the SearchEntry area
+        (x, y) = self.get_pointer()
+        rect = self.get_allocation()
 
-        elif icon == Gtk.EntryIconPosition.PRIMARY:
-            self.select_region(0, -1)
-            self.grab_focus()
+        if self.is_pressed == True and x > 192 and x < rect.width and y > 17 and y < rect.height:
+            if icon == Gtk.EntryIconPosition.SECONDARY:
+                # clear with no signal and emit manually to avoid the
+                # search-timeout
+                self.clear_with_no_signal()
+                self.grab_focus()
+                self.emit("terms-changed", "")
+            elif icon == Gtk.EntryIconPosition.PRIMARY:
+                self.select_region(0, -1)
+                self.grab_focus()
+                
+        self.is_pressed = False
 
     def undo(self):
         if len(self._undo_stack) <= 1: