From 22ffeebc34bb8338f8710a47f8b4787e76b59547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Jun 2008 23:17:32 +0200 Subject: [PATCH] Add contributors for issue120 --- setup.py | 3 ++- share/tryton/contributors.txt | 2 ++ share/tryton/tryton.glade | 14 +++++++++--- tryton/gui/main.py | 43 +++++++++++++++++++++++++++++++---- 4 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 share/tryton/contributors.txt diff --git a/setup.py b/setup.py index 0f0efd2def..e721163b9f 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,8 @@ setup(name=PACKAGE, ('share/pixmaps', glob.glob('share/pixmaps/*.png') + \ glob.glob('share/pixmaps/*.svg')), ('share/tryton', glob.glob('share/tryton/tryton.glade') + \ - glob.glob('share/tryton/tipoftheday.txt')), + glob.glob('share/tryton/tipoftheday.txt') + \ + glob.glob('share/tryton/contributors.txt')), ], scripts=['bin/tryton'], classifiers=[ diff --git a/share/tryton/contributors.txt b/share/tryton/contributors.txt new file mode 100644 index 0000000000..a68bf1ce19 --- /dev/null +++ b/share/tryton/contributors.txt @@ -0,0 +1,2 @@ +Cédric Krier +Bertrand Chenal diff --git a/share/tryton/tryton.glade b/share/tryton/tryton.glade index bff407c45e..99ab5133f8 100644 --- a/share/tryton/tryton.glade +++ b/share/tryton/tryton.glade @@ -1096,11 +1096,19 @@ - + True _License True - + + + + + + True + _Credits + True + @@ -3007,7 +3015,7 @@ Save as CSV - + 484 358 License diff --git a/tryton/gui/main.py b/tryton/gui/main.py index 2d4dd9d6c8..3b3c119295 100644 --- a/tryton/gui/main.py +++ b/tryton/gui/main.py @@ -390,6 +390,35 @@ class Tips(object): self.number -= 1 self.tip_set() + +class Credits(object): + + def __init__(self, parent): + self.win = gtk.Dialog(_('Credits'), parent, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) + self.win.set_icon(TRYTON_ICON) + + self.win.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE) + + vbox = gtk.VBox() + img = gtk.Image() + img.set_from_file(os.path.join(PIXMAPS_DIR, 'tryton.png')) + vbox.pack_start(img, False, False) + self.label = gtk.Label() + self.label.set_alignment(0.5, 0) + contributors_file = os.path.join(DATA_DIR, 'contributors.txt') + contributors = '\n' + _('Contributors:') + '\n\n' + contributors += file(contributors_file).read() + self.label.set_text(contributors) + self.label.set_use_markup(True) + vbox.pack_start(self.label, True, True) + self.win.vbox.pack_start(vbox) + self.win.show_all() + + self.win.run() + parent.present() + self.win.destroy() + _MAIN = [] class Main(object): @@ -469,7 +498,8 @@ class Main(object): Main.sig_form_tab_orientation(90), 'on_opt_files_actions_activate': self.sig_files_actions, 'on_help_tips_activate': self.sig_tips, - 'on_help_licence_activate': self.sig_licence, + 'on_help_license_activate': self.sig_license, + 'on_help_credits_activate': self.sig_credits, 'on_shortcuts_activate' : self.sig_shortcuts, 'on_db_new_activate': self.sig_db_new, 'on_db_restore_activate': self.sig_db_restore, @@ -761,15 +791,18 @@ class Main(object): def sig_tips(self, *args): Tips(self.window) - def sig_licence(self, widget): - dialog = glade.XML(GLADE, "win_licence", gettext.textdomain()) + def sig_license(self, widget): + dialog = glade.XML(GLADE, "win_license", gettext.textdomain()) dialog.signal_connect("on_but_ok_pressed", - lambda obj: dialog.get_widget('win_licence').destroy()) + lambda obj: dialog.get_widget('win_license').destroy()) - win = dialog.get_widget('win_licence') + win = dialog.get_widget('win_license') win.set_transient_for(self.window) win.show_all() + def sig_credits(self, widget): + Credits(self.window) + def sig_shortcuts(self, widget): shortcuts_win = glade.XML(GLADE, 'shortcuts_dia', gettext.textdomain()) shortcuts_win.signal_connect("on_but_ok_pressed",