Merge lp:~amichai2/software-properties/edit-on-doubleclick into lp:software-properties

[amichair]

Made the edit dialog pop up when double-clicking a source. There were two non-working implementations in the code already, which I replaced with one that works.

[Brian Murray (brian-murray)]

This looks good to me but I'm not really in a position to easily test this change since its KDE. Could you provide some screenshots or video showing how it works? Thanks!

[amichair (amichai2)]

Hi, I don't see how screenshots will help... it looks exactly the same as when you select a source and then click the 'Edit' button. Except you can double-click the source instead of using the button. Nothing is different visually from the current/past behavior.

[amichair (amichai2)]

So, this has been waiting around for months... will it be merged? I was hoping to see it in the upcoming release.

[amichair (amichai2)]

Or the next next release?

Unmerged revisions

994. By amichair on 2017-04-30

software-properties-kde: fixed editing when source is double-clicked

=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
--- softwareproperties/kde/SoftwarePropertiesKDE.py	2015-06-16 11:11:36 +0000
+++ softwareproperties/kde/SoftwarePropertiesKDE.py	2017-04-30 23:04:28 +0000
@@ -115,6 +115,7 @@
     self.userinterface.button_add.clicked.connect(self.on_add_clicked)
     self.userinterface.treeview_sources.itemChanged.connect(self.on_isv_source_toggled)
     self.userinterface.treeview_sources.itemClicked.connect(self.on_treeview_sources_cursor_changed)
+    self.userinterface.treeview_sources.itemDoubleClicked.connect(self.on_isv_source_activated)
     self.userinterface.treeview_cdroms.itemChanged.connect(self.on_cdrom_source_toggled)
     self.userinterface.treeview2.itemClicked.connect(self.on_treeview_keys_cursor_changed)
     button_close = self.userinterface.buttonBox.button(QDialogButtonBox.Close)
@@ -476,11 +477,6 @@
                                   self.on_sources_drag_data_received)
     """
 
-  def on_isv_source_activate(self, treeview, path, column):
-    """Open the edit dialog if a channel was double clicked"""
-    ##FIXME TODO
-    ##self.on_edit_clicked(treeview)
-
   def on_treeview_sources_cursor_changed(self, item, column):
     """set the sensitiveness of the edit and remove button
        corresponding to the selected channel"""
@@ -642,13 +638,11 @@
             self.set_modified_sourceslist()
             self.show_isv_sources()
 
-  # FIXME:outstanding from merge
-  def on_isv_source_activated(self, treeview, path, column):
+  def on_isv_source_activated(self, item, column):
      """Open the edit dialog if a channel was double clicked"""
-     ##FIXME TODO
      # check if the channel can be edited
-     if self.button_edit.get_property("sensitive") == True:
-         self.on_edit_clicked(treeview)
+     if self.userinterface.button_edit.isEnabled():
+        self.on_edit_clicked()
 
   def on_remove_clicked(self):
     """Remove the selected source"""