|
 |
426c0a8 |
From cdbb0497d9536d81b24abe166ab7c7834fd18e8f Mon Sep 17 00:00:00 2001
|
|
|
426c0a8 |
From: Yosef Or Boczko <yoseforb@src.gnome.org>
|
|
|
426c0a8 |
Date: Thu, 1 May 2014 19:46:20 +0200
|
|
|
426c0a8 |
Subject: Fix headerbar item positions
|
|
|
426c0a8 |
|
|
|
426c0a8 |
https://bugzilla.gnome.org/show_bug.cgi?id=729349
|
|
|
426c0a8 |
|
|
|
426c0a8 |
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
|
|
|
426c0a8 |
|
|
|
426c0a8 |
diff --git a/configure.ac b/configure.ac
|
|
|
426c0a8 |
index ebdd5b0..6ecfbe3 100644
|
|
|
426c0a8 |
--- a/configure.ac
|
|
|
426c0a8 |
+++ b/configure.ac
|
|
|
426c0a8 |
@@ -104,7 +104,7 @@ AC_MSG_RESULT([no])])
|
|
|
426c0a8 |
|
|
|
426c0a8 |
GLIB2_REQUIRED=2.31.0
|
|
|
426c0a8 |
UDISKS2_REQUIRED=2.1.1
|
|
|
426c0a8 |
-GTK3_REQUIRED=3.10.0
|
|
|
426c0a8 |
+GTK3_REQUIRED=3.12.0
|
|
|
426c0a8 |
LIBSECRET1_REQUIRED=0.7
|
|
|
426c0a8 |
PWQUALITY_REQUIRED=1.0.0
|
|
|
426c0a8 |
CANBERRA_REQUIRED=0.1
|
|
|
426c0a8 |
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
|
|
|
426c0a8 |
index 24834ce..f8710d6 100644
|
|
|
426c0a8 |
--- a/src/disks/gduwindow.c
|
|
|
426c0a8 |
+++ b/src/disks/gduwindow.c
|
|
|
426c0a8 |
@@ -978,26 +978,27 @@ create_header (GduWindow *window)
|
|
|
426c0a8 |
header = gtk_header_bar_new ();
|
|
|
426c0a8 |
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
|
|
|
426c0a8 |
|
|
|
426c0a8 |
- button = window->devtab_drive_loop_detach_button = gtk_button_new ();
|
|
|
426c0a8 |
- image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
+ button = window->devtab_drive_generic_button = gtk_menu_button_new ();
|
|
|
426c0a8 |
+ gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
|
|
|
426c0a8 |
+ image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
gtk_button_set_image (GTK_BUTTON (button), image);
|
|
|
426c0a8 |
gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
|
|
|
426c0a8 |
|
|
|
426c0a8 |
- button = window->devtab_drive_eject_button = gtk_button_new ();
|
|
|
426c0a8 |
- image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
+ button = window->devtab_drive_power_off_button = gtk_button_new ();
|
|
|
426c0a8 |
+ image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
gtk_button_set_image (GTK_BUTTON (button), image);
|
|
|
426c0a8 |
gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
|
|
|
426c0a8 |
|
|
|
426c0a8 |
- button = window->devtab_drive_power_off_button = gtk_button_new ();
|
|
|
426c0a8 |
- image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
+ button = window->devtab_drive_eject_button = gtk_button_new ();
|
|
|
426c0a8 |
+ image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
gtk_button_set_image (GTK_BUTTON (button), image);
|
|
|
426c0a8 |
gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
|
|
|
426c0a8 |
|
|
|
426c0a8 |
- button = window->devtab_drive_generic_button = gtk_menu_button_new ();
|
|
|
426c0a8 |
- gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
|
|
|
426c0a8 |
- image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
+ button = window->devtab_drive_loop_detach_button = gtk_button_new ();
|
|
|
426c0a8 |
+ image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
|
|
|
426c0a8 |
gtk_button_set_image (GTK_BUTTON (button), image);
|
|
|
426c0a8 |
gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
|
|
|
426c0a8 |
+
|
|
|
426c0a8 |
return header;
|
|
|
426c0a8 |
}
|
|
|
426c0a8 |
|
|
|
426c0a8 |
--
|
|
|
426c0a8 |
cgit v0.10.1
|
|
|
426c0a8 |
|