Merge lp:~nico-inattendu/luciole/bug_740324 into lp:luciole

[NicoInattendu]

fix for bug #740324. : About window added, actions report a bug, ask a question and help translate also added.

fix for bug #740324.
About window added, actions report a bug, ask a question and help translate also added.

=== modified file 'luciole/gui/actions.py'
--- luciole/gui/actions.py	2011-03-05 13:59:13 +0000
+++ luciole/gui/actions.py	2011-03-25 09:26:06 +0000
@@ -3,7 +3,7 @@
 # -*- Mode: Python -*-
 # vim:si:ai:et:sw=4:sts=4:ts=4
 #
-# Copyright Nicolas Bertrand ([e-mail]), 2010
+# Copyright Nicolas Bertrand ([e-mail]), 2010-2011
 #
 # This file is part of Luciole.
 #
@@ -27,6 +27,7 @@
 """
 # standard library imports
 from gettext import gettext as _
+import webbrowser
 
 # related third party imports
 import gobject
@@ -38,7 +39,7 @@
 import luciole.gui.constants as GUI_CONST
 import luciole.constants as LCONST
 from luciole.gui.windows.export_video_window import ExportVideoWindow
-
+from luciole.info import REVNO, VERSION
 _tv_change_signal = 'treeview-change'
 _tv_selected_signal = 'treeview-selected'
 
@@ -183,6 +184,12 @@
                 self._preferences_cb),
             (self.builder_actions[GUI_CONST.ACTION_ABOUT],
                 self._about_cb),
+            (self.builder_actions[GUI_CONST.ACTION_BUG],
+                self._bug_cb),
+            (self.builder_actions[GUI_CONST.ACTION_ASK],
+                self._ask_cb),
+            (self.builder_actions[GUI_CONST.ACTION_I18N],
+                self._i18n_cb),
             ]
 
         #
@@ -457,11 +464,41 @@
         pass
 
     def _about_cb(self, action ) :
-        # TODO : implement About dialog
-        pass
-
-   
-    
+        _ver = "%s (%s)"%(VERSION, REVNO)
+        self.debug('show about dialog: version %s', _ver)
+        self.gui.windows.about(_ver)
+        
+    def _bug_cb(self, action ) :
+        """ report bug action """ 
+        self.debug('Report bug action')
+        try:
+			webbrowser.open("https://bugs.launchpad.net/luciole/+filebug")
+		except:
+            _msg = _("Unable to open the Launchpad web page.")
+            self.warning(_msg)
+            self.gui.windows.error_message(_msg)
+
+    def _ask_cb(self, action ) :
+        """ ask a question action """ 
+        self.debug('Ask a question action')
+        try:
+			webbrowser.open("https://answers.launchpad.net/luciole/+addquestion")
+		except:
+            _msg = _("Unable to open the Launchpad web page.")
+            self.warning(_msg)
+            self.gui.windows.error_message(_msg)
+
+    def _i18n_cb(self, action ) :
+        """ Help trranslate action """ 
+        self.debug('Help translate action')
+        try:
+			webbrowser.open("https://translations.launchpad.net/luciole")
+		except:
+            _msg = _("Unable to open the Launchpad web page.")
+            self.warning(_msg)
+            self.gui.windows.error_message(_msg)
+
+
     #
     # project common callbacks
     #

=== modified file 'luciole/gui/constants.py'
--- luciole/gui/constants.py	2011-02-27 18:32:53 +0000
+++ luciole/gui/constants.py	2011-03-25 09:26:06 +0000
@@ -64,6 +64,9 @@
 ACTION_PREFERENCES = "ActionPreferences"
 ACTION_OPEN = "ActionOpen"
 ACTION_NEW = "ActionNew"
+ACTION_BUG = "ActionReportBug"
+ACTION_ASK = "ActionAsk"
+ACTION_I18N = "ActionTranslate"
 
 ACTION_CLOSE = "ActionClose"
 ACTION_SAVE = "ActionSave"

=== modified file 'luciole/po/POTFILES.in'
--- luciole/po/POTFILES.in	2010-09-06 12:10:40 +0000
+++ luciole/po/POTFILES.in	2011-03-25 09:26:06 +0000
@@ -1,15 +1,12 @@
 [encoding: UTF-8]
-../luciole/ui/luciole.glade
-../luciole/ui/export_file.glade
 ../luciole/base/lcl_et.py
 ../luciole/conf.py
 ../luciole/constants.py
-../luciole/ctrl/ctrl.py
 ../luciole/ctrl/import_image.py
 ../luciole/ctrl/load_rush.py
-../luciole/ctrl/project_ctrl.py
-../luciole/ctrl/viewer_ctrl.py
+../luciole/ctrl/ctrl_project.py
 ../luciole/gui/control_widget.py
+../luciole/gui/windows/actions.py
 ../luciole/gui/windows/assistant_new_project.py
 ../luciole/gui/windows/dialog_project_properties.py
 ../luciole/gui/windows/dialog.py
@@ -22,3 +19,5 @@
 ../luciole/project/export/export_pitivi.py
 ../luciole/project/export/export_tool_base.py
 ../luciole/project/export/export_video.py
+../luciole/ui/export_file.glade
+../luciole/ui/luciole.glade

=== modified file 'luciole/ui/luciole.glade'
--- luciole/ui/luciole.glade	2011-02-28 12:58:02 +0000
+++ luciole/ui/luciole.glade	2011-03-25 09:26:06 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
@@ -71,8 +71,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_new">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionNew</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_new_activate"/>
@@ -81,8 +81,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_open">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionOpen</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -137,8 +137,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem3">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionSave</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_save_activate"/>
@@ -147,8 +147,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem4">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionSaveAs</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_save_as_activate"/>
@@ -162,8 +162,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_import">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionImportImage</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_import_activate"/>
@@ -172,8 +172,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_export">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionExportVideo</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_export_activate"/>
@@ -182,8 +182,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_export_tool">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionExportTool</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_export_tool_activate"/>
@@ -197,8 +197,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="file_close">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionClose</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_close_activate"/>
@@ -207,8 +207,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem5">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionQuit</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_file_quit_activate"/>
@@ -229,8 +229,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="view_project">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionProjectProperties</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_view_project_activate"/>
@@ -239,8 +239,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="Preferences_menu">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionPreferences</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_preferences_activate"/>
@@ -261,8 +261,8 @@
                     <child>
                       <object class="GtkRadioMenuItem" id="start_stop_acqusition_item">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">start_stop_acquisition</property>
+                        <property name="use_action_appearance">True</property>
                       </object>
                     </child>
                   </object>
@@ -278,10 +278,42 @@
                   <object class="GtkMenu" id="menu3">
                     <property name="visible">True</property>
                     <child>
+                      <object class="GtkImageMenuItem" id="mnuReportBug">
+                        <property name="visible">True</property>
+                        <property name="related_action">ActionReportBug</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="MnuAskQquestion">
+                        <property name="visible">True</property>
+                        <property name="related_action">ActionAsk</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="mnuTranslate">
+                        <property name="visible">True</property>
+                        <property name="related_action">ActionTranslate</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem2">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="help_about">
                         <property name="visible">True</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="related_action">ActionAbout</property>
+                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_help_about_activate"/>
@@ -665,7 +697,6 @@
     <property name="title" translatable="yes">Select a Luciole project</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">menu</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -700,7 +731,6 @@
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Luciole</property>
     <property name="version">0.8</property>
     <property name="copyright" translatable="yes">Copyright 2009-2010  Nicolas Bertrand ([e-mail])</property>
@@ -763,7 +793,6 @@
     <property name="title" translatable="yes">Video Export</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox11">
         <property name="visible">True</property>
@@ -1044,9 +1073,9 @@
                                   <object class="GtkFileChooserButton" id="filechooserbutton1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="action">select-folder</property>
                                     <property name="do_overwrite_confirmation">True</property>
                                     <property name="use_preview_label">False</property>
-                                    <property name="action">select-folder</property>
                                     <property name="title" translatable="yes">Select a folder</property>
                                   </object>
                                   <packing>
@@ -1268,7 +1297,6 @@
     <property name="border_width">5</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
@@ -1304,7 +1332,6 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="height_request">269</property>
@@ -1550,4 +1577,16 @@
   <object class="GtkAction" id="ActionProjectProperties">
     <property name="stock_id">gtk-properties</property>
   </object>
+  <object class="GtkAction" id="ActionReportBug">
+    <property name="label">_Report a Bug...</property>
+    <property name="stock_id">gtk-dialog-warning</property>
+  </object>
+  <object class="GtkAction" id="ActionAsk">
+    <property name="label">_Ask a Question...</property>
+    <property name="stock_id">gtk-dialog-question</property>
+  </object>
+  <object class="GtkAction" id="ActionTranslate">
+    <property name="label">_Translate this Application...</property>
+    <property name="stock_id">gtk-index</property>
+  </object>
 </interface>

=== modified file 'luciole/version.py'
--- luciole/version.py	2010-09-06 11:02:42 +0000
+++ luciole/version.py	2011-03-25 09:26:06 +0000
@@ -4,12 +4,12 @@
 So don't edit it. :)
 """
 
-version_info = {'branch_nick': u'luciole',
- 'build_date': '2010-09-06 15:01:02 +0400',
+version_info = {'branch_nick': u'bug_740324',
+ 'build_date': '2011-03-24 19:11:26 +0100',
  'clean': None,
- 'date': '2010-09-06 13:00:55 +0400',
- 'revision_id': '[e-mail]-20100906090055-iafu3ghe623sroam',
- 'revno': 117}
+ 'date': '2011-03-09 15:52:21 +0400',
+ 'revision_id': '[e-mail]-20110309115221-l1nzqwerhwwcz9jf',
+ 'revno': 129}
 
 revisions = {}