From 3dd5509417259229da204493f2d5cce5333269d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= Date: Tue, 12 Apr 2016 01:40:56 +0200 Subject: [PATCH] Add support for GTK+ 3 Provide full support for GTK+ 3 by fixing all deprecations in Xarchiver. It keeps the compatibility with GTK+ 2 by using the --disable-gtk3 configure flag. --- README | 2 +- configure.ac | 15 +- doc/html/ch01s01.html | 4 +- doc/xarchiver.docbook | 2 +- src/Makefile.am | 2 - src/add_dialog.c | 25 +- src/add_dialog.h | 4 +- src/archive.c | 2 +- src/extract_dialog.c | 50 ++- src/extract_dialog.h | 1 - src/interface.c | 81 ++--- src/interface.h | 3 +- src/new_dialog.c | 12 +- src/open-with-dlg.c | 9 +- src/pref_dialog.c | 90 +++-- src/pref_dialog.h | 1 - src/sexy-icon-entry.c | 950 -------------------------------------------------- src/sexy-icon-entry.h | 101 ------ src/window.c | 87 +++-- xarchiver.desktop.in | 2 +- 20 files changed, 204 insertions(+), 1239 deletions(-) delete mode 100644 src/sexy-icon-entry.c delete mode 100644 src/sexy-icon-entry.h --- ./README +++ ./README @@ -3,7 +3,7 @@ What is it? Xarchiver is the ultimate solution for handling archives on Linux and FreeBSD. It's a Desktop Environment independent archiver frontend. All common archive types are supported. RPM and DEB packages are handled without their package -managers being installed. Xarchiver only depends on the GTK+2 libraries and +managers being installed. Xarchiver only depends on the GTK+ libraries and utilizes various (un)compressor/(un)archiver command line programs at runtime. Installation of xdg-utils is optional but installing it will allow Xarchiver the support to open more file types directly from inside an archive. --- ./configure.ac +++ ./configure.ac @@ -76,8 +76,21 @@ AM_GLIB_GNU_GETTEXT dnl *********************************** dnl *** Check for required packages *** dnl *********************************** +AC_ARG_ENABLE([gtk3], + [AC_HELP_STRING([--enable-gtk3], + [compile xarchiver against gtk+ 3.0 (default: yes)])], + [enable_gtk3="${enableval}"], + [enable_gtk3="yes"] +) + +if test x"$enable_gtk3" = x"yes"; then + GTK_API_VERSION="3.0" +else + GTK_API_VERSION="2.0" +fi + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.10.0]) -PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0]) +PKG_CHECK_MODULES([GTK], [gtk+-$GTK_API_VERSION >= 2.10.0]) dnl *********************************** dnl *** Check for debugging support *** --- ./doc/html/ch01s01.html +++ ./doc/html/ch01s01.html @@ -4,11 +4,11 @@  Next

About Xarchiver

Xarchiver is a small and lightweight archive manager. I developed it to manage archives without depending from a special Desktop Environment - like KDE or GNOME, so Xarchiver requires only the GTK+2 toolkit + like KDE or GNOME, so Xarchiver requires only the GTK+ toolkit to work. The package xdg-utils is optional.

Xarchiver presents the following characteristic:

  • Archive directories can be browsed just like a file manager
  • Mime icon for each of the archive entries
  • The most used archiver's command line options are supported in the Add and Extract dialogs
  • Tabs Firefox style support
  • Multi-extract facility
  • Dump of the whole archive content as HTML or text file
  • Context menu on each of the archive entries with cut/copy/paste/rename abilities
  • Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz
  • Drag and drop from and to Xarchiver window
  • Progress window when using Xarchiver from the command line or from a file-manager
  • ARJ, RAR and ZIP archive comment are supported
  • Ability to convert the archive to self-extracting for those archive types which support it
  • Smart detection of arj, zip and rar password encrypted archives
  • All the the output of the command line archiver is displayed in the Xarchiver window
  • All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)
  • Deb and Rpm packages are handled internally, their package managers are NOT required.
  • Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)

Prev Up Next
Chapter 1.  Introduction -  Home Where to get it
\ No newline at end of file +  Home Where to get it --- ./doc/xarchiver.docbook +++ ./doc/xarchiver.docbook @@ -40,7 +40,7 @@ &app; is a small and lightweight archive manager. I developed it to manage archives without depending from a special Desktop Environment - like KDE or GNOME, so &app; requires only the GTK+2 toolkit + like KDE or GNOME, so &app; requires only the GTK+ toolkit to work. The package xdg-utils is optional. --- ./src/Makefile.am +++ ./src/Makefile.am @@ -37,8 +37,6 @@ xarchiver_SOURCES = \ rar.h \ rpm.c \ rpm.h \ - sexy-icon-entry.c \ - sexy-icon-entry.h \ socket.c \ socket.h \ string_utils.c \ --- ./src/add_dialog.c +++ ./src/add_dialog.c @@ -31,16 +31,13 @@ Add_dialog_data *xa_create_add_dialog() add_dialog = g_new0 (Add_dialog_data, 1); add_dialog->path_group = NULL; - add_dialog->option_tooltip = gtk_tooltips_new (); add_dialog->dialog1 = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (add_dialog->dialog1), _("Add files")); gtk_window_set_position (GTK_WINDOW (add_dialog->dialog1),GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_type_hint (GTK_WINDOW (add_dialog->dialog1), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator (GTK_DIALOG (add_dialog->dialog1),FALSE); - add_dialog->add_option_tooltip = gtk_tooltips_new (); - add_dialog->dialog_vbox1 = GTK_DIALOG (add_dialog->dialog1)->vbox; + add_dialog->dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG (add_dialog->dialog1)); add_dialog->notebook1 = gtk_notebook_new (); gtk_box_pack_start (GTK_BOX (add_dialog->dialog_vbox1),add_dialog->notebook1, TRUE, TRUE,0); @@ -107,13 +104,13 @@ Add_dialog_data *xa_create_add_dialog() add_dialog->update = gtk_check_button_new_with_mnemonic (_("Update and add")); gtk_button_set_focus_on_click (GTK_BUTTON (add_dialog->update), FALSE); - gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->update, _("This option will add any new files and update any files which have been modified since the archive was last created/modified"), NULL ); + gtk_widget_set_tooltip_text (add_dialog->update, _("This option will add any new files and update any files which have been modified since the archive was last created/modified")); gtk_box_pack_start (GTK_BOX (vbox3), add_dialog->update, FALSE, FALSE, 0); add_dialog->freshen = gtk_check_button_new_with_mnemonic (_("Freshen and replace")); gtk_button_set_focus_on_click (GTK_BUTTON (add_dialog->freshen), FALSE); - gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->freshen , _("This option affects the archive only if it has been modified more recently than the version already in the archive; unlike the update option it will not add files that are not already in the archive"), NULL ); + gtk_widget_set_tooltip_text (add_dialog->freshen , _("This option affects the archive only if it has been modified more recently than the version already in the archive; unlike the update option it will not add files that are not already in the archive")); gtk_box_pack_start (GTK_BOX (vbox3), add_dialog->freshen, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (add_dialog->freshen),"toggled",G_CALLBACK (add_fresh_update_toggled_cb) , add_dialog); @@ -123,7 +120,7 @@ Add_dialog_data *xa_create_add_dialog() add_dialog->solid_archive = gtk_check_button_new_with_mnemonic (_("Create a solid archive")); gtk_button_set_focus_on_click (GTK_BUTTON (add_dialog->solid_archive), FALSE); - gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->solid_archive , _("In a solid archive the files are grouped together featuring a better compression ratio"), NULL); + gtk_widget_set_tooltip_text (add_dialog->solid_archive , _("In a solid archive the files are grouped together featuring a better compression ratio")); gtk_box_pack_start (GTK_BOX (vbox3), add_dialog->solid_archive, FALSE, FALSE, 0); add_dialog->remove_files = gtk_check_button_new_with_mnemonic (_("Delete files after adding")); @@ -172,12 +169,12 @@ Add_dialog_data *xa_create_add_dialog() label5 = gtk_label_new (_("Encryption: ")); gtk_frame_set_label_widget (GTK_FRAME (frame3), label5); - dialog_action_area1 = GTK_DIALOG (add_dialog->dialog1)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (add_dialog->dialog1)); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); add_dialog->cancel_button = gtk_button_new_from_stock ("gtk-cancel"); gtk_dialog_add_action_widget (GTK_DIALOG (add_dialog->dialog1), add_dialog->cancel_button, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (add_dialog->cancel_button, TRUE); add_dialog->add_button = gtk_button_new(); add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -192,7 +189,7 @@ Add_dialog_data *xa_create_add_dialog() gtk_container_add(GTK_CONTAINER(add_dialog->add_button), alignment2); gtk_dialog_add_action_widget (GTK_DIALOG (add_dialog->dialog1), add_dialog->add_button, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (add_dialog->add_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (add_dialog->add_button, TRUE); gtk_dialog_set_default_response (GTK_DIALOG (add_dialog->dialog1), GTK_RESPONSE_OK); return add_dialog; } @@ -312,7 +309,7 @@ void xa_set_add_dialog_options(Add_dialog_data *add_dialog,XArchive *archive) gtk_range_set_inverted (GTK_RANGE (add_dialog->compression_scale), TRUE); else if (archive->type == XARCHIVETYPE_7ZIP) g_signal_connect (G_OBJECT (add_dialog->compression_value),"value-changed",G_CALLBACK (fix_adjustment_value), NULL); - gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->compression_scale, compression_msg, NULL ); + gtk_widget_set_tooltip_text (add_dialog->compression_scale, compression_msg); if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_XZ || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP) flag = FALSE; @@ -414,13 +411,13 @@ void xa_parse_add_dialog_options (XArchive *archive,Add_dialog_data *add_dialog) if (add_dialog->remove_files != NULL) archive->remove_files = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (add_dialog->remove_files)); - if (GTK_WIDGET_IS_SENSITIVE(add_dialog->freshen)) + if (gtk_widget_is_sensitive(GTK_WIDGET(add_dialog->freshen))) archive->freshen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (add_dialog->freshen)); - if (GTK_WIDGET_IS_SENSITIVE(add_dialog->solid_archive)) + if (gtk_widget_is_sensitive(GTK_WIDGET(add_dialog->solid_archive))) archive->solid_archive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (add_dialog->solid_archive)); - if (GTK_WIDGET_IS_SENSITIVE(add_dialog->compression_scale)) + if (gtk_widget_is_sensitive(GTK_WIDGET(add_dialog->compression_scale))) { archive->compression_level = gtk_adjustment_get_value(GTK_ADJUSTMENT (add_dialog->compression_value)); compression_string = g_strdup_printf("%d",archive->compression_level); --- ./src/add_dialog.h +++ ./src/add_dialog.h @@ -46,10 +46,8 @@ typedef struct GtkWidget *add_label; GtkWidget *cancel_button; GtkWidget *add_button; - GtkTooltips *add_option_tooltip; GtkWidget *add_option_label; - GtkTooltips *option_tooltip; - GtkObject *compression_value; + GtkAdjustment *compression_value; } Add_dialog_data; Add_dialog_data *xa_create_add_dialog(); --- ./src/archive.c +++ ./src/archive.c @@ -360,7 +360,7 @@ gboolean xa_create_temp_directory (XArchive *archive) if (archive->tmp != NULL) return TRUE; - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_temp_dir)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_temp_dir)); tmp_dir = g_strconcat(value,"/xa-XXXXXX",NULL); g_free(value); --- ./src/extract_dialog.c +++ ./src/extract_dialog.c @@ -19,7 +19,6 @@ #include #include #include "extract_dialog.h" -#include "sexy-icon-entry.h" #include "window.h" #include "string_utils.h" #include "support.h" @@ -30,7 +29,7 @@ extern Progress_bar_data *pb; extern extract_func extract [XARCHIVETYPE_COUNT]; static gchar *xa_multi_extract_archive(Multi_extract_data *,gchar *,gboolean,gboolean,gchar *); -static void xa_select_where_to_extract(SexyIconEntry *,SexyIconEntryPosition ,int ,Multi_extract_data *); +static void xa_select_where_to_extract(GtkEntry *entry,gint icon_pos,GdkEventButton *event,Multi_extract_data *dialog_data); static void xa_remove_files_liststore (GtkWidget *,Multi_extract_data *); static void xa_multi_extract_dialog_select_files_to_add (GtkButton*,Multi_extract_data *); static void xa_multi_extract_dialog_selection_changed(GtkTreeSelection *selection,Multi_extract_data *); @@ -51,11 +50,9 @@ Extract_dialog_data *xa_create_extract_dialog() gtk_window_set_position (GTK_WINDOW (dialog_data->dialog1),GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_type_hint (GTK_WINDOW (dialog_data->dialog1),GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator (GTK_DIALOG(dialog_data->dialog1),FALSE); gtk_window_set_destroy_with_parent(GTK_WINDOW (dialog_data->dialog1),TRUE); - option_tooltip = gtk_tooltips_new (); - dialog_data->dialog_vbox1 = GTK_DIALOG (dialog_data->dialog1)->vbox; + dialog_data->dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG (dialog_data->dialog1)); vbox1 = gtk_vbox_new (FALSE,2); gtk_box_pack_start (GTK_BOX (dialog_data->dialog_vbox1),vbox1,TRUE,TRUE,0); @@ -65,9 +62,9 @@ Extract_dialog_data *xa_create_extract_dialog() gtk_box_pack_start (GTK_BOX (vbox1),label1,FALSE,FALSE,0); gtk_misc_set_alignment (GTK_MISC (label1),0,0.5); - dialog_data->destination_path_entry = sexy_icon_entry_new(); - sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY(dialog_data->destination_path_entry),dialog_data,xa_select_where_to_extract); - sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY(dialog_data->destination_path_entry),SEXY_ICON_ENTRY_PRIMARY,TRUE ); + dialog_data->destination_path_entry = gtk_entry_new(); + gtk_entry_set_icon_from_stock( GTK_ENTRY(dialog_data->destination_path_entry),GTK_ENTRY_ICON_SECONDARY,GTK_STOCK_OPEN); + g_signal_connect (dialog_data->destination_path_entry, "icon-press",G_CALLBACK (xa_select_where_to_extract),dialog_data); gtk_box_pack_start (GTK_BOX (vbox1),dialog_data->destination_path_entry,FALSE,FALSE,0); hbox1 = gtk_hbox_new (TRUE,10); @@ -129,20 +126,20 @@ Extract_dialog_data *xa_create_extract_dialog() gtk_box_pack_start (GTK_BOX (vbox5),dialog_data->overwrite_check,FALSE,FALSE,0); dialog_data->extract_full = gtk_check_button_new_with_mnemonic (_("Extract files with full path")); - gtk_tooltips_set_tip(option_tooltip,dialog_data->extract_full,_("The archive's directory structure is recreated in the extraction directory"),NULL ); + gtk_widget_set_tooltip_text (dialog_data->extract_full,_("The archive's directory structure is recreated in the extraction directory")); gtk_box_pack_start (GTK_BOX (vbox5),dialog_data->extract_full,FALSE,FALSE,0); dialog_data->touch = gtk_check_button_new_with_mnemonic (_("Touch files")); - gtk_tooltips_set_tip (option_tooltip,dialog_data->touch,_("When this option is used,tar leaves the data modification times of the files it extracts as the times when the files were extracted,instead of setting it to the times recorded in the archive"),NULL ); + gtk_widget_set_tooltip_text (dialog_data->touch,_("When this option is used,tar leaves the data modification times of the files it extracts as the times when the files were extracted,instead of setting it to the times recorded in the archive")); gtk_box_pack_start (GTK_BOX (vbox5),dialog_data->touch,FALSE,FALSE,0); dialog_data->fresh = gtk_check_button_new_with_mnemonic (_("Freshen existing files")); - gtk_tooltips_set_tip (option_tooltip,dialog_data->fresh,_("Extract only those files that already exist on disk and that are newer than the disk copies"),NULL ); + gtk_widget_set_tooltip_text (dialog_data->fresh,_("Extract only those files that already exist on disk and that are newer than the disk copies")); gtk_box_pack_start (GTK_BOX (vbox5),dialog_data->fresh,FALSE,FALSE,0); g_signal_connect (G_OBJECT (dialog_data->fresh),"toggled",G_CALLBACK (fresh_update_toggled_cb),dialog_data); dialog_data->update = gtk_check_button_new_with_mnemonic (_("Update existing files")); - gtk_tooltips_set_tip (option_tooltip,dialog_data->update,_("This option performs the same function as the freshen one,extracting files that are newer than those with the same name on disk,and in addition it extracts those files that do not already exist on disk"),NULL ); + gtk_widget_set_tooltip_text (dialog_data->update,_("This option performs the same function as the freshen one,extracting files that are newer than those with the same name on disk,and in addition it extracts those files that do not already exist on disk")); gtk_box_pack_start (GTK_BOX (vbox5),dialog_data->update,FALSE,FALSE,0); g_signal_connect (G_OBJECT (dialog_data->update),"toggled",G_CALLBACK (update_fresh_toggled_cb),dialog_data); @@ -159,12 +156,12 @@ Extract_dialog_data *xa_create_extract_dialog() gtk_box_pack_start (GTK_BOX (hbox3),dialog_data->password_entry,TRUE,TRUE,0); gtk_entry_set_visibility (GTK_ENTRY (dialog_data->password_entry),FALSE); - dialog_action_area1 = GTK_DIALOG (dialog_data->dialog1)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (dialog_data->dialog1)); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),GTK_BUTTONBOX_END); cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_dialog_add_action_widget (GTK_DIALOG (dialog_data->dialog1),cancel_button,GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); + gtk_widget_set_can_default (cancel_button,TRUE); extract_button = gtk_button_new(); extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -178,7 +175,7 @@ Extract_dialog_data *xa_create_extract_dialog() gtk_container_add(GTK_CONTAINER(extract_button),alignment3); gtk_dialog_add_action_widget (GTK_DIALOG (dialog_data->dialog1),extract_button,GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (extract_button,GTK_CAN_DEFAULT); + gtk_widget_set_can_default (extract_button,TRUE); gtk_dialog_set_default_response (GTK_DIALOG (dialog_data->dialog1),GTK_RESPONSE_OK); return dialog_data; } @@ -267,7 +264,7 @@ void xa_set_extract_dialog_options(Extract_dialog_data *dialog_data,gint selecte if (archive->extraction_path == NULL) { - archive_dir = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_extract_dir)); + archive_dir = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_extract_dir)); if (archive_dir == NULL) archive_dir = xa_remove_level_from_path (archive->path); gtk_entry_set_text (GTK_ENTRY(dialog_data->destination_path_entry),archive_dir); } @@ -391,11 +388,9 @@ Multi_extract_data *xa_create_multi_extract_dialog() GtkTreeSelection *selection; GtkTreeViewColumn *column; GSList *radiobutton1_group = NULL; - GtkTooltips *multi_tooltip; char *column_names[]= {(_("Archive Name")),(_("Size")),(_("Path")),NULL}; int x; - multi_tooltip = gtk_tooltips_new (); dialog_data = g_new0 (Multi_extract_data,1); dialog_data->multi_extract = gtk_dialog_new(); @@ -403,10 +398,9 @@ Multi_extract_data *xa_create_multi_extract_dialog() gtk_window_set_type_hint (GTK_WINDOW (dialog_data->multi_extract),GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog_data->multi_extract),TRUE); gtk_widget_set_size_request(dialog_data->multi_extract,-1,300); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog_data->multi_extract),FALSE); gtk_window_set_title (GTK_WINDOW (dialog_data->multi_extract),_("Multi-Extract")); - dialog_vbox1 = GTK_DIALOG (dialog_data->multi_extract)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG (dialog_data->multi_extract)); vbox1 = gtk_vbox_new (FALSE,5); gtk_box_pack_start (GTK_BOX (dialog_vbox1),vbox1,TRUE,TRUE,0); scrolledwindow1 = gtk_scrolled_window_new (NULL,NULL); @@ -470,13 +464,13 @@ Multi_extract_data *xa_create_multi_extract_dialog() gtk_radio_button_set_group (GTK_RADIO_BUTTON (dialog_data->extract_to),radiobutton1_group); radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (dialog_data->extract_to)); - dialog_data->entry1 = sexy_icon_entry_new(); - sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY(dialog_data->entry1),dialog_data,xa_select_where_to_extract); - sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY(dialog_data->entry1),SEXY_ICON_ENTRY_PRIMARY,TRUE ); + dialog_data->entry1 = gtk_entry_new(); + gtk_entry_set_icon_from_stock( GTK_ENTRY(dialog_data->entry1),GTK_ENTRY_ICON_SECONDARY,GTK_STOCK_OPEN); + g_signal_connect (dialog_data->entry1, "icon-press",G_CALLBACK (xa_select_where_to_extract),dialog_data); gtk_box_pack_start (GTK_BOX (hbox3),dialog_data->entry1,TRUE,TRUE,0); dialog_data->extract_to_archive_name = gtk_radio_button_new_with_mnemonic (NULL,_("Extract to dir \"Archive Name\"")); - gtk_tooltips_set_tip (multi_tooltip,dialog_data->extract_to_archive_name,_("This option extracts archives in directories named with the archive names"),NULL); + gtk_widget_set_tooltip_text (dialog_data->extract_to_archive_name,_("This option extracts archives in directories named with the archive names")); gtk_box_pack_start (GTK_BOX (vbox2),dialog_data->extract_to_archive_name,FALSE,FALSE,0); gtk_radio_button_set_group (GTK_RADIO_BUTTON (dialog_data->extract_to_archive_name),radiobutton1_group); radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (dialog_data->extract_to_archive_name)); @@ -500,11 +494,11 @@ Multi_extract_data *xa_create_multi_extract_dialog() label2 = gtk_label_new (_("Options:")); gtk_frame_set_label_widget(GTK_FRAME(frame2),label2); - dialog_action_area1 = GTK_DIALOG (dialog_data->multi_extract)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (dialog_data->multi_extract)); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),GTK_BUTTONBOX_END); cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel"); gtk_dialog_add_action_widget (GTK_DIALOG (dialog_data->multi_extract),cancelbutton1,GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); + gtk_widget_set_can_default(cancelbutton1,TRUE); extract_button = gtk_button_new(); extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -518,7 +512,7 @@ Multi_extract_data *xa_create_multi_extract_dialog() gtk_container_add(GTK_CONTAINER(extract_button),alignment3); gtk_dialog_add_action_widget (GTK_DIALOG (dialog_data->multi_extract),extract_button,GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (extract_button,GTK_CAN_DEFAULT); + gtk_widget_set_can_default (extract_button,TRUE); gtk_dialog_set_default_response (GTK_DIALOG (dialog_data->multi_extract),GTK_RESPONSE_OK); return dialog_data; } @@ -665,7 +659,7 @@ static void xa_multi_extract_dialog_drag_data_received (GtkWidget *widget,GdkDra g_strfreev (array); } -void xa_select_where_to_extract(SexyIconEntry *entry, SexyIconEntryPosition icon_pos,int button,Multi_extract_data *dialog_data) +void xa_select_where_to_extract(GtkEntry *entry,gint icon_pos,GdkEventButton *event,Multi_extract_data *dialog_data) { GtkWidget *file_selector; gchar *dest_dir; --- ./src/extract_dialog.h +++ ./src/extract_dialog.h @@ -44,7 +44,6 @@ GtkWidget *label1,*label2,*label3,*label_password; GtkWidget *hbox1,*hbox2,*hbox3,*vbox1,*vbox2,*vbox3,*vbox5; GtkWidget *frame1,*frame2,*alignment1,*alignment2,*alignment3; GtkWidget *dialog_action_area1,*cancel_button,*okbutton1,*extract_button,*extract_image,*extract_hbox,*extract_label; -GtkTooltips *option_tooltip; Extract_dialog_data *xa_create_extract_dialog(); void xa_activate_entry(GtkToggleButton *,gpointer ); --- ./src/interface.c +++ ./src/interface.c @@ -57,7 +57,6 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo GdkPixbuf *icon; xa_create_popup_menu(); - tooltips = gtk_tooltips_new (); accel_group = gtk_accel_group_new (); xa_set_window_title (xa_main_window,NULL); @@ -130,7 +129,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (check_menu); gtk_widget_set_sensitive (check_menu,FALSE); gtk_container_add (GTK_CONTAINER (menuitem1_menu),check_menu); - gtk_widget_add_accelerator (check_menu,"activate",accel_group,GDK_t,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (check_menu,"activate",accel_group,GDK_KEY_t,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-index",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -140,7 +139,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (properties); gtk_widget_set_sensitive ( properties,FALSE); gtk_container_add (GTK_CONTAINER (menuitem1_menu),properties); - gtk_widget_add_accelerator (properties,"activate",accel_group,GDK_p,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (properties,"activate",accel_group,GDK_KEY_p,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-properties",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -171,7 +170,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_set_sensitive (addfile,FALSE); gtk_widget_show (addfile); gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); - gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_KEY_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); gtk_widget_show (image2); @@ -181,7 +180,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_set_sensitive (extract_menu,FALSE); gtk_widget_show (extract_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); - gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_KEY_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); gtk_widget_show (image2); @@ -191,7 +190,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_set_sensitive (delete_menu,FALSE); gtk_widget_show (delete_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),delete_menu); - gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_KEY_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); rename_menu = gtk_image_menu_item_new_with_mnemonic (_("Re_name")); gtk_widget_set_sensitive (rename_menu,FALSE); @@ -215,7 +214,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_set_sensitive (exe_menu,FALSE); gtk_widget_show (exe_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),exe_menu); - gtk_widget_add_accelerator (exe_menu,"activate",accel_group,GDK_x,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (exe_menu,"activate",accel_group,GDK_KEY_x,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); image2 = gtk_image_new_from_stock ("gtk-execute",GTK_ICON_SIZE_MENU); gtk_widget_show (image2); @@ -224,13 +223,13 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo multi_extract_menu = gtk_menu_item_new_with_mnemonic (_("_Multi-Extract")); gtk_widget_show (multi_extract_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),multi_extract_menu); - gtk_widget_add_accelerator (multi_extract_menu,"activate",accel_group,GDK_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (multi_extract_menu,"activate",accel_group,GDK_KEY_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); comment_menu = gtk_image_menu_item_new_with_mnemonic (_("Archive _comment")); gtk_widget_set_sensitive (comment_menu,FALSE); gtk_widget_show (comment_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),comment_menu); - gtk_widget_add_accelerator (comment_menu,"activate",accel_group,GDK_s,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (comment_menu,"activate",accel_group,GDK_KEY_s,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-justify-fill",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -244,7 +243,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (select_all); gtk_container_add (GTK_CONTAINER (menuitem2_menu),select_all); gtk_widget_set_sensitive (select_all,FALSE); - gtk_widget_add_accelerator (select_all,"activate",accel_group,GDK_a,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (select_all,"activate",accel_group,GDK_KEY_a,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-select-all",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -254,13 +253,13 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (deselect_all); gtk_container_add (GTK_CONTAINER (menuitem2_menu),deselect_all); gtk_widget_set_sensitive (deselect_all,FALSE); - gtk_widget_add_accelerator (deselect_all,"activate",accel_group,GDK_l,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (deselect_all,"activate",accel_group,GDK_KEY_l,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); select_pattern = gtk_menu_item_new_with_mnemonic (_("Select _by pattern")); gtk_widget_show (select_pattern); gtk_container_add (GTK_CONTAINER (menuitem2_menu),select_pattern); gtk_widget_set_sensitive (select_pattern,FALSE); - gtk_widget_add_accelerator (select_pattern,"activate",accel_group,GDK_b,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (select_pattern,"activate",accel_group,GDK_KEY_b,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); separatormenuitem5 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem5); @@ -269,7 +268,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo view_shell_output1 = gtk_image_menu_item_new_with_mnemonic (_("Cmd-line outp_ut")); gtk_container_add (GTK_CONTAINER (menuitem2_menu),view_shell_output1); - gtk_widget_add_accelerator (view_shell_output1,"activate",accel_group,GDK_u,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (view_shell_output1,"activate",accel_group,GDK_KEY_u,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); if (show_output_menu_item) gtk_widget_set_sensitive(view_shell_output1,TRUE); else @@ -284,7 +283,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (password_entry_menu); gtk_widget_set_sensitive (password_entry_menu,FALSE); gtk_container_add (GTK_CONTAINER (menuitem2_menu),password_entry_menu); - gtk_widget_add_accelerator (password_entry_menu,"activate",accel_group,GDK_r,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (password_entry_menu,"activate",accel_group,GDK_KEY_r,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); separatormenuitem6 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem6); @@ -294,7 +293,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo prefs_menu = gtk_image_menu_item_new_with_mnemonic (_("_Preferences")); gtk_widget_show (prefs_menu); gtk_container_add (GTK_CONTAINER (menuitem2_menu),prefs_menu); - gtk_widget_add_accelerator (prefs_menu,"activate",accel_group,GDK_f,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (prefs_menu,"activate",accel_group,GDK_KEY_f,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-preferences",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -310,7 +309,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo help1 = gtk_image_menu_item_new_with_mnemonic (_("_Contents")); gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menuitem4_menu),help1); - gtk_widget_add_accelerator (help1,"activate",accel_group,GDK_F1,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (help1,"activate",accel_group,GDK_KEY_F1,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); tmp_image = gtk_image_new_from_stock ("gtk-help",GTK_ICON_SIZE_MENU); gtk_widget_show (tmp_image); @@ -334,7 +333,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (New_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (New_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),New_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (New_button),tooltips,_("Create a new archive"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (New_button),_("Create a new archive")); tmp_image = gtk_image_new_from_stock ("gtk-open",tmp_toolbar_icon_size); gtk_widget_show (tmp_image); @@ -342,7 +341,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (Open_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (Open_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),Open_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Open_button),tooltips,_("Open an archive"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (Open_button),_("Open an archive")); separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new (); gtk_widget_show (separatortoolitem1); @@ -355,7 +354,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (back_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (back_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),back_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (back_button),tooltips,_("Back"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (back_button),_("Back")); tmp_image = gtk_image_new_from_stock ("gtk-go-up",tmp_toolbar_icon_size); gtk_widget_show (tmp_image); @@ -364,7 +363,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (up_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (up_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),up_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (up_button),tooltips,_("Up"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (up_button),_("Up")); tmp_image = gtk_image_new_from_stock ("gtk-go-forward",tmp_toolbar_icon_size); gtk_widget_show (tmp_image); @@ -373,7 +372,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (forward_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (forward_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),forward_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (forward_button),tooltips,_("Forward"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (forward_button),_("Forward")); tmp_image = gtk_image_new_from_stock ("gtk-home",tmp_toolbar_icon_size); gtk_widget_show (tmp_image); @@ -382,7 +381,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (home_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (home_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),home_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (home_button),tooltips,_("Root"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (home_button),_("Root")); separatortoolitem3 = (GtkWidget*) gtk_separator_tool_item_new (); gtk_widget_show (separatortoolitem3); @@ -395,7 +394,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (AddFile_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (AddFile_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (AddFile_button),_("Add files")); tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show (tmp_image); @@ -404,7 +403,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (Extract_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (Extract_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),Extract_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Extract_button),tooltips,_("Extract files"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (Extract_button),_("Extract files")); separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new (); gtk_widget_show (separatortoolitem2); @@ -417,7 +416,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (Stop_button); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM ( Stop_button),FALSE); gtk_container_add (GTK_CONTAINER (toolbar1),Stop_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Stop_button),tooltips,_("Cancel current operation"),NULL); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (Stop_button),_("Cancel current operation")); /* Location entry */ toolbar2 = gtk_toolbar_new (); @@ -517,7 +516,7 @@ void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gbo gtk_widget_show (green_led); gtk_box_pack_start (GTK_BOX (hbox_sb),green_led,FALSE,FALSE,0); gtk_misc_set_alignment (GTK_MISC (green_led),1,1); - gtk_tooltips_set_tip (tooltips,green_led,_("This is Xarchiver led status. When it's flashing Xarchiver is busy"),NULL); + gtk_widget_set_tooltip_text (green_led,_("This is Xarchiver led status. When it's flashing Xarchiver is busy")); red_led = gtk_image_new_from_icon_name ("gtk-no",GTK_ICON_SIZE_BUTTON); gtk_box_pack_start (GTK_BOX (hbox_sb),red_led,FALSE,FALSE,0); @@ -572,7 +571,7 @@ gboolean xa_flash_led_indicator (XArchive *archive) archive->pb_source = 0; return FALSE; } - if (GTK_WIDGET_VISIBLE(green_led)) + if (gtk_widget_get_visible(GTK_WIDGET(green_led))) { gtk_widget_hide(green_led); gtk_widget_show(red_led); @@ -585,7 +584,7 @@ gboolean xa_flash_led_indicator (XArchive *archive) return TRUE; } -void xa_page_has_changed (GtkNotebook *notebook,GtkNotebookPage *page,guint page_num,gpointer user_data) +void xa_page_has_changed (GtkNotebook *notebook,GtkWidget *page,guint page_num,gpointer user_data) { gint id,selected = 0; GtkTreeSelection *selection = NULL; @@ -670,7 +669,6 @@ void xa_page_has_changed (GtkNotebook *notebook,GtkNotebookPage *page,guint page void xa_add_page (XArchive *archive) { GtkWidget *page_hbox,*label,*tab_label,*close_button,*image,*align; - GtkTooltips *close_button_tips = gtk_tooltips_new(); gchar *filename_only; GtkRcStyle *rcstyle; GtkRequisition size; @@ -706,13 +704,13 @@ void xa_add_page (XArchive *archive) close_button = gtk_button_new(); gtk_button_set_focus_on_click(GTK_BUTTON(close_button),FALSE); gtk_button_set_relief (GTK_BUTTON(close_button),GTK_RELIEF_NONE); - gtk_tooltips_set_tip (close_button_tips,close_button,_("Close archive"),NULL); + gtk_widget_set_tooltip_text (close_button,_("Close archive")); g_signal_connect (G_OBJECT(close_button),"clicked",G_CALLBACK(xa_close_page),(gpointer) archive->scrollwindow); rcstyle = gtk_rc_style_new(); rcstyle->xthickness = rcstyle->ythickness = 0; gtk_widget_modify_style(close_button,rcstyle); - gtk_rc_style_unref(rcstyle); + g_object_unref(rcstyle); image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU); gtk_widget_size_request(image,&size); @@ -766,9 +764,8 @@ gchar *xa_create_password_dialog(XArchive *archive) gtk_window_set_position (GTK_WINDOW (password_dialog),GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_resizable (GTK_WINDOW (password_dialog),FALSE); gtk_window_set_type_hint (GTK_WINDOW (password_dialog),GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator (GTK_DIALOG (password_dialog),FALSE); - dialog_vbox1 = GTK_DIALOG (password_dialog)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (password_dialog)); gtk_widget_show (dialog_vbox1); vbox1 = gtk_vbox_new (FALSE,12); @@ -965,14 +962,13 @@ void xa_select_by_pattern_dialog(GtkMenuItem *menuitem,gpointer user_data) current_page = gtk_notebook_get_current_page (notebook); id = xa_find_archive_index (current_page); - GtkTooltips *tooltip = gtk_tooltips_new(); ddialog1 = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (ddialog1),_("Select by Pattern")); gtk_window_set_modal (GTK_WINDOW (ddialog1),TRUE); gtk_window_set_type_hint (GTK_WINDOW (ddialog1),GDK_WINDOW_TYPE_HINT_DIALOG); gtk_widget_set_size_request(ddialog1,286,93); gtk_window_set_transient_for (GTK_WINDOW (ddialog1),GTK_WINDOW (xa_main_window)); - ddialog_vbox1 = GTK_DIALOG (ddialog1)->vbox; + ddialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (ddialog1)); gtk_widget_show (ddialog_vbox1); dhbox1 = gtk_hbox_new (FALSE,10); @@ -985,19 +981,19 @@ void xa_select_by_pattern_dialog(GtkMenuItem *menuitem,gpointer user_data) gtk_box_pack_start (GTK_BOX (dhbox1),pattern_label,FALSE,FALSE,0); pattern_entry = gtk_entry_new (); - gtk_tooltips_set_tip (tooltip,pattern_entry,_("example: *.txt; ac*"),NULL); + gtk_widget_set_tooltip_text (pattern_entry,_("example: *.txt; ac*")); gtk_widget_show (pattern_entry); gtk_box_pack_start (GTK_BOX (dhbox1),pattern_entry,TRUE,TRUE,0); gtk_entry_set_activates_default(GTK_ENTRY(pattern_entry),TRUE); - dialog_action_area1 = GTK_DIALOG (ddialog1)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (ddialog1)); gtk_widget_show (dialog_action_area1); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),GTK_BUTTONBOX_END); cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (cancelbutton1); gtk_dialog_add_action_widget (GTK_DIALOG (ddialog1),cancelbutton1,GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); + gtk_widget_set_can_default (cancelbutton1,TRUE); okbutton1 = gtk_button_new(); tmp_image = gtk_image_new_from_stock ("gtk-ok",GTK_ICON_SIZE_BUTTON); @@ -1012,7 +1008,7 @@ void xa_select_by_pattern_dialog(GtkMenuItem *menuitem,gpointer user_data) gtk_container_add(GTK_CONTAINER(okbutton1),alignment2); gtk_widget_show_all (okbutton1); gtk_dialog_add_action_widget (GTK_DIALOG (ddialog1),okbutton1,GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (okbutton1,GTK_CAN_DEFAULT); + gtk_widget_set_can_default (okbutton1,TRUE); gtk_dialog_set_default_response (GTK_DIALOG (ddialog1),GTK_RESPONSE_OK); while (! done) @@ -1086,10 +1082,9 @@ GtkWidget *xa_create_archive_properties_window() gtk_window_set_type_hint (GTK_WINDOW (archive_properties_window),GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_resizable (GTK_WINDOW (archive_properties_window),FALSE); gtk_window_set_modal (GTK_WINDOW (archive_properties_window),TRUE); - gtk_dialog_set_has_separator(GTK_DIALOG(archive_properties_window),FALSE); table1 = gtk_table_new (10,2,FALSE); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG(archive_properties_window)->vbox),table1,TRUE,TRUE,0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (archive_properties_window))),table1,TRUE,TRUE,0); gtk_container_set_border_width (GTK_CONTAINER (table1),6); gtk_table_set_row_spacings (GTK_TABLE (table1),6); gtk_table_set_col_spacings (GTK_TABLE (table1),12); @@ -1503,7 +1498,7 @@ gboolean xa_sidepane_drag_motion (GtkWidget *widget,GdkDragContext *context,gint } /* This to set the focus on the dropped row */ gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW(widget),path,GTK_TREE_VIEW_DROP_INTO_OR_BEFORE); - gdk_drag_status (context,context->suggested_action,time); + gdk_drag_status (context,gdk_drag_context_get_suggested_action(context),time); return TRUE; } @@ -1654,7 +1649,7 @@ static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid *pid) gboolean xa_pulse_progress_bar_window (Progress_bar_data *pb) { - if (GTK_WIDGET_VISIBLE(pb->progress_window)) + if (gtk_widget_get_visible(GTK_WIDGET(pb->progress_window))) { gtk_progress_bar_pulse(GTK_PROGRESS_BAR(pb->progressbar1)); return TRUE; --- ./src/interface.h +++ ./src/interface.h @@ -39,7 +39,6 @@ GtkTreeStore *archive_dir_model; GtkTreeViewColumn *column; GtkCellRenderer *archive_dir_renderer; GtkAccelGroup *accel_group; -GtkTooltips *tooltips; GtkIconTheme *icon_theme; GtkWidget *xa_popup_menu, *xa_main_window, *vbox1, *hbox_sb, *menubar1, *menuitem1, *menuitem1_menu, *new1, *open1, *listing, *listing_submenu, @@ -64,7 +63,7 @@ gboolean select_matched_rows(GtkTreeModel *,GtkTreePath *,GtkTreeIter *,gpointer void xa_select_by_pattern_dialog(GtkMenuItem *, gpointer ); void xa_handle_navigation_buttons (GtkMenuItem *, gpointer ); void xa_add_page (XArchive *); -void xa_page_has_changed (GtkNotebook *, GtkNotebookPage *, guint ,gpointer ); +void xa_page_has_changed (GtkNotebook *, GtkWidget *, guint ,gpointer ); void xa_close_page ( GtkWidget*, gpointer ); void xa_set_button_state (gboolean,gboolean,gboolean,gboolean,gboolean,gboolean, gboolean, gboolean,gboolean,gboolean,gboolean); void xa_restore_navigation(int idx); --- ./src/new_dialog.c +++ ./src/new_dialog.c @@ -51,7 +51,7 @@ static void xa_change_archive_extension (GtkComboBox *combo_box, GtkWidget *xa_f gchar *file, *stem, *newfile; g_free(ComboArchiveType); - ComboArchiveType = gtk_combo_box_get_active_text(combo_box); + ComboArchiveType = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box)); newsuff = xa_get_suffix(g_list_first(ArchiveType), ComboArchiveType); Name = g_list_last(ArchiveType); @@ -97,7 +97,6 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean GtkWidget *hbox = NULL; GtkWidget *combo_box = NULL; GtkFileFilter *xa_new_archive_dialog_filter; - GtkTooltips *filter_tooltip; GList *Suffix,*Name; gchar *my_path = NULL; gchar *basepath, *filename; @@ -150,10 +149,9 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (hbox),gtk_label_new (_("Archive type:")),FALSE,FALSE,0); - combo_box = gtk_combo_box_new_text (); + combo_box = gtk_combo_box_text_new (); - filter_tooltip = gtk_tooltips_new(); - gtk_tooltips_set_tip (filter_tooltip,combo_box, _("Choose the archive type to create") , NULL); + gtk_widget_set_tooltip_text (combo_box, _("Choose the archive type to create")); Name = g_list_first (ArchiveType); while (Name) @@ -161,7 +159,7 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean if (!(*(char *) Name->data == 0 || (strncmp(Name->data, "arj", 3) == 0 && unarj) || (strncmp(Name->data, "rar", 3) == 0 && unrar))) - gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),Name->data); Name = g_list_next (Name); } if (new_combo_box == -1) @@ -173,7 +171,7 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean gtk_widget_show_all (hbox); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (xa_file_chooser), hbox); - ComboArchiveType = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_box)); + ComboArchiveType = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(combo_box)); suffix = xa_get_suffix(g_list_first(ArchiveType), ComboArchiveType); g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(xa_change_archive_extension), xa_file_chooser); --- ./src/open-with-dlg.c +++ ./src/open-with-dlg.c @@ -60,10 +60,9 @@ void xa_create_open_with_dialog(gchar *filename,gchar *filenames,int nr) gtk_window_set_modal (GTK_WINDOW (data->dialog1), TRUE); gtk_window_set_type_hint (GTK_WINDOW (data->dialog1), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_transient_for(GTK_WINDOW(data->dialog1),GTK_WINDOW(xa_main_window)); - gtk_dialog_set_has_separator (GTK_DIALOG (data->dialog1),FALSE); gtk_container_set_border_width (GTK_CONTAINER (data->dialog1),5); gtk_widget_set_size_request(data->dialog1,380,380); - dialog_vbox1 = GTK_DIALOG (data->dialog1)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (data->dialog1)); vbox1 = gtk_vbox_new (FALSE, 5); gtk_box_pack_start (GTK_BOX (dialog_vbox1),vbox1,TRUE,TRUE,0); @@ -133,20 +132,20 @@ void xa_create_open_with_dialog(gchar *filename,gchar *filenames,int nr) gtk_box_pack_start (GTK_BOX (hbox_expander),browse,FALSE,TRUE,0); gtk_container_add(GTK_CONTAINER(custom_command_expander),hbox_expander); - dialog_action_area1 = GTK_DIALOG (data->dialog1)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (data->dialog1)); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),GTK_BUTTONBOX_END); cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel"); gtk_widget_show (cancelbutton1); gtk_dialog_add_action_widget (GTK_DIALOG (data->dialog1),cancelbutton1,GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (cancelbutton1, TRUE); g_signal_connect_swapped (G_OBJECT (cancelbutton1),"clicked",G_CALLBACK (gtk_widget_destroy),G_OBJECT(data->dialog1)); okbutton1 = gtk_button_new_from_stock ("gtk-open"); gtk_widget_show (okbutton1); gtk_dialog_add_action_widget (GTK_DIALOG (data->dialog1),okbutton1,GTK_RESPONSE_OK); g_signal_connect (G_OBJECT (okbutton1),"clicked",G_CALLBACK (xa_open_with_dialog_execute_command),data); - GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (okbutton1, TRUE); gtk_widget_show_all(data->dialog1); /* Let's parse the desktop files in all the system data dirs */ --- ./src/pref_dialog.c +++ ./src/pref_dialog.c @@ -41,13 +41,11 @@ Prefs_dialog_data *xa_create_prefs_dialog() prefs_data->dialog1 = gtk_dialog_new_with_buttons (_("Preferences"), GTK_WINDOW (xa_main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,GTK_STOCK_OK,GTK_RESPONSE_OK, NULL); - tooltips = gtk_tooltips_new(); icon_theme = gtk_icon_theme_get_default(); gtk_dialog_set_default_response (GTK_DIALOG (prefs_data->dialog1), GTK_RESPONSE_OK); gtk_window_set_position (GTK_WINDOW(prefs_data->dialog1),GTK_WIN_POS_CENTER_ON_PARENT); - gtk_dialog_set_has_separator(GTK_DIALOG(prefs_data->dialog1),FALSE); - vbox1 = GTK_DIALOG (prefs_data->dialog1)->vbox; + vbox1 = gtk_dialog_get_content_area(GTK_DIALOG (prefs_data->dialog1)); hbox1 = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,10); @@ -76,7 +74,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() prefs_iconview = gtk_icon_view_new_with_model(GTK_TREE_MODEL(prefs_data->prefs_liststore)); g_object_unref (prefs_data->prefs_liststore); - gtk_icon_view_set_orientation (GTK_ICON_VIEW (prefs_iconview), GTK_ORIENTATION_VERTICAL); + gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (prefs_iconview), GTK_ORIENTATION_VERTICAL); gtk_icon_view_set_columns (GTK_ICON_VIEW (prefs_iconview),1); gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (prefs_iconview), 0); gtk_icon_view_set_text_column(GTK_ICON_VIEW (prefs_iconview),1); @@ -85,7 +83,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() prefs_data->prefs_notebook = gtk_notebook_new (); g_object_set (G_OBJECT (prefs_data->prefs_notebook),"show-border", FALSE,"show-tabs", FALSE,"enable-popup",FALSE,NULL); gtk_box_pack_start (GTK_BOX (hbox1), prefs_data->prefs_notebook,TRUE,TRUE,0); - GTK_WIDGET_UNSET_FLAGS (prefs_data->prefs_notebook, GTK_CAN_FOCUS); + gtk_widget_set_can_default (prefs_data->prefs_notebook, TRUE); g_signal_connect (G_OBJECT (prefs_iconview),"selection-changed",G_CALLBACK (xa_prefs_iconview_changed),prefs_data); /* Archive page*/ @@ -98,7 +96,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() label4 = gtk_label_new (_("Preferred archive format")); gtk_box_pack_start (GTK_BOX (hbox1), label4, FALSE, FALSE,0); - prefs_data->combo_prefered_format = gtk_combo_box_new_text(); + prefs_data->combo_prefered_format = gtk_combo_box_text_new(); gtk_box_pack_start (GTK_BOX (hbox1), prefs_data->combo_prefered_format,FALSE,TRUE,0); archive_type = g_list_first (ArchiveType); while ( archive_type != NULL ) @@ -106,7 +104,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() if (!(*(char *) archive_type->data == 0 || (strncmp(archive_type->data, "arj", 3) == 0 && unarj) || (strncmp(archive_type->data, "rar", 3) == 0 && unrar))) - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_format),archive_type->data ); archive_type = g_list_next (archive_type); } @@ -117,12 +115,12 @@ Prefs_dialog_data *xa_create_prefs_dialog() prefs_data->check_sort_filename_column = gtk_check_button_new_with_mnemonic(_("Sort archive by filename")); gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->check_sort_filename_column, FALSE, FALSE, 0); gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_sort_filename_column), FALSE); - gtk_tooltips_set_tip(tooltips, prefs_data->check_sort_filename_column, _("The filename column is sorted after loading the archive"), NULL); + gtk_widget_set_tooltip_text(prefs_data->check_sort_filename_column, _("The filename column is sorted after loading the archive")); prefs_data->store_output = gtk_check_button_new_with_mnemonic (_("Store archiver output")); gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->store_output, FALSE, FALSE, 0); gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->store_output), FALSE); - gtk_tooltips_set_tip(tooltips, prefs_data->store_output, _("This option takes more memory with large archives"), NULL); + gtk_widget_set_tooltip_text(prefs_data->store_output, _("This option takes more memory with large archives")); label1 = gtk_label_new (""); gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 0), label1); @@ -138,15 +136,15 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5); - prefs_data->combo_icon_size = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_icon_size), _("large") ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_icon_size), _("small") ); + prefs_data->combo_icon_size = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_icon_size), _("large") ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_icon_size), _("small") ); gtk_table_attach (GTK_TABLE (table1), prefs_data->combo_icon_size, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); prefs_data->check_show_comment = gtk_check_button_new_with_mnemonic (_("Show archive comment")); - gtk_tooltips_set_tip(tooltips, prefs_data->check_show_comment, _("If checked the archive comment is shown after the archive is loaded"), NULL); + gtk_widget_set_tooltip_text(prefs_data->check_show_comment, _("If checked the archive comment is shown after the archive is loaded")); gtk_table_attach (GTK_TABLE (table1), prefs_data->check_show_comment, 0, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); @@ -191,9 +189,9 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5); - prefs_data->combo_prefered_web_browser = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_web_browser), "" ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_web_browser), _("choose...") ); + prefs_data->combo_prefered_web_browser = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_web_browser), "" ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_web_browser), _("choose...") ); g_signal_connect (prefs_data->combo_prefered_web_browser,"changed",G_CALLBACK (xa_prefs_combo_changed),NULL); gtk_table_attach (GTK_TABLE (table2), prefs_data->combo_prefered_web_browser, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -204,9 +202,9 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5); - prefs_data->combo_prefered_editor = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_editor), "" ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_editor), _("choose...") ); + prefs_data->combo_prefered_editor = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_editor), "" ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_editor), _("choose...") ); g_signal_connect (prefs_data->combo_prefered_editor,"changed",G_CALLBACK (xa_prefs_combo_changed),NULL); gtk_table_attach (GTK_TABLE (table2), prefs_data->combo_prefered_editor, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -217,9 +215,9 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5); - prefs_data->combo_prefered_viewer = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_viewer), "" ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_viewer), _("choose...") ); + prefs_data->combo_prefered_viewer = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_viewer), "" ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_viewer), _("choose...") ); g_signal_connect (prefs_data->combo_prefered_viewer,"changed",G_CALLBACK (xa_prefs_combo_changed),NULL); gtk_table_attach (GTK_TABLE (table2), prefs_data->combo_prefered_viewer, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -230,9 +228,9 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5); - prefs_data->combo_prefered_temp_dir = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_temp_dir), _("/tmp") ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_temp_dir), _("choose...") ); + prefs_data->combo_prefered_temp_dir = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_temp_dir), _("/tmp") ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_temp_dir), _("choose...") ); g_signal_connect (prefs_data->combo_prefered_temp_dir,"changed",G_CALLBACK (xa_prefs_combo_changed),(gpointer) 1); gtk_table_attach (GTK_TABLE (table2), prefs_data->combo_prefered_temp_dir, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -243,9 +241,9 @@ Prefs_dialog_data *xa_create_prefs_dialog() (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_SHRINK), 0, 0); gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5); - prefs_data->combo_prefered_extract_dir = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_extract_dir), _("/tmp") ); - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_extract_dir), _("choose...") ); + prefs_data->combo_prefered_extract_dir = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_extract_dir), _("/tmp") ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_extract_dir), _("choose...") ); g_signal_connect (prefs_data->combo_prefered_extract_dir,"changed",G_CALLBACK (xa_prefs_combo_changed),(gpointer) 1); gtk_table_attach (GTK_TABLE (table2), prefs_data->combo_prefered_extract_dir, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -260,7 +258,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() gtk_table_attach (GTK_TABLE (table2), prefs_data->allow_sub_dir, 0, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, prefs_data->allow_sub_dir, _("This option includes the subdirectories when you add files with drag and drop"), NULL); + gtk_widget_set_tooltip_text(prefs_data->allow_sub_dir, _("This option includes the subdirectories when you add files with drag and drop")); gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_save_geometry), FALSE); if (xdg_open == FALSE) @@ -350,32 +348,32 @@ void xa_prefs_save_options(Prefs_dialog_data *prefs_data, const char *filename) if (!xdg_open) { - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_web_browser)); if (value != NULL) { g_key_file_set_string (xa_key_file,PACKAGE,"preferred_web_browser",value); g_free (value); } - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_editor)); if (value != NULL) { g_key_file_set_string (xa_key_file,PACKAGE,"preferred_editor",value); g_free(value); } - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_viewer)); if (value != NULL) { g_key_file_set_string (xa_key_file,PACKAGE,"preferred_viewer",value); g_free(value); } } - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_temp_dir)); if (value != NULL) { g_key_file_set_string (xa_key_file,PACKAGE,"preferred_temp_dir",value); g_free(value); } - value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_extract_dir)); + value = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_extract_dir)); if (value != NULL) { g_key_file_set_string (xa_key_file,PACKAGE,"preferred_extract_dir",value); @@ -475,24 +473,24 @@ void xa_prefs_load_options(Prefs_dialog_data *prefs_data) value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_web_browser",NULL); if (value != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_web_browser),0); - gtk_combo_box_prepend_text(GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),value); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_web_browser),0); + gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_web_browser),value); gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),0); g_free(value); } value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_editor",NULL); if (value != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_editor),0); - gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0,value); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_editor),0); + gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_editor),0,value); gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0); g_free(value); } value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_viewer",NULL); if (value != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_viewer),0); - gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0,value); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_viewer),0); + gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_viewer),0,value); gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0); g_free(value); } @@ -500,16 +498,16 @@ void xa_prefs_load_options(Prefs_dialog_data *prefs_data) value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_temp_dir",NULL); if (value != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_temp_dir),0); - gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0,value); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_temp_dir),0); + gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_temp_dir),0,value); gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0); g_free(value); } value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_extract_dir",NULL); if (value != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_extract_dir),0); - gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_extract_dir),0,value); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_extract_dir),0); + gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT(prefs_data->combo_prefered_extract_dir),0,value); gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_extract_dir),0); g_free(value); } @@ -583,8 +581,8 @@ void xa_prefs_combo_changed (GtkComboBox *widget,gpointer user_data) filename = xa_prefs_choose_program(flag); if (filename != NULL) { - gtk_combo_box_remove_text(GTK_COMBO_BOX (widget),0); - gtk_combo_box_insert_text(GTK_COMBO_BOX (widget),0,filename); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT (widget),0); + gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT (widget),0,filename); g_free(filename); } gtk_combo_box_set_active (GTK_COMBO_BOX (widget),0); --- ./src/pref_dialog.h +++ ./src/pref_dialog.h @@ -28,7 +28,6 @@ typedef struct GtkWidget *check_show_comment, *check_sort_filename_column,*show_location_bar,*show_sidebar,*show_toolbar,*combo_prefered_viewer; GtkWidget *combo_prefered_web_browser, *combo_prefered_editor, *combo_prefered_temp_dir, *combo_prefered_extract_dir, *allow_sub_dir,*check_save_geometry,*prefs_notebook; GtkListStore *prefs_liststore; - GtkTooltips *tooltips; gint geometry[5]; gint extract_dialog[2]; gint add_coords[2]; --- ./src/sexy-icon-entry.c +++ /dev/null @@ -1,950 +0,0 @@ -/* - * @file libsexy/sexy-icon-entry.c Entry widget - * - * @Copyright (C) 2004-2006 Christian Hammond. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#include -#include -#include "sexy-icon-entry.h" - -#define ICON_MARGIN 2 -#define MAX_ICONS 2 - -#define IS_VALID_ICON_ENTRY_POSITION(pos) \ - ((pos) == SEXY_ICON_ENTRY_PRIMARY || \ - (pos) == SEXY_ICON_ENTRY_SECONDARY) - -typedef struct -{ - GtkImage *icon; - gboolean highlight; - gboolean hovered; - GdkWindow *window; - -} SexyIconInfo; - -struct _SexyIconEntryPriv -{ - SexyIconInfo icons[MAX_ICONS]; - - gulong icon_released_id; -}; - -enum -{ - ICON_PRESSED, - ICON_RELEASED, - LAST_SIGNAL -}; - -static void sexy_icon_entry_class_init(SexyIconEntryClass *klass); -static void sexy_icon_entry_editable_init(GtkEditableClass *iface); -static void sexy_icon_entry_init(SexyIconEntry *entry); -static void sexy_icon_entry_finalize(GObject *obj); -static void sexy_icon_entry_destroy(GtkObject *obj); -static void sexy_icon_entry_map(GtkWidget *widget); -static void sexy_icon_entry_unmap(GtkWidget *widget); -static void sexy_icon_entry_realize(GtkWidget *widget); -static void sexy_icon_entry_unrealize(GtkWidget *widget); -static void sexy_icon_entry_size_request(GtkWidget *widget, - GtkRequisition *requisition); -static void sexy_icon_entry_size_allocate(GtkWidget *widget, - GtkAllocation *allocation); -static gint sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event); -static gint sexy_icon_entry_enter_notify(GtkWidget *widget, - GdkEventCrossing *event); -static gint sexy_icon_entry_leave_notify(GtkWidget *widget, - GdkEventCrossing *event); -static gint sexy_icon_entry_button_press(GtkWidget *widget, - GdkEventButton *event); -static gint sexy_icon_entry_button_release(GtkWidget *widget, - GdkEventButton *event); - -static GtkEntryClass *parent_class = NULL; -static guint signals[LAST_SIGNAL] = {0}; - -G_DEFINE_TYPE_EXTENDED(SexyIconEntry, sexy_icon_entry, GTK_TYPE_ENTRY, - 0, - G_IMPLEMENT_INTERFACE(GTK_TYPE_EDITABLE, - sexy_icon_entry_editable_init)); - -static void -sexy_icon_entry_class_init(SexyIconEntryClass *klass) -{ - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - - parent_class = g_type_class_peek_parent(klass); - - gobject_class = G_OBJECT_CLASS(klass); - object_class = GTK_OBJECT_CLASS(klass); - widget_class = GTK_WIDGET_CLASS(klass); - - gobject_class->finalize = sexy_icon_entry_finalize; - - object_class->destroy = sexy_icon_entry_destroy; - - widget_class->map = sexy_icon_entry_map; - widget_class->unmap = sexy_icon_entry_unmap; - widget_class->realize = sexy_icon_entry_realize; - widget_class->unrealize = sexy_icon_entry_unrealize; - widget_class->size_request = sexy_icon_entry_size_request; - widget_class->size_allocate = sexy_icon_entry_size_allocate; - widget_class->expose_event = sexy_icon_entry_expose; - widget_class->enter_notify_event = sexy_icon_entry_enter_notify; - widget_class->leave_notify_event = sexy_icon_entry_leave_notify; - widget_class->button_press_event = sexy_icon_entry_button_press; - widget_class->button_release_event = sexy_icon_entry_button_release; - - /** - * SexyIconEntry::icon-pressed: - * @entry: The entry on which the signal is emitted. - * @icon_pos: The position of the clicked icon. - * @button: The mouse button clicked. - * - * The ::icon-pressed signal is emitted when an icon is clicked. - */ - signals[ICON_PRESSED] = - g_signal_new("icon_pressed", - G_TYPE_FROM_CLASS(gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(SexyIconEntryClass, icon_pressed), - NULL, NULL, - gtk_marshal_VOID__INT_INT, - G_TYPE_NONE, 2, - G_TYPE_INT, - G_TYPE_INT); - - /** - * SexyIconEntry::icon-released: - * @entry: The entry on which the signal is emitted. - * @icon_pos: The position of the clicked icon. - * @button: The mouse button clicked. - * - * The ::icon-released signal is emitted on the button release from a - * mouse click. - */ - signals[ICON_RELEASED] = - g_signal_new("icon_released", - G_TYPE_FROM_CLASS(gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(SexyIconEntryClass, icon_released), - NULL, NULL, - gtk_marshal_VOID__INT_INT, - G_TYPE_NONE, 2, - G_TYPE_INT, - G_TYPE_INT); -} - -static void -sexy_icon_entry_editable_init(GtkEditableClass *iface G_GNUC_UNUSED ) -{ -}; - -static void -sexy_icon_entry_init(SexyIconEntry *entry) -{ - entry->priv = g_new0(SexyIconEntryPriv, 1); -} - -static void -sexy_icon_entry_finalize(GObject *obj) -{ - SexyIconEntry *entry; - - g_return_if_fail(obj != NULL); - g_return_if_fail(SEXY_IS_ICON_ENTRY(obj)); - - entry = SEXY_ICON_ENTRY(obj); - - g_free(entry->priv); - - if (G_OBJECT_CLASS(parent_class)->finalize) - G_OBJECT_CLASS(parent_class)->finalize(obj); -} - -static void -sexy_icon_entry_destroy(GtkObject *obj) -{ - SexyIconEntry *entry; - - entry = SEXY_ICON_ENTRY(obj); - - sexy_icon_entry_set_icon(entry, SEXY_ICON_ENTRY_PRIMARY, NULL); - sexy_icon_entry_set_icon(entry, SEXY_ICON_ENTRY_SECONDARY, NULL); - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - GTK_OBJECT_CLASS(parent_class)->destroy(obj); -} - -static void -sexy_icon_entry_map(GtkWidget *widget) -{ - if (GTK_WIDGET_REALIZED(widget) && !GTK_WIDGET_MAPPED(widget)) - { - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - GTK_WIDGET_CLASS(parent_class)->map(widget); - - for (i = 0; i < MAX_ICONS; i++) - { - if (entry->priv->icons[i].icon != NULL) - gdk_window_show(entry->priv->icons[i].window); - } - } -} - -static void -sexy_icon_entry_unmap(GtkWidget *widget) -{ - if (GTK_WIDGET_MAPPED(widget)) - { - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - for (i = 0; i < MAX_ICONS; i++) - { - if (entry->priv->icons[i].icon != NULL) - gdk_window_hide(entry->priv->icons[i].window); - } - - GTK_WIDGET_CLASS(parent_class)->unmap(widget); - } -} - -static gint -get_icon_width(SexyIconEntry *entry, SexyIconEntryPosition icon_pos) -{ - GtkRequisition requisition; - gint menu_icon_width; - gint width; - SexyIconInfo *icon_info = &entry->priv->icons[icon_pos]; - - if (icon_info->icon == NULL) - return 0; - - gtk_widget_size_request(GTK_WIDGET(icon_info->icon), &requisition); - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &menu_icon_width, NULL); - - width = MAX(requisition.width, menu_icon_width); - - return width; -} - -static void -get_borders(SexyIconEntry *entry, gint *xborder, gint *yborder) -{ - GtkWidget *widget = GTK_WIDGET(entry); - gint focus_width; - gboolean interior_focus; - - gtk_widget_style_get(widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - NULL); - - if (gtk_entry_get_has_frame(GTK_ENTRY(entry))) - { - *xborder = widget->style->xthickness; - *yborder = widget->style->ythickness; - } - else - { - *xborder = 0; - *yborder = 0; - } - - if (!interior_focus) - { - *xborder += focus_width; - *yborder += focus_width; - } -} - -static void -get_text_area_size(SexyIconEntry *entry, GtkAllocation *alloc) -{ - GtkWidget *widget = GTK_WIDGET(entry); - GtkRequisition requisition; - gint xborder, yborder; - - gtk_widget_get_child_requisition(widget, &requisition); - get_borders(entry, &xborder, &yborder); - - alloc->x = xborder; - alloc->y = yborder; - alloc->width = widget->allocation.width - xborder * 2; - alloc->height = requisition.height - yborder * 2; -} - -static void -get_icon_allocation(SexyIconEntry *icon_entry, - gboolean left, - GtkAllocation *widget_alloc G_GNUC_UNUSED, - GtkAllocation *text_area_alloc, - GtkAllocation *allocation, - SexyIconEntryPosition *icon_pos) -{ - gboolean rtl; - - rtl = (gtk_widget_get_direction(GTK_WIDGET(icon_entry)) == - GTK_TEXT_DIR_RTL); - - if (left) - *icon_pos = (rtl ? SEXY_ICON_ENTRY_SECONDARY : SEXY_ICON_ENTRY_PRIMARY); - else - *icon_pos = (rtl ? SEXY_ICON_ENTRY_PRIMARY : SEXY_ICON_ENTRY_SECONDARY); - - allocation->y = text_area_alloc->y; - allocation->width = get_icon_width(icon_entry, *icon_pos); - allocation->height = text_area_alloc->height; - - if (left) - allocation->x = text_area_alloc->x + ICON_MARGIN; - else - { - allocation->x = text_area_alloc->x + text_area_alloc->width - - allocation->width - ICON_MARGIN; - } -} - -static void -sexy_icon_entry_realize(GtkWidget *widget) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - GdkWindowAttr attributes; - gint attributes_mask; - int i; - - GTK_WIDGET_CLASS(parent_class)->realize(widget); - - attributes.x = 0; - attributes.y = 0; - attributes.width = 1; - attributes.height = 1; - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual(widget); - attributes.colormap = gtk_widget_get_colormap(widget); - attributes.event_mask = gtk_widget_get_events(widget); - attributes.event_mask |= - (GDK_EXPOSURE_MASK - | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - for (i = 0; i < MAX_ICONS; i++) - { - SexyIconInfo *icon_info; - - icon_info = &entry->priv->icons[i]; - icon_info->window = gdk_window_new(widget->window, &attributes, - attributes_mask); - gdk_window_set_user_data(icon_info->window, widget); - - gdk_window_set_background(icon_info->window, - &widget->style->base[GTK_WIDGET_STATE(widget)]); - } - - gtk_widget_queue_resize(widget); -} - -static void -sexy_icon_entry_unrealize(GtkWidget *widget) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - GTK_WIDGET_CLASS(parent_class)->unrealize(widget); - - for (i = 0; i < MAX_ICONS; i++) - { - SexyIconInfo *icon_info = &entry->priv->icons[i]; - - gdk_window_destroy(icon_info->window); - icon_info->window = NULL; - } -} - -static void -sexy_icon_entry_size_request(GtkWidget *widget, GtkRequisition *requisition) -{ - SexyIconEntry *entry; - gint icon_widths = 0; - int i; - - entry = SEXY_ICON_ENTRY(widget); - - for (i = 0; i < MAX_ICONS; i++) - { - int icon_width = get_icon_width(entry, i); - - if (icon_width > 0) - icon_widths += icon_width + ICON_MARGIN; - } - - GTK_WIDGET_CLASS(parent_class)->size_request(widget, requisition); - - if (icon_widths > requisition->width) - requisition->width += icon_widths; -} - -static void -place_windows(SexyIconEntry *icon_entry, GtkAllocation *widget_alloc) -{ - SexyIconEntryPosition left_icon_pos; - SexyIconEntryPosition right_icon_pos; - GtkAllocation left_icon_alloc; - GtkAllocation right_icon_alloc; - GtkAllocation text_area_alloc; - - get_text_area_size(icon_entry, &text_area_alloc); - get_icon_allocation(icon_entry, TRUE, widget_alloc, &text_area_alloc, - &left_icon_alloc, &left_icon_pos); - get_icon_allocation(icon_entry, FALSE, widget_alloc, &text_area_alloc, - &right_icon_alloc, &right_icon_pos); - - if (left_icon_alloc.width > 0) - { - text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width + - ICON_MARGIN; - } - - if (right_icon_alloc.width > 0) - text_area_alloc.width -= right_icon_alloc.width + ICON_MARGIN; - - text_area_alloc.width -= text_area_alloc.x; - - gdk_window_move_resize(icon_entry->priv->icons[left_icon_pos].window, - left_icon_alloc.x, left_icon_alloc.y, - left_icon_alloc.width, left_icon_alloc.height); - - gdk_window_move_resize(icon_entry->priv->icons[right_icon_pos].window, - right_icon_alloc.x, right_icon_alloc.y, - right_icon_alloc.width, right_icon_alloc.height); - - gdk_window_move_resize(GTK_ENTRY(icon_entry)->text_area, - text_area_alloc.x, text_area_alloc.y, - text_area_alloc.width, text_area_alloc.height); -} - -static void -sexy_icon_entry_size_allocate(GtkWidget *widget, GtkAllocation *allocation) -{ - g_return_if_fail(SEXY_IS_ICON_ENTRY(widget)); - g_return_if_fail(allocation != NULL); - - widget->allocation = *allocation; - - GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation); - - if (GTK_WIDGET_REALIZED(widget)) - place_windows(SEXY_ICON_ENTRY(widget), allocation); -} - -static GdkPixbuf * -get_pixbuf_from_icon(SexyIconEntry *entry, SexyIconEntryPosition icon_pos) -{ - GdkPixbuf *pixbuf = NULL; - gchar *stock_id; - SexyIconInfo *icon_info = &entry->priv->icons[icon_pos]; - GtkIconSize size; - - switch (gtk_image_get_storage_type(GTK_IMAGE(icon_info->icon))) - { - case GTK_IMAGE_PIXBUF: - pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(icon_info->icon)); - g_object_ref(pixbuf); - break; - - case GTK_IMAGE_STOCK: - gtk_image_get_stock(GTK_IMAGE(icon_info->icon), &stock_id, &size); - pixbuf = gtk_widget_render_icon(GTK_WIDGET(entry), - stock_id, size, NULL); - break; - - default: - return NULL; - } - - return pixbuf; -} - -/* Kudos to the gnome-panel guys. */ -static void -colorshift_pixbuf(GdkPixbuf *dest, GdkPixbuf *src, int shift) -{ - gint i, j; - gint width, height, has_alpha, src_rowstride, dest_rowstride; - guchar *target_pixels; - guchar *original_pixels; - guchar *pix_src; - guchar *pix_dest; - int val; - guchar r, g, b; - - has_alpha = gdk_pixbuf_get_has_alpha(src); - width = gdk_pixbuf_get_width(src); - height = gdk_pixbuf_get_height(src); - src_rowstride = gdk_pixbuf_get_rowstride(src); - dest_rowstride = gdk_pixbuf_get_rowstride(dest); - original_pixels = gdk_pixbuf_get_pixels(src); - target_pixels = gdk_pixbuf_get_pixels(dest); - - for (i = 0; i < height; i++) - { - pix_dest = target_pixels + i * dest_rowstride; - pix_src = original_pixels + i * src_rowstride; - - for (j = 0; j < width; j++) - { - r = *(pix_src++); - g = *(pix_src++); - b = *(pix_src++); - - val = r + shift; - *(pix_dest++) = CLAMP(val, 0, 255); - - val = g + shift; - *(pix_dest++) = CLAMP(val, 0, 255); - - val = b + shift; - *(pix_dest++) = CLAMP(val, 0, 255); - - if (has_alpha) - *(pix_dest++) = *(pix_src++); - } - } -} - -static void -draw_icon(GtkWidget *widget, SexyIconEntryPosition icon_pos) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - SexyIconInfo *icon_info = &entry->priv->icons[icon_pos]; - GdkPixbuf *pixbuf; - gint x, y, width, height; - - if (icon_info->icon == NULL || !GTK_WIDGET_REALIZED(widget)) - return; - - if ((pixbuf = get_pixbuf_from_icon(entry, icon_pos)) == NULL) - return; - - gdk_drawable_get_size(icon_info->window, &width, &height); - - if (width == 1 || height == 1) - { - /* - * size_allocate hasn't been called yet. These are the default values. - */ - return; - } - - if (gdk_pixbuf_get_height(pixbuf) > height) - { - GdkPixbuf *temp_pixbuf; - int scale; - - scale = height - (2 * ICON_MARGIN); - - temp_pixbuf = gdk_pixbuf_scale_simple(pixbuf, scale, scale, GDK_INTERP_BILINEAR); - - g_object_unref(pixbuf); - - pixbuf = temp_pixbuf; - } - - x = (width - gdk_pixbuf_get_width(pixbuf)) / 2; - y = (height - gdk_pixbuf_get_height(pixbuf)) / 2; - - if (icon_info->hovered) - { - GdkPixbuf *temp_pixbuf; - - temp_pixbuf = gdk_pixbuf_copy(pixbuf); - - colorshift_pixbuf(temp_pixbuf, pixbuf, 30); - - g_object_unref(pixbuf); - - pixbuf = temp_pixbuf; - } - - gdk_draw_pixbuf(icon_info->window, widget->style->black_gc, pixbuf, - 0, 0, x, y, -1, -1, - GDK_RGB_DITHER_NORMAL, 0, 0); - - g_object_unref(pixbuf); -} - -static gint -sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event) -{ - SexyIconEntry *entry; - - g_return_val_if_fail(SEXY_IS_ICON_ENTRY(widget), FALSE); - g_return_val_if_fail(event != NULL, FALSE); - - entry = SEXY_ICON_ENTRY(widget); - - if (GTK_WIDGET_DRAWABLE(widget)) - { - gboolean found = FALSE; - int i; - - for (i = 0; i < MAX_ICONS && !found; i++) - { - SexyIconInfo *icon_info = &entry->priv->icons[i]; - - if (event->window == icon_info->window) - { - gint width; - GtkAllocation text_area_alloc; - - get_text_area_size(entry, &text_area_alloc); - gdk_drawable_get_size(icon_info->window, &width, NULL); - - gtk_paint_flat_box(widget->style, icon_info->window, - GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE, - NULL, widget, "entry_bg", - 0, 0, width, text_area_alloc.height); - - draw_icon(widget, i); - - found = TRUE; - } - } - - if (!found) - GTK_WIDGET_CLASS(parent_class)->expose_event(widget, event); - } - - return FALSE; -} - -static void -update_icon(GObject *obj G_GNUC_UNUSED, GParamSpec *param, SexyIconEntry *entry) -{ - if (param != NULL) - { - const char *name = g_param_spec_get_name(param); - - if (strcmp(name, "pixbuf") && strcmp(name, "stock") && - strcmp(name, "image") && strcmp(name, "pixmap") && - strcmp(name, "icon_set") && strcmp(name, "pixbuf_animation")) - { - return; - } - } - - gtk_widget_queue_resize(GTK_WIDGET(entry)); -} - -static gint -sexy_icon_entry_enter_notify(GtkWidget *widget, GdkEventCrossing *event) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - for (i = 0; i < MAX_ICONS; i++) - { - if (event->window == entry->priv->icons[i].window) - { - if (sexy_icon_entry_get_icon_highlight(entry, i)) - { - entry->priv->icons[i].hovered = TRUE; - - update_icon(NULL, NULL, entry); - - break; - } - } - } - - return FALSE; -} - -static gint -sexy_icon_entry_leave_notify(GtkWidget *widget, GdkEventCrossing *event) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - for (i = 0; i < MAX_ICONS; i++) - { - if (event->window == entry->priv->icons[i].window) - { - if (sexy_icon_entry_get_icon_highlight(entry, i)) - { - entry->priv->icons[i].hovered = FALSE; - - update_icon(NULL, NULL, entry); - - break; - } - } - } - - return FALSE; -} - -static gint -sexy_icon_entry_button_press(GtkWidget *widget, GdkEventButton *event) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - for (i = 0; i < MAX_ICONS; i++) - { - if (event->window == entry->priv->icons[i].window) - { - if (event->button == 1 && - sexy_icon_entry_get_icon_highlight(entry, i)) - { - entry->priv->icons[i].hovered = FALSE; - - update_icon(NULL, NULL, entry); - } - - g_signal_emit(entry, signals[ICON_PRESSED], 0, i, event->button); - - return TRUE; - } - } - - if (GTK_WIDGET_CLASS(parent_class)->button_press_event) - return GTK_WIDGET_CLASS(parent_class)->button_press_event(widget, - event); - - return FALSE; -} - -static gint -sexy_icon_entry_button_release(GtkWidget *widget, GdkEventButton *event) -{ - SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); - int i; - - for (i = 0; i < MAX_ICONS; i++) - { - GdkWindow *icon_window = entry->priv->icons[i].window; - - if (event->window == icon_window) - { - int width, height; - gdk_drawable_get_size(icon_window, &width, &height); - - if (event->button == 1 && - sexy_icon_entry_get_icon_highlight(entry, i) && - event->x >= 0 && event->y >= 0 && - event->x <= width && event->y <= height) - { - entry->priv->icons[i].hovered = TRUE; - - update_icon(NULL, NULL, entry); - } - - g_signal_emit(entry, signals[ICON_RELEASED], 0, i, event->button); - - return TRUE; - } - } - - if (GTK_WIDGET_CLASS(parent_class)->button_release_event) - return GTK_WIDGET_CLASS(parent_class)->button_release_event(widget, - event); - - return FALSE; -} - -/** - * sexy_icon_entry_new - * - * Creates a new SexyIconEntry widget. - * - * Returns a new #SexyIconEntry. - */ -GtkWidget * -sexy_icon_entry_new(void) -{ - return GTK_WIDGET(g_object_new(SEXY_TYPE_ICON_ENTRY, NULL)); -} - -/** - * sexy_icon_entry_set_icon - * @entry: A #SexyIconEntry. - * @position: Icon position. - * @icon: A #GtkImage to set as the icon. - * - * Sets the icon shown in the entry - */ -void -sexy_icon_entry_set_icon(SexyIconEntry *entry, SexyIconEntryPosition icon_pos, - GtkImage *icon) -{ - SexyIconInfo *icon_info; - - g_return_if_fail(entry != NULL); - g_return_if_fail(SEXY_IS_ICON_ENTRY(entry)); - g_return_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos)); - g_return_if_fail(icon == NULL || GTK_IS_IMAGE(icon)); - - icon_info = &entry->priv->icons[icon_pos]; - - if (icon == icon_info->icon) - return; - - if (icon_pos == SEXY_ICON_ENTRY_SECONDARY && - entry->priv->icon_released_id != 0) - { - g_signal_handler_disconnect(entry, entry->priv->icon_released_id); - entry->priv->icon_released_id = 0; - } - - if (icon == NULL) - { - if (icon_info->icon != NULL) - { - gtk_widget_destroy(GTK_WIDGET(icon_info->icon)); - icon_info->icon = NULL; - - /* - * Explicitly check, as the pointer may become invalidated - * during destruction. - */ - if (icon_info->window != NULL && GDK_IS_WINDOW(icon_info->window)) - gdk_window_hide(icon_info->window); - } - } - else - { - if (icon_info->window != NULL && icon_info->icon == NULL) - gdk_window_show(icon_info->window); - - g_signal_connect(G_OBJECT(icon), "notify", - G_CALLBACK(update_icon), entry); - - icon_info->icon = icon; - g_object_ref(icon); - } - - update_icon(NULL, NULL, entry); -} - -/** - * sexy_icon_entry_set_icon_highlight - * @entry: A #SexyIconEntry; - * @position: Icon position. - * @highlight: TRUE if the icon should highlight on mouse-over - * - * Determines whether the icon will highlight on mouse-over. - */ -void -sexy_icon_entry_set_icon_highlight(SexyIconEntry *entry, - SexyIconEntryPosition icon_pos, - gboolean highlight) -{ - SexyIconInfo *icon_info; - - g_return_if_fail(entry != NULL); - g_return_if_fail(SEXY_IS_ICON_ENTRY(entry)); - g_return_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos)); - - icon_info = &entry->priv->icons[icon_pos]; - - if (icon_info->highlight == highlight) - return; - - icon_info->highlight = highlight; -} - -/** - * sexy_icon_entry_get_icon - * @entry: A #SexyIconEntry. - * @position: Icon position. - * - * Retrieves the image used for the icon - * - * Returns: A #GtkImage. - */ -GtkImage * -sexy_icon_entry_get_icon(const SexyIconEntry *entry, - SexyIconEntryPosition icon_pos) -{ - g_return_val_if_fail(entry != NULL, NULL); - g_return_val_if_fail(SEXY_IS_ICON_ENTRY(entry), NULL); - g_return_val_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos), NULL); - - return entry->priv->icons[icon_pos].icon; -} - -/** - * sexy_icon_entry_get_icon_highlight - * @entry: A #SexyIconEntry. - * @position: Icon position. - * - * Retrieves whether entry will highlight the icon on mouseover. - * - * Returns: TRUE if icon highlights. - */ -gboolean -sexy_icon_entry_get_icon_highlight(const SexyIconEntry *entry, - SexyIconEntryPosition icon_pos) -{ - g_return_val_if_fail(entry != NULL, FALSE); - g_return_val_if_fail(SEXY_IS_ICON_ENTRY(entry), FALSE); - g_return_val_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos), FALSE); - - return entry->priv->icons[icon_pos].highlight; -} - -/** - * sexy_icon_entry_add_clear_button - * @icon_entry: A #SexyIconEntry. - * - * A convenience function to add a clear button to the end of the entry. - * This is useful for search boxes. - */ -void -sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry,gpointer data, gpointer function) -{ - GtkWidget *icon; - - g_return_if_fail(icon_entry != NULL); - g_return_if_fail(SEXY_IS_ICON_ENTRY(icon_entry)); - - icon = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); - gtk_widget_show(icon); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(icon_entry), - SEXY_ICON_ENTRY_SECONDARY, - GTK_IMAGE(icon)); - sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(icon_entry), - SEXY_ICON_ENTRY_SECONDARY, TRUE); - - if (icon_entry->priv->icon_released_id != 0) - { - g_signal_handler_disconnect(icon_entry, - icon_entry->priv->icon_released_id); - } - - icon_entry->priv->icon_released_id = g_signal_connect(G_OBJECT(icon_entry), "icon_released",G_CALLBACK(function), data); -} --- ./src/sexy-icon-entry.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * @file libsexy/sexy-icon-entry.h Entry widget - * - * @Copyright (C) 2004-2006 Christian Hammond. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#ifndef _SEXY_ICON_ENTRY_H_ -#define _SEXY_ICON_ENTRY_H_ - -typedef struct _SexyIconEntry SexyIconEntry; -typedef struct _SexyIconEntryClass SexyIconEntryClass; -typedef struct _SexyIconEntryPriv SexyIconEntryPriv; - -#include -#include - -#define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type()) -#define SEXY_ICON_ENTRY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_ICON_ENTRY, SexyIconEntry)) -#define SEXY_ICON_ENTRY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), SEXY_TYPE_ICON_ENTRY, SexyIconEntryClass)) -#define SEXY_IS_ICON_ENTRY(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), SEXY_TYPE_ICON_ENTRY)) -#define SEXY_IS_ICON_ENTRY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), SEXY_TYPE_ICON_ENTRY)) -#define SEXY_ICON_ENTRY_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), SEXY_TYPE_ICON_ENTRY, SexyIconEntryClass)) - -typedef enum -{ - SEXY_ICON_ENTRY_PRIMARY, - SEXY_ICON_ENTRY_SECONDARY - -} SexyIconEntryPosition; - -struct _SexyIconEntry -{ - GtkEntry parent_object; - - SexyIconEntryPriv *priv; - - void (*gtk_reserved1)(void); - void (*gtk_reserved2)(void); - void (*gtk_reserved3)(void); - void (*gtk_reserved4)(void); -}; - -struct _SexyIconEntryClass -{ - GtkEntryClass parent_class; - - /* Signals */ - void (*icon_pressed)(SexyIconEntry *entry, SexyIconEntryPosition icon_pos, - int button); - void (*icon_released)(SexyIconEntry *entry, SexyIconEntryPosition icon_pos, - int button); - - void (*gtk_reserved1)(void); - void (*gtk_reserved2)(void); - void (*gtk_reserved3)(void); - void (*gtk_reserved4)(void); -}; - -G_BEGIN_DECLS - -GType sexy_icon_entry_get_type(void); - -GtkWidget *sexy_icon_entry_new(void); - -void sexy_icon_entry_set_icon(SexyIconEntry *entry, - SexyIconEntryPosition position, - GtkImage *icon); - -void sexy_icon_entry_set_icon_highlight(SexyIconEntry *entry, - SexyIconEntryPosition position, - gboolean highlight); - -GtkImage *sexy_icon_entry_get_icon(const SexyIconEntry *entry, - SexyIconEntryPosition position); - -gboolean sexy_icon_entry_get_icon_highlight(const SexyIconEntry *entry, - SexyIconEntryPosition position); -void sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry,gpointer, gpointer); - -G_END_DECLS - -#endif /* _SEXY_ICON_ENTRY_H_ */ --- ./src/window.c +++ ./src/window.c @@ -150,10 +150,9 @@ void xa_show_cmd_line_output(GtkMenuItem *menuitem,XArchive *_archive) GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_STOCK_OK,GTK_RESPONSE_OK,NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_OK); - 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 (dialog)->vbox),6); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox),8); + 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); gtk_widget_set_size_request (dialog,400,-1); scrolledwindow = gtk_scrolled_window_new (NULL,NULL); @@ -186,7 +185,7 @@ void xa_show_cmd_line_output(GtkMenuItem *menuitem,XArchive *_archive) } gtk_container_add (GTK_CONTAINER (scrolledwindow),textview); gtk_box_pack_start (GTK_BOX (vbox),scrolledwindow,TRUE,TRUE,0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),vbox,TRUE,TRUE,0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),vbox,TRUE,TRUE,0); output = _archive->error_output; while (output) @@ -446,7 +445,7 @@ void xa_list_archive (GtkMenuItem *menuitem,gpointer data) g_free(filename_plus); filename = NULL; - pref_path = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_extract_dir)); + pref_path = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_extract_dir)); if (current_open_directory != NULL || pref_path != NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (save), pref_path ? pref_path : current_open_directory); g_free (pref_path); @@ -961,14 +960,32 @@ void xa_convert_sfx (GtkMenuItem *menuitem ,gpointer user_data) void xa_about (GtkMenuItem *menuitem,gpointer user_data) { static GtkWidget *about = NULL; - const char *authors[] = {"\nMain developer:\nGiuseppe Torelli \n\nThis version:\nIngo Brückl \n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nRARv5, XZ, TAR.XZ support:\nFrederick GUERIN \n",NULL}; - const char *documenters[] = {"\nSpecial thanks to Bjoern Martensen for\nbugs hunting and " PACKAGE_NAME " Tango logo.\n\nThanks to:\nBenedikt Meurer\nStephan Arts\nBruno Jesus <00cpxxx@gmail.com>\nUracile for the stunning logo\n",NULL}; + const char *authors[] = { + "Main developer:\nGiuseppe Torelli \n", + "This version:\nIngo Brückl \n", + "Archive navigation code:\nJohn Berthels\n", + "Code fixing:\nEnrico Tröger\n", + "LHA and DEB support:\nŁukasz Zemczak \n", + "LZMA support:\nThomas Dy \n", + "LZOP support:\nKevin Day\n", + "RARv5, XZ, TAR.XZ support:\nFrederick GUERIN \n", + "GTK+ 3 port:\nBalló György \n", + NULL + }; + + const char *documenters[] = { + "Special thanks to Bjoern Martensen for\nbugs hunting and " PACKAGE_NAME " Tango logo.\n", + "Thanks to:", + "Benedikt Meurer", + "Stephan Arts", + "Bruno Jesus <00cpxxx@gmail.com>", + "Uracile for the stunning logo\n", + NULL + }; if (about == NULL) { about = gtk_about_dialog_new (); - gtk_about_dialog_set_email_hook (xa_activate_link,NULL,NULL); - gtk_about_dialog_set_url_hook (xa_activate_link,NULL,NULL); gtk_window_set_position (GTK_WINDOW (about),GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_transient_for (GTK_WINDOW (about),GTK_WINDOW (xa_main_window)); gtk_window_set_destroy_with_parent (GTK_WINDOW (about),TRUE); @@ -976,7 +993,7 @@ void xa_about (GtkMenuItem *menuitem,gpointer user_data) "program-name", PACKAGE_NAME, "version",PACKAGE_VERSION, "copyright","Copyright \xC2\xA9 2005-2014 Giuseppe Torelli", - "comments",_("A GTK+2 only lightweight archive manager"), + "comments",_("A GTK+ only lightweight archive manager"), "authors",authors, "documenters",documenters, "translator_credits",_("translator-credits"), @@ -1325,7 +1342,7 @@ void xa_cancel_archive (GtkMenuItem *menuitem,gpointer data) current_page = gtk_notebook_get_current_page(notebook); idx = xa_find_archive_index (current_page); gtk_widget_set_sensitive(Stop_button,FALSE); - if (GTK_WIDGET_VISIBLE(multi_extract_window->multi_extract)) + if (gtk_widget_get_visible(GTK_WIDGET(multi_extract_window->multi_extract))) { multi_extract_window->stop_pressed = TRUE; kill (multi_extract_window->archive->child_pid,SIGINT); @@ -1656,7 +1673,7 @@ void drag_begin (GtkWidget *treeview1,GdkDragContext *context,XArchive *archive) gtk_tree_model_get_iter(archive->model,&iter,(GtkTreePath*) (row_list->data)); gtk_tree_model_get (GTK_TREE_MODEL (archive->liststore),&iter,archive->nc+1,&entry,-1); - gdk_property_change (context->source_window, + gdk_property_change (gdk_drag_context_get_source_window(context), gdk_atom_intern ("XdndDirectSave0",FALSE), gdk_atom_intern ("text/plain",FALSE), 8,GDK_PROP_MODE_REPLACE, @@ -1691,7 +1708,7 @@ void drag_data_get (GtkWidget *widget,GdkDragContext *dc,GtkSelectionData *selec xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform another extraction:"),_("Please wait until the completion of the current one!")); return; } - gdk_property_get ( dc->source_window, + gdk_property_get ( gdk_drag_context_get_source_window(dc), gdk_atom_intern ("XdndDirectSave0",FALSE), gdk_atom_intern ("text/plain",FALSE), 0,4096,FALSE,NULL,NULL,NULL,&_destination ); @@ -1749,7 +1766,7 @@ void drag_data_get (GtkWidget *widget,GdkDragContext *dc,GtkSelectionData *selec g_free (archive->extraction_path); archive->extraction_path = NULL; } - gtk_selection_data_set (selection_data,selection_data->target,8,(guchar*)to_send,1); + gtk_selection_data_set (selection_data,gtk_selection_data_get_target(selection_data),8,(guchar*)to_send,1); } } @@ -1894,7 +1911,7 @@ void xa_activate_link (GtkAboutDialog *about,const gchar *link,gpointer data) if ( !xdg_open) { gchar *browser_path = NULL; - browser_path = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs_window->combo_prefered_web_browser)); + browser_path = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_web_browser)); if (strlen(browser_path) == 0) { xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_INFO,GTK_BUTTONS_OK,_("You didn't set which browser to use!"),_("Please go to Preferences->Advanced and set it.")); @@ -1917,16 +1934,16 @@ void xa_determine_program_to_run(gchar *file) { if (strstr(file,".html")) { - program = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_web_browser)); + program = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_web_browser)); } else if (strstr(file,".txt")) { - program = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_editor)); + program = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_editor)); } else if (strstr(file,".png") || strstr(file,".gif") || strstr(file,".jpg") || strstr(file,".bmp") || strstr(file,".tif") || strstr(file,".tiff")|| strstr(file,".svg") || strstr(file,".tga")) - program = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_viewer)); + program = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(prefs_window->combo_prefered_viewer)); else { xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("This file type is not supported!"),_("Please install xdg-utils package.")); @@ -1945,6 +1962,11 @@ void xa_determine_program_to_run(gchar *file) g_free(program); } +void setup_display_cb (gpointer data) +{ + g_setenv ("DISPLAY", (char *) data, TRUE); +} + gboolean xa_launch_external_program(gchar *program,gchar *arg) { GtkWidget *message; @@ -1952,6 +1974,7 @@ gboolean xa_launch_external_program(gchar *program,gchar *arg) gchar *command_line = NULL; gchar **argv; GdkScreen *screen; + char *display; command_line = g_strconcat(program," ",arg,NULL); g_shell_parse_argv(command_line,NULL,&argv,NULL); @@ -1958,7 +1981,14 @@ gboolean xa_launch_external_program(gchar *program,gchar *arg) g_free(command_line); screen = gtk_widget_get_screen (GTK_WIDGET (xa_main_window)); - if (!gdk_spawn_on_screen (screen,NULL,argv,NULL,G_SPAWN_SEARCH_PATH,NULL,NULL,NULL,&error)) + + if (screen != NULL) + display = gdk_screen_make_display_name (screen); + else + display = NULL; + + display = gdk_screen_make_display_name (screen); + if (!g_spawn_async (NULL,argv,NULL,G_SPAWN_SEARCH_PATH,setup_display_cb,display,NULL,&error)) { message = gtk_message_dialog_new (GTK_WINDOW (xa_main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, @@ -2017,8 +2047,7 @@ void xa_show_archive_comment (GtkMenuItem *menuitem,gpointer user_data) comment_dialog = gtk_dialog_new_with_buttons (_("Comment"),GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,NULL); gtk_window_set_position (GTK_WINDOW (comment_dialog),GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_type_hint (GTK_WINDOW (comment_dialog),GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator (GTK_DIALOG (comment_dialog),FALSE); - dialog_vbox1 = GTK_DIALOG (comment_dialog)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (comment_dialog)); gtk_widget_set_size_request(comment_dialog,500,330); scrolledwindow1 = gtk_scrolled_window_new (NULL,NULL); @@ -2034,7 +2063,7 @@ void xa_show_archive_comment (GtkMenuItem *menuitem,gpointer user_data) g_object_unref (textbuffer); gtk_container_add (GTK_CONTAINER (scrolledwindow1),textview); - dialog_action_area1 = GTK_DIALOG (comment_dialog)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG (comment_dialog)); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),GTK_BUTTONBOX_END); clear = gtk_button_new_from_stock ("gtk-clear"); @@ -2293,7 +2322,7 @@ int xa_mouse_button_event(GtkWidget *widget,GdkEventButton *event,XArchive *arch clipboard_selection = gtk_clipboard_wait_for_contents(clipboard,XA_INFO_LIST); if (clipboard_selection != NULL) { - paste_data = xa_get_paste_data_from_clipboard_selection((char*)clipboard_selection->data); + paste_data = xa_get_paste_data_from_clipboard_selection((char*)gtk_selection_data_get_data (clipboard_selection)); gtk_selection_data_free (clipboard_selection); if (strcmp(archive->escaped_path,paste_data->cut_copy_archive->escaped_path) == 0) value = FALSE; @@ -2361,7 +2390,7 @@ void xa_clipboard_paste(GtkMenuItem* item,gpointer data) selection = gtk_clipboard_wait_for_contents(clipboard,XA_INFO_LIST); if (selection == NULL) return; - paste_data = xa_get_paste_data_from_clipboard_selection((char*)selection->data); + paste_data = xa_get_paste_data_from_clipboard_selection((char*)gtk_selection_data_get_data(selection)); gtk_selection_data_free (selection); /* Let's add the already extracted files in the tmp dir to the current archive dir */ @@ -2462,7 +2491,7 @@ void xa_clipboard_get (GtkClipboard *clipboard,GtkSelectionData *selection_data, XArchive *archive = user_data; GSList *_files = archive->clipboard_data->files; GString *params = g_string_new(""); - if (selection_data->target != XA_INFO_LIST) + if (gtk_selection_data_get_target (selection_data) != XA_INFO_LIST) return; g_string_append (params,g_strdup(archive->escaped_path)); @@ -2478,7 +2507,7 @@ void xa_clipboard_get (GtkClipboard *clipboard,GtkSelectionData *selection_data, g_string_append (params,"\r\n"); _files = _files->next; } - gtk_selection_data_set (selection_data,selection_data->target,8,(guchar *) params->str,strlen(params->str)); + gtk_selection_data_set (selection_data,gtk_selection_data_get_target(selection_data),8,(guchar *) params->str,strlen(params->str)); g_string_free (params,TRUE); } @@ -2515,7 +2544,7 @@ void xa_rename_archive(GtkMenuItem* item,gpointer data) row_list = gtk_tree_selection_get_selected_rows(selection,&model); g_object_set(archive[idx]->renderer_text,"editable",TRUE,NULL); - gtk_accel_group_disconnect_key(accel_group,GDK_Delete,GDK_MODE_DISABLED); + gtk_accel_group_disconnect_key(accel_group,GDK_KEY_Delete,GDK_MODE_DISABLED); column = gtk_tree_view_get_column(GTK_TREE_VIEW (archive[idx]->treeview),0); gtk_tree_view_set_cursor(GTK_TREE_VIEW(archive[idx]->treeview),row_list->data,column,TRUE); gtk_tree_path_free (row_list->data); @@ -2525,7 +2554,7 @@ void xa_rename_archive(GtkMenuItem* item,gpointer data) void xa_rename_cell_edited_canceled(GtkCellRenderer *renderer,gpointer data) { g_object_set(renderer,"editable",FALSE,NULL); - gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_KEY_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); } void xa_rename_cell_edited (GtkCellRendererText *cell,const gchar *path_string,const gchar *new_name,XArchive *archive) @@ -2604,7 +2633,7 @@ void xa_rename_cell_edited (GtkCellRendererText *cell,const gchar *path_string,c chdir (archive->tmp); xa_execute_add_commands(archive,list,NULL); } - gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (delete_menu,"activate",accel_group,GDK_KEY_Delete,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE); g_object_set(cell,"editable",FALSE,NULL); } --- ./xarchiver.desktop.in +++ ./xarchiver.desktop.in @@ -3,7 +3,7 @@ Version=1.0 Type=Application Name=Xarchiver _GenericName=Archive manager -_Comment=A GTK+2 only archive manager +_Comment=A GTK+ only archive manager Icon=xarchiver Exec=xarchiver %f Terminal=false -- 2.8.0