summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhuyaliang <[email protected]>2023-09-30 14:18:51 +0800
committerraveit65 <[email protected]>2023-10-01 10:33:25 +0200
commitba0d50e323f888f9b68f355ba22518179283b93f (patch)
tree186d9ba7987c42550c534a9e9bbba2ad36a2fcc5
parent9da7a436ba68fc3eeff0d2b1af16c96e5b8fbc8c (diff)
downloadatril-ba0d50e323f888f9b68f355ba22518179283b93f.tar.bz2
atril-ba0d50e323f888f9b68f355ba22518179283b93f.tar.xz
Remove compilation warnings and set 'always_show_image' Properties in the UI file
-rw-r--r--data/atril-ui.xml4
-rw-r--r--shell/atril-ui.xml4
-rw-r--r--shell/ev-window.c7
3 files changed, 4 insertions, 11 deletions
diff --git a/data/atril-ui.xml b/data/atril-ui.xml
index 851a014c..3ba59ee7 100644
--- a/data/atril-ui.xml
+++ b/data/atril-ui.xml
@@ -24,8 +24,8 @@
<menuitem name="EditFindNextMenu" action="EditFindNext"/>
<menuitem name="EditFindPreviousMenu" action="EditFindPrevious"/>
<separator/>
- <menuitem name="EditRotateLeftMenu" action="EditRotateLeft"/>
- <menuitem name="EditRotateRightMenu" action="EditRotateRight"/>
+ <menuitem name="EditRotateLeftMenu" action="EditRotateLeft" always-show-image="true"/>
+ <menuitem name="EditRotateRightMenu" action="EditRotateRight" always-show-image="true"/>
<separator/>
<menuitem name="EditToolbarMenu" action="EditToolbar"/>
<separator/>
diff --git a/shell/atril-ui.xml b/shell/atril-ui.xml
index 851a014c..3ba59ee7 100644
--- a/shell/atril-ui.xml
+++ b/shell/atril-ui.xml
@@ -24,8 +24,8 @@
<menuitem name="EditFindNextMenu" action="EditFindNext"/>
<menuitem name="EditFindPreviousMenu" action="EditFindPrevious"/>
<separator/>
- <menuitem name="EditRotateLeftMenu" action="EditRotateLeft"/>
- <menuitem name="EditRotateRightMenu" action="EditRotateRight"/>
+ <menuitem name="EditRotateLeftMenu" action="EditRotateLeft" always-show-image="true"/>
+ <menuitem name="EditRotateRightMenu" action="EditRotateRight" always-show-image="true"/>
<separator/>
<menuitem name="EditToolbarMenu" action="EditToolbar"/>
<separator/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index f1fe7616..9f9576f6 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -7804,7 +7804,6 @@ ev_window_init (EvWindow *ev_window)
GtkCssProvider *css_provider;
GError *error = NULL;
GtkWidget *sidebar_widget;
- GtkWidget *menuitem;
GtkWidget *overlay;
GObject *mpkeys;
guint page_cache_mb;
@@ -7940,12 +7939,6 @@ ev_window_init (EvWindow *ev_window)
gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
ev_window->priv->menubar,
FALSE, FALSE, 0);
- menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
- "/MainMenu/EditMenu/EditRotateLeftMenu");
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
- menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
- "/MainMenu/EditMenu/EditRotateRightMenu");
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
ev_window->priv->toolbars_model = get_toolbars_model ();
ev_window->priv->toolbar = GTK_WIDGET