14400 packagemanager shows summary instead of description in info window
authorPadraig O'Briain <padraig.obriain@oracle.com>
Mon, 26 Apr 2010 14:41:56 +0100
changeset 1876 c3cb39529a82
parent 1875 df9286d5c93f
child 1877 3bdaef023cdb
14400 packagemanager shows summary instead of description in info window
src/gui/data/packagemanager.glade
src/gui/modules/installupdate.py
src/gui/modules/misc.py
src/packagemanager.py
--- a/src/gui/data/packagemanager.glade	Mon Apr 26 14:34:50 2010 +0100
+++ b/src/gui/data/packagemanager.glade	Mon Apr 26 14:41:56 2010 +0100
@@ -835,6 +835,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="editable">False</property>
+                                        <property name="wrap_mode">word</property>
                                         <property name="left_margin">6</property>
                                       </widget>
                                     </child>
--- a/src/gui/modules/installupdate.py	Mon Apr 26 14:34:50 2010 +0100
+++ b/src/gui/modules/installupdate.py	Mon Apr 26 14:41:56 2010 +0100
@@ -380,9 +380,9 @@
                 column.set_sort_column_id(1)
                 column.set_sort_indicator(True)
                 treeview.append_column(column)
-                description_renderer = gtk.CellRendererText()
-                description_renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
-                column = gtk.TreeViewColumn(_('Description'), description_renderer,
+                summary_renderer = gtk.CellRendererText()
+                summary_renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+                column = gtk.TreeViewColumn(_('Summary'), summary_renderer,
                     text = enumerations.CONFIRM_DESC)
                 column.set_resizable(True)
                 column.set_sort_column_id(2)
@@ -724,7 +724,7 @@
                         elif orig and not dest:
                                 dic_to_remove[orig.pkg_stem] = [orig.publisher, None] 
 
-                self.__update_descriptions(dic_to_update, dic_to_install, dic_to_remove)
+                self.__update_summaries(dic_to_update, dic_to_install, dic_to_remove)
 
                 self.__dic_to_liststore(dic_to_update, to_update)
                 self.__dic_to_liststore(dic_to_install, to_install)
@@ -1152,7 +1152,7 @@
                 pkg_version = version_pref + version_suf + dt_str
                 return pkg_name + "@" + pkg_version
 
-        def __update_descriptions(self, to_update, to_install, to_remove):
+        def __update_summaries(self, to_update, to_install, to_remove):
                 pkgs_table = to_update.keys() + to_install.keys()
                 info = None
                 try:
--- a/src/gui/modules/misc.py	Mon Apr 26 14:34:50 2010 +0100
+++ b/src/gui/modules/misc.py	Mon Apr 26 14:41:56 2010 +0100
@@ -455,6 +455,7 @@
 
         labs = {}
         labs["name"] = _("Name:")
+        labs["summ"] = _("Summary:")
         labs["desc"] = _("Description:")
         labs["size"] = _("Size:")
         labs["cat"] = _("Category:")
@@ -463,12 +464,16 @@
         labs["lat"] = _("Latest Version:")
         labs["repository"] = _("Publisher:")
 
-        description = _("None")
+        summary = _("None")
         if local_info.summary:
-                description = local_info.summary
+                summary = local_info.summary
+        description = ""
+        if local_info.description:
+                description = local_info.description
 
         text = {}
         text["name"] = pkg_name
+        text["summ"] = summary
         text["desc"] = description
         if installed:
                 ver_text = _("%(version)s (Build %(build)s-%(branch)s)")
@@ -561,7 +566,7 @@
         i = 0
         __add_line_to_generalinfo(infobuffer, i, labs["name"], text["name"])
         i += 1
-        __add_line_to_generalinfo(infobuffer, i, labs["desc"], text["desc"])
+        __add_line_to_generalinfo(infobuffer, i, labs["summ"], text["summ"])
         i += 1
         installed = False
         if text["ins"] == _("No"):
@@ -588,6 +593,12 @@
         i += 1
         __add_line_to_generalinfo(infobuffer, i, labs["repository"],
             text["repository"])
+        i += 1
+        __add_label_to_generalinfo(infobuffer, i, labs["desc"] + '\n')
+        if len(text["desc"]) > 0:
+                i += 1
+                itr = infobuffer.get_iter_at_line(i)
+                infobuffer.insert(itr, text["desc"])
 
 def __add_label_to_generalinfo(text_buffer, index, label):
         itr = text_buffer.get_iter_at_line(index)
--- a/src/packagemanager.py	Mon Apr 26 14:34:50 2010 +0100
+++ b/src/packagemanager.py	Mon Apr 26 14:41:56 2010 +0100
@@ -856,7 +856,7 @@
                             self.__column_sort_func, 
                             enumerations.PUBLISHER_COLUMN)
                 description_renderer = gtk.CellRendererText()
-                column = gtk.TreeViewColumn(_('Description'),
+                column = gtk.TreeViewColumn(_('Summary'),
                     description_renderer,
                     text = enumerations.DESCRIPTION_COLUMN)
                 column.set_sort_column_id(enumerations.DESCRIPTION_COLUMN)