Rename UIManager file

diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py
index c066478e90283a3321125b47c526b8460fe13a0c..3973c6488c1ddab209c29891587efe06f52bf390 100644 (file)
--- a/debug-viewer/GstDebugViewer/GUI.py
+++ b/debug-viewer/GstDebugViewer/GUI.py
@@ -1639,8 +1639,7 @@ class Window (object):
         self.widget_factory = Common.GUI.WidgetFactory (Main.Paths.data_dir)
         self.widgets = self.widget_factory.make ("main-window.ui", "main_window")
 
-        ui_filename = os.path.join (Main.Paths.data_dir,
-                                    "gst-debug-viewer.ui")
+        ui_filename = os.path.join (Main.Paths.data_dir, "menus.ui")
         self.ui_factory = Common.GUI.UIFactory (ui_filename, self.actions)
 
         self.ui_manager = ui = self.ui_factory.make ()

diff --git a/debug-viewer/data/gst-debug-viewer.ui b/debug-viewer/data/gst-debug-viewer.ui
deleted file mode 100644 (file)
index 7623079..0000000
--- a/debug-viewer/data/gst-debug-viewer.ui
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- -*- mode: xml; -*- -->
-<ui>
-  <menubar>
-    <menu name="FileMenu" action="FileMenuAction">
-      <menuitem name="FileNewWindow" action="new-window"/>
-      <menuitem name="FileOpen" action="open-file"/>
-      <menuitem name="FileReload" action="reload-file"/>
-      <separator/>
-      <placeholder name="FileMenuAdditions"/>
-      <separator/>
-      <menuitem name="FileCloseWindow" action="close-window"/>
-    </menu>
-    <menu name="ViewMenu" action="ViewMenuAction">
-      <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
-        <menuitem name="ViewColumnsTime" action="show-time-column"/>
-        <menuitem name="ViewColumnsLevel" action="show-level-column"/>
-        <menuitem name="ViewColumnsPid" action="show-pid-column"/>
-        <menuitem name="ViewColumnsThread" action="show-thread-column"/>
-        <menuitem name="ViewColumnsCode" action="show-code-column"/>
-        <menuitem name="ViewColumnsCategory" action="show-category-column"/>
-        <menuitem name="ViewColumnsFunction" action="show-function-column"/>
-        <menuitem name="ViewColumnsObject" action="show-object-column"/>
-        <menuitem name="ViewColumnsMessage" action="show-message-column"/>
-      </menu>
-      <placeholder name="ViewMenuAdditions"/>
-      <separator/>
-      <menuitem name="ViewContextMenuHideLevel" action="hide-log-level"/>
-      <menuitem name="ViewContextMenuHideCategory" action="hide-log-category"/>
-      <menuitem name="ViewContextMenuHideObject" action="hide-log-object"/>
-      <menuitem name="ViewContextMenuHideFilename" action="hide-filename"/>
-      <menuitem name="ViewContextMenuHideBefore" action="hide-before-line"/>
-      <menuitem name="ViewContextMenuHideAfter" action="hide-after-line"/>
-      <menuitem name="ViewContextMenuShowHidden" action="show-hidden-lines"/>
-      <separator/>
-      <menuitem name="ViewContextMenuCopyMessage" action="edit-copy-message"/>
-      <menuitem name="ViewContextMenuCopyLine" action="edit-copy-line"/>
-    </menu>
-    <menu name="HelpMenu" action="HelpMenuAction">
-      <placeholder name="HelpMenuAdditions"/>
-      <menuitem name="HelpInfo" action="show-about"/>
-    </menu>
-  </menubar>
-  <menubar name="context">
-    <menu name="LogViewContextMenu" action="ViewMenuAction">
-      <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
-        <menuitem name="ViewColumnsTime" action="show-time-column"/>
-        <menuitem name="ViewColumnsLevel" action="show-level-column"/>
-        <menuitem name="ViewColumnsPid" action="show-pid-column"/>
-        <menuitem name="ViewColumnsThread" action="show-thread-column"/>
-        <menuitem name="ViewColumnsCode" action="show-code-column"/>
-        <menuitem name="ViewColumnsCategory" action="show-category-column"/>
-        <menuitem name="ViewColumnsFunction" action="show-function-column"/>
-        <menuitem name="ViewColumnsObject" action="show-object-column"/>
-        <menuitem name="ViewColumnsMessage" action="show-message-column"/>
-      </menu>
-      <placeholder name="LogViewContextMenuAdditions"/>
-      <separator/>
-      <menuitem name="ViewContextMenuHideLevel" action="hide-log-level"/>
-      <menuitem name="ViewContextMenuHideCategory" action="hide-log-category"/>
-      <menuitem name="ViewContextMenuHideObject" action="hide-log-object"/>
-      <menuitem name="ViewContextMenuHideFilename" action="hide-filename"/>
-      <menuitem name="ViewContextMenuHideBefore" action="hide-before-line"/>
-      <menuitem name="ViewContextMenuHideAfter" action="hide-after-line"/>
-      <menuitem name="ViewContextMenuShowHidden" action="show-hidden-lines"/>
-      <separator/>
-      <menuitem name="ViewContextMenuCopyMessage" action="edit-copy-message"/>
-      <menuitem name="ViewContextMenuCopyLine" action="edit-copy-line"/>
-    </menu>
-    <menu name="LineViewContextMenu" action="LineViewContextMenuAction">
-      <menuitem name="LineViewContextMenuClear" action="clear-line-view"/>
-      <placeholder name="LineViewContextMenuAdditions"/>
-    </menu>
-  </menubar>
-</ui>

diff --git a/debug-viewer/data/menus.ui b/debug-viewer/data/menus.ui
new file mode 100644 (file)
index 0000000..7623079
--- /dev/null
+++ b/debug-viewer/data/menus.ui
@@ -0,0 +1,74 @@
+<!-- -*- mode: xml; -*- -->
+<ui>
+  <menubar>
+    <menu name="FileMenu" action="FileMenuAction">
+      <menuitem name="FileNewWindow" action="new-window"/>
+      <menuitem name="FileOpen" action="open-file"/>
+      <menuitem name="FileReload" action="reload-file"/>
+      <separator/>
+      <placeholder name="FileMenuAdditions"/>
+      <separator/>
+      <menuitem name="FileCloseWindow" action="close-window"/>
+    </menu>
+    <menu name="ViewMenu" action="ViewMenuAction">
+      <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
+        <menuitem name="ViewColumnsTime" action="show-time-column"/>
+        <menuitem name="ViewColumnsLevel" action="show-level-column"/>
+        <menuitem name="ViewColumnsPid" action="show-pid-column"/>
+        <menuitem name="ViewColumnsThread" action="show-thread-column"/>
+        <menuitem name="ViewColumnsCode" action="show-code-column"/>
+        <menuitem name="ViewColumnsCategory" action="show-category-column"/>
+        <menuitem name="ViewColumnsFunction" action="show-function-column"/>
+        <menuitem name="ViewColumnsObject" action="show-object-column"/>
+        <menuitem name="ViewColumnsMessage" action="show-message-column"/>
+      </menu>
+      <placeholder name="ViewMenuAdditions"/>
+      <separator/>
+      <menuitem name="ViewContextMenuHideLevel" action="hide-log-level"/>
+      <menuitem name="ViewContextMenuHideCategory" action="hide-log-category"/>
+      <menuitem name="ViewContextMenuHideObject" action="hide-log-object"/>
+      <menuitem name="ViewContextMenuHideFilename" action="hide-filename"/>
+      <menuitem name="ViewContextMenuHideBefore" action="hide-before-line"/>
+      <menuitem name="ViewContextMenuHideAfter" action="hide-after-line"/>
+      <menuitem name="ViewContextMenuShowHidden" action="show-hidden-lines"/>
+      <separator/>
+      <menuitem name="ViewContextMenuCopyMessage" action="edit-copy-message"/>
+      <menuitem name="ViewContextMenuCopyLine" action="edit-copy-line"/>
+    </menu>
+    <menu name="HelpMenu" action="HelpMenuAction">
+      <placeholder name="HelpMenuAdditions"/>
+      <menuitem name="HelpInfo" action="show-about"/>
+    </menu>
+  </menubar>
+  <menubar name="context">
+    <menu name="LogViewContextMenu" action="ViewMenuAction">
+      <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
+        <menuitem name="ViewColumnsTime" action="show-time-column"/>
+        <menuitem name="ViewColumnsLevel" action="show-level-column"/>
+        <menuitem name="ViewColumnsPid" action="show-pid-column"/>
+        <menuitem name="ViewColumnsThread" action="show-thread-column"/>
+        <menuitem name="ViewColumnsCode" action="show-code-column"/>
+        <menuitem name="ViewColumnsCategory" action="show-category-column"/>
+        <menuitem name="ViewColumnsFunction" action="show-function-column"/>
+        <menuitem name="ViewColumnsObject" action="show-object-column"/>
+        <menuitem name="ViewColumnsMessage" action="show-message-column"/>
+      </menu>
+      <placeholder name="LogViewContextMenuAdditions"/>
+      <separator/>
+      <menuitem name="ViewContextMenuHideLevel" action="hide-log-level"/>
+      <menuitem name="ViewContextMenuHideCategory" action="hide-log-category"/>
+      <menuitem name="ViewContextMenuHideObject" action="hide-log-object"/>
+      <menuitem name="ViewContextMenuHideFilename" action="hide-filename"/>
+      <menuitem name="ViewContextMenuHideBefore" action="hide-before-line"/>
+      <menuitem name="ViewContextMenuHideAfter" action="hide-after-line"/>
+      <menuitem name="ViewContextMenuShowHidden" action="show-hidden-lines"/>
+      <separator/>
+      <menuitem name="ViewContextMenuCopyMessage" action="edit-copy-message"/>
+      <menuitem name="ViewContextMenuCopyLine" action="edit-copy-line"/>
+    </menu>
+    <menu name="LineViewContextMenu" action="LineViewContextMenuAction">
+      <menuitem name="LineViewContextMenuClear" action="clear-line-view"/>
+      <placeholder name="LineViewContextMenuAdditions"/>
+    </menu>
+  </menubar>
+</ui>

diff --git a/debug-viewer/setup.py b/debug-viewer/setup.py
index 21a1a8e861c4e5eeb340d67896489d8543139d82..4e55e5a98698a87eb914d95ee3b073fa6835e492 100755 (executable)
--- a/debug-viewer/setup.py
+++ b/debug-viewer/setup.py
@@ -330,7 +330,7 @@ setup (cmdclass = cmdclass,
        scripts = ["gst-debug-viewer"],
        data_files = [("share/gst-debug-viewer", ["data/about-dialog.ui",
                                                  "data/main-window.ui",
-                                                 "data/gst-debug-viewer.ui",
+                                                 "data/menus.ui",
                                                  "data/progress-dialog.ui"],),
                      ("share/icons/hicolor/48x48/apps", ["data/gst-debug-viewer.png"],),
                      ("share/icons/hicolor/scalable/apps", ["data/gst-debug-viewer.svg"],)],