[gthumb] added a fullscreen button in viewer mode
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] added a fullscreen button in viewer mode
- Date: Fri, 1 Jan 2016 21:13:52 +0000 (UTC)
commit 3519f65915d57d0d8d083d301977fb1f850ff4e8
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Jan 1 21:50:15 2016 +0100
added a fullscreen button in viewer mode
extensions/image_viewer/gth-image-viewer-page.c | 2 +-
gthumb/gth-browser.c | 35 +++++++++++++++++------
gthumb/gth-browser.h | 7 ++--
3 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index cf84dfe..ed4fb15 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -850,7 +850,7 @@ gth_image_viewer_page_real_activate (GthViewerPage *base,
NULL);
self->priv->buttons[APPLY_ICC_PROFILE_BUTTON] =
gth_browser_add_header_bar_toggle_button (browser,
- GTH_BROWSER_HEADER_SECTION_VIEWER_TOOLS,
+
GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS,
"color-profile",
_("Apply the embedded color profile"),
"win.apply-icc-profile",
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 54f2a22..3036c78 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -2392,8 +2392,9 @@ _gth_browser_update_header_bar_content (GthBrowser *browser)
_gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS,
section_visible);
_gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW,
section_visible);
_gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT,
section_visible);
- _gth_browser_update_header_section_visibility (browser,
GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR, section_visible);
- _gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_TOOLS,
section_visible);
+ _gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR,
section_visible);
+ _gth_browser_update_header_section_visibility (browser,
GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS, section_visible);
+ _gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW,
section_visible);
section_visible = (page == GTH_BROWSER_PAGE_VIEWER) && active_tool;
_gth_browser_update_header_section_visibility (browser, GTH_BROWSER_HEADER_SECTION_EDITOR_NAVIGATION,
section_visible);
@@ -4403,8 +4404,10 @@ gth_browser_init (GthBrowser *browser)
gboolean separated_buttons;
separated_buttons = ((i == GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS)
- || (i == GTH_BROWSER_HEADER_SECTION_VIEWER_TOOLS)
- || (i == GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR)
+ || (i == GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS)
+ /*|| (i == GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR)*/
+ || (i == GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW)
+ /*|| (i == GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT)*/
|| (i == GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS));
browser->priv->header_sections[i] = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
separated_buttons ? 6 : 0);
@@ -4423,10 +4426,13 @@ gth_browser_init (GthBrowser *browser)
header_bar = gth_window_get_header_bar (GTH_WINDOW (browser));
+ gtk_widget_set_margin_right
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_COMMANDS],
GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_left
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_COMMANDS],
GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_right
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW], GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_left
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT], GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
+ gtk_widget_set_margin_right
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT], GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_left
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW], GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
+ gtk_widget_set_margin_left
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW],
GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_left
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS],
GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
gtk_widget_set_margin_right
(browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS],
GTH_BROWSER_HEADER_BAR_BIG_MARGIN);
@@ -4434,16 +4440,18 @@ gth_browser_init (GthBrowser *browser)
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_LOCATIONS]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_COMMANDS]);
#if ! GTK_CHECK_VERSION(3,11,4)
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_OTHER_VIEW]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS]);
#endif
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_NAVIGATION]);
+ gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS]);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_TOOLS]);
+ gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS]);
#if ! GTK_CHECK_VERSION(3,11,4)
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR]);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT]);
#endif
@@ -4479,7 +4487,7 @@ gth_browser_init (GthBrowser *browser)
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT]);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR]);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_APPLY]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS]);
@@ -4525,18 +4533,27 @@ gth_browser_init (GthBrowser *browser)
/* viewer edit */
gth_browser_add_header_bar_toggle_button (browser,
- GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR,
"dialog-information-symbolic",
_("Properties"),
"win.viewer-properties",
NULL);
gth_browser_add_header_bar_toggle_button (browser,
- GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR,
"palette-symbolic",
_("Edit file"),
"win.viewer-edit-file",
NULL);
+ /* viewer view */
+
+ gth_browser_add_header_bar_button (browser,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW,
+ "view-fullscreen-symbolic",
+ _("Fullscreen"),
+ "win.fullscreen",
+ NULL);
+
/* editor navigation */
gth_browser_add_header_bar_button (browser,
diff --git a/gthumb/gth-browser.h b/gthumb/gth-browser.h
index 18180df..7383d04 100644
--- a/gthumb/gth-browser.h
+++ b/gthumb/gth-browser.h
@@ -86,10 +86,11 @@ typedef enum { /*< skip >*/
GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS,
GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW,
GTH_BROWSER_HEADER_SECTION_VIEWER_NAVIGATION,
- GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS,
- GTH_BROWSER_HEADER_SECTION_VIEWER_TOOLS,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW,
GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW,
- GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT_SIDEBAR,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS,
+ GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR,
GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT,
GTH_BROWSER_HEADER_SECTION_EDITOR_NAVIGATION,
GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
