diff --git a/frontends/gtk-old/src/callbacks.c b/frontends/gtk-old/src/callbacks.c index 957b014b2..142e94876 100644 --- a/frontends/gtk-old/src/callbacks.c +++ b/frontends/gtk-old/src/callbacks.c @@ -163,10 +163,6 @@ void open_directory() { debug_print("open directory"); } -void save_opened_photo() { - debug_print("save opened photo"); -} - void save_selected_photo() { debug_print("save selected photo"); } @@ -176,11 +172,6 @@ void export_gallery() { } -void print_photo() { - debug_print("print photo"); - -} - void close_photo() { debug_print("close photo"); @@ -279,11 +270,28 @@ void select_none() { /* Folder Callbacks */ /* ----------------------------------------------------------- */ +void folder_refresh (GtkWidget *widget, gpointer data) { + + GtkWidget *icon_list; + + debug_print("folder refresh"); + + if (!gp_gtk_camera_init) + if (camera_set()==GP_ERROR) {return;} + + icon_list = (GtkWidget*) lookup_widget(gp_gtk_main_window, "icons"); + gtk_icon_list_clear (GTK_ICON_LIST(icon_list)); + + camera_index(); +} + void folder_set (GtkWidget *tree_item, gpointer data) { char buf[1024]; char *path = (char*)gtk_object_get_data(GTK_OBJECT(tree_item), "path"); + debug_print("folder set"); + if (!gp_gtk_camera_init) if (camera_set()==GP_ERROR) {return;} @@ -296,7 +304,7 @@ void folder_set (GtkWidget *tree_item, gpointer data) { return; } - camera_index_thumbnails(); + camera_index(); } GtkWidget *folder_item (GtkWidget *tree, char *text) { @@ -350,6 +358,8 @@ void folder_expand (GtkWidget *tree_item, gpointer data) { char buf[1024]; int x, count=0; + debug_print("folder_expand"); + if (!gp_gtk_camera_init) if (camera_set()==GP_ERROR) {return;} @@ -618,17 +628,19 @@ camera_select_again: gtk_widget_destroy(window); } -void camera_index_common(int thumbnails) { +void camera_index () { CameraFile *f; CameraAbilities a; - GtkWidget *icon_list; + GtkWidget *icon_list, *camera_tree; GtkIconListItem *item; GdkPixmap *pixmap; GdkBitmap *bitmap; char buf[1024]; - int x, count=0; + int x, count=0, get_thumbnails = 1; + debug_print("camera index"); + if (!gp_gtk_camera_init) if (camera_set()==GP_ERROR) {return;} @@ -654,9 +666,12 @@ void camera_index_common(int thumbnails) { return; gtk_icon_list_clear (GTK_ICON_LIST(icon_list)); + camera_tree = (GtkWidget*) lookup_widget(gp_gtk_main_window, "folder_tree"); x=0; gp_progress(0.00); + gtk_widget_set_sensitive(camera_tree, FALSE); gtk_widget_show(gp_gtk_progress_window); + idle(); while ((xdata,f->size,1,&pixmap,&bitmap); @@ -678,20 +693,7 @@ void camera_index_common(int thumbnails) { } gp_progress(0.00); gtk_widget_hide(gp_gtk_progress_window); -} - -void camera_index_thumbnails() { - - debug_print("camera index thumbnails"); - - camera_index_common(1); -} - -void camera_index_no_thumbnails() { - - debug_print("camera index no thumbnails"); - - camera_index_common(0); + gtk_widget_set_sensitive(camera_tree, TRUE); } void camera_download_thumbnails() { @@ -895,12 +897,6 @@ void on_open_directory_activate (GtkMenuItem *menuitem, gpointer user_data) { open_directory(); } - -void on_save_open_photo_activate (GtkMenuItem *menuitem, gpointer user_data) { - save_opened_photo(); -} - - void on_save_photo_activate (GtkMenuItem *menuitem, gpointer user_data) { save_selected_photo(); } @@ -910,12 +906,6 @@ void on_html_gallery_activate (GtkMenuItem *menuitem, gpointer user_data) { export_gallery(); } - -void on_print_activate (GtkMenuItem *menuitem, gpointer user_data) { - print_photo(); -} - - void on_close_activate (GtkMenuItem *menuitem, gpointer user_data) { close_photo(); } @@ -986,16 +976,6 @@ void on_select_camera_activate (GtkMenuItem *menuitem, gpointer user_data) { } -void on_index_thumbnails_activate (GtkMenuItem *menuitem, gpointer user_data) { - camera_index_thumbnails(); -} - - -void on_index_no_thumbnails_activate (GtkMenuItem *menuitem, gpointer user_data) { - camera_index_no_thumbnails(); -} - - void on_download_thumbnails_activate (GtkMenuItem *menuitem, gpointer user_data) { camera_download_thumbnails(); } diff --git a/frontends/gtk-old/src/callbacks.h b/frontends/gtk-old/src/callbacks.h index 4704741ce..b45c7f02e 100644 --- a/frontends/gtk-old/src/callbacks.h +++ b/frontends/gtk-old/src/callbacks.h @@ -10,10 +10,8 @@ void icon_resize(GtkWidget *window); /* File operations */ void open_photo(); void open_directory(); -void save_opened_photo(); void save_selected_photo(); void export_gallery(); -void print_photo(); void close_photo(); /* Editing operations */ @@ -34,14 +32,13 @@ void select_none(); /* Folder operations */ GtkWidget *tree_item_icon (GtkWidget *tree, char *text, char *icon_name); GtkWidget *folder_item (GtkWidget *tree, char *text); - +void folder_refresh (GtkWidget *widget, gpointer data); void folder_set (GtkWidget *tree_item, gpointer data); void folder_expand (GtkWidget *tree_item, gpointer data); /* Camera operations */ void camera_select(); -void camera_index_thumbnails(); -void camera_index_no_thumbnails(); +void camera_index(); void camera_download_thumbnails(); void camera_download_photos(); void camera_download_both(); @@ -63,10 +60,8 @@ void help_manual(); /* Menu callbacks */ void on_open_photo_activate (GtkMenuItem *menuitem, gpointer user_data); void on_open_directory_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_save_open_photo_activate (GtkMenuItem *menuitem, gpointer user_data); void on_save_photo_activate (GtkMenuItem *menuitem, gpointer user_data); void on_html_gallery_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_print_activate (GtkMenuItem *menuitem, gpointer user_data); void on_close_activate (GtkMenuItem *menuitem, gpointer user_data); void on_exit_activate (GtkMenuItem *menuitem, gpointer user_data); void on_flip_horizontal_activate (GtkMenuItem *menuitem, gpointer user_data); diff --git a/frontends/gtk-old/src/interface.c b/frontends/gtk-old/src/interface.c index 66cd90103..a501999d0 100644 --- a/frontends/gtk-old/src/interface.c +++ b/frontends/gtk-old/src/interface.c @@ -119,28 +119,19 @@ create_main_window (void) GtkWidget *pixmap; GtkWidget *label; GtkWidget *menubar1; + GtkTooltips *tooltip; guint tmp_key; GtkWidget *file2; GtkWidget *file2_menu; GtkAccelGroup *file2_menu_accels; GtkWidget *open3; - GtkWidget *open3_menu; - GtkAccelGroup *open3_menu_accels; - GtkWidget *photo1; - GtkWidget *directory1; GtkWidget *save1; - GtkWidget *save1_menu; - GtkAccelGroup *save1_menu_accels; - GtkWidget *opened_photo1; - GtkWidget *selected_photo1; GtkWidget *separator2; GtkWidget *export1; GtkWidget *export1_menu; GtkAccelGroup *export1_menu_accels; GtkWidget *html_gallery1; GtkWidget *separator5; - GtkWidget *print1; - GtkWidget *close1; GtkWidget *exit1; GtkWidget *edit1; GtkWidget *edit1_menu; @@ -183,12 +174,8 @@ create_main_window (void) GtkWidget *tmp_toolbar_icon; GtkWidget *open_button; GtkWidget *save_button; - GtkWidget *print_button; - GtkWidget *close_button; GtkWidget *label1; - GtkWidget *index_button; - GtkWidget *index_empty_button; - GtkWidget *download_button; + GtkWidget *refresh_button; GtkWidget *delete_button; GtkWidget *label2; GtkWidget *configure_button; @@ -248,96 +235,32 @@ create_main_window (void) open3 = gtk_menu_item_new_with_label (""); tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (open3)->child), - _("_Open")); + _("_Open Photo")); gtk_widget_add_accelerator (open3, "activate_item", file2_menu_accels, - tmp_key, 0, 0); + tmp_key, 0, 0); gtk_widget_ref (open3); gtk_object_set_data_full (GTK_OBJECT (main_window), "open3", open3, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (open3); gtk_container_add (GTK_CONTAINER (file2_menu), open3); - - open3_menu = gtk_menu_new (); - gtk_widget_ref (open3_menu); - gtk_object_set_data_full (GTK_OBJECT (main_window), "open3_menu", open3_menu, - (GtkDestroyNotify) gtk_widget_unref); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (open3), open3_menu); - open3_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (open3_menu)); - - photo1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (photo1)->child), - _("_Photo...")); - gtk_widget_add_accelerator (photo1, "activate_item", open3_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (photo1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "photo1", photo1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (photo1); - gtk_container_add (GTK_CONTAINER (open3_menu), photo1); - gtk_widget_add_accelerator (photo1, "activate", accel_group, + gtk_widget_add_accelerator (open3, "activate", accel_group, GDK_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - directory1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (directory1)->child), - _("_Directory...")); - gtk_widget_add_accelerator (directory1, "activate_item", open3_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (directory1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "directory1", directory1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (directory1); - gtk_container_add (GTK_CONTAINER (open3_menu), directory1); - gtk_widget_add_accelerator (directory1, "activate", accel_group, - GDK_d, GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - save1 = gtk_menu_item_new_with_label (""); tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (save1)->child), - _("_Save")); + _("_Save Selected Photos...")); gtk_widget_add_accelerator (save1, "activate_item", file2_menu_accels, - tmp_key, 0, 0); + GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); gtk_widget_ref (save1); gtk_object_set_data_full (GTK_OBJECT (main_window), "save1", save1, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (save1); gtk_container_add (GTK_CONTAINER (file2_menu), save1); - - save1_menu = gtk_menu_new (); - gtk_widget_ref (save1_menu); - gtk_object_set_data_full (GTK_OBJECT (main_window), "save1_menu", save1_menu, - (GtkDestroyNotify) gtk_widget_unref); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (save1), save1_menu); - save1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (save1_menu)); - - opened_photo1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (opened_photo1)->child), - _("_Opened Photo(s)..")); - gtk_widget_add_accelerator (opened_photo1, "activate_item", save1_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (opened_photo1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "opened_photo1", opened_photo1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (opened_photo1); - gtk_container_add (GTK_CONTAINER (save1_menu), opened_photo1); - gtk_widget_add_accelerator (opened_photo1, "activate", accel_group, + gtk_widget_add_accelerator (save1, "activate", accel_group, GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - selected_photo1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (selected_photo1)->child), - _("_Selected Photo(s)...")); - gtk_widget_add_accelerator (selected_photo1, "activate_item", save1_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (selected_photo1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "selected_photo1", selected_photo1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (selected_photo1); - gtk_container_add (GTK_CONTAINER (save1_menu), selected_photo1); - gtk_widget_add_accelerator (selected_photo1, "activate", accel_group, - GDK_i, GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - separator2 = gtk_menu_item_new (); gtk_widget_ref (separator2); gtk_object_set_data_full (GTK_OBJECT (main_window), "separator2", separator2, @@ -383,34 +306,6 @@ create_main_window (void) gtk_container_add (GTK_CONTAINER (file2_menu), separator5); gtk_widget_set_sensitive (separator5, FALSE); - print1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (print1)->child), - _("_Print")); - gtk_widget_add_accelerator (print1, "activate_item", file2_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (print1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "print1", print1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (print1); - gtk_container_add (GTK_CONTAINER (file2_menu), print1); - gtk_widget_add_accelerator (print1, "activate", accel_group, - GDK_p, GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - close1 = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (close1)->child), - _("_Close")); - gtk_widget_add_accelerator (close1, "activate_item", file2_menu_accels, - tmp_key, 0, 0); - gtk_widget_ref (close1); - gtk_object_set_data_full (GTK_OBJECT (main_window), "close1", close1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (close1); - gtk_container_add (GTK_CONTAINER (file2_menu), close1); - gtk_widget_add_accelerator (close1, "activate", accel_group, - GDK_c, GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - exit1 = gtk_menu_item_new_with_label (""); tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (exit1)->child), _("_Exit")); @@ -783,6 +678,8 @@ create_main_window (void) gtk_object_set_data_full (GTK_OBJECT (main_window), "open_button", open_button, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (open_button); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, open_button, "Open a photo", NULL); tmp_toolbar_icon = create_pixmap (main_window, "save_current_image.xpm"); save_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), @@ -795,87 +692,47 @@ create_main_window (void) gtk_object_set_data_full (GTK_OBJECT (main_window), "save_button", save_button, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (save_button); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, save_button, "Save selected photos", NULL); - tmp_toolbar_icon = create_pixmap (main_window, "print_image.xpm"); - print_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("button3"), - NULL, NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_widget_ref (print_button); - gtk_object_set_data_full (GTK_OBJECT (main_window), "print_button", print_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (print_button); - - tmp_toolbar_icon = create_pixmap (main_window, "close_image.xpm"); - close_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("button4"), - NULL, NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_widget_ref (close_button); - gtk_object_set_data_full (GTK_OBJECT (main_window), "close_button", close_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (close_button); - - label1 = gtk_label_new (_(" ")); + label1 = gtk_label_new (_(" ")); gtk_widget_ref (label1); gtk_object_set_data_full (GTK_OBJECT (main_window), "label1", label1, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1); gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), label1, NULL, NULL); - tmp_toolbar_icon = create_pixmap (main_window, "get_index.xpm"); - index_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), + tmp_toolbar_icon = create_pixmap (main_window, "refresh.xpm"); + refresh_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_CHILD_BUTTON, NULL, - _("button5"), + _("Refresh"), NULL, NULL, tmp_toolbar_icon, NULL, NULL); - gtk_widget_ref (index_button); - gtk_object_set_data_full (GTK_OBJECT (main_window), "index_button", index_button, + gtk_widget_ref (refresh_button); + gtk_object_set_data_full (GTK_OBJECT (main_window), "refresh_button", refresh_button, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (index_button); - - tmp_toolbar_icon = create_pixmap (main_window, "get_index_empty.xpm"); - index_empty_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("button6"), - NULL, NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_widget_ref (index_empty_button); - gtk_object_set_data_full (GTK_OBJECT (main_window), "index_empty_button", index_empty_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (index_empty_button); - - tmp_toolbar_icon = create_pixmap (main_window, "get_selected_images.xpm"); - download_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("button7"), - NULL, NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_widget_ref (download_button); - gtk_object_set_data_full (GTK_OBJECT (main_window), "download_button", download_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (download_button); + gtk_widget_show (refresh_button); + gtk_signal_connect(GTK_OBJECT(refresh_button), "clicked", + GTK_SIGNAL_FUNC(folder_refresh), NULL); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, refresh_button, "Refresh photo index", NULL); tmp_toolbar_icon = create_pixmap (main_window, "delete_images.xpm"); delete_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_CHILD_BUTTON, NULL, - "", + "Delete", NULL, NULL, tmp_toolbar_icon, NULL, NULL); gtk_widget_ref (delete_button); gtk_object_set_data_full (GTK_OBJECT (main_window), "delete_button", delete_button, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (delete_button); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, delete_button, "Delete selected photos", NULL); - label2 = gtk_label_new (_(" ")); + label2 = gtk_label_new (_(" ")); gtk_widget_ref (label2); gtk_object_set_data_full (GTK_OBJECT (main_window), "label2", label2, (GtkDestroyNotify) gtk_widget_unref); @@ -886,15 +743,17 @@ create_main_window (void) configure_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_CHILD_BUTTON, NULL, - _("button15"), + _("Configure"), NULL, NULL, tmp_toolbar_icon, NULL, NULL); gtk_widget_ref (configure_button); gtk_object_set_data_full (GTK_OBJECT (main_window), "configure_button", configure_button, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (configure_button); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, configure_button, "Configure the camera", NULL); - label5 = gtk_label_new (_(" ")); + label5 = gtk_label_new (_(" ")); gtk_widget_ref (label5); gtk_object_set_data_full (GTK_OBJECT (main_window), "label5", label5, (GtkDestroyNotify) gtk_widget_unref); @@ -905,7 +764,7 @@ create_main_window (void) exit_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_CHILD_BUTTON, NULL, - _("button16"), + _("Exit"), NULL, NULL, tmp_toolbar_icon, NULL, NULL); gtk_widget_ref (exit_button); @@ -914,6 +773,8 @@ create_main_window (void) gtk_signal_connect(GTK_OBJECT(exit_button), "clicked", GTK_SIGNAL_FUNC(main_quit), NULL); gtk_widget_show (exit_button); + tooltip = gtk_tooltips_new(); + gtk_tooltips_set_tip (tooltip, exit_button, "Exit gPhoto", NULL); hpaned1 = gtk_hpaned_new (); gtk_widget_ref (hpaned1); @@ -1033,27 +894,15 @@ create_main_window (void) gtk_widget_show (status_bar); gtk_box_pack_start (GTK_BOX (vbox1), status_bar, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (photo1), "activate", + gtk_signal_connect (GTK_OBJECT (open3), "activate", GTK_SIGNAL_FUNC (on_open_photo_activate), NULL); - gtk_signal_connect (GTK_OBJECT (directory1), "activate", - GTK_SIGNAL_FUNC (on_open_directory_activate), - NULL); - gtk_signal_connect (GTK_OBJECT (opened_photo1), "activate", - GTK_SIGNAL_FUNC (on_save_open_photo_activate), - NULL); - gtk_signal_connect (GTK_OBJECT (selected_photo1), "activate", + gtk_signal_connect (GTK_OBJECT (save1), "activate", GTK_SIGNAL_FUNC (on_save_photo_activate), NULL); gtk_signal_connect (GTK_OBJECT (html_gallery1), "activate", GTK_SIGNAL_FUNC (on_html_gallery_activate), NULL); - gtk_signal_connect (GTK_OBJECT (print1), "activate", - GTK_SIGNAL_FUNC (on_print_activate), - NULL); - gtk_signal_connect (GTK_OBJECT (close1), "activate", - GTK_SIGNAL_FUNC (on_close_activate), - NULL); gtk_signal_connect (GTK_OBJECT (exit1), "activate", GTK_SIGNAL_FUNC (on_exit_activate), NULL);