[Xfce4-commits] <midori:master> Drop Hildon code from katze
Christian Dywan
noreply at xfce.org
Fri Dec 14 00:06:05 CET 2012
Updating branch refs/heads/master
to 50c97421a0d2b9c18d76feb1e0d7d876c1309ee2 (commit)
from 65d8e4987b7bbde56330de8303b4603b75df7b62 (commit)
commit 50c97421a0d2b9c18d76feb1e0d7d876c1309ee2
Author: Paweł Forysiuk <tuxator at o2.pl>
Date: Wed Dec 12 23:16:38 2012 +0100
Drop Hildon code from katze
katze/gtk3-compat.h | 5 +--
katze/katze-arrayaction.c | 6 ---
katze/katze-preferences.c | 92 ---------------------------------------------
katze/katze-utils.c | 71 ++++------------------------------
4 files changed, 9 insertions(+), 165 deletions(-)
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index 1b0b456..3bf4301 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -79,10 +79,7 @@ G_BEGIN_DECLS
#define GTK_DIALOG_NO_SEPARATOR 0
#endif
-#if !GTK_CHECK_VERSION (3, 2, 0) && defined (HAVE_HILDON_2_2)
- #define gtk_entry_set_placeholder_text hildon_gtk_entry_set_placeholder_text
- #define gtk_entry_get_placeholder_text hildon_gtk_entry_get_placeholder_text
-#elif !GTK_CHECK_VERSION (3, 2, 0)
+#if !GTK_CHECK_VERSION (3, 2, 0)
void gtk_entry_set_placeholder_text (GtkEntry* entry, const gchar* text);
const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
#endif
diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c
index e5edad6..6b19659 100644
--- a/katze/katze-arrayaction.c
+++ b/katze/katze-arrayaction.c
@@ -511,14 +511,8 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy,
g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu);
}
- #if HAVE_HILDON
- /* Avoid a bug in GTK+ messing up the initial scrolling position */
- katze_widget_popup (NULL, GTK_MENU (menu),
- NULL, KATZE_MENU_POSITION_LEFT);
- #else
katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu),
NULL, KATZE_MENU_POSITION_LEFT);
- #endif
gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), TRUE);
g_object_set_data (G_OBJECT (menu), "KatzeArrayAction", array_action);
g_signal_connect (menu, "deactivate",
diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index 6108fd4..f43bb95 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -22,23 +22,11 @@
#include <granite.h>
#endif
-#if HAVE_HILDON
- #include "katze-scrolled.h"
- #include <hildon/hildon.h>
-#endif
-
#include <string.h>
#include <glib/gi18n.h>
struct _KatzePreferencesPrivate
{
- #if HAVE_HILDON
- GtkWidget* scrolled;
- GtkSizeGroup* sizegroup;
- GtkSizeGroup* sizegroup2;
- GtkWidget* box;
- GtkWidget* hbox;
- #else
GtkWidget* notebook;
GtkWidget* toolbar;
GtkWidget* toolbutton;
@@ -48,7 +36,6 @@ struct _KatzePreferencesPrivate
GtkWidget* frame;
GtkWidget* box;
GtkWidget* hbox;
- #endif
};
G_DEFINE_TYPE (KatzePreferences, katze_preferences, GTK_TYPE_DIALOG);
@@ -73,19 +60,6 @@ katze_preferences_response_cb (KatzePreferences* preferences,
gtk_widget_destroy (GTK_WIDGET (preferences));
}
-#ifdef HAVE_HILDON_2_2
-static void
-katze_preferences_size_request_cb (KatzePreferences* preferences,
- GtkRequisition* requisition)
-{
- GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (preferences));
- if (gdk_screen_get_height (screen) > gdk_screen_get_width (screen))
- gtk_widget_hide (gtk_dialog_get_action_area (GTK_DIALOG (preferences)));
- else
- gtk_widget_show (gtk_dialog_get_action_area (GTK_DIALOG (preferences)));
-}
-#endif
-
static void
katze_preferences_init (KatzePreferences* preferences)
{
@@ -114,11 +88,7 @@ katze_preferences_init (KatzePreferences* preferences)
GTK_DIALOG (preferences), GTK_RESPONSE_HELP), "help_button");
gtk_dialog_add_buttons (GTK_DIALOG (preferences),
- #if HAVE_HILDON
- GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,
- #else
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- #endif
NULL);
#endif
@@ -126,12 +96,6 @@ katze_preferences_init (KatzePreferences* preferences)
"signal::response", katze_preferences_response_cb, NULL,
NULL);
- #ifdef HAVE_HILDON_2_2
- katze_preferences_size_request_cb (preferences, NULL);
- g_object_connect (preferences,
- "signal::size-request", katze_preferences_size_request_cb, NULL,
- NULL);
- #endif
}
static void
@@ -187,25 +151,6 @@ katze_preferences_prepare (KatzePreferences* preferences)
{
KatzePreferencesPrivate* priv = preferences->priv;
- #if HAVE_HILDON
- GtkWidget* viewport;
-
- priv->scrolled = katze_scrolled_new (NULL, NULL);
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
- priv->scrolled, TRUE, TRUE, 4);
- viewport = gtk_viewport_new (NULL, NULL);
- gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
- gtk_container_add (GTK_CONTAINER (priv->scrolled), viewport);
- priv->box = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (viewport), priv->box);
-
- priv->hbox = NULL;
- priv->sizegroup = NULL;
- priv->sizegroup2 = NULL;
-
- g_signal_connect (priv->scrolled, "destroy",
- G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
- #else
#ifdef HAVE_GRANITE
/* FIXME: granite: should return GtkWidget* like GTK+ */
priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE);
@@ -238,7 +183,6 @@ katze_preferences_prepare (KatzePreferences* preferences)
g_signal_connect (priv->notebook, "destroy",
G_CALLBACK (gtk_widget_destroyed), &priv->notebook);
- #endif
#if HAVE_OSX
GtkWidget* icon;
@@ -280,24 +224,6 @@ katze_preferences_add_category (KatzePreferences* preferences,
priv = preferences->priv;
- #if HAVE_HILDON
- GtkWidget* widget;
- gchar* markup;
-
- if (!priv->scrolled)
- katze_preferences_prepare (preferences);
-
- widget = gtk_label_new (NULL);
- gtk_widget_show (widget);
- markup = g_markup_printf_escaped ("<b>%s</b>", label);
- gtk_label_set_markup (GTK_LABEL (widget), markup);
- g_free (markup);
- gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE, 0);
-
- priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- priv->sizegroup2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- priv->hbox = NULL;
- #else
if (!priv->notebook)
katze_preferences_prepare (preferences);
@@ -328,12 +254,10 @@ katze_preferences_add_category (KatzePreferences* preferences,
if (priv->toolbutton)
g_object_set_data (G_OBJECT (priv->toolbutton), "notebook", priv->notebook);
#endif
- #endif
return priv->page;
}
-#if !HAVE_HILDON
static GtkWidget*
katze_hig_frame_new (const gchar* title)
{
@@ -351,7 +275,6 @@ katze_hig_frame_new (const gchar* title)
#endif
return frame;
}
-#endif
/**
* katze_preferences_add_group:
@@ -368,7 +291,6 @@ void
katze_preferences_add_group (KatzePreferences* preferences,
const gchar* label)
{
- #if !HAVE_HILDON
KatzePreferencesPrivate* priv;
g_return_if_fail (KATZE_IS_PREFERENCES (preferences));
@@ -383,7 +305,6 @@ katze_preferences_add_group (KatzePreferences* preferences,
gtk_container_set_border_width (GTK_CONTAINER (priv->box), 4);
gtk_container_add (GTK_CONTAINER (priv->frame), priv->box);
gtk_widget_show_all (priv->frame);
- #endif
}
/**
@@ -417,10 +338,6 @@ katze_preferences_add_widget (KatzePreferences* preferences,
if (!priv->hbox)
_type = g_intern_string ("indented");
- #ifdef HAVE_HILDON_2_2
- else if (HILDON_IS_CHECK_BUTTON (widget) || HILDON_IS_PICKER_BUTTON (widget))
- _type = g_intern_string ("indented");
- #endif
if (_type != g_intern_static_string ("spanned"))
{
@@ -436,11 +353,7 @@ katze_preferences_add_widget (KatzePreferences* preferences,
GtkWidget* align = gtk_alignment_new (0, 0.5, 0, 0);
gtk_widget_show (align);
gtk_container_add (GTK_CONTAINER (align), priv->hbox);
- #if HAVE_HILDON
- if (!GTK_IS_SPIN_BUTTON (widget) && !GTK_IS_LABEL (widget))
- #else
if (!GTK_IS_SPIN_BUTTON (widget))
- #endif
gtk_size_group_add_widget (priv->sizegroup, widget);
gtk_box_pack_start (GTK_BOX (priv->box), align, TRUE, FALSE, 0);
}
@@ -454,9 +367,4 @@ katze_preferences_add_widget (KatzePreferences* preferences,
gtk_size_group_add_widget (priv->sizegroup2, widget);
gtk_box_pack_start (GTK_BOX (priv->hbox), align, TRUE, FALSE, 0);
}
-
- #if HAVE_HILDON
- if (GTK_IS_BUTTON (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
- gtk_widget_hide (widget);
- #endif
}
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index adfdf48..8942162 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -29,10 +29,6 @@
#include <unistd.h>
#endif
-#ifdef HAVE_HILDON_2_2
- #include <hildon/hildon.h>
-#endif
-
#define I_ g_intern_static_string
static void
@@ -42,12 +38,7 @@ proxy_toggle_button_toggled_cb (GtkToggleButton* button,
gboolean toggled;
const gchar* property;
- #ifdef HAVE_HILDON_2_2
- if (HILDON_IS_CHECK_BUTTON (button))
- toggled = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button));
- #else
toggled = gtk_toggle_button_get_active (button);
- #endif
property = g_object_get_data (G_OBJECT (button), "property");
g_object_set (object, property, toggled, NULL);
}
@@ -219,17 +210,6 @@ proxy_spin_button_changed_cb (GtkSpinButton* button,
}
}
-#ifdef HAVE_HILDON_2_2
-static void
-proxy_picker_button_changed_cb (HildonPickerButton* button,
- GObject* object)
-{
- gint value = hildon_picker_button_get_active (button);
- const gchar* property = g_object_get_data (G_OBJECT (button), "property");
- g_object_set (object, property, value, NULL);
- /* FIXME: Implement custom-PROPERTY */
-}
-#else
static void
proxy_combo_box_changed_cb (GtkComboBox* button,
GObject* object)
@@ -287,7 +267,6 @@ proxy_combo_box_changed_cb (GtkComboBox* button,
}
}
}
-#endif
static void
proxy_object_notify_boolean_cb (GObject* object,
@@ -456,23 +435,14 @@ katze_property_proxy (gpointer object,
gchar* notify_property;
gboolean toggled = katze_object_get_boolean (object, property);
- #ifdef HAVE_HILDON_2_2
- if (_hint != I_("toggle"))
- {
- widget = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
- gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (widget), toggled);
- }
+
+ widget = gtk_check_button_new ();
+ if (_hint == I_("toggle"))
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE);
else
- #endif
- {
- widget = gtk_check_button_new ();
- if (_hint == I_("toggle"))
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE);
- else
- gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled);
- }
+ gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled);
+
g_signal_connect (widget, "toggled",
G_CALLBACK (proxy_toggle_button_toggled_cb), object);
notify_property = g_strdup_printf ("notify::%s", property);
@@ -740,10 +710,7 @@ katze_property_proxy (gpointer object,
widget = gtk_spin_button_new_with_range (
G_PARAM_SPEC_INT (pspec)->minimum,
G_PARAM_SPEC_INT (pspec)->maximum, 1);
- #if HAVE_HILDON
- hildon_gtk_entry_set_input_mode (GTK_ENTRY (widget),
- HILDON_GTK_INPUT_MODE_NUMERIC);
- #endif
+
/* Keep it narrow, 5 digits are usually fine */
gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
@@ -761,39 +728,17 @@ katze_property_proxy (gpointer object,
if (hint && g_str_has_prefix (hint, "custom-"))
custom = &hint[7];
- #ifdef HAVE_HILDON_2_2
- GtkWidget* selector;
-
- widget = hildon_picker_button_new (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
- selector = hildon_touch_selector_new_text ();
- hildon_button_set_title (HILDON_BUTTON (widget), gettext (nick));
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (widget),
- HILDON_TOUCH_SELECTOR (selector));
- #else
widget = gtk_combo_box_text_new ();
- #endif
for (i = 0; i < enum_class->n_values; i++)
{
const gchar* raw_label = gettext (enum_class->values[i].value_nick);
gchar* label = katze_strip_mnemonics (raw_label);
- #ifdef HAVE_HILDON_2_2
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), label);
- #else
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), label);
- #endif
g_free (label);
}
- #ifdef HAVE_HILDON_2_2
- hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, value);
- g_signal_connect (widget, "value-changed",
- G_CALLBACK (proxy_picker_button_changed_cb), object);
- #else
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value);
g_signal_connect (widget, "changed",
G_CALLBACK (proxy_combo_box_changed_cb), object);
- #endif
if (custom)
{
gchar* custom_text = katze_object_get_string (object, custom);
More information about the Xfce4-commits
mailing list