Merge lp:~ubuntukylin-members/ubiquity/showos into lp:ubiquity

[Dimitri John Ledkov]

[kobe (kobe24-lixiang)]

Thank you, expect the result.

At 2013-01-22 17:43:32,"Dmitrijs Ledkovs" <email address hidden> wrote:
>Dmitrijs Ledkovs has proposed merging lp:~ubuntukylin-members/ubiquity/showos into lp:ubiquity.
>
>Requested reviews:
> Ubuntu Installer Team (ubuntu-installer)
>Related bugs:
> Bug #1100694 in ubiquity (Ubuntu): "display OS in existing partitions"
> https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1100694
>
>For more details, see:
>https://code.launchpad.net/~ubuntukylin-members/ubiquity/showos/+merge/144252
>--
>https://code.launchpad.net/~ubuntukylin-members/ubiquity/showos/+merge/144252
>You are subscribed to branch lp:~ubuntukylin-members/ubiquity/showos.

[Anthony Wong (anthonywong)]

Hi xnox or anyone else from ubiquity team -- just wonder if you have some bandwidth to help reviewing kobe's work? Thanks for your time.

[Dimitri John Ledkov (xnox)]

Works like a charm. I did refactor this a little bit before landing to reduce lines of code. Look at the diff between this branch and trunk for the ubi-partman.py file.

Regards,

Dmitrijs.

review: Approve

[kobe (kobe24-lixiang)]

Hi Dmitrijs,
we have seen the diff for the ubi-partman.py file between this branch and trunk. Thanks for merging our diff file.

Regards,
Kobe Lee.

[Jack Yu (jackyu)]

Nice. Thanks, Dmitrijs.

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-18 17:43:32 +0000
+++ debian/changelog	2013-01-22 09:42:23 +0000
@@ -13,7 +13,10 @@
   [ Iain Lane ]
   * Port the webcam support to GStreamer 1.0.
 
- -- Colin Watson <[e-mail]>  Fri, 11 Jan 2013 17:17:27 +0000
+  [ Kobe Lee ]
+  * use a global variable to show all OS. 
+
+ -- Kobe Lee (kylinkobe) <[e-mail]>  Tue, 22 Jan 2013 12:05:53 +0800
 
 ubiquity (2.13.9) raring; urgency=low
 

=== modified file 'debian/real-po/en_GB.po'
--- debian/real-po/en_GB.po	2013-01-12 00:47:22 +0000
+++ debian/real-po/en_GB.po	2013-01-22 09:42:23 +0000
@@ -703,6 +703,20 @@
 
 #. Type: text
 #. Description
+#. A column heading in the partitioner. 
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "System"
+
+#. Type: text
+#. Description
+#. A column heading in the partitioner. 
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "System"
+
+#. Type: text
+#. Description
 #. Indicates unpartitioned free space on a disk.
 #: ../ubiquity.templates:100001
 msgid "free space"

=== modified file 'debian/real-po/templates.pot'
--- debian/real-po/templates.pot	2012-10-19 14:27:05 +0000
+++ debian/real-po/templates.pot	2013-01-22 09:42:23 +0000
@@ -669,6 +669,22 @@
 
 #. Type: text
 #. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr ""
+
+#. Type: text
+#. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr ""
+
+#. Type: text
+#. Description
 #. Indicates unpartitioned free space on a disk.
 #: ../ubiquity.templates:100001
 msgid "free space"

=== modified file 'debian/real-po/zh_CN.po'
--- debian/real-po/zh_CN.po	2013-01-12 00:47:22 +0000
+++ debian/real-po/zh_CN.po	2013-01-22 09:42:23 +0000
@@ -682,6 +682,22 @@
 
 #. Type: text
 #. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "已装系统"
+
+#. Type: text
+#. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "已装系统"
+
+#. Type: text
+#. Description
 #. Indicates unpartitioned free space on a disk.
 #: ../ubiquity.templates:100001
 msgid "free space"

=== modified file 'debian/real-po/zh_HK.po'
--- debian/real-po/zh_HK.po	2013-01-12 00:47:22 +0000
+++ debian/real-po/zh_HK.po	2013-01-22 09:42:23 +0000
@@ -686,6 +686,22 @@
 
 #. Type: text
 #. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "已裝系統"
+
+#. Type: text
+#. Description
+#. A column heading in the partitioner. Indicates how much of the space on
+#. this partition is used by data.
+#: ../ubiquity.templates:99001
+msgid "System"
+msgstr "已裝系統"
+
+#. Type: text
+#. Description
 #. Indicates unpartitioned free space on a disk.
 #: ../ubiquity.templates:100001
 msgid "free space"

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2012-10-19 14:27:05 +0000
+++ debian/ubiquity.templates	2013-01-22 09:42:23 +0000
@@ -468,6 +468,11 @@
 # this partition is used by data.
 _Description: Used
 
+Template: ubiquity/text/partition_column_syst
+Type: text
+# A column heading in the partitioner.
+_Description: System
+
 Template: ubiquity/text/partition_free_space
 Type: text
 # Indicates unpartitioned free space on a disk.

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2013-01-09 15:39:38 +0000
+++ ubiquity/plugins/ubi-partman.py	2013-01-22 09:42:23 +0000
@@ -200,6 +200,9 @@
         self.part_auto_hidden_label.connect(
             'activate-link', self.part_auto_hidden_label_activate_link)
 
+        # Define a list to save grub imformation
+        self.grub_options = []
+
     def plugin_get_current_page(self):
         if self.current_page == self.page_ask:
             self.plugin_is_install = self.part_ask_option_is_install()
@@ -566,6 +569,10 @@
     def set_grub_options(self, default, grub_installable):
         from gi.repository import Gtk, GObject
         options = misc.grub_options()
+
+        # Now save grub information
+        self.grub_options = options
+
         l = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
         self.grub_device_entry.set_model(l)
         selected = False
@@ -837,6 +844,25 @@
             size_mb = int(partition['resize_min_size']) / 1000000
             cell.set_property('text', '%d MB' % size_mb)
 
+    def partman_column_syst(self, unused_column, cell, model, iterator,
+                            user_data):
+        if not model[iterator][1]:
+            return
+        partition = model[iterator][1]
+        options = self.grub_options
+        if 'id' not in partition:
+            cell.set_property('text', '')
+        elif (partition['parted']['fs'] != 'free'
+                and partition['parted']['fs'] != 'linux-swap'):
+            for opt in options:
+                if partition['parted']['path'] in opt:
+                    cell.set_property('text', '%s' % opt[1])
+                    break
+        elif partition['parted']['type'] == 'unusable':
+            cell.set_property('text', '')
+        else:
+            cell.set_property('text', '')
+
     @plugin.only_this_page
     def partman_popup(self, widget, event):
         from gi.repository import Gtk
@@ -1329,6 +1355,13 @@
             column_used.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
             self.partition_list_treeview.append_column(column_used)
 
+            cell_syst = Gtk.CellRendererText()
+            column_syst = Gtk.TreeViewColumn(
+                self.controller.get_string('partition_column_syst'), cell_syst)
+            column_syst.set_cell_data_func(cell_syst, self.partman_column_syst)
+            column_syst.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
+            self.partition_list_treeview.append_column(column_syst)
+
             self.partition_list_treeview.set_model(partition_tree_model)
 
             selection = self.partition_list_treeview.get_selection()