ubiquity

Merge lp:~agateau/ubiquity/kde-fix-cancel-button into lp:ubiquity

  1. kde-fix-cancel-button
  2. Merge into trunk
Proposed by Aurélien Gâteau
Status: Merged
Merged at revision: 5880
Proposed branch: lp:~agateau/ubiquity/kde-fix-cancel-button
Merge into: lp:ubiquity
Diff against target: 53 lines (+6/-12)
2 files modified
gui/qt/app.ui (+1/-10)
ubiquity/frontend/kde_ui.py (+5/-2)
To merge this branch: bzr merge lp:~agateau/ubiquity/kde-fix-cancel-button
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+154782@code.launchpad.net

Description of the change

Fix the cancel button. It was missing its icon and actually doing nothing.

To post a comment you must log in.
lp:~agateau/ubiquity/kde-fix-cancel-button updated
5879. By Aurélien Gâteau

pep8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gui/qt/app.ui'
2--- gui/qt/app.ui 2013-03-14 18:29:20 +0000
3+++ gui/qt/app.ui 2013-03-21 18:26:27 +0000
4@@ -260,16 +260,7 @@
5 </widget>
6 </item>
7 <item>
8- <widget class="QPushButton" name="progressCancel">
9- <property name="text">
10- <string/>
11- </property>
12- <property name="icon">
13- <iconset theme="dialog-close">
14- <normaloff/>
15- </iconset>
16- </property>
17- </widget>
18+ <widget class="QToolButton" name="progressCancel"/>
19 </item>
20 </layout>
21 </widget>
22
23=== modified file 'ubiquity/frontend/kde_ui.py'
24--- ubiquity/frontend/kde_ui.py 2013-03-14 18:29:20 +0000
25+++ ubiquity/frontend/kde_ui.py 2013-03-21 18:26:27 +0000
26@@ -283,6 +283,7 @@
27 self.update_back_button()
28 self.update_next_button(install_now=False)
29 self.ui.quit.setIcon(QtGui.QIcon.fromTheme("dialog-close"))
30+ self.ui.progressCancel.setIcon(QtGui.QIcon.fromTheme("dialog-close"))
31
32 self._show_progress_bar(False)
33
34@@ -385,6 +386,8 @@
35 self.ui.next.clicked.connect(self.on_next_clicked)
36 self.ui.back.clicked.connect(self.on_back_clicked)
37 self.ui.quit.clicked.connect(self.on_quit_clicked)
38+ self.ui.progressCancel.clicked.connect(
39+ self.on_progress_cancel_button_clicked)
40
41 if 'UBIQUITY_AUTOMATIC' in os.environ:
42 self.debconf_progress_start(
43@@ -1170,8 +1173,8 @@
44 self.progressDialog.setCancellable(False)
45 self.progress_cancelled = False
46
47- #def on_progress_cancel_button_clicked(self, button):
48- # self.progress_cancelled = True
49+ def on_progress_cancel_button_clicked(self, button):
50+ self.progress_cancelled = True
51
52 def debconffilter_done(self, dbfilter):
53 # processing events here prevents GUI from hanging until mouse moves

Subscribers

People subscribed via source and target branches

to status/vote changes: