[vinagre] Add some style classes and junctions to make vinagre look better
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Add some style classes and junctions to make vinagre look better
- Date: Fri, 25 Mar 2011 08:59:09 +0000 (UTC)
commit 0a92945bc63fc648c15043bdd5d9ac1c0604a9ad
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Mar 22 18:16:53 2011 -0400
Add some style classes and junctions to make vinagre look better
Use primary-toolbar, inline-toolbar and set some junctions in the
sidebar to make vinagre play better with Adwaita. Bump the GTK+
requirement to 3.0.3. Fixes bug 645573.
configure.ac | 2 +-
vinagre/vinagre-fav.c | 8 +++++++-
vinagre/vinagre-window.c | 2 ++
3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 853b84e..f267795 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_SUBST([VINAGRE_PLUGINS_LIBS_DIR], ["$libdir/vinagre-1/plugins"])
GLIB_DEPS="glib-2.0 >= 2.25.11 gio-unix-2.0 >= 2.25.11"
GTHREAD_DEPS="gthread-2.0 >= 2.0.0"
-GTK_DEPS="gtk+-3.0 >= 2.99.3"
+GTK_DEPS="gtk+-3.0 >= 3.0.3"
GTK_VNC_DEPS="gtk-vnc-2.0 >= 0.4.3"
XML2_DEPS="libxml-2.0 >= 2.6.31"
PEAS_DEPS="libpeas-1.0 >= 0.7.2 libpeas-gtk-1.0 >= 0.7.2"
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 537259c..0d4633e 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -619,6 +619,10 @@ vinagre_fav_create_toolbar (VinagreFav *fav)
fav->priv->always_sensitive_action_group = action_group;
toolbar = gtk_ui_manager_get_widget (manager, "/FavToolBar");
+ gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+ GTK_STYLE_CLASS_INLINE_TOOLBAR);
+ gtk_style_context_set_junction_sides (gtk_widget_get_style_context (toolbar),
+ GTK_JUNCTION_BOTTOM);
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
@@ -641,7 +645,9 @@ vinagre_fav_create_tree (VinagreFav *fav)
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
- GTK_SHADOW_ETCHED_OUT);
+ GTK_SHADOW_IN);
+ gtk_style_context_set_junction_sides (gtk_widget_get_style_context (scroll),
+ GTK_JUNCTION_TOP);
gtk_box_pack_start (fav->priv->box, scroll, TRUE, TRUE, 0);
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 6615173..e75a1d3 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -425,6 +425,8 @@ create_menu_bar_and_toolbar (VinagreWindow *window,
0);
window->priv->toolbar = gtk_ui_manager_get_widget (manager, "/ToolBar");
+ gtk_style_context_add_class (gtk_widget_get_style_context (window->priv->toolbar),
+ GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
gtk_widget_hide (window->priv->toolbar);
gtk_box_pack_start (GTK_BOX (main_box),
window->priv->toolbar,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]