Merge lp:~bdfhjk/clicompanion/fix-643125 into lp:clicompanion

Proposed by Marek Bardoński
Status: Merged
Approved by: Duane Hinnen
Approved revision: 67
Merged at revision: 68
Proposed branch: lp:~bdfhjk/clicompanion/fix-643125
Merge into: lp:clicompanion
Diff against target: 57 lines (+34/-2)
2 files modified
clicompanionlib/controller.py (+28/-1)
clicompanionlib/view.py (+6/-1)
To merge this branch: bzr merge lp:~bdfhjk/clicompanion/fix-643125
Reviewer Review Type Date Requested Status
Duane Hinnen Approve
Review via email: mp+54114@code.launchpad.net

Description of the change

Added AboutBox and fixed error in view.py

To post a comment you must log in.
Revision history for this message
Duane Hinnen (duanedesign) wrote :

works great. Good job!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clicompanionlib/controller.py'
2--- clicompanionlib/controller.py 2011-03-18 15:46:30 +0000
3+++ clicompanionlib/controller.py 2011-03-19 21:01:02 +0000
4@@ -423,7 +423,34 @@
5
6 ## Help --> About and Help --> Help menus
7 def about_event(self, widget, data=None):
8- pass
9+ # Create AboutDialog object
10+ dialog = gtk.AboutDialog()
11+
12+ # Add the application name to the dialog
13+ dialog.set_name('CLI Companion ')
14+
15+ # Set the application version
16+ dialog.set_version('1.0')
17+
18+ # Pass a list of authors. This is then connected to the 'Credits'
19+ # button. When clicked the buttons opens a new window showing
20+ # each author on their own line.
21+ dialog.set_authors(['Duane Hinnen', 'Kenny Meyer', 'Marcos Vanetta'])
22+
23+ # Add a short comment about the application, this appears below the application
24+ # name in the dialog
25+ dialog.set_comments('This is a CLI Companion program.')
26+
27+ # Add license information, this is connected to the 'License' button
28+ # and is displayed in a new window.
29+ dialog.set_license('Distributed under the GNU license. You can see it at <http://www.gnu.org/licenses/>.')
30+
31+ # Show the dialog
32+ dialog.run()
33+
34+ # The destroy method must be called otherwise the 'Close' button will
35+ # not work.
36+ dialog.destroy()
37 def help_event(self, widget, data=None):
38 webbrowser.open("http://okiebuntu.homelinux.com/okwiki/clicompanion")
39
40
41=== modified file 'clicompanionlib/view.py'
42--- clicompanionlib/view.py 2011-03-18 15:46:30 +0000
43+++ clicompanionlib/view.py 2011-03-19 21:01:02 +0000
44@@ -53,7 +53,12 @@
45 CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
46 CMNDS = [] ## will hold the commands. Actually the first two columns
47 ROW = '1' ## holds the currently selected row
48-
49+TARGETS = [
50+ ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0),
51+ ('text/plain', 0, 1),
52+ ('TEXT', 0, 2),
53+ ('STRING', 0, 3),
54+ ]
55
56
57 class MainWindow():

Subscribers

People subscribed via source and target branches