[ocrfeeder: 7/15] Move menubar UI XML to a separate file

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit 15581fcaa9b82033e8a8b6c0ddff5abf1f3570b4
Author: Joaquim Rocha <jrocha igalia com>
Date:   Sat Oct 6 15:21:36 2012 +0200

    Move menubar UI XML to a separate file

 resources/Makefile.am                   |    6 +-
 resources/menubar.ui                    |   73 +++++++++++++++++++++++++++++
 src/ocrfeeder/studio/widgetPresenter.py |   76 +------------------------------
 src/ocrfeeder/util/constants.py.in      |    3 +-
 4 files changed, 79 insertions(+), 79 deletions(-)
---
diff --git a/resources/Makefile.am b/resources/Makefile.am
index 58d378d..abecc99 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -5,11 +5,11 @@ desktop_in_files = ocrfeeder.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-spellchecker_uidir = $(datadir)/ocrfeeder
-spellchecker_ui_DATA = spell-checker.ui
+ui_filesdir = $(datadir)/ocrfeeder
+ui_files_DATA = spell-checker.ui menubar.ui
 
 man_MANS = ocrfeeder.1 ocrfeeder-cli.1
 
-EXTRA_DIST = $(desktop_in_files) $(man_MANS) $(spellchecker_ui_DATA)
+EXTRA_DIST = $(desktop_in_files) $(man_MANS) $(ui_files_DATA)
 
 CLEANFILES = $(desktop_DATA)
diff --git a/resources/menubar.ui b/resources/menubar.ui
new file mode 100644
index 0000000..2413978
--- /dev/null
+++ b/resources/menubar.ui
@@ -0,0 +1,73 @@
+<ui>
+    <menubar name="MenuBar">
+        <menu action="File">
+            <menuitem action="OpenProject"/>
+            <menuitem action="SaveProject"/>
+            <menuitem action="SaveProjectAs"/>
+            <separator/>
+            <menuitem action="AppendProject"/>
+            <separator/>
+            <menuitem action="AddImage"/>
+            <menuitem action="AddFolder"/>
+            <separator/>
+            <menuitem action="ImportPDF"/>
+            <separator/>
+            <menuitem action="ImportFromScanner"/>
+            <menuitem action="Export"/>
+            <separator/>
+            <menuitem action="Quit"/>
+        </menu>
+        <menu action="Edit">
+            <menuitem action="CopyToClipboard"/>
+            <separator/>
+            <menuitem action="EditPage"/>
+            <menuitem action="DeletePage"/>
+            <menuitem action="SelectNextPage"/>
+            <menuitem action="SelectPreviousPage"/>
+            <menuitem action="MovePageUp"/>
+            <menuitem action="MovePageDown"/>
+            <separator/>
+            <menuitem action="ClearProject"/>
+            <separator/>
+            <menuitem action="Preferences"/>
+        </menu>
+        <menu action="View">
+            <menuitem action="ZoomIn"/>
+            <menuitem action="ZoomOut"/>
+            <menuitem action="ResetZoom"/>
+            <menuitem action="ZoomFit"/>
+        </menu>
+        <menu action="Document">
+            <menuitem action="OCRFeederReconDocument"/>
+            <menuitem action="OCRFeederReconPage"/>
+            <menuitem action="RecognizeAreas"/>
+            <separator/>
+            <menuitem action="SelectAllAreas"/>
+            <menuitem action="SelectPreviousArea"/>
+            <menuitem action="SelectNextArea"/>
+            <separator/>
+            <menuitem action="DeleteSelectedAreas"/>
+        </menu>
+        <menu action="Tools">
+            <menuitem action="OCREngines"/>
+            <separator/>
+            <menuitem action="Unpaper"/>
+            <menuitem action="ImageDeskewer"/>
+            <separator/>
+            <menuitem action="SpellChecker"/>
+        </menu>
+        <menu action="Help">
+            <menuitem action="HelpContents"/>
+            <menuitem action="About"/>
+        </menu>
+    </menubar>
+    <toolbar name="ToolBar">
+        <toolitem action="AddImage"/>
+        <separator/>
+        <toolitem action="OCRFeederReconDocument"/>
+        <toolitem action="GenerateODT"/>
+        <separator/>
+        <toolitem action="ZoomOut"/>
+        <toolitem action="ZoomIn"/>
+    </toolbar>
+</ui>
\ No newline at end of file
diff --git a/src/ocrfeeder/studio/widgetPresenter.py b/src/ocrfeeder/studio/widgetPresenter.py
index 1e14cfb..691fa7b 100644
--- a/src/ocrfeeder/studio/widgetPresenter.py
+++ b/src/ocrfeeder/studio/widgetPresenter.py
@@ -45,80 +45,6 @@ _ = gettext.gettext
 
 class MainWindow:
 
-    menubar = '''<ui>
-    <menubar name="MenuBar">
-        <menu action="File">
-            <menuitem action="OpenProject"/>
-            <menuitem action="SaveProject"/>
-            <menuitem action="SaveProjectAs"/>
-            <separator/>
-            <menuitem action="AppendProject"/>
-            <separator/>
-            <menuitem action="AddImage"/>
-            <menuitem action="AddFolder"/>
-            <separator/>
-            <menuitem action="ImportPDF"/>
-            <separator/>
-            <menuitem action="ImportFromScanner"/>
-            <menuitem action="Export"/>
-            <separator/>
-            <menuitem action="Quit"/>
-        </menu>
-        <menu action="Edit">
-            <menuitem action="CopyToClipboard"/>
-            <separator/>
-            <menuitem action="EditPage"/>
-            <menuitem action="DeletePage"/>
-            <menuitem action="SelectNextPage"/>
-            <menuitem action="SelectPreviousPage"/>
-            <menuitem action="MovePageUp"/>
-            <menuitem action="MovePageDown"/>
-            <separator/>
-            <menuitem action="ClearProject"/>
-            <separator/>
-            <menuitem action="Preferences"/>
-        </menu>
-        <menu action="View">
-            <menuitem action="ZoomIn"/>
-            <menuitem action="ZoomOut"/>
-            <menuitem action="ResetZoom"/>
-            <menuitem action="ZoomFit"/>
-        </menu>
-        <menu action="Document">
-            <menuitem action="OCRFeederReconDocument"/>
-            <menuitem action="OCRFeederReconPage"/>
-            <menuitem action="RecognizeAreas"/>
-            <separator/>
-            <menuitem action="SelectAllAreas"/>
-            <menuitem action="SelectPreviousArea"/>
-            <menuitem action="SelectNextArea"/>
-            <separator/>
-            <menuitem action="DeleteSelectedAreas"/>
-        </menu>
-        <menu action="Tools">
-            <menuitem action="OCREngines"/>
-            <separator/>
-            <menuitem action="Unpaper"/>
-            <menuitem action="ImageDeskewer"/>
-            <separator/>
-            <menuitem action="SpellChecker"/>
-        </menu>
-        <menu action="Help">
-            <menuitem action="HelpContents"/>
-            <menuitem action="About"/>
-        </menu>
-    </menubar>
-    <toolbar name="ToolBar">
-        <toolitem action="AddImage"/>
-        <separator/>
-        <toolitem action="OCRFeederReconDocument"/>
-        <toolitem action="GenerateODT"/>
-        <separator/>
-        <toolitem action="ZoomOut"/>
-        <toolitem action="ZoomIn"/>
-    </toolbar>
-    </ui>'''
-
     def __init__(self):
         self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         self.window.set_size_request(800, 600)
@@ -238,7 +164,7 @@ class MainWindow:
                                    menu_items['spell_checker']),
                                   ])
         ui_manager.insert_action_group(action_group, 0)
-        ui_manager.add_ui_from_string(self.menubar)
+        ui_manager.add_ui_from_file(OCRFEEDER_MENUBAR_UI)
         menu_bar = ui_manager.get_widget('/MenuBar/')
         self.main_box.pack_start(menu_bar, False)
         tool_bar = ui_manager.get_widget('/ToolBar')
diff --git a/src/ocrfeeder/util/constants.py.in b/src/ocrfeeder/util/constants.py.in
index ad3648e..6dfc6bd 100644
--- a/src/ocrfeeder/util/constants.py.in
+++ b/src/ocrfeeder/util/constants.py.in
@@ -87,6 +87,7 @@ GHOSTSCRIPT_COMMAND = 'gs'
 
 # DeskTop Publishing Point (for calculating print measures)
 DTP = 72
-# location of glade spellchecker UI file
 
+# UI files' location
 OCRFEEDER_SPELLCHECKER_UI = os.path.join(RESOURCES_DIR, 'spell-checker.ui')
+OCRFEEDER_MENUBAR_UI = os.path.join(RESOURCES_DIR, 'menubar.ui')