TestDrive

Merge lp:~dkessel/testdrive/testdrive-add-mate-and-desktop-next into lp:testdrive

  1. testdrive-add-mate-and-desktop-next
  2. Merge into trunk
Proposed by Daniel Kessel
Status: Merged
Merged at revision: 452
Proposed branch: lp:~dkessel/testdrive/testdrive-add-mate-and-desktop-next
Merge into: lp:testdrive
Diff against target: 120 lines (+49/-1)
4 files modified
bin/testdrive-gtk (+2/-0)
data/ui/PreferencesTestdrivegtkDialog.ui (+31/-1)
testdrive/testdrive.py (+4/-0)
testdrivegtk/PreferencesTestdrivegtkDialog.py (+12/-0)
To merge this branch: bzr merge lp:~dkessel/testdrive/testdrive-add-mate-and-desktop-next
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve
Review via email: mp+260655@code.launchpad.net

Description of the change

I have added support for Ubuntu MATE and Desktop Next.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/testdrive-gtk'
--- bin/testdrive-gtk 2013-11-17 08:19:27 +0000
+++ bin/testdrive-gtk 2015-05-31 12:54:44 +0000
@@ -47,6 +47,8 @@
47TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})47TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})
48TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})48TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})
49TAB_LABEL.append({"dist":"ubuntugnome", "label":"Ubuntu Gnome"})49TAB_LABEL.append({"dist":"ubuntugnome", "label":"Ubuntu Gnome"})
50TAB_LABEL.append({"dist":"ubuntu-mate", "label":"Ubuntu MATE"})
51TAB_LABEL.append({"dist":"ubuntu-desktop-next", "label":"Ubuntu Desktop Next"})
50TAB_LABEL.append({"dist":"other", "label":_("Other")})52TAB_LABEL.append({"dist":"other", "label":_("Other")})
5153
52global ISOLIST54global ISOLIST
5355
=== modified file 'data/ui/PreferencesTestdrivegtkDialog.ui'
--- data/ui/PreferencesTestdrivegtkDialog.ui 2013-10-26 18:34:02 +0000
+++ data/ui/PreferencesTestdrivegtkDialog.ui 2015-05-31 12:54:44 +0000
@@ -1003,6 +1003,36 @@
1003 <property name="position">8</property>1003 <property name="position">8</property>
1004 </packing>1004 </packing>
1005 </child>1005 </child>
1006 <child>
1007 <object class="GtkCheckButton" id="chk_flavor_ubuntumate">
1008 <property name="label" translatable="yes">Ubuntu MATE</property>
1009 <property name="visible">True</property>
1010 <property name="can_focus">True</property>
1011 <property name="receives_default">False</property>
1012 <property name="use_action_appearance">False</property>
1013 <property name="draw_indicator">True</property>
1014 </object>
1015 <packing>
1016 <property name="expand">False</property>
1017 <property name="fill">False</property>
1018 <property name="position">9</property>
1019 </packing>
1020 </child>
1021 <child>
1022 <object class="GtkCheckButton" id="chk_flavor_ubuntudesktopnext">
1023 <property name="label" translatable="yes">Ubuntu Desktop Next</property>
1024 <property name="visible">True</property>
1025 <property name="can_focus">True</property>
1026 <property name="receives_default">False</property>
1027 <property name="use_action_appearance">False</property>
1028 <property name="draw_indicator">True</property>
1029 </object>
1030 <packing>
1031 <property name="expand">False</property>
1032 <property name="fill">False</property>
1033 <property name="position">10</property>
1034 </packing>
1035 </child>
1006 <child>1036 <child>
1007 <object class="GtkCheckButton" id="chk_flavor_other">1037 <object class="GtkCheckButton" id="chk_flavor_other">
1008 <property name="label" translatable="yes">Other</property>1038 <property name="label" translatable="yes">Other</property>
@@ -1015,7 +1045,7 @@
1015 <packing>1045 <packing>
1016 <property name="expand">False</property>1046 <property name="expand">False</property>
1017 <property name="fill">False</property>1047 <property name="fill">False</property>
1018 <property name="position">9</property>1048 <property name="position">11</property>
1019 </packing>1049 </packing>
1020 </child>1050 </child>
1021 </object>1051 </object>
10221052
=== modified file 'testdrive/testdrive.py'
--- testdrive/testdrive.py 2013-10-27 14:32:31 +0000
+++ testdrive/testdrive.py 2015-05-31 12:54:44 +0000
@@ -31,6 +31,8 @@
31 "kubuntu-active":"kubuntu",31 "kubuntu-active":"kubuntu",
32 "ubuntukylin":"ubuntukylin",32 "ubuntukylin":"ubuntukylin",
33 "ubuntu-gnome":"ubuntugnome",33 "ubuntu-gnome":"ubuntugnome",
34 "ubuntu-mate":"ubuntumate",
35 "ubuntu-desktop-next":"ubuntudesktopnext",
34}36}
3537
3638
@@ -44,6 +46,8 @@
44 "ubuntu-server":"Ubuntu",46 "ubuntu-server":"Ubuntu",
45 "ubuntukylin":"UbuntuKylin",47 "ubuntukylin":"UbuntuKylin",
46 "ubuntu-gnome":"Ubuntu Gnome",48 "ubuntu-gnome":"Ubuntu Gnome",
49 "ubuntu-mate":"Ubuntu MATE",
50 "ubuntu-desktop-next":"Ubuntu Desktop Next",
47 "cloud-server":"Cloud Server",51 "cloud-server":"Cloud Server",
48 "cloud-desktop":"Cloud Desktop",52 "cloud-desktop":"Cloud Desktop",
49}53}
5054
=== modified file 'testdrivegtk/PreferencesTestdrivegtkDialog.py'
--- testdrivegtk/PreferencesTestdrivegtkDialog.py 2013-10-24 14:10:11 +0000
+++ testdrivegtk/PreferencesTestdrivegtkDialog.py 2015-05-31 12:54:44 +0000
@@ -201,6 +201,10 @@
201 self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)201 self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)
202 self.chk_flavor_ubuntugnome = self.builder.get_object("chk_flavor_ubuntugnome")202 self.chk_flavor_ubuntugnome = self.builder.get_object("chk_flavor_ubuntugnome")
203 self.chk_flavor_ubuntugnome.connect("clicked", self.on_select_flavors)203 self.chk_flavor_ubuntugnome.connect("clicked", self.on_select_flavors)
204 self.chk_flavor_ubuntumate = self.builder.get_object("chk_flavor_ubuntumate")
205 self.chk_flavor_ubuntumate.connect("clicked", self.on_select_flavors)
206 self.chk_flavor_ubuntudesktopnext = self.builder.get_object("chk_flavor_ubuntudesktopnext")
207 self.chk_flavor_ubuntudesktopnext.connect("clicked", self.on_select_flavors)
204 self.chk_flavor_other = self.builder.get_object("chk_flavor_other")208 self.chk_flavor_other = self.builder.get_object("chk_flavor_other")
205 self.chk_flavor_other.connect("clicked", self.on_select_flavors)209 self.chk_flavor_other.connect("clicked", self.on_select_flavors)
206210
@@ -306,6 +310,10 @@
306 self.chk_flavor_ubuntukylin.set_active(True)310 self.chk_flavor_ubuntukylin.set_active(True)
307 elif flavor == 'ubuntugnome':311 elif flavor == 'ubuntugnome':
308 self.chk_flavor_ubuntugnome.set_active(True)312 self.chk_flavor_ubuntugnome.set_active(True)
313 elif flavor == 'ubuntu-mate':
314 self.chk_flavor_ubuntumate.set_active(True)
315 elif flavor == 'ubuntu-desktop-next':
316 self.chk_flavor_ubuntudesktopnext.set_active(True)
309 elif flavor == 'other':317 elif flavor == 'other':
310 self.chk_flavor_other.set_active(True)318 self.chk_flavor_other.set_active(True)
311 else:319 else:
@@ -453,6 +461,10 @@
453 self.flavors = self.flavors + "ubuntukylin, "461 self.flavors = self.flavors + "ubuntukylin, "
454 if self.chk_flavor_ubuntugnome.get_active():462 if self.chk_flavor_ubuntugnome.get_active():
455 self.flavors = self.flavors + "ubuntugnome, "463 self.flavors = self.flavors + "ubuntugnome, "
464 if self.chk_flavor_ubuntumate.get_active():
465 self.flavors = self.flavors + "ubuntu-mate, "
466 if self.chk_flavor_ubuntudesktopnext.get_active():
467 self.flavors = self.flavors + "ubuntu-desktop-next, "
456 if self.chk_flavor_other.get_active():468 if self.chk_flavor_other.get_active():
457 self.flavors = self.flavors + "other, "469 self.flavors = self.flavors + "other, "
458470

Subscribers

People subscribed via source and target branches