From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- ui/Makefile.am | 1 - ui/Makefile.in | 1 - ui/appmenu.ui | 67 ------------------------------------------- ui/direct.ui | 31 ++++++++++++++++++++ ui/event.ui | 30 +++++++++++++++++++ ui/events_directory.ui | 37 ++++++++++++++++++++++++ ui/import.ui | 53 ++++++++++++++++++++++++++++------ ui/import_queue.ui | 13 +++++++++ ui/media.ui | 37 ++++++++++++++++++++++++ ui/offline.ui | 53 ++++++++++++++++++++++++++++------ ui/photo.ui | 37 ++++++++++++++++++++++++ ui/sidebar_default_context.ui | 4 +-- ui/tag_sidebar_context.ui | 2 +- ui/tags.ui | 55 ++++++++++++++++++++++++++++++++++- ui/trash.ui | 53 ++++++++++++++++++++++++++++------ 15 files changed, 377 insertions(+), 97 deletions(-) delete mode 100644 ui/appmenu.ui (limited to 'ui') 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/Makefile.in b/ui/Makefile.in index 2e3b7c5..dc60376 100644 --- a/ui/Makefile.in +++ b/ui/Makefile.in @@ -363,7 +363,6 @@ dist_ui_DATA = \ trash.ui dist_noinst_DATA = \ - appmenu.ui \ set_background_dialog.ui \ set_background_slideshow_dialog.ui diff --git a/ui/appmenu.ui b/ui/appmenu.ui deleted file mode 100644 index 72e5424..0000000 --- a/ui/appmenu.ui +++ /dev/null @@ -1,67 +0,0 @@ - - - - - -
- - _Preferences - win.CommonPreferences - -
-
- - _Help - F1 - win.CommonHelpContents - - - _Frequently Asked Questions - win.CommonHelpFAQ - - - _Report a Problem… - win.CommonHelpReportProblem - - - _About - win.CommonAbout - -
-
- - _Quit - <Primary>q - win.CommonQuit - -
- - -
- - _Help - F1 - win.CommonHelpContents - - - _Frequently Asked Questions - win.CommonHelpFAQ - - - _Report a Problem… - win.CommonHelpReportProblem - - - _About - win.CommonAbout - -
-
- - _Quit - <Primary>q - win.CommonQuit - -
- - 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 @@ win.CommonJumpToFile +
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -162,5 +169,29 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+ 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 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -408,6 +414,30 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+
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 @@ win.CommonEmptyTrash
+
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -53,6 +60,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -133,6 +146,30 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+
diff --git a/ui/import.ui b/ui/import.ui index af733bc..73320d6 100644 --- a/ui/import.ui +++ b/ui/import.ui @@ -28,6 +28,13 @@ win.CommonEmptyTrash
+
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -56,6 +63,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -99,49 +112,49 @@
★★★★★ - filterbar.display.rating + win.display.rating 7 <Primary>5 ★★★★ - filterbar.display.rating + win.display.rating 6 <Primary>4 ★★★ - filterbar.display.rating + win.display.rating 5 <Primary>3 ★★ - filterbar.display.rating + win.display.rating 4 <Primary>2 ★ - filterbar.display.rating + win.display.rating 3 <Primary>1 _All Photos - filterbar.display.rating + win.display.rating 2 <Primary>0 All + _Rejected - filterbar.display.rating + win.display.rating 1 <Primary>9 Rejected _Only - filterbar.display.rating + win.display.rating 8 <Primary>8 @@ -166,6 +179,30 @@
+ + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+
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 @@ win.CommonEmptyTrash
+
+ + _Quit + <Primary>q + win.CommonQuit + +
_View @@ -71,6 +78,12 @@ win.CommonHelpReportProblem +
+ + _About + win.CommonAbout + +
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 @@ win.CommonEmptyTrash +
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -81,6 +88,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -384,5 +397,29 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+ diff --git a/ui/offline.ui b/ui/offline.ui index 273ac73..d6608d6 100644 --- a/ui/offline.ui +++ b/ui/offline.ui @@ -20,6 +20,13 @@ win.CommonEmptyTrash +
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -60,6 +67,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -96,49 +109,49 @@
★★★★★ - filterbar.display.rating + win.display.rating 7 <Primary>5 ★★★★ - filterbar.display.rating + win.display.rating 6 <Primary>4 ★★★ - filterbar.display.rating + win.display.rating 5 <Primary>3 ★★ - filterbar.display.rating + win.display.rating 4 <Primary>2 ★ - filterbar.display.rating + win.display.rating 3 <Primary>1 _All Photos - filterbar.display.rating + win.display.rating 2 <Primary>0 All + _Rejected - filterbar.display.rating + win.display.rating 1 <Primary>9 Rejected _Only - filterbar.display.rating + win.display.rating 8 <Primary>8 @@ -163,6 +176,30 @@
+ + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+
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 @@ win.CommonEmptyTrash
+
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -77,6 +84,12 @@ win.MoveToTrash +
+ + _Preferences + win.CommonPreferences + +
_View @@ -367,5 +380,29 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+ diff --git a/ui/sidebar_default_context.ui b/ui/sidebar_default_context.ui index 644d8c7..bd3d63a 100644 --- a/ui/sidebar_default_context.ui +++ b/ui/sidebar_default_context.ui @@ -4,12 +4,12 @@
Ne_w Saved Search… - win.CommonNewSearch + sidebar.search.new <Primary>s New _Tag… - win.CommonNewTag + sidebar.tag.new
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui index 96b0f1e..b810c28 100644 --- a/ui/tag_sidebar_context.ui +++ b/ui/tag_sidebar_context.ui @@ -4,7 +4,7 @@
New _Tag… - win.CommonNewTag + sidebar.tag.new
diff --git a/ui/tags.ui b/ui/tags.ui index e2cb3cf..334b24d 100644 --- a/ui/tags.ui +++ b/ui/tags.ui @@ -35,6 +35,13 @@ win.CommonEmptyTrash +
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -81,6 +88,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -345,7 +358,7 @@ Camera win.RawDeveloper - Camera + Camera @@ -403,8 +416,48 @@ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+ +
+ + _New + win.NewChildTagSidebar + +
+
+ + _Rename… + win.RenameTag + + + _Delete + win.DeleteTag + +
diff --git a/ui/trash.ui b/ui/trash.ui index 0bd7a20..2fbb9a4 100644 --- a/ui/trash.ui +++ b/ui/trash.ui @@ -25,6 +25,13 @@ win.CommonEmptyTrash +
+ + _Quit + <Primary>q + win.CommonQuit + +
_Edit @@ -69,6 +76,12 @@ win.CommonSelectAll +
+ + _Preferences + win.CommonPreferences + +
_View @@ -105,49 +118,49 @@
★★★★★ - filterbar.display.rating + win.display.rating 7 <Primary>5 ★★★★ - filterbar.display.rating + win.display.rating 6 <Primary>4 ★★★ - filterbar.display.rating + win.display.rating 5 <Primary>3 ★★ - filterbar.display.rating + win.display.rating 4 <Primary>2 ★ - filterbar.display.rating + win.display.rating 3 <Primary>1 _All Photos - filterbar.display.rating + win.display.rating 2 <Primary>0 All + _Rejected - filterbar.display.rating + win.display.rating 1 <Primary>9 Rejected _Only - filterbar.display.rating + win.display.rating 8 <Primary>8 @@ -172,6 +185,30 @@
+ + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+
-- cgit v1.2.3