From 084bfc5807982b4f3e32850a64993766fd9993d0 Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Wed, 13 Nov 2013 19:56:15 +0100 Subject: replace GDK_ with GDK_KEY_ --- src/fr-window.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/fr-window.c b/src/fr-window.c index d986b9c..f48b203 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -2159,9 +2159,9 @@ location_entry_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, FrWindow *window) { - if ((event->keyval == GDK_Return) - || (event->keyval == GDK_KP_Enter) - || (event->keyval == GDK_ISO_Enter)) + if ((event->keyval == GDK_KEY_Return) + || (event->keyval == GDK_KEY_KP_Enter) + || (event->keyval == GDK_KEY_ISO_Enter)) { fr_window_go_to_location (window, gtk_entry_get_text (GTK_ENTRY (window->priv->location_entry)), FALSE); } @@ -4474,7 +4474,7 @@ key_press_cb (GtkWidget *widget, if (gtk_widget_has_focus (window->priv->filter_entry)) { switch (event->keyval) { - case GDK_Escape: + case GDK_KEY_Escape: fr_window_deactivate_filter (window); retval = TRUE; break; @@ -4487,14 +4487,14 @@ key_press_cb (GtkWidget *widget, alt = (event->state & GDK_MOD1_MASK) == GDK_MOD1_MASK; switch (event->keyval) { - case GDK_Escape: + case GDK_KEY_Escape: activate_action_stop (NULL, window); if (window->priv->filter_mode) fr_window_deactivate_filter (window); retval = TRUE; break; - case GDK_F10: + case GDK_KEY_F10: if (event->state & GDK_SHIFT_MASK) { GtkTreeSelection *selection; @@ -4511,37 +4511,37 @@ key_press_cb (GtkWidget *widget, } break; - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: if (alt) { fr_window_go_up_one_level (window); retval = TRUE; } break; - case GDK_BackSpace: + case GDK_KEY_BackSpace: fr_window_go_up_one_level (window); retval = TRUE; break; - case GDK_Right: - case GDK_KP_Right: + case GDK_KEY_Right: + case GDK_KEY_KP_Right: if (alt) { fr_window_go_forward (window); retval = TRUE; } break; - case GDK_Left: - case GDK_KP_Left: + case GDK_KEY_Left: + case GDK_KEY_KP_Left: if (alt) { fr_window_go_back (window); retval = TRUE; } break; - case GDK_Home: - case GDK_KP_Home: + case GDK_KEY_Home: + case GDK_KEY_KP_Home: if (alt) { fr_window_go_to_location (window, "/", FALSE); retval = TRUE; @@ -5809,7 +5809,7 @@ fr_window_construct (FrWindow *window) /* Add a hidden short cut Ctrl-Q for power users */ gtk_accel_group_connect (gtk_ui_manager_get_accel_group (ui), - GDK_q, GDK_CONTROL_MASK, 0, + GDK_KEY_q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (fr_window_close), window, NULL)); -- cgit v1.2.1 From 612e6529a66899e5466b9bf4bd9bdc2443075896 Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Fri, 15 Nov 2013 17:52:52 +0100 Subject: port to GTK3 --- copy-n-paste/eggsmclient-private.h | 2 +- src/dlg-batch-add.c | 11 +++++++++-- src/fr-window.c | 5 +---- src/gtk-utils.c | 4 ---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/copy-n-paste/eggsmclient-private.h b/copy-n-paste/eggsmclient-private.h index 2e41d6d..3462ec3 100644 --- a/copy-n-paste/eggsmclient-private.h +++ b/copy-n-paste/eggsmclient-private.h @@ -20,7 +20,7 @@ #ifndef __EGG_SM_CLIENT_PRIVATE_H__ #define __EGG_SM_CLIENT_PRIVATE_H__ -#include +#include #include "eggsmclient.h" G_BEGIN_DECLS diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c index 28dbc01..e9d00a9 100644 --- a/src/dlg-batch-add.c +++ b/src/dlg-batch-add.c @@ -555,7 +555,11 @@ dlg_batch_add_files (FrWindow *window, /* archive type combobox */ +#if GTK_CHECK_VERSION(2,24,0) + data->a_archive_type_combo_box = gtk_combo_box_text_new (); +#else data->a_archive_type_combo_box = gtk_combo_box_new_text (); +#endif if (data->single_file) data->supported_types = single_file_save_type; else @@ -563,8 +567,11 @@ dlg_batch_add_files (FrWindow *window, sort_mime_types_by_extension (data->supported_types); for (i = 0; data->supported_types[i] != -1; i++) - gtk_combo_box_append_text (GTK_COMBO_BOX (data->a_archive_type_combo_box), - mime_type_desc[data->supported_types[i]].default_ext); +#if GTK_CHECK_VERSION(2,24,0) + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (data->a_archive_type_combo_box), mime_type_desc[data->supported_types[i]].default_ext); +#else + gtk_combo_box_append_text (GTK_COMBO_BOX (data->a_archive_type_combo_box), mime_type_desc[data->supported_types[i]].default_ext); +#endif gtk_box_pack_start (GTK_BOX (a_archive_type_box), data->a_archive_type_combo_box, TRUE, TRUE, 0); gtk_widget_show_all (a_archive_type_box); diff --git a/src/fr-window.c b/src/fr-window.c index f48b203..12fdce6 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1919,7 +1919,7 @@ fr_window_update_file_list (FrWindow *window, } else { gtk_widget_set_sensitive (window->priv->list_view, FALSE); - gtk_widget_hide_all (gtk_widget_get_parent (window->priv->list_view)); + gtk_widget_hide (gtk_widget_get_parent (window->priv->list_view)); } return; @@ -2512,7 +2512,6 @@ create_the_progress_dialog (FrWindow *window) window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); d = GTK_DIALOG (window->priv->progress_dialog); - gtk_dialog_set_has_separator (d, FALSE); gtk_window_set_resizable (GTK_WINDOW (d), TRUE); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_window_set_default_size (GTK_WINDOW (d), PROGRESS_DIALOG_DEFAULT_WIDTH, -1); @@ -5952,7 +5951,6 @@ fr_window_construct (FrWindow *window) gtk_widget_show (vbox); } gtk_widget_show (statusbar_box); - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar), TRUE); fr_window_attach (FR_WINDOW (window), window->priv->statusbar, FR_WINDOW_AREA_STATUSBAR); if (g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_STATUSBAR)) @@ -7085,7 +7083,6 @@ fr_window_view_last_output (FrWindow *window, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 6); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 8); diff --git a/src/gtk-utils.c b/src/gtk-utils.c index 5e7fff4..8082127 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -78,7 +78,6 @@ _gtk_message_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -214,7 +213,6 @@ _gtk_request_dialog_run (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -306,7 +304,6 @@ _gtk_yesno_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (d)); - gtk_dialog_set_has_separator (GTK_DIALOG (d), FALSE); gtk_container_set_border_width (GTK_CONTAINER (d), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -394,7 +391,6 @@ _gtk_error_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); -- cgit v1.2.1 From 3b99041059ea2147c296443a9460be67443776d0 Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Fri, 15 Nov 2013 18:01:26 +0100 Subject: add the primary-toolbar style class --- src/fr-window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/fr-window.c b/src/fr-window.c index 12fdce6..b5ee695 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -5823,6 +5823,9 @@ fr_window_construct (FrWindow *window) window->priv->toolbar = toolbar = gtk_ui_manager_get_widget (ui, "/ToolBar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE); +#if GTK_CHECK_VERSION(3,0,0) + gtk_style_context_add_class (gtk_widget_get_style_context (toolbar), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); +#endif set_action_important (ui, "/ToolBar/Extract_Toolbar"); /* location bar */ -- cgit v1.2.1 From 8d284101a0ee5714a198424926612a163c3c691f Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Sat, 16 Nov 2013 08:45:07 +0100 Subject: fix the GTK3 version --- copy-n-paste/eggsmclient-private.h | 2 +- src/fr-window.c | 9 +++++++-- src/gtk-utils.c | 12 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/copy-n-paste/eggsmclient-private.h b/copy-n-paste/eggsmclient-private.h index 3462ec3..18daf54 100644 --- a/copy-n-paste/eggsmclient-private.h +++ b/copy-n-paste/eggsmclient-private.h @@ -20,7 +20,7 @@ #ifndef __EGG_SM_CLIENT_PRIVATE_H__ #define __EGG_SM_CLIENT_PRIVATE_H__ -#include +#include #include "eggsmclient.h" G_BEGIN_DECLS diff --git a/src/fr-window.c b/src/fr-window.c index b5ee695..b488b88 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1926,8 +1926,7 @@ fr_window_update_file_list (FrWindow *window, } else { gtk_widget_set_sensitive (window->priv->list_view, TRUE); - if (! gtk_widget_get_visible (window->priv->list_view)) - gtk_widget_show_all (gtk_widget_get_parent (window->priv->list_view)); + gtk_widget_show_all (gtk_widget_get_parent (window->priv->list_view)); } if (window->priv->give_focus_to_the_list) { @@ -2512,6 +2511,9 @@ create_the_progress_dialog (FrWindow *window) window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); d = GTK_DIALOG (window->priv->progress_dialog); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (d, FALSE); +#endif gtk_window_set_resizable (GTK_WINDOW (d), TRUE); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_window_set_default_size (GTK_WINDOW (d), PROGRESS_DIALOG_DEFAULT_WIDTH, -1); @@ -7086,6 +7088,9 @@ fr_window_view_last_output (FrWindow *window, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 6); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 8); diff --git a/src/gtk-utils.c b/src/gtk-utils.c index 8082127..3c55ffe 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -78,6 +78,9 @@ _gtk_message_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -213,6 +216,9 @@ _gtk_request_dialog_run (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -304,6 +310,9 @@ _gtk_yesno_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (d)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (d), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (d), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -391,6 +400,9 @@ _gtk_error_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); -- cgit v1.2.1