[Xfce4-commits] [apps/xfburn] 07/42: updated to autoconf to GTK+3
noreply at xfce.org
noreply at xfce.org
Tue Oct 15 02:21:50 CEST 2019
This is an automated email from the git hooks/post-receive script.
k a t a n a s t e e l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfburn.
commit 3fc812be2740234a95a6afade9e5bc47f0da486f
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Wed Sep 4 21:55:08 2019 -0700
updated to autoconf to GTK+3
removed all EXO toolbars as exo-2 doesn't yet support them for GTK+3
---
configure.ac.in | 9 ++++++---
xfburn/xfburn-adding-progress.c | 2 +-
xfburn/xfburn-audio-composition.c | 6 +++---
xfburn/xfburn-blank-dialog.c | 4 ++--
xfburn/xfburn-data-composition.c | 6 +++---
xfburn/xfburn-main-window.c | 10 ++++++----
xfburn/xfburn-preferences-dialog.c | 6 ++++--
7 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 7ddd082..ad66fde 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -34,10 +34,13 @@ dnl check for required packages
XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.4.2])
XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.6.2])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+dnl XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.32])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.4], [], [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.3.100])])
+dnl XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
+dnl XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.4], [], [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.3.100])])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.11.0], [], [XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0])])
XDT_CHECK_PACKAGE([LIBGIO], [gio-2.0], [2.22.0])
XDT_CHECK_PACKAGE([LIBGIOUNIX], [gio-unix-2.0], [2.16.0])
dnl **************************************
diff --git a/xfburn/xfburn-adding-progress.c b/xfburn/xfburn-adding-progress.c
index fe22f29..7da07b3 100644
--- a/xfburn/xfburn-adding-progress.c
+++ b/xfburn/xfburn-adding-progress.c
@@ -111,7 +111,7 @@ xfburn_adding_progress_init (XfburnAddingProgress * win)
gtk_window_set_destroy_with_parent (GTK_WINDOW (win), TRUE);
gtk_window_set_title (GTK_WINDOW (win), _("Adding files to the composition"));
- vbox = gtk_vbox_new (FALSE, 5);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (win), vbox);
diff --git a/xfburn/xfburn-audio-composition.c b/xfburn/xfburn-audio-composition.c
index 86472e9..dfcd895 100644
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@ -294,7 +294,7 @@ xfburn_audio_composition_init (XfburnAudioComposition * composition)
XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (composition);
gint x, y;
- ExoToolbarsModel *model_toolbar;
+// ExoToolbarsModel *model_toolbar;
gint toolbar_position;
GtkWidget *hbox_toolbar;
//GtkWidget *hbox, *label;
@@ -356,7 +356,7 @@ xfburn_audio_composition_init (XfburnAudioComposition * composition)
gtk_widget_show (hbox_toolbar);
/* toolbar */
- model_toolbar = exo_toolbars_model_new ();
+/* model_toolbar = exo_toolbars_model_new ();
exo_toolbars_model_set_actions (model_toolbar, (gchar **) toolbar_actions, G_N_ELEMENTS (toolbar_actions));
toolbar_position = exo_toolbars_model_add_toolbar (model_toolbar, -1, "content-toolbar");
exo_toolbars_model_set_style (model_toolbar, GTK_TOOLBAR_BOTH, toolbar_position);
@@ -373,7 +373,7 @@ xfburn_audio_composition_init (XfburnAudioComposition * composition)
priv->toolbar = exo_toolbars_view_new_with_model (priv->ui_manager, model_toolbar);
gtk_box_pack_start (GTK_BOX (hbox_toolbar), priv->toolbar, TRUE, TRUE, 0);
gtk_widget_show (priv->toolbar);
-
+*/
/* content treeview */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index 2a8732d..ab070f0 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -227,7 +227,7 @@ xfburn_blank_dialog_init (XfburnBlankDialog * obj)
gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
/* options */
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
@@ -240,7 +240,7 @@ xfburn_blank_dialog_init (XfburnBlankDialog * obj)
gtk_box_pack_start (GTK_BOX (vbox), priv->check_eject, FALSE, FALSE, BORDER);
/* action buttons */
- button = gtk_button_new_from_stock ("_Cancel");
+ button = gtk_button_new_with_mnemonic ("_Cancel");
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
index efae9a7..ed1b6da 100644
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@ -276,7 +276,7 @@ xfburn_data_composition_init (XfburnDataComposition * composition)
XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE (composition);
gint x, y;
- ExoToolbarsModel *model_toolbar;
+// ExoToolbarsModel *model_toolbar;
gint toolbar_position;
GtkWidget *hbox_toolbar;
GtkWidget *hbox, *label;
@@ -329,7 +329,7 @@ xfburn_data_composition_init (XfburnDataComposition * composition)
gtk_widget_show (hbox_toolbar);
/* toolbar */
- model_toolbar = exo_toolbars_model_new ();
+/* model_toolbar = exo_toolbars_model_new ();
exo_toolbars_model_set_actions (model_toolbar, (gchar **) toolbar_actions, G_N_ELEMENTS (toolbar_actions));
toolbar_position = exo_toolbars_model_add_toolbar (model_toolbar, -1, "content-toolbar");
exo_toolbars_model_set_style (model_toolbar, GTK_TOOLBAR_BOTH, toolbar_position);
@@ -345,7 +345,7 @@ xfburn_data_composition_init (XfburnDataComposition * composition)
priv->toolbar = exo_toolbars_view_new_with_model (priv->ui_manager, model_toolbar);
gtk_box_pack_start (GTK_BOX (hbox_toolbar), priv->toolbar, TRUE, TRUE, 0);
gtk_widget_show (priv->toolbar);
-
+*/
/* volume name */
hbox = gtk_hbox_new (FALSE, 5);
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index 34aae83..03945a1 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -67,7 +67,7 @@ static void xfburn_main_window_finalize (GObject *obj);
static void xfburn_main_window_init (XfburnMainWindow *);
static gboolean cb_delete_main_window (XfburnMainWindow *, GdkEvent *, XfburnMainWindowPrivate *);
-static void cb_edit_toolbars_view (ExoToolbarsView *, gpointer);
+// static void cb_edit_toolbars_view (ExoToolbarsView *, gpointer);
static void action_about (GtkAction *, XfburnMainWindow *);
static void action_preferences (GtkAction *, XfburnMainWindow *);
@@ -272,7 +272,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
}
/* toolbar */
- file = xfce_resource_lookup (XFCE_RESOURCE_DATA, "xfburn/xfburn-toolbars.ui");
+/* file = xfce_resource_lookup (XFCE_RESOURCE_DATA, "xfburn/xfburn-toolbars.ui");
if (G_LIKELY (file != NULL)) {
ExoToolbarsModel *model;
@@ -285,7 +285,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
gtk_box_pack_start (GTK_BOX (vbox), priv->toolbars, FALSE, FALSE, 0);
gtk_widget_show (priv->toolbars);
- g_signal_connect (G_OBJECT (priv->toolbars), "customize", G_CALLBACK (cb_edit_toolbars_view), mainwin);
+// g_signal_connect (G_OBJECT (priv->toolbars), "customize", G_CALLBACK (cb_edit_toolbars_view), mainwin);
}
else {
g_warning ("Unable to load %s: %s", file, error->message);
@@ -297,7 +297,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
else {
g_warning ("Unable to locate xfburn/xfburn-toolbars.ui !");
}
-
+*/
/* vpaned */
priv->vpaned = gtk_vpaned_new ();
gtk_container_add (GTK_CONTAINER (vbox), priv->vpaned);
@@ -321,6 +321,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
}
/* internals */
+/*
static void
cb_edit_toolbars_view_done (ExoToolbarsEditorDialog * dialog, ExoToolbarsView * toolbar)
{
@@ -353,6 +354,7 @@ cb_edit_toolbars_view (ExoToolbarsView * toolbar, gpointer user_data)
g_signal_connect (G_OBJECT (editor_dialog), "destroy", G_CALLBACK (cb_edit_toolbars_view_done), toolbar);
}
+*/
static gboolean
cb_delete_main_window (XfburnMainWindow * mainwin, GdkEvent * event, XfburnMainWindowPrivate *priv)
diff --git a/xfburn/xfburn-preferences-dialog.c b/xfburn/xfburn-preferences-dialog.c
index 20d5bef..a5c0791 100644
--- a/xfburn/xfburn-preferences-dialog.c
+++ b/xfburn/xfburn-preferences-dialog.c
@@ -161,13 +161,15 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
gtk_widget_show (scrolled_window);
/* icon bar */
+/*
icon_store = gtk_list_store_new (SETTINGS_LIST_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
priv->icon_bar = exo_icon_bar_new_with_model (GTK_TREE_MODEL (icon_store));
exo_icon_bar_set_pixbuf_column (EXO_ICON_BAR (priv->icon_bar), SETTINGS_LIST_PIXBUF_COLUMN);
exo_icon_bar_set_text_column (EXO_ICON_BAR (priv->icon_bar), SETTINGS_LIST_TEXT_COLUMN);
gtk_container_add (GTK_CONTAINER (scrolled_window), priv->icon_bar);
gtk_widget_show (priv->icon_bar);
-
+*/
+
/* notebook */
priv->notebook = gtk_notebook_new ();
gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), BORDER);
@@ -348,7 +350,7 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
button_close = gtk_button_new_from_stock ("gtk-close");
gtk_widget_show (button_close);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), button_close, GTK_RESPONSE_CLOSE);
- gtk_widget_set_can_default (button_close, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default (button_close, TRUE);
gtk_widget_grab_focus (button_close);
gtk_widget_grab_default (button_close);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list