Merge lp:~stefan-schwarzburg/qreator/fix-bug-1017674 into lp:~dpm/qreator/trunk

[Schwarzburg]

This implements the more complicated but preferred version:

- check if the entry starts with a supported protocol (support is taken from the combobox entries)
- if so, remove that protocol and
- select the appropriate protocol of the combobox

It is actually not that complicated, so we should stick with that...

[lp:~stefan-schwarzburg/qreator/fix-bug-1017674]

117. By Schwarzburg on 2012-08-02

removed GObject import

118. By Schwarzburg on 2012-08-05

merge with trunk

[David Planella (dpm)]

Looks great and works great, as discussed in the implementation e-mail a while ago. Merged, thanks!

review: Approve

=== modified file 'qreator/qrcodes/QRCodeURLGtk.py'
--- qreator/qrcodes/QRCodeURLGtk.py	2012-05-30 10:19:57 +0000
+++ qreator/qrcodes/QRCodeURLGtk.py	2012-08-05 14:34:19 +0000
@@ -58,8 +58,21 @@
     def on_entryURL_icon_press(self, widget, icon, mouse_button):
         clear_text_entry(widget, icon)
 
+    def check_and_remove_protocol(self, widget):
+        """
+        Creates a list of protocols (as given by the combobox).
+        Checks if beginning of the text entry is in that list. If so, remove the protocol
+        and select the appropriate protocol in the combobox.
+        """
+        for n, protocol in enumerate([mr[0] for mr in self.combobox.get_model()]):
+            if widget.get_text().strip().startswith(protocol):
+                widget.set_text(widget.get_text().strip().strip(protocol))
+                self.combobox.set_active(n)
+                return
+
     def on_entryURL_changed(self, widget, data=None):
         show_clear_icon(widget)
+        self.check_and_remove_protocol(widget)
         self.update_url_qr_code(www=widget.get_text())
 
     def on_comboboxtextProtocol_changed(self, widget, data=None):