Merge lp:~evfool/software-properties/lp1060543 into lp:software-properties

[Robert Roth]

Added some keywords to the software sources desktop file for easier discovery of the driver management functionality (search for Driver/Drivers shows software sources after adding Drivers as a keyword).

[Robert Roth (evfool)]

I have updated the merge proposal with the following changes based on the feedback from the bug:
* copied the jockey desktop file with its icons from jockey trunk (it gets installed with software-properties-gtk)
* renamed it to additional-drivers.desktop
* removed the control center panel category
* updated the translation domain

[Didier Roche (didrocks)]

Hey, it seems that mpt has another opinion on how to fix it rather than adding another desktop file to it, see https://lists.ubuntu.com/archives/ubuntu-desktop/2012-November/004121.html (and the full discussion which is worth reading). Can you please rather implements that?

review: Needs Fixing

[Robert Roth (evfool)]

Could you please be a bit more explicit on what do you mean by "implement that"?
mpt's suggestions is about
* renaming Software sources to Software & updates (Easy enough)
* finding it by searching for "drivers" = adding a keyword to the desktop file (done)
* and the wiki spec details a control center panel (embedded), which as far as I know is not possible with the current python-based software sources, it would require porting the whole thing to C, and I can't do that, if that's the requirement here, I'll pass on to someone else.

[Didier Roche (didrocks)]

@Robert: I think mpt just wants the two bullet points to be addressed rathen than adding another desktop file, which means:
- renaming software sources
- adding the drivers keyword.

(and so, not adding a jockey desktop file).
Did I misunderstand him?

[Robert Roth (evfool)]

@didrocks: No, that's what he basically asks in his email, but he is also pointing to the spec, which describes a control center panel. Anyway, for now I have reverted the changes related to the new desktop file, and updated the Software Sources title to match the spec.

[Didier Roche (didrocks)]

Excellent! Pushing to trunk :)

Thanks a lot!

review: Approve

=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui	2012-11-09 17:44:47 +0000
+++ data/gtkbuilder/main.ui	2012-11-23 12:22:22 +0000
@@ -93,7 +93,7 @@
   <object class="GtkWindow" id="window_main">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Software Sources</property>
+    <property name="title" translatable="yes">Software &amp; Updates</property>
     <property name="window_position">center</property>
     <signal name="delete-event" handler="on_delete_event" swapped="no"/>
     <child>

=== modified file 'data/software-properties-gtk.desktop.in'
--- data/software-properties-gtk.desktop.in	2012-11-08 03:25:41 +0000
+++ data/software-properties-gtk.desktop.in	2012-11-23 12:22:22 +0000
@@ -1,7 +1,8 @@
 [Desktop Entry]
-_Name=Software Sources
-_GenericName=Software Sources
+_Name=Software & Updates
+_GenericName=Software & Updates
 _Comment=Configure the sources for installable software and updates
+_Keywords=Drivers;Repositories;Repository;PPA;
 Exec=software-properties-gtk
 Icon=software-properties
 Terminal=false