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
=== modified file 'clicompanionlib/controller.py'
--- clicompanionlib/controller.py 2011-03-18 15:46:30 +0000
+++ clicompanionlib/controller.py 2011-03-19 21:01:02 +0000
@@ -423,7 +423,34 @@
423 423
424 ## Help --> About and Help --> Help menus424 ## Help --> About and Help --> Help menus
425 def about_event(self, widget, data=None):425 def about_event(self, widget, data=None):
426 pass426 # Create AboutDialog object
427 dialog = gtk.AboutDialog()
428
429 # Add the application name to the dialog
430 dialog.set_name('CLI Companion ')
431
432 # Set the application version
433 dialog.set_version('1.0')
434
435 # Pass a list of authors. This is then connected to the 'Credits'
436 # button. When clicked the buttons opens a new window showing
437 # each author on their own line.
438 dialog.set_authors(['Duane Hinnen', 'Kenny Meyer', 'Marcos Vanetta'])
439
440 # Add a short comment about the application, this appears below the application
441 # name in the dialog
442 dialog.set_comments('This is a CLI Companion program.')
443
444 # Add license information, this is connected to the 'License' button
445 # and is displayed in a new window.
446 dialog.set_license('Distributed under the GNU license. You can see it at <http://www.gnu.org/licenses/>.')
447
448 # Show the dialog
449 dialog.run()
450
451 # The destroy method must be called otherwise the 'Close' button will
452 # not work.
453 dialog.destroy()
427 def help_event(self, widget, data=None):454 def help_event(self, widget, data=None):
428 webbrowser.open("http://okiebuntu.homelinux.com/okwiki/clicompanion")455 webbrowser.open("http://okiebuntu.homelinux.com/okwiki/clicompanion")
429 456
430457
=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py 2011-03-18 15:46:30 +0000
+++ clicompanionlib/view.py 2011-03-19 21:01:02 +0000
@@ -53,7 +53,12 @@
53CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"53CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
54CMNDS = [] ## will hold the commands. Actually the first two columns54CMNDS = [] ## will hold the commands. Actually the first two columns
55ROW = '1' ## holds the currently selected row55ROW = '1' ## holds the currently selected row
5656TARGETS = [
57 ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0),
58 ('text/plain', 0, 1),
59 ('TEXT', 0, 2),
60 ('STRING', 0, 3),
61 ]
5762
5863
59class MainWindow():64class MainWindow():

Subscribers

People subscribed via source and target branches