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
1=== modified file 'bin/testdrive-gtk'
2--- bin/testdrive-gtk 2013-11-17 08:19:27 +0000
3+++ bin/testdrive-gtk 2015-05-31 12:54:44 +0000
4@@ -47,6 +47,8 @@
5 TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})
6 TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})
7 TAB_LABEL.append({"dist":"ubuntugnome", "label":"Ubuntu Gnome"})
8+TAB_LABEL.append({"dist":"ubuntu-mate", "label":"Ubuntu MATE"})
9+TAB_LABEL.append({"dist":"ubuntu-desktop-next", "label":"Ubuntu Desktop Next"})
10 TAB_LABEL.append({"dist":"other", "label":_("Other")})
11
12 global ISOLIST
13
14=== modified file 'data/ui/PreferencesTestdrivegtkDialog.ui'
15--- data/ui/PreferencesTestdrivegtkDialog.ui 2013-10-26 18:34:02 +0000
16+++ data/ui/PreferencesTestdrivegtkDialog.ui 2015-05-31 12:54:44 +0000
17@@ -1003,6 +1003,36 @@
18 <property name="position">8</property>
19 </packing>
20 </child>
21+ <child>
22+ <object class="GtkCheckButton" id="chk_flavor_ubuntumate">
23+ <property name="label" translatable="yes">Ubuntu MATE</property>
24+ <property name="visible">True</property>
25+ <property name="can_focus">True</property>
26+ <property name="receives_default">False</property>
27+ <property name="use_action_appearance">False</property>
28+ <property name="draw_indicator">True</property>
29+ </object>
30+ <packing>
31+ <property name="expand">False</property>
32+ <property name="fill">False</property>
33+ <property name="position">9</property>
34+ </packing>
35+ </child>
36+ <child>
37+ <object class="GtkCheckButton" id="chk_flavor_ubuntudesktopnext">
38+ <property name="label" translatable="yes">Ubuntu Desktop Next</property>
39+ <property name="visible">True</property>
40+ <property name="can_focus">True</property>
41+ <property name="receives_default">False</property>
42+ <property name="use_action_appearance">False</property>
43+ <property name="draw_indicator">True</property>
44+ </object>
45+ <packing>
46+ <property name="expand">False</property>
47+ <property name="fill">False</property>
48+ <property name="position">10</property>
49+ </packing>
50+ </child>
51 <child>
52 <object class="GtkCheckButton" id="chk_flavor_other">
53 <property name="label" translatable="yes">Other</property>
54@@ -1015,7 +1045,7 @@
55 <packing>
56 <property name="expand">False</property>
57 <property name="fill">False</property>
58- <property name="position">9</property>
59+ <property name="position">11</property>
60 </packing>
61 </child>
62 </object>
63
64=== modified file 'testdrive/testdrive.py'
65--- testdrive/testdrive.py 2013-10-27 14:32:31 +0000
66+++ testdrive/testdrive.py 2015-05-31 12:54:44 +0000
67@@ -31,6 +31,8 @@
68 "kubuntu-active":"kubuntu",
69 "ubuntukylin":"ubuntukylin",
70 "ubuntu-gnome":"ubuntugnome",
71+ "ubuntu-mate":"ubuntumate",
72+ "ubuntu-desktop-next":"ubuntudesktopnext",
73 }
74
75
76@@ -44,6 +46,8 @@
77 "ubuntu-server":"Ubuntu",
78 "ubuntukylin":"UbuntuKylin",
79 "ubuntu-gnome":"Ubuntu Gnome",
80+ "ubuntu-mate":"Ubuntu MATE",
81+ "ubuntu-desktop-next":"Ubuntu Desktop Next",
82 "cloud-server":"Cloud Server",
83 "cloud-desktop":"Cloud Desktop",
84 }
85
86=== modified file 'testdrivegtk/PreferencesTestdrivegtkDialog.py'
87--- testdrivegtk/PreferencesTestdrivegtkDialog.py 2013-10-24 14:10:11 +0000
88+++ testdrivegtk/PreferencesTestdrivegtkDialog.py 2015-05-31 12:54:44 +0000
89@@ -201,6 +201,10 @@
90 self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)
91 self.chk_flavor_ubuntugnome = self.builder.get_object("chk_flavor_ubuntugnome")
92 self.chk_flavor_ubuntugnome.connect("clicked", self.on_select_flavors)
93+ self.chk_flavor_ubuntumate = self.builder.get_object("chk_flavor_ubuntumate")
94+ self.chk_flavor_ubuntumate.connect("clicked", self.on_select_flavors)
95+ self.chk_flavor_ubuntudesktopnext = self.builder.get_object("chk_flavor_ubuntudesktopnext")
96+ self.chk_flavor_ubuntudesktopnext.connect("clicked", self.on_select_flavors)
97 self.chk_flavor_other = self.builder.get_object("chk_flavor_other")
98 self.chk_flavor_other.connect("clicked", self.on_select_flavors)
99
100@@ -306,6 +310,10 @@
101 self.chk_flavor_ubuntukylin.set_active(True)
102 elif flavor == 'ubuntugnome':
103 self.chk_flavor_ubuntugnome.set_active(True)
104+ elif flavor == 'ubuntu-mate':
105+ self.chk_flavor_ubuntumate.set_active(True)
106+ elif flavor == 'ubuntu-desktop-next':
107+ self.chk_flavor_ubuntudesktopnext.set_active(True)
108 elif flavor == 'other':
109 self.chk_flavor_other.set_active(True)
110 else:
111@@ -453,6 +461,10 @@
112 self.flavors = self.flavors + "ubuntukylin, "
113 if self.chk_flavor_ubuntugnome.get_active():
114 self.flavors = self.flavors + "ubuntugnome, "
115+ if self.chk_flavor_ubuntumate.get_active():
116+ self.flavors = self.flavors + "ubuntu-mate, "
117+ if self.chk_flavor_ubuntudesktopnext.get_active():
118+ self.flavors = self.flavors + "ubuntu-desktop-next, "
119 if self.chk_flavor_other.get_active():
120 self.flavors = self.flavors + "other, "
121

Subscribers

People subscribed via source and target branches