[shotwell] Revert "Use AppMenu"
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Revert "Use AppMenu"
- Date: Thu, 22 Dec 2016 21:18:44 +0000 (UTC)
commit e8622e25c3753fb9191e871c479685bc036fecb6
Author: Jens Georg <mail jensge org>
Date: Thu Dec 22 21:08:18 2016 +0100
Revert "Use AppMenu"
Not good. Help is not easily discoverable. Needs some more thinking
This reverts commit 6e6a51b3a5b939322e0a40c2f2766367969721c2.
org.gnome.Shotwell.gresource.xml | 1 -
src/Application.vala | 4 --
src/direct/DirectWindow.vala | 2 -
src/library/LibraryWindow.vala | 3 --
ui/Makefile.am | 1 -
ui/appmenu.ui | 67 --------------------------------------
ui/direct.ui | 31 +++++++++++++++++
ui/event.ui | 30 +++++++++++++++++
ui/events_directory.ui | 37 +++++++++++++++++++++
ui/import.ui | 37 +++++++++++++++++++++
ui/import_queue.ui | 13 +++++++
ui/media.ui | 37 +++++++++++++++++++++
ui/offline.ui | 37 +++++++++++++++++++++
ui/photo.ui | 37 +++++++++++++++++++++
ui/tags.ui | 37 +++++++++++++++++++++
ui/trash.ui | 37 +++++++++++++++++++++
16 files changed, 333 insertions(+), 78 deletions(-)
---
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 11489d9..3716038 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -6,7 +6,6 @@
<file alias="tag_sidebar_context.ui">ui/tag_sidebar_context.ui</file>
<file alias="sidebar_default_context.ui">ui/sidebar_default_context.ui</file>
<file alias="search_bar.ui">ui/search_bar.ui</file>
- <file alias="appmenu.ui">ui/appmenu.ui</file>
<file>ui/set_background_dialog.ui</file>
<file>ui/set_background_slideshow_dialog.ui</file>
</gresource>
diff --git a/src/Application.vala b/src/Application.vala
index 6e6ba85..4a24fd4 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -103,10 +103,6 @@ public class Application {
get_instance().system_app.set_menubar (model);
}
- public static void set_appmenu (GLib.MenuModel? model) {
- get_instance().system_app.set_app_menu (model);
- }
-
/**
* @brief Signal handler for GApplication's 'command-line' signal.
*
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index ee1995a..e1cbf75 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -24,9 +24,7 @@ public class DirectWindow : AppWindow {
layout.pack_start(direct_photo_page, true, true, 0);
layout.pack_end(direct_photo_page.get_toolbar(), false, false, 0);
- var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
Application.set_menubar (direct_photo_page.get_menubar ());
- Application.set_appmenu (builder.get_object ("direct-appmenu") as GLib.Menu);
add(layout);
}
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 236c3ab..ccb9fb5 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -1191,9 +1191,6 @@ public class LibraryWindow : AppWindow {
add(layout);
- var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
- Application.set_appmenu (builder.get_object ("appmenu") as GLib.Menu);
-
switch_to_page(start_page);
start_page.grab_focus();
}
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 7bcf37d..c13a172 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -23,7 +23,6 @@ dist_ui_DATA = \
trash.ui
dist_noinst_DATA = \
- appmenu.ui \
set_background_dialog.ui \
set_background_slideshow_dialog.ui
diff --git a/ui/direct.ui b/ui/direct.ui
index 6053967..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -32,6 +32,13 @@
<attribute name="action">win.CommonJumpToFile</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -162,5 +169,29 @@
</item>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
</interface>
diff --git a/ui/event.ui b/ui/event.ui
index c2bc6cb..11d9b74 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -88,6 +88,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -408,6 +414,30 @@
</section>
</submenu>
<!-- Faces menu goes here FacesMenuPlaceholder -->
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="CollectionContextMenu">
<section>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index ad4135e..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -20,6 +20,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -53,6 +60,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -133,6 +146,30 @@
</item>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="EventsDirectoryContextMenu">
<section>
diff --git a/ui/import.ui b/ui/import.ui
index 4a75993..73320d6 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -28,6 +28,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -56,6 +63,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -166,6 +179,30 @@
</submenu>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="ImportContextMenu">
<section>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index a19c32b..9b07d9c 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -26,6 +26,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -71,6 +78,12 @@
<attribute name="action">win.CommonHelpReportProblem</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
</submenu>
</menu>
</interface>
diff --git a/ui/media.ui b/ui/media.ui
index 895855a..e3d8ba1 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -35,6 +35,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -81,6 +88,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -384,5 +397,29 @@
</section>
</submenu>
<!-- Faces menu goes here FacesMenuPlaceholder -->
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
</interface>
diff --git a/ui/offline.ui b/ui/offline.ui
index bf241ed..d6608d6 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -20,6 +20,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -60,6 +67,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -163,6 +176,30 @@
</submenu>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="OfflineContextMenu">
<section>
diff --git a/ui/photo.ui b/ui/photo.ui
index cb39801..6b662a5 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -43,6 +43,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -77,6 +84,12 @@
<attribute name="action">win.MoveToTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -367,5 +380,29 @@
</item>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
</interface>
diff --git a/ui/tags.ui b/ui/tags.ui
index 11a4f44..334b24d 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -35,6 +35,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -81,6 +88,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -403,6 +416,30 @@
</section>
</submenu>
<!-- Faces menu goes here FacesMenuPlaceholder -->
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="TagsContextMenu">
diff --git a/ui/trash.ui b/ui/trash.ui
index 58badfa..2fbb9a4 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -25,6 +25,13 @@
<attribute name="action">win.CommonEmptyTrash</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ <attribute name="action">win.CommonQuit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -69,6 +76,12 @@
<attribute name="action">win.CommonSelectAll</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">win.CommonPreferences</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_View</attribute>
@@ -172,6 +185,30 @@
</submenu>
</section>
</submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="accel">F1</attribute>
+ <attribute name="action">win.CommonHelpContents</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+ <attribute name="action">win.CommonHelpFAQ</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+ <attribute name="action">win.CommonHelpReportProblem</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">win.CommonAbout</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id="TrashContextMenu">
<section>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]