diff -Naur gqview-2.0.4.org/src/collect-table.c gqview-2.0.4/src/collect-table.c --- gqview-2.0.4.org/src/collect-table.c 2005-08-15 15:26:27.000000000 -0600 +++ gqview-2.0.4/src/collect-table.c 2007-03-02 02:03:04.000000000 -0700 @@ -798,8 +798,8 @@ menu_item_add_divider(menu); menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, over_icon, G_CALLBACK(collection_table_popup_copy_cb), ct); - menu_item_add_sensitive(menu, _("_Move..."), over_icon, - G_CALLBACK(collection_table_popup_move_cb), ct); + /*menu_item_add_sensitive(menu, _("_Move..."), over_icon, + G_CALLBACK(collection_table_popup_move_cb), ct);*/ menu_item_add_sensitive(menu, _("_Rename..."), over_icon, G_CALLBACK(collection_table_popup_rename_cb), ct); menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, over_icon, @@ -817,8 +817,8 @@ menu_item_add_divider(menu); menu_item_add_stock(menu, _("_Find duplicates..."), GTK_STOCK_FIND, G_CALLBACK(collection_table_popup_find_dupes_cb), ct); - menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, over_icon, - G_CALLBACK(collection_table_popup_print_cb), ct); + /*menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, over_icon, + G_CALLBACK(collection_table_popup_print_cb), ct);*/ return menu; } diff -Naur gqview-2.0.4.org/src/dupe.c gqview-2.0.4/src/dupe.c --- gqview-2.0.4.org/src/dupe.c 2005-08-15 15:26:27.000000000 -0600 +++ gqview-2.0.4/src/dupe.c 2007-03-02 02:24:20.000000000 -0700 @@ -2186,8 +2186,8 @@ menu = popup_menu_short_lived(); menu_item_add_sensitive(menu, _("_View"), on_row, G_CALLBACK(dupe_menu_view_cb), dw); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row, - G_CALLBACK(dupe_menu_viewnew_cb), dw); + /*menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row, + G_CALLBACK(dupe_menu_viewnew_cb), dw);*/ menu_item_add_divider(menu); menu_item_add_sensitive(menu, _("Select all"), (dw->dupes != NULL), G_CALLBACK(dupe_menu_select_all_cb), dw); @@ -2202,15 +2202,15 @@ if (!on_row) gtk_widget_set_sensitive(item, FALSE); menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, on_row, G_CALLBACK(dupe_menu_info_cb), dw); - menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, on_row, + /*menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, on_row, G_CALLBACK(dupe_menu_collection_cb), dw); menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row, - G_CALLBACK(dupe_menu_print_cb), dw); + G_CALLBACK(dupe_menu_print_cb), dw);*/ menu_item_add_divider(menu); menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, on_row, G_CALLBACK(dupe_menu_copy_cb), dw); - menu_item_add_sensitive(menu, _("_Move..."), on_row, - G_CALLBACK(dupe_menu_move_cb), dw); + /*menu_item_add_sensitive(menu, _("_Move..."), on_row, + G_CALLBACK(dupe_menu_move_cb), dw);*/ menu_item_add_sensitive(menu, _("_Rename..."), on_row, G_CALLBACK(dupe_menu_rename_cb), dw); menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row, diff -Naur gqview-2.0.4.org/src/globals.c gqview-2.0.4/src/globals.c --- gqview-2.0.4.org/src/globals.c 2005-02-08 13:27:54.000000000 -0700 +++ gqview-2.0.4/src/globals.c 2007-03-02 14:48:52.000000000 -0700 @@ -16,20 +16,20 @@ GList *filename_filter = NULL; /* -- options -- */ -gint main_window_w = 500; -gint main_window_h = 400; +gint main_window_w = 1280; +gint main_window_h = 720; gint main_window_x = 0; gint main_window_y = 0; -gint main_window_maximized = FALSE; +gint main_window_maximized = TRUE; gint float_window_w = 260; gint float_window_h = 450; gint float_window_x = 0; gint float_window_y = 0; -gint float_window_divider = -1; +gint float_window_divider = 200; -gint window_hdivider_pos = -1; -gint window_vdivider_pos = 200; +gint window_hdivider_pos = 191; +gint window_vdivider_pos = 153; gint save_window_positions = FALSE; gint tools_float = FALSE; @@ -37,7 +37,7 @@ gint toolbar_hidden = FALSE; gint progressive_key_scrolling = FALSE; -gint startup_path_enable = FALSE; +gint startup_path_enable = TRUE; gchar *startup_path = NULL; gint confirm_delete = TRUE; gint enable_delete_key = TRUE; @@ -68,7 +68,7 @@ SortType file_sort_method = SORT_NAME; gint file_sort_ascending = TRUE; -gint slideshow_delay = 150; +gint slideshow_delay = 90; gint slideshow_random = FALSE; gint slideshow_repeat = FALSE; @@ -105,7 +105,7 @@ gchar *layout_order = NULL; gint layout_style = 0; -gint layout_view_icons = FALSE; +gint layout_view_icons = TRUE; gint layout_view_tree = FALSE; gint show_icon_names = TRUE; diff -Naur gqview-2.0.4.org/src/img-view.c gqview-2.0.4/src/img-view.c --- gqview-2.0.4.org/src/img-view.c 2006-11-29 20:59:36.000000000 -0700 +++ gqview-2.0.4/src/img-view.c 2007-03-04 16:16:21.000000000 -0700 @@ -1240,17 +1240,17 @@ item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw); menu_item_add_divider(item); - menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw); + /*menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);*/ submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw); menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(view_info_cb), vw); - menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw); + /*menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);*/ menu_item_add_divider(menu); menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw); - menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw); + /*menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);*/ menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw); menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw); diff -Naur gqview-2.0.4.org/src/layout.c gqview-2.0.4/src/layout.c --- gqview-2.0.4.org/src/layout.c 2006-11-30 15:55:00.000000000 -0700 +++ gqview-2.0.4/src/layout.c 2007-03-02 01:23:54.000000000 -0700 @@ -178,18 +178,18 @@ lw->toolbar = layout_button_bar(lw); gtk_box_pack_start(GTK_BOX(box), lw->toolbar, FALSE, FALSE, 0); - if (!lw->toolbar_hidden) gtk_widget_show(lw->toolbar); + //if (!lw->toolbar_hidden) gtk_widget_show(lw->toolbar); tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "path_list", -1, layout_path_entry_cb, lw); tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw); gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0); - gtk_widget_show(tabcomp); + //gtk_widget_show(tabcomp); g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed", G_CALLBACK(layout_path_entry_changed_cb), lw); - if (lw->tree_view) + /*if (lw->tree_view) { lw->vdt = vdtree_new(lw->path, TRUE); vdtree_set_layout(lw->vdt, lw); @@ -198,13 +198,13 @@ lw->dir_view = lw->vdt->widget; } else - { + { */ lw->vdl = vdlist_new(lw->path); vdlist_set_layout(lw->vdl, lw); vdlist_set_select_func(lw->vdl, layout_vdlist_select_cb, lw); lw->dir_view = lw->vdl->widget; - } + //} gtk_box_pack_start(GTK_BOX(box), lw->dir_view, TRUE, TRUE, 0); gtk_widget_show(lw->dir_view); @@ -1542,10 +1542,10 @@ { if (GTK_WIDGET_VISIBLE(lw->toolbar)) gtk_widget_hide(lw->toolbar); } - else + /*else { if (!GTK_WIDGET_VISIBLE(lw->toolbar)) gtk_widget_show(lw->toolbar); - } + }*/ } gint layout_toolbar_hidden(LayoutWindow *lw) diff -Naur gqview-2.0.4.org/src/layout_image.c gqview-2.0.4/src/layout_image.c --- gqview-2.0.4.org/src/layout_image.c 2006-10-23 03:39:12.000000000 -0600 +++ gqview-2.0.4/src/layout_image.c 2007-03-05 00:08:27.000000000 -0700 @@ -144,7 +144,7 @@ stop_signal = TRUE; switch (event->keyval) { - case '1': + /*case '1': n = 0; break; case '2': @@ -177,7 +177,16 @@ case 'C': case 'c': file_util_copy(layout_image_get_path(lw), NULL, NULL, widget); break; - case 'M': case 'm': + case 'L': case 'l': + layout_image_full_screen_stop(lw); + break;*/ + case 'I': case 'i': + layout_image_alter(lw, ALTER_MIRROR); + break; + case 'G': case 'g': + layout_image_alter(lw, ALTER_FLIP); + break; + /*case 'M': case 'm': file_util_move(layout_image_get_path(lw), NULL, NULL, widget); break; case 'R': case 'r': @@ -188,8 +197,8 @@ break; case 'P': case 'p': info_window_new(layout_image_get_path(lw), NULL); - break; - case 'Q': case 'q': + break;*/ + case 'X': case 'x': exit_gqview(); return FALSE; break; @@ -197,21 +206,21 @@ stop_signal = FALSE; break; } - if (n != -1) + /*if (n != -1) { if (!editor_window_flag_set(n)) { layout_image_full_screen_stop(lw); } start_editor_from_file(n, layout_image_get_path(lw)); - } + }*/ } else if (event->state & GDK_SHIFT_MASK) { stop_signal = TRUE; switch (event->keyval) { - case 'R': case 'r': + /*case 'R': case 'r': layout_image_alter(lw, ALTER_ROTATE_180); break; case 'M': case 'm': @@ -219,7 +228,7 @@ break; case 'F': case 'f': layout_image_alter(lw, ALTER_FLIP); - break; + break;*/ default: stop_signal = FALSE; break; @@ -236,10 +245,10 @@ case '-': case GDK_KP_Subtract: layout_image_zoom_adjust(lw, -get_zoom_increment()); break; - case 'X': case 'x': case GDK_KP_Multiply: + case GDK_KP_Multiply: layout_image_zoom_set(lw, 0.0); break; - case 'Z': case 'z': case GDK_KP_Divide: + case GDK_KP_Divide: case '1': layout_image_zoom_set(lw, 1.0); break; @@ -261,17 +270,19 @@ case '9': layout_image_zoom_set(lw, -2.0); break; - case 'W': case 'w': + /*case 'W': case 'w': layout_image_zoom_set_fill_geometry(lw, FALSE); break; case 'H': case 'h': layout_image_zoom_set_fill_geometry(lw, TRUE); - break; + break;*/ case GDK_Page_Up: case GDK_KP_Page_Up: + case GDK_Escape: case GDK_BackSpace: case 'B': case 'b': layout_image_prev(lw); break; + case GDK_F3: case GDK_Page_Down: case GDK_KP_Page_Down: case GDK_space: case 'N': case 'n': @@ -283,24 +294,24 @@ case GDK_End: case GDK_KP_End: layout_image_last(lw); break; + case GDK_F4: case ']': layout_image_alter(lw, ALTER_ROTATE_90); break; + case GDK_F1: case '[': layout_image_alter(lw, ALTER_ROTATE_90_CC); break; - case GDK_Delete: case GDK_KP_Delete: + /*case GDK_Delete: case GDK_KP_Delete: if (enable_delete_key) { file_util_delete(layout_image_get_path(lw), NULL, widget); } - break; - case GDK_Escape: - layout_image_full_screen_stop(lw); - break; + break;*/ case 'R': case 'r': layout_refresh(lw); break; + case GDK_F2: case 'S': case 's': layout_image_slideshow_toggle(lw); break; @@ -316,7 +327,7 @@ case GDK_F10: layout_image_full_screen_menu_popup(lw); break; - case 'I': case 'i': + case '0': layout_image_overlay_set(lw, !(lw->full_screen_overlay_on)); break; default: @@ -724,21 +735,21 @@ submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); menu_item_add_divider(submenu); - menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw); + /*menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw);*/ item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw); item = menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(li_pop_menu_info_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); - item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw); + /*item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw);*/ if (!path || fullscreen) gtk_widget_set_sensitive(item, FALSE); menu_item_add_divider(menu); item = menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(li_pop_menu_copy_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); - item = menu_item_add(menu, _("_Move..."), G_CALLBACK(li_pop_menu_move_cb), lw); + /*item = menu_item_add(menu, _("_Move..."), G_CALLBACK(li_pop_menu_move_cb), lw);*/ if (!path) gtk_widget_set_sensitive(item, FALSE); item = menu_item_add(menu, _("_Rename..."), G_CALLBACK(li_pop_menu_rename_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); @@ -1286,19 +1297,19 @@ switch (button) { case 1: - layout_image_next(lw); - break; - case 2: layout_image_prev(lw); break; case 3: + layout_image_next(lw); + break; + /*case 3: menu = layout_image_pop_menu(lw); if (imd == lw->image) { g_object_set_data(G_OBJECT(menu), "click_parent", imd->widget); } gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time); - break; + break;*/ default: break; } diff -Naur gqview-2.0.4.org/src/layout_util.c gqview-2.0.4/src/layout_util.c --- gqview-2.0.4.org/src/layout_util.c 2006-11-02 16:25:27.000000000 -0700 +++ gqview-2.0.4/src/layout_util.c 2007-03-04 17:18:59.000000000 -0700 @@ -132,10 +132,11 @@ stop_signal = TRUE; switch (event->keyval) { - case GDK_BackSpace: + case GDK_Escape: case 'B': case 'b': layout_image_prev(lw); break; + case GDK_F3: case GDK_space: case 'N': case 'n': layout_image_next(lw); @@ -219,6 +220,7 @@ case 'H': case 'h': layout_image_zoom_set_fill_geometry(lw, TRUE); break; + case GDK_Escape: case GDK_Page_Up: case GDK_KP_Page_Up: layout_image_prev(lw); break; @@ -237,12 +239,12 @@ file_util_delete(NULL, layout_selection_list(lw), widget); } break; - case GDK_Escape: - /* FIXME:interrupting thumbs no longer allowed */ + /*case GDK_Escape: + FIXME:interrupting thumbs no longer allowed #if 0 interrupt_thumbs(); #endif - break; + break;*/ case 'P': case 'p': if (!event->state & GDK_SHIFT_MASK) { @@ -734,8 +736,8 @@ } recent = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/FileMenu/OpenRecent"); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent), menu); - gtk_widget_set_sensitive(recent, (n != 0)); + /*gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent), menu); + gtk_widget_set_sensitive(recent, (n != 0));*/ } void layout_recent_update_all(void) @@ -776,20 +778,20 @@ { "ViewMenu", NULL, N_("_View") }, { "HelpMenu", NULL, N_("_Help") }, - { "NewWindow", GTK_STOCK_NEW, N_("New _window"), NULL, NULL, CB(layout_menu_new_window_cb) }, +/* { "NewWindow", GTK_STOCK_NEW, N_("New _window"), NULL, NULL, CB(layout_menu_new_window_cb) }, { "NewCollection", GTK_STOCK_INDEX,N_("_New collection"), "C", NULL, CB(layout_menu_new_cb) }, { "OpenCollection", GTK_STOCK_OPEN, N_("_Open collection..."),"O", NULL, CB(layout_menu_open_cb) }, { "OpenRecent", NULL, N_("Open _recent") }, { "Search", GTK_STOCK_FIND, N_("_Search..."), "F3", NULL, CB(layout_menu_search_cb) }, { "FindDupes", GTK_STOCK_FIND, N_("_Find duplicates..."),"D", NULL, CB(layout_menu_dupes_cb) }, - { "Print", GTK_STOCK_PRINT,N_("_Print..."), "P", NULL, CB(layout_menu_print_cb) }, + { "Print", GTK_STOCK_PRINT,N_("_Print..."), "P", NULL, CB(layout_menu_print_cb) },*/ { "NewFolder", NULL, N_("N_ew folder..."), "F", NULL, CB(layout_menu_dir_cb) }, { "Copy", NULL, N_("_Copy..."), "C", NULL, CB(layout_menu_copy_cb) }, - { "Move", NULL, N_("_Move..."), "M", NULL, CB(layout_menu_move_cb) }, +/* { "Move", NULL, N_("_Move..."), "M", NULL, CB(layout_menu_move_cb) },*/ { "Rename", NULL, N_("_Rename..."), "R", NULL, CB(layout_menu_rename_cb) }, { "Delete", GTK_STOCK_DELETE, N_("_Delete..."), "D", NULL, CB(layout_menu_delete_cb) }, { "CloseWindow", GTK_STOCK_CLOSE,N_("C_lose window"), "W", NULL, CB(layout_menu_close_cb) }, - { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "Q", NULL, CB(layout_menu_exit_cb) }, + { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "X", NULL, CB(layout_menu_exit_cb) }, { "Editor0", NULL, "editor0", "1", NULL, CB(layout_menu_edit_cb) }, { "Editor1", NULL, "editor1", "2", NULL, CB(layout_menu_edit_cb) }, @@ -801,46 +803,46 @@ { "Editor7", NULL, "editor7", "8", NULL, CB(layout_menu_edit_cb) }, { "Editor8", NULL, "editor8", "9", NULL, CB(layout_menu_edit_cb) }, { "Editor9", NULL, "editor9", "0", NULL, CB(layout_menu_edit_cb) }, - { "RotateCW", NULL, N_("_Rotate clockwise"), "bracketright", NULL, CB(layout_menu_alter_90_cb) }, - { "RotateCCW", NULL, N_("Rotate _counterclockwise"), "bracketleft", NULL, CB(layout_menu_alter_90cc_cb) }, + { "RotateCW", NULL, N_("_Rotate clockwise"), "F4", NULL, CB(layout_menu_alter_90_cb) }, + { "RotateCCW", NULL, N_("Rotate _counterclockwise"), "F1", NULL, CB(layout_menu_alter_90cc_cb) }, { "Rotate180", NULL, N_("Rotate 1_80"), "R", NULL, CB(layout_menu_alter_180_cb) }, - { "Mirror", NULL, N_("_Mirror"), "M", NULL, CB(layout_menu_alter_mirror_cb) }, - { "Flip", NULL, N_("_Flip"), "F", NULL, CB(layout_menu_alter_flip_cb) }, - { "Properties",GTK_STOCK_PROPERTIES, N_("_Properties"), "P", NULL, CB(layout_menu_info_cb) }, + { "Mirror", NULL, N_("_Mirror"), "I", NULL, CB(layout_menu_alter_mirror_cb) }, + { "Flip", NULL, N_("_Flip"), "G", NULL, CB(layout_menu_alter_flip_cb) }, + { "Properties",GTK_STOCK_PROPERTIES, N_("_Properties"), "N", NULL, CB(layout_menu_info_cb) }, { "SelectAll", NULL, N_("Select _all"), "A", NULL, CB(layout_menu_select_all_cb) }, { "SelectNone", NULL, N_("Select _none"), "A",NULL, CB(layout_menu_unselect_all_cb) }, { "Preferences",GTK_STOCK_PREFERENCES,N_("P_references..."), "O", NULL, CB(layout_menu_config_cb) }, { "Maintenance", NULL, N_("_Thumbnail maintenance..."),NULL, NULL, CB(layout_menu_remove_thumb_cb) }, - { "Wallpaper", NULL, N_("Set as _wallpaper"),NULL, NULL, CB(layout_menu_wallpaper_cb) }, +/* { "Wallpaper", NULL, N_("Set as _wallpaper"),NULL, NULL, CB(layout_menu_wallpaper_cb) },*/ - { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "equal", NULL, CB(layout_menu_zoom_in_cb) }, + { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "equal", NULL, CB(layout_menu_zoom_in_cb) }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "minus", NULL, CB(layout_menu_zoom_out_cb) }, { "Zoom100", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "Z", NULL, CB(layout_menu_zoom_1_1_cb) }, { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "X", NULL, CB(layout_menu_zoom_fit_cb) }, - { "FullScreen", NULL, N_("F_ull screen"), "F", NULL, CB(layout_menu_fullscreen_cb) }, + { "FullScreen", NULL, N_("F_ull screen"), "L", NULL, CB(layout_menu_fullscreen_cb) }, { "HideTools", NULL, N_("_Hide file list"), "H", NULL, CB(layout_menu_hide_cb) }, - { "SlideShow", NULL, N_("Toggle _slideshow"),"S", NULL, CB(layout_menu_slideshow_cb) }, + { "SlideShow", NULL, N_("Toggle _slideshow"),"F2", NULL, CB(layout_menu_slideshow_cb) }, { "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", NULL, CB(layout_menu_refresh_cb) }, - { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) }, +/* { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) }, { "HelpShortcuts", NULL, N_("_Keyboard shortcuts"),NULL, NULL, CB(layout_menu_help_keys_cb) }, - { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) }, + { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) },*/ { "About", NULL, N_("_About"), NULL, NULL, CB(layout_menu_about_cb) } }; static GtkToggleActionEntry menu_toggle_entries[] = { { "Thumbnails", NULL, N_("_Thumbnails"), "T", NULL, CB(layout_menu_thumb_cb) }, - { "FolderTree", NULL, N_("Tr_ee"), "T", NULL, CB(layout_menu_tree_cb) }, +/* { "FolderTree", NULL, N_("Tr_ee"), "T", NULL, CB(layout_menu_tree_cb) },*/ { "FloatTools", NULL, N_("_Float file list"), "L", NULL, CB(layout_menu_float_cb) }, - { "HideToolbar", NULL, N_("Hide tool_bar"), NULL, NULL, CB(layout_menu_toolbar_cb) }, +/* { "HideToolbar", NULL, N_("Hide tool_bar"), NULL, NULL, CB(layout_menu_toolbar_cb) },*/ { "SBarKeywords", NULL, N_("_Keywords"), "K", NULL, CB(layout_menu_bar_info_cb) }, { "SBarExif", NULL, N_("E_xif data"), "E", NULL, CB(layout_menu_bar_exif_cb) }, - { "SBarSort", NULL, N_("Sort _manager"), "S", NULL, CB(layout_menu_bar_sort_cb) } +/* { "SBarSort", NULL, N_("Sort _manager"), "S", NULL, CB(layout_menu_bar_sort_cb) }*/ }; static GtkRadioActionEntry menu_radio_entries[] = { - { "ViewList", NULL, N_("_List"), "L", NULL, 0 }, - { "ViewIcons", NULL, N_("I_cons"), "I", NULL, 1 } + { "ViewList", NULL, N_("_List"), NULL, NULL, 0 }, + { "ViewIcons", NULL, N_("I_cons"), NULL, NULL, 1 } }; #undef CB @@ -849,19 +851,9 @@ "" " " " " -" " -" " -" " -" " -" " -" " -" " -" " -" " " " " " " " -" " " " " " " " @@ -894,8 +886,6 @@ " " " " " " -" " -" " " " " " " " @@ -908,26 +898,19 @@ " " " " " " -" " " " " " " " " " -" " " " " " " " -" " " " " " " " " " " " " " -" " -" " -" " -" " " " " " " " @@ -1138,8 +1121,8 @@ if (!lw->action_group) return; - action = gtk_action_group_get_action(lw->action_group, "FolderTree"); - gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->tree_view); + /*action = gtk_action_group_get_action(lw->action_group, "FolderTree"); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->tree_view);*/ action = gtk_action_group_get_action(lw->action_group, "ViewIcons"); gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->icon_view); @@ -1153,11 +1136,11 @@ action = gtk_action_group_get_action(lw->action_group, "SBarExif"); gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->bar_exif_enabled); - action = gtk_action_group_get_action(lw->action_group, "SBarSort"); + /*action = gtk_action_group_get_action(lw->action_group, "SBarSort"); gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->bar_sort_enabled); action = gtk_action_group_get_action(lw->action_group, "HideToolbar"); - gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->toolbar_hidden); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->toolbar_hidden);*/ } void layout_util_sync_thumb(LayoutWindow *lw) diff -Naur gqview-2.0.4.org/src/preferences.c gqview-2.0.4/src/preferences.c --- gqview-2.0.4.org/src/preferences.c 2006-11-30 15:55:00.000000000 -0700 +++ gqview-2.0.4/src/preferences.c 2007-03-02 16:26:22.000000000 -0700 @@ -67,7 +67,7 @@ }; /* config memory values */ -static gint startup_path_enable_c; +//static gint startup_path_enable_c; static gint confirm_delete_c; static gint enable_delete_key_c; static gint safe_delete_enable_c; @@ -120,7 +120,7 @@ static gint dupe_custom_threshold_c; static GtkWidget *configwindow = NULL; -static GtkWidget *startup_path_entry; +//static GtkWidget *startup_path_entry; static GtkListStore *filter_store = NULL; static GtkWidget *editor_name_entry[GQVIEW_EDITOR_SLOTS]; static GtkWidget *editor_command_entry[GQVIEW_EDITOR_SLOTS]; @@ -141,10 +141,10 @@ *----------------------------------------------------------------------------- */ -static void startup_path_set_current(GtkWidget *widget, gpointer data) +/*static void startup_path_set_current(GtkWidget *widget, gpointer data) { gtk_entry_set_text(GTK_ENTRY(startup_path_entry), layout_get_path(NULL)); -} +}*/ static void zoom_mode_original_cb(GtkWidget *widget, gpointer data) { @@ -203,10 +203,10 @@ } layout_edit_update_all(); - g_free(startup_path); + /*g_free(startup_path); startup_path = NULL; buf = gtk_entry_get_text(GTK_ENTRY(startup_path_entry)); - if (buf && strlen(buf) > 0) startup_path = remove_trailing_slash(buf); + if (buf && strlen(buf) > 0) startup_path = remove_trailing_slash(buf);*/ g_free(safe_delete_path); safe_delete_path = NULL; @@ -217,7 +217,7 @@ if (file_sort_case_sensitive != file_sort_case_sensitive_c) refresh = TRUE; if (file_filter_disable != file_filter_disable_c) refresh = TRUE; - startup_path_enable = startup_path_enable_c; + //startup_path_enable = startup_path_enable_c; confirm_delete = confirm_delete_c; enable_delete_key = enable_delete_key_c; safe_delete_enable = safe_delete_enable_c; @@ -819,7 +819,7 @@ label = gtk_label_new(_("General")); gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox, label); - group = pref_group_new(vbox, FALSE, _("Startup"), GTK_ORIENTATION_VERTICAL); + /*group = pref_group_new(vbox, FALSE, _("Startup"), GTK_ORIENTATION_VERTICAL); button = pref_checkbox_new_int(group, _("Change to folder:"), startup_path_enable, &startup_path_enable_c); @@ -833,7 +833,7 @@ gtk_widget_show(tabcomp); button = pref_button_new(hbox, NULL, _("Use current"), FALSE, - G_CALLBACK(startup_path_set_current), NULL); + G_CALLBACK(startup_path_set_current), NULL);*/ group = pref_group_new(vbox, FALSE, _("Thumbnails"), GTK_ORIENTATION_VERTICAL); @@ -1102,7 +1102,7 @@ gtk_widget_show(editor_command_entry[i]); } - hbox = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); + /*hbox = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); button = pref_button_new(NULL, NULL, _("Defaults"), FALSE, G_CALLBACK(editor_default_cb), NULL); @@ -1112,7 +1112,7 @@ button = pref_button_new(NULL, GTK_STOCK_HELP, NULL, FALSE, G_CALLBACK(editor_help_cb), NULL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); + gtk_widget_show(button);*/ /* advanced entry tab */ @@ -1137,7 +1137,7 @@ fullscreen_screen_c = fullscreen_screen; fullscreen_above_c = fullscreen_above; - hbox = fullscreen_prefs_selection_new(_("Location:"), &fullscreen_screen_c, &fullscreen_above_c); + /*hbox = fullscreen_prefs_selection_new(_("Location:"), &fullscreen_screen_c, &fullscreen_above_c);*/ gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -1153,8 +1153,8 @@ pref_checkbox_new_int(group, _("Enable Delete key"), enable_delete_key, &enable_delete_key_c); - ct_button = pref_checkbox_new_int(group, _("Safe delete"), - safe_delete_enable, &safe_delete_enable_c); + /*ct_button = pref_checkbox_new_int(group, _("Safe delete"), + safe_delete_enable, &safe_delete_enable_c);*/ hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE); pref_checkbox_link_sensitivity(ct_button, hbox); @@ -1317,8 +1317,8 @@ gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - button = pref_button_new(NULL, NULL, _("Credits..."), FALSE, - G_CALLBACK(about_credits_cb), NULL); + /*button = pref_button_new(NULL, NULL, _("Credits..."), FALSE, + G_CALLBACK(about_credits_cb), NULL);*/ gtk_container_add(GTK_CONTAINER(hbox), button); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_widget_show(button); diff -Naur gqview-2.0.4.org/src/view_dir_list.c gqview-2.0.4/src/view_dir_list.c --- gqview-2.0.4.org/src/view_dir_list.c 2005-08-15 15:26:27.000000000 -0600 +++ gqview-2.0.4/src/view_dir_list.c 2007-03-05 01:26:59.000000000 -0700 @@ -208,7 +208,7 @@ menu_item_add_stock_sensitive(menu, _("_Copy"), GTK_STOCK_COPY, active, G_CALLBACK(vdlist_drop_menu_copy_cb), vdl); - menu_item_add_sensitive(menu, _("_Move"), active, G_CALLBACK(vdlist_drop_menu_move_cb), vdl); + /*menu_item_add_sensitive(menu, _("_Move"), active, G_CALLBACK(vdlist_drop_menu_move_cb), vdl);*/ menu_item_add_divider(menu); menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, NULL, vdl); @@ -227,7 +227,7 @@ ViewDirList *vdl = data; gchar *path; - if (!vdl->path || strcmp(vdl->path, "/") == 0) return; + if (!vdl->path || strcmp(vdl->path, "/captive/media/pics") == 0) return; path = remove_level_from_path(vdl->path); if (vdl->select_func) @@ -377,7 +377,7 @@ G_CALLBACK(vdlist_popup_destroy_cb), vdl); menu_item_add_stock_sensitive(menu, _("_Up to parent"), GTK_STOCK_GO_UP, - (vdl->path && strcmp(vdl->path, "/") != 0), + (vdl->path && strcmp(vdl->path, "/captive/media/pics") != 0), G_CALLBACK(vdlist_pop_menu_up_cb), vdl); menu_item_add_divider(menu); @@ -408,8 +408,8 @@ G_CALLBACK(vdlist_pop_menu_rename_cb), vdl); menu_item_add_divider(menu); - menu_item_add_check(menu, _("View as _tree"), FALSE, - G_CALLBACK(vdlist_pop_menu_tree_cb), vdl); + /*menu_item_add_check(menu, _("View as _tree"), FALSE, + G_CALLBACK(vdlist_pop_menu_tree_cb), vdl);*/ menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vdlist_pop_menu_refresh_cb), vdl); @@ -836,7 +836,7 @@ /* add . and .. */ - if (strcmp(vdl->path, "/") != 0) + if (strcmp(vdl->path, "/captive/media/pics") != 0) { fd = g_new0(FileData, 1); fd->path = remove_level_from_path(vdl->path); diff -Naur gqview-2.0.4.org/src/view_file_icon.c gqview-2.0.4/src/view_file_icon.c --- gqview-2.0.4.org/src/view_file_icon.c 2006-11-30 15:55:00.000000000 -0700 +++ gqview-2.0.4/src/view_file_icon.c 2007-03-02 02:15:00.000000000 -0700 @@ -284,14 +284,14 @@ item = menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(vficon_pop_menu_info_cb), vfi); gtk_widget_set_sensitive(item, active); - item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(vficon_pop_menu_view_cb), vfi); + /*item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(vficon_pop_menu_view_cb), vfi);*/ gtk_widget_set_sensitive(item, active); menu_item_add_divider(menu); item = menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(vficon_pop_menu_copy_cb), vfi); gtk_widget_set_sensitive(item, active); - item = menu_item_add(menu, _("_Move..."), G_CALLBACK(vficon_pop_menu_move_cb), vfi); - gtk_widget_set_sensitive(item, active); + /*item = menu_item_add(menu, _("_Move..."), G_CALLBACK(vficon_pop_menu_move_cb), vfi); + gtk_widget_set_sensitive(item, active);*/ item = menu_item_add(menu, _("_Rename..."), G_CALLBACK(vficon_pop_menu_rename_cb), vfi); gtk_widget_set_sensitive(item, active); item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(vficon_pop_menu_delete_cb), vfi); diff -Naur gqview-2.0.4.org/src/view_file_list.c gqview-2.0.4/src/view_file_list.c --- gqview-2.0.4.org/src/view_file_list.c 2006-11-30 15:55:00.000000000 -0700 +++ gqview-2.0.4/src/view_file_list.c 2007-03-02 02:16:55.000000000 -0700 @@ -395,14 +395,14 @@ menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, active, G_CALLBACK(vflist_pop_menu_info_cb), vfl); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active, - G_CALLBACK(vflist_pop_menu_view_cb), vfl); + /*menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active, + G_CALLBACK(vflist_pop_menu_view_cb), vfl);*/ menu_item_add_divider(menu); menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active, G_CALLBACK(vflist_pop_menu_copy_cb), vfl); - menu_item_add_sensitive(menu, _("_Move..."), active, - G_CALLBACK(vflist_pop_menu_move_cb), vfl); + /*menu_item_add_sensitive(menu, _("_Move..."), active, + G_CALLBACK(vflist_pop_menu_move_cb), vfl);*/ menu_item_add_sensitive(menu, _("_Rename..."), active, G_CALLBACK(vflist_pop_menu_rename_cb), vfl); menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,