[devhelp] window: Use the new support for RTL icons in GtkIconTheme



commit ec506855f08c4214c7e23cd403dd1a9c73986925
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Mon Jun 2 21:38:57 2014 +0300

    window: Use the new support for RTL icons in GtkIconTheme
    
    Bump required GTK+ version for this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730772

 configure.ac     |    2 +-
 src/dh-window.c  |   15 ---------------
 src/dh-window.ui |    2 ++
 3 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 74be6a1..c350959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_SUBST(LIBM)
 
 PKG_CHECK_MODULES(DEVHELP, [
   gthread-2.0 >= 2.10.0
-  gtk+-3.0 >= 3.11.6
+  gtk+-3.0 >= 3.13.0
   webkit2gtk-3.0 >= 2.0.0
   gio-2.0 >= 2.37.3
 ])
diff --git a/src/dh-window.c b/src/dh-window.c
index 4f558db..e1b075e 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -44,9 +44,7 @@ typedef struct {
         GtkWidget      *notebook;
         GtkWidget      *header_bar;
         GtkWidget      *back_button;
-        GtkImage       *back_button_image;
         GtkWidget      *forward_button;
-        GtkImage       *forward_button_image;
         GtkMenuButton  *gear_menu_button;
         GtkWidget      *grid_sidebar;
         GtkWidget      *grid_documents;
@@ -598,9 +596,7 @@ dh_window_class_init (DhWindowClass *klass)
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, gear_app_menu);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, header_bar);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, back_button);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, back_button_image);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, forward_button);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, forward_button_image);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, gear_menu_button);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, hpaned);
         gtk_widget_class_bind_template_child_private (widget_class, DhWindow, grid_sidebar);
@@ -666,17 +662,6 @@ window_populate (DhWindow *window)
         priv = dh_window_get_instance_private (window);
         book_manager = dh_app_peek_book_manager (DH_APP (gtk_window_get_application (GTK_WINDOW (window))));
 
-        if (gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL) {
-                prev_icon = "go-previous-rtl-symbolic";
-                next_icon = "go-next-rtl-symbolic";
-        } else {
-                prev_icon = "go-previous-symbolic";
-                next_icon = "go-next-symbolic";
-        }
-
-        gtk_image_set_from_icon_name (priv->back_button_image, prev_icon, GTK_ICON_SIZE_MENU);
-        gtk_image_set_from_icon_name (priv->forward_button_image, next_icon, GTK_ICON_SIZE_MENU);
-
         /* Sidebar */
         priv->sidebar = dh_sidebar_new (book_manager);
         gtk_widget_set_vexpand (priv->sidebar, TRUE);
diff --git a/src/dh-window.ui b/src/dh-window.ui
index 67176d4..5da1143 100644
--- a/src/dh-window.ui
+++ b/src/dh-window.ui
@@ -134,6 +134,7 @@
                   <object class="GtkImage" id="back_button_image">
                     <property name="visible">True</property>
                     <property name="icon_size">1</property>
+                    <property name="icon_name">go-previous-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -152,6 +153,7 @@
                   <object class="GtkImage" id="forward_button_image">
                     <property name="visible">True</property>
                     <property name="icon_size">1</property>
+                    <property name="icon_name">go-next-symbolic</property>
                   </object>
                 </child>
               </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]