From cb1c025f945fe46dab39b70712cbe4378ae24970 Mon Sep 17 00:00:00 2001 From: waker Date: Sat, 8 Oct 2011 13:30:01 +0200 Subject: port to GTK3 (WIP) --- scripts/quickinstall.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/quickinstall.sh') diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh index 20b89482..a7e54c7d 100755 --- a/scripts/quickinstall.sh +++ b/scripts/quickinstall.sh @@ -18,6 +18,7 @@ cp ./plugins/lastfm/.libs/lastfm.so /usr/local/lib/deadbeef/ cp ./plugins/sid/.libs/sid.so /usr/local/lib/deadbeef/ cp ./plugins/adplug/.libs/adplug.so /usr/local/lib/deadbeef/ cp ./plugins/gtkui/.libs/ddb_gui_GTK2.so /usr/local/lib/deadbeef/ +cp ./plugins/gtkui/.libs/ddb_gui_GTK3.so /usr/local/lib/deadbeef/ cp ./plugins/sndfile/.libs/sndfile.so /usr/local/lib/deadbeef/ cp ./plugins/pulse/.libs/pulse.so /usr/local/lib/deadbeef/ cp ./plugins/artwork/.libs/artwork.so /usr/local/lib/deadbeef/ -- cgit v1.2.3 From b7f8552d60d53c02b1966d004e680242b92bbd8e Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 9 Oct 2011 20:54:08 +0200 Subject: added gtk3 support to converter gui --- plugins/converter/Makefile.am | 37 ++++++++++--- plugins/converter/converter.gladep | 1 + plugins/converter/convgui.c | 12 ++++- plugins/converter/interface.c | 104 +++++++++++++++++-------------------- plugins/converter/support.c | 11 +++- plugins/converter/support.h | 8 +++ plugins/gtkui/gtkui.c | 4 ++ scripts/quickinstall.sh | 3 +- 8 files changed, 113 insertions(+), 67 deletions(-) (limited to 'scripts/quickinstall.sh') diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am index 2fd222c1..26691bab 100644 --- a/plugins/converter/Makefile.am +++ b/plugins/converter/Makefile.am @@ -1,6 +1,16 @@ if HAVE_CONVERTER -pkglib_LTLIBRARIES = converter.la converter_gtkui.la +if HAVE_GTK2 +if HAVE_GTK3 +pkglib_LTLIBRARIES = converter.la converter_gtk2.la converter_gtk3.la +else +pkglib_LTLIBRARIES = converter.la converter_gtk2.la +endif +else +if HAVE_GTK3 +pkglib_LTLIBRARIES = converter.la converter_gtk3.la +endif +endif convdatadir = $(libdir)/deadbeef/convpresets convdata_DATA = \ @@ -17,21 +27,34 @@ convdata_DATA = \ EXTRA_DIST = $(convdata_DATA) AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC + converter_la_SOURCES = converter.c converter.h converter_la_LDFLAGS = -module -converter_gtkui_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h -converter_gtkui_la_LDFLAGS = -module +if HAVE_GTK2 +converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +converter_gtk2_la_LDFLAGS = -module +endif +if HAVE_GTK3 +converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +converter_gtk3_la_LDFLAGS = -module +endif if STATICLINK GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr -converter_gtkui_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la +converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la -converter_gtkui_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 +converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 else -converter_gtkui_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) -converter_gtkui_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) +if HAVE_GTK2 +converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) +converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) +endif +if HAVE_GTK3 +converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) +converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) endif +endif endif diff --git a/plugins/converter/converter.gladep b/plugins/converter/converter.gladep index fc0e5ab2..f08332d4 100644 --- a/plugins/converter/converter.gladep +++ b/plugins/converter/converter.gladep @@ -7,5 +7,6 @@ FALSE FALSE + FALSE FALSE diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c index 9a20d274..bd54eb0e 100644 --- a/plugins/converter/convgui.c +++ b/plugins/converter/convgui.c @@ -246,7 +246,7 @@ converter_process (converter_ctx_t *conv) } GtkWidget *progress = gtk_dialog_new_with_buttons (_("Converting..."), GTK_WINDOW (gtkui_plugin->get_mainwin ()), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - GtkWidget *vbox = GTK_DIALOG (progress)->vbox; + GtkWidget *vbox = gtk_dialog_get_content_area (GTK_DIALOG (progress)); GtkWidget *entry = gtk_entry_new (); gtk_widget_set_size_request (entry, 400, -1); gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE); @@ -1265,7 +1265,11 @@ convgui_get_actions (DB_playItem_t *it) int convgui_connect (void) { +#if GTK_CHECK_VERSION(3,0,0) + gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id ("gtkui3"); +#else gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id ("gtkui"); +#endif converter_plugin = (ddb_converter_t *)deadbeef->plug_get_for_id ("converter"); if (!gtkui_plugin || !converter_plugin) { return -1; @@ -1312,7 +1316,11 @@ DB_misc_t plugin = { }; DB_plugin_t * -converter_gtkui_load (DB_functions_t *api) { +#if GTK_CHECK_VERSION(3,0,0) +converter_gtk3_load (DB_functions_t *api) { +#else +converter_gtk2_load (DB_functions_t *api) { +#endif deadbeef = api; return DB_PLUGIN (&plugin); } diff --git a/plugins/converter/interface.c b/plugins/converter/interface.c index 7cba6062..503f5d51 100644 --- a/plugins/converter/interface.c +++ b/plugins/converter/interface.c @@ -21,7 +21,7 @@ #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + g_object_ref(G_OBJECT(widget)), (GDestroyNotify) g_object_unref) #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ g_object_set_data (G_OBJECT (component), name, widget) @@ -56,7 +56,7 @@ create_converterdlg (void) GtkWidget *image470; GtkWidget *hbox88; GtkWidget *label116; - GtkObject *numthreads_adj; + GObject *numthreads_adj; GtkWidget *numthreads; GtkWidget *hbox89; GtkWidget *label117; @@ -71,9 +71,6 @@ create_converterdlg (void) GtkWidget *dialog_action_area5; GtkWidget *converter_cancel; GtkWidget *converter_ok; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); converterdlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (converterdlg), "Converter"); @@ -82,7 +79,7 @@ create_converterdlg (void) gtk_window_set_type_hint (GTK_WINDOW (converterdlg), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_dialog_set_has_separator (GTK_DIALOG (converterdlg), FALSE); - dialog_vbox6 = GTK_DIALOG (converterdlg)->vbox; + dialog_vbox6 = gtk_dialog_get_content_area (GTK_DIALOG (converterdlg)); gtk_widget_show (dialog_vbox6); vbox26 = gtk_vbox_new (FALSE, 8); @@ -126,14 +123,14 @@ create_converterdlg (void) output_file = gtk_entry_new (); gtk_widget_show (output_file); gtk_box_pack_start (GTK_BOX (hbox101), output_file, TRUE, TRUE, 0); - gtk_tooltips_set_tip (tooltips, output_file, _("Extension (e.g. .mp3) will be appended automatically.\nLeave the field empty for default (%a - %t)."), NULL); + gtk_widget_set_tooltip_text (output_file, _("Extension (e.g. .mp3) will be appended automatically.\nLeave the field empty for default (%a - %t).")); gtk_entry_set_invisible_char (GTK_ENTRY (output_file), 8226); custom6 = title_formatting_help_link_create ("custom6", "", "", 0, 0); gtk_widget_show (custom6); gtk_box_pack_start (GTK_BOX (hbox101), custom6, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (custom6, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (custom6, GTK_CAN_DEFAULT); + gtk_widget_set_can_focus(custom6, FALSE); + gtk_widget_set_can_default(custom6, FALSE); hbox69 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox69); @@ -147,7 +144,7 @@ create_converterdlg (void) gtk_widget_show (hbox90); gtk_box_pack_start (GTK_BOX (hbox69), hbox90, TRUE, TRUE, 0); - encoder = gtk_combo_box_new_text (); + encoder = gtk_combo_box_text_new (); gtk_widget_show (encoder); gtk_box_pack_start (GTK_BOX (hbox90), encoder, TRUE, TRUE, 0); @@ -171,7 +168,7 @@ create_converterdlg (void) gtk_widget_show (hbox91); gtk_box_pack_start (GTK_BOX (hbox86), hbox91, TRUE, TRUE, 0); - dsp_preset = gtk_combo_box_new_text (); + dsp_preset = gtk_combo_box_text_new (); gtk_widget_show (dsp_preset); gtk_box_pack_start (GTK_BOX (hbox91), dsp_preset, TRUE, TRUE, 0); @@ -190,7 +187,7 @@ create_converterdlg (void) gtk_widget_show (label116); gtk_box_pack_start (GTK_BOX (hbox88), label116, FALSE, FALSE, 0); - numthreads_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 0); + numthreads_adj = G_OBJECT(gtk_adjustment_new (1, 0, 100, 1, 10, 0)); numthreads = gtk_spin_button_new (GTK_ADJUSTMENT (numthreads_adj), 1, 0); gtk_widget_show (numthreads); gtk_box_pack_start (GTK_BOX (hbox88), numthreads, TRUE, TRUE, 0); @@ -203,15 +200,15 @@ create_converterdlg (void) gtk_widget_show (label117); gtk_box_pack_start (GTK_BOX (hbox89), label117, FALSE, FALSE, 0); - output_format = gtk_combo_box_new_text (); + output_format = gtk_combo_box_text_new (); gtk_widget_show (output_format); gtk_box_pack_start (GTK_BOX (hbox89), output_format, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("Keep source format")); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("8 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("16 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("24 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("32 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("32 bit float")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("Keep source format")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("8 bit signed int")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("16 bit signed int")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("24 bit signed int")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("32 bit signed int")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (output_format), _("32 bit float")); hbox99 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox99); @@ -221,11 +218,11 @@ create_converterdlg (void) gtk_widget_show (label121); gtk_box_pack_start (GTK_BOX (hbox99), label121, FALSE, FALSE, 0); - overwrite_action = gtk_combo_box_new_text (); + overwrite_action = gtk_combo_box_text_new (); gtk_widget_show (overwrite_action); gtk_box_pack_start (GTK_BOX (hbox99), overwrite_action, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (overwrite_action), _("Prompt")); - gtk_combo_box_append_text (GTK_COMBO_BOX (overwrite_action), _("Overwrite")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (overwrite_action), _("Prompt")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (overwrite_action), _("Overwrite")); preserve_folders = gtk_check_button_new_with_mnemonic (_("Preserve folder structure, starting from:")); gtk_box_pack_start (GTK_BOX (vbox26), preserve_folders, FALSE, FALSE, 0); @@ -242,19 +239,19 @@ create_converterdlg (void) gtk_widget_show (preserve_folder_browse); gtk_box_pack_start (GTK_BOX (hbox102), preserve_folder_browse, FALSE, FALSE, 0); - dialog_action_area5 = GTK_DIALOG (converterdlg)->action_area; + dialog_action_area5 = gtk_dialog_get_action_area (GTK_DIALOG (converterdlg)); gtk_widget_show (dialog_action_area5); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area5), GTK_BUTTONBOX_END); converter_cancel = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (converter_cancel); gtk_dialog_add_action_widget (GTK_DIALOG (converterdlg), converter_cancel, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (converter_cancel, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(converter_cancel, TRUE); converter_ok = gtk_button_new_from_stock ("gtk-ok"); gtk_widget_show (converter_ok); gtk_dialog_add_action_widget (GTK_DIALOG (converterdlg), converter_ok, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (converter_ok, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(converter_ok, TRUE); g_signal_connect ((gpointer) output_folder, "changed", G_CALLBACK (on_output_folder_changed), @@ -338,7 +335,6 @@ create_converterdlg (void) GLADE_HOOKUP_OBJECT_NO_REF (converterdlg, dialog_action_area5, "dialog_action_area5"); GLADE_HOOKUP_OBJECT (converterdlg, converter_cancel, "converter_cancel"); GLADE_HOOKUP_OBJECT (converterdlg, converter_ok, "converter_ok"); - GLADE_HOOKUP_OBJECT_NO_REF (converterdlg, tooltips, "tooltips"); return converterdlg; } @@ -378,16 +374,13 @@ create_convpreset_editor (void) GtkWidget *dialog_action_area6; GtkWidget *convpreset_cancel; GtkWidget *convpreset_ok; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); convpreset_editor = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (convpreset_editor), _("Edit Encoder Preset")); gtk_window_set_modal (GTK_WINDOW (convpreset_editor), TRUE); gtk_window_set_type_hint (GTK_WINDOW (convpreset_editor), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox7 = GTK_DIALOG (convpreset_editor)->vbox; + dialog_vbox7 = gtk_dialog_get_content_area (GTK_DIALOG (convpreset_editor)); gtk_widget_show (dialog_vbox7); vbox27 = gtk_vbox_new (FALSE, 8); @@ -421,7 +414,7 @@ create_convpreset_editor (void) ext = gtk_entry_new (); gtk_widget_show (ext); gtk_box_pack_start (GTK_BOX (hbox96), ext, TRUE, TRUE, 0); - gtk_tooltips_set_tip (tooltips, ext, _("E.g. mp3"), NULL); + gtk_widget_set_tooltip_text (ext, _("E.g. mp3")); gtk_entry_set_invisible_char (GTK_ENTRY (ext), 9679); gtk_entry_set_activates_default (GTK_ENTRY (ext), TRUE); @@ -440,15 +433,15 @@ create_convpreset_editor (void) encoder = gtk_entry_new (); gtk_widget_show (encoder); gtk_box_pack_start (GTK_BOX (hbox93), encoder, TRUE, TRUE, 0); - gtk_tooltips_set_tip (tooltips, encoder, _("Example: lame - %o\n%i for input file, %o for output file, - for stdin"), NULL); + gtk_widget_set_tooltip_text (encoder, _("Example: lame - %o\n%i for input file, %o for output file, - for stdin")); gtk_entry_set_invisible_char (GTK_ENTRY (encoder), 9679); gtk_entry_set_activates_default (GTK_ENTRY (encoder), TRUE); custom4 = encoder_cmdline_help_link_create ("custom4", "", "", 0, 0); gtk_widget_show (custom4); gtk_box_pack_start (GTK_BOX (hbox93), custom4, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (custom4, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (custom4, GTK_CAN_DEFAULT); + gtk_widget_set_can_focus(custom4, FALSE); + gtk_widget_set_can_default(custom4, FALSE); label124 = gtk_label_new (_("%o - output file name\n%i - temporary input file name")); gtk_widget_show (label124); @@ -463,11 +456,11 @@ create_convpreset_editor (void) gtk_widget_show (label107); gtk_box_pack_start (GTK_BOX (hbox73), label107, FALSE, FALSE, 0); - method = gtk_combo_box_new_text (); + method = gtk_combo_box_text_new (); gtk_widget_show (method); gtk_box_pack_start (GTK_BOX (hbox73), method, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (method), _("Pipe")); - gtk_combo_box_append_text (GTK_COMBO_BOX (method), _("Temporary file")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Pipe")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Temporary file")); frame9 = gtk_frame_new (NULL); gtk_widget_show (frame9); @@ -518,30 +511,30 @@ create_convpreset_editor (void) gtk_widget_show (id3v2); gtk_box_pack_start (GTK_BOX (hbox104), id3v2, FALSE, FALSE, 0); - id3v2_version = gtk_combo_box_new_text (); + id3v2_version = gtk_combo_box_text_new (); gtk_widget_show (id3v2_version); gtk_box_pack_start (GTK_BOX (hbox104), id3v2_version, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (id3v2_version), "2.3"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id3v2_version), "2.4"); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), "2.3"); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), "2.4"); label125 = gtk_label_new (_("Tag writer")); gtk_widget_show (label125); gtk_frame_set_label_widget (GTK_FRAME (frame9), label125); gtk_label_set_use_markup (GTK_LABEL (label125), TRUE); - dialog_action_area6 = GTK_DIALOG (convpreset_editor)->action_area; + dialog_action_area6 = gtk_dialog_get_action_area (GTK_DIALOG (convpreset_editor)); gtk_widget_show (dialog_action_area6); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area6), GTK_BUTTONBOX_END); convpreset_cancel = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (convpreset_cancel); gtk_dialog_add_action_widget (GTK_DIALOG (convpreset_editor), convpreset_cancel, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (convpreset_cancel, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(convpreset_cancel, TRUE); convpreset_ok = gtk_button_new_from_stock ("gtk-ok"); gtk_widget_show (convpreset_ok); gtk_dialog_add_action_widget (GTK_DIALOG (convpreset_editor), convpreset_ok, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (convpreset_ok, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(convpreset_ok, TRUE); g_signal_connect ((gpointer) encoder, "changed", G_CALLBACK (on_encoder_changed), @@ -580,7 +573,6 @@ create_convpreset_editor (void) GLADE_HOOKUP_OBJECT_NO_REF (convpreset_editor, dialog_action_area6, "dialog_action_area6"); GLADE_HOOKUP_OBJECT (convpreset_editor, convpreset_cancel, "convpreset_cancel"); GLADE_HOOKUP_OBJECT (convpreset_editor, convpreset_ok, "convpreset_ok"); - GLADE_HOOKUP_OBJECT_NO_REF (convpreset_editor, tooltips, "tooltips"); return convpreset_editor; } @@ -615,7 +607,7 @@ create_dsppreset_editor (void) gtk_window_set_modal (GTK_WINDOW (dsppreset_editor), TRUE); gtk_window_set_type_hint (GTK_WINDOW (dsppreset_editor), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox9 = GTK_DIALOG (dsppreset_editor)->vbox; + dialog_vbox9 = gtk_dialog_get_content_area (GTK_DIALOG (dsppreset_editor)); gtk_widget_show (dialog_vbox9); vbox30 = gtk_vbox_new (FALSE, 8); @@ -686,19 +678,19 @@ create_dsppreset_editor (void) gtk_widget_show (down); gtk_box_pack_start (GTK_BOX (vbox34), down, FALSE, FALSE, 0); - dialog_action_area8 = GTK_DIALOG (dsppreset_editor)->action_area; + dialog_action_area8 = gtk_dialog_get_action_area (GTK_DIALOG (dsppreset_editor)); gtk_widget_show (dialog_action_area8); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area8), GTK_BUTTONBOX_END); cancelbutton6 = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (cancelbutton6); gtk_dialog_add_action_widget (GTK_DIALOG (dsppreset_editor), cancelbutton6, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton6, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(cancelbutton6, TRUE); okbutton6 = gtk_button_new_from_stock ("gtk-ok"); gtk_widget_show (okbutton6); gtk_dialog_add_action_widget (GTK_DIALOG (dsppreset_editor), okbutton6, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (okbutton6, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton6, TRUE); g_signal_connect ((gpointer) add, "clicked", G_CALLBACK (on_dsp_preset_add_plugin_clicked), @@ -759,7 +751,7 @@ create_select_dsp_plugin (void) gtk_window_set_modal (GTK_WINDOW (select_dsp_plugin), TRUE); gtk_window_set_type_hint (GTK_WINDOW (select_dsp_plugin), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox10 = GTK_DIALOG (select_dsp_plugin)->vbox; + dialog_vbox10 = gtk_dialog_get_content_area (GTK_DIALOG (select_dsp_plugin)); gtk_widget_show (dialog_vbox10); vbox31 = gtk_vbox_new (FALSE, 8); @@ -775,23 +767,23 @@ create_select_dsp_plugin (void) gtk_widget_show (label113); gtk_box_pack_start (GTK_BOX (hbox85), label113, FALSE, FALSE, 0); - plugin = gtk_combo_box_new_text (); + plugin = gtk_combo_box_text_new (); gtk_widget_show (plugin); gtk_box_pack_start (GTK_BOX (hbox85), plugin, TRUE, TRUE, 0); - dialog_action_area9 = GTK_DIALOG (select_dsp_plugin)->action_area; + dialog_action_area9 = gtk_dialog_get_action_area (GTK_DIALOG (select_dsp_plugin)); gtk_widget_show (dialog_action_area9); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area9), GTK_BUTTONBOX_END); cancelbutton7 = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (cancelbutton7); gtk_dialog_add_action_widget (GTK_DIALOG (select_dsp_plugin), cancelbutton7, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton7, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(cancelbutton7, TRUE); okbutton7 = gtk_button_new_from_stock ("gtk-ok"); gtk_widget_show (okbutton7); gtk_dialog_add_action_widget (GTK_DIALOG (select_dsp_plugin), okbutton7, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (okbutton7, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton7, TRUE); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (select_dsp_plugin, select_dsp_plugin, "select_dsp_plugin"); @@ -827,7 +819,7 @@ create_preset_list (void) gtk_window_set_modal (GTK_WINDOW (preset_list), TRUE); gtk_window_set_type_hint (GTK_WINDOW (preset_list), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox11 = GTK_DIALOG (preset_list)->vbox; + dialog_vbox11 = gtk_dialog_get_content_area (GTK_DIALOG (preset_list)); gtk_widget_show (dialog_vbox11); vbox33 = gtk_vbox_new (FALSE, 8); @@ -863,14 +855,14 @@ create_preset_list (void) gtk_widget_set_size_request (presets, 400, 176); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (presets), FALSE); - dialog_action_area10 = GTK_DIALOG (preset_list)->action_area; + dialog_action_area10 = gtk_dialog_get_action_area (GTK_DIALOG (preset_list)); gtk_widget_show (dialog_action_area10); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area10), GTK_BUTTONBOX_END); okbutton8 = gtk_button_new_from_stock ("gtk-close"); gtk_widget_show (okbutton8); gtk_dialog_add_action_widget (GTK_DIALOG (preset_list), okbutton8, GTK_RESPONSE_CLOSE); - GTK_WIDGET_SET_FLAGS (okbutton8, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton8, TRUE); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (preset_list, preset_list, "preset_list"); diff --git a/plugins/converter/support.c b/plugins/converter/support.c index 00aff298..ae0b71d5 100644 --- a/plugins/converter/support.c +++ b/plugins/converter/support.c @@ -27,7 +27,7 @@ lookup_widget (GtkWidget *widget, if (GTK_IS_MENU (widget)) parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); else - parent = widget->parent; + parent = gtk_widget_get_parent (widget); if (!parent) parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); if (parent == NULL) @@ -142,3 +142,12 @@ glade_set_atk_action_description (AtkAction *action, } } +#if GTK_CHECK_VERSION(3,0,0) +GtkWidget * +gtk_combo_box_entry_new_text(void) { + GtkWidget *w = gtk_combo_box_text_new_with_entry (); +} +void +gtk_dialog_set_has_separator (GtkDialog *dlg, gboolean has) { +} +#endif diff --git a/plugins/converter/support.h b/plugins/converter/support.h index a32649e5..7037765f 100644 --- a/plugins/converter/support.h +++ b/plugins/converter/support.h @@ -67,3 +67,11 @@ void glade_set_atk_action_description (AtkAction *action, const gchar *action_name, const gchar *description); + +#if GTK_CHECK_VERSION(3,0,0) +GtkWidget * +gtk_combo_box_entry_new_text(void); + +void +gtk_dialog_set_has_separator (GtkDialog *dlg, gboolean has); +#endif diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 51fd3c52..709280d6 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1363,7 +1363,11 @@ static ddb_gtkui_t plugin = { .gui.plugin.version_major = 1, .gui.plugin.version_minor = 0, .gui.plugin.type = DB_PLUGIN_MISC, +#if GTK_CHECK_VERSION(3,0,0) + .gui.plugin.id = "gtkui3", +#else .gui.plugin.id = "gtkui", +#endif .gui.plugin.name = "Standard GTK2 user interface", .gui.plugin.descr = "Default DeaDBeeF GUI", .gui.plugin.copyright = diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh index a7e54c7d..05f4eabb 100755 --- a/scripts/quickinstall.sh +++ b/scripts/quickinstall.sh @@ -39,7 +39,8 @@ cp ./plugins/dsp_libsrc/.libs/dsp_libsrc.so /usr/local/lib/deadbeef/ cp ./plugins/m3u/.libs/m3u.so /usr/local/lib/deadbeef/ cp ./plugins/ddb_input_uade2/ddb_input_uade2.so /usr/local/lib/deadbeef/ cp ./plugins/converter/.libs/converter.so /usr/local/lib/deadbeef/ -cp ./plugins/converter/.libs/converter_gtkui.so /usr/local/lib/deadbeef/ +cp ./plugins/converter/.libs/converter_gtk2.so /usr/local/lib/deadbeef/ +cp ./plugins/converter/.libs/converter_gtk3.so /usr/local/lib/deadbeef/ cp ./plugins/soundtouch/ddb_soundtouch.so /usr/local/lib/deadbeef/ cp ./plugins/vfs_zip/.libs/vfs_zip.so /usr/local/lib/deadbeef/ cp ./plugins/mono2stereo/mono2stereo.so /usr/local/lib/deadbeef/ -- cgit v1.2.3