debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use granite static notebook for preferences

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/1018074
This commit is contained in:
Christian Dywan 2012-06-26 23:38:30 +02:00
parent 3effb9a4ce
commit ebd0ef2a46
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
katze/katze-preferences.c
View file

@ -15,6 +15,13 @@
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_GRANITE
#if HAVE_OSX
#error FIXME granite on OSX is not implemented
#endif
#include <granite.h>
#endif
#if HAVE_HILDON #if HAVE_HILDON
#include "katze-scrolled.h" #include "katze-scrolled.h"
#include <hildon/hildon.h> #include <hildon/hildon.h>
@ -202,7 +209,11 @@ katze_preferences_prepare (KatzePreferences* preferences)
g_signal_connect (priv->scrolled, "destroy", g_signal_connect (priv->scrolled, "destroy",
G_CALLBACK (gtk_widget_destroyed), &priv->scrolled); G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
#else #else
#if HAVE_GRANITE
priv->notebook = granite_widgets_static_notebook_new ();
#else
priv->notebook = gtk_notebook_new (); priv->notebook = gtk_notebook_new ();
#endif
gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6); gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
#if HAVE_OSX #if HAVE_OSX
@ -296,8 +307,14 @@ katze_preferences_add_category (KatzePreferences* preferences,
priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_widget_show (priv->page); gtk_widget_show (priv->page);
gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4); gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
#if HAVE_GRANITE
granite_widgets_static_notebook_append_page (
GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook),
priv->page, gtk_label_new (label));
#else
gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
priv->page, gtk_label_new (label)); priv->page, gtk_label_new (label));
#endif
#if HAVE_OSX #if HAVE_OSX
priv->toolbutton = GTK_WIDGET (priv->toolbutton ? priv->toolbutton = GTK_WIDGET (priv->toolbutton ?
gtk_radio_tool_button_new_from_widget ( gtk_radio_tool_button_new_from_widget (