comparison src/dupe.c @ 85:9d5c75b5ec28

Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net> * collect-table.c, collect.c, dupe.c, pan-view.c, search.c, view_file_icon.c: Keypress signal handler code clean-up round 2: the remaining files. Make control and shift logic easier to follow.
author gqview
date Fri, 20 Oct 2006 13:25:03 +0000
parents 04ff0df3ad2f
children 71e1ebee420e
comparison
equal deleted inserted replaced
84:ba3c39002a24 85:9d5c75b5ec28
2829 if (event->state & GDK_CONTROL_MASK) 2829 if (event->state & GDK_CONTROL_MASK)
2830 { 2830 {
2831 gint edit_val = -1; 2831 gint edit_val = -1;
2832 2832
2833 if (!on_second) 2833 if (!on_second)
2834 switch (event->keyval) 2834 {
2835 { 2835 stop_signal = TRUE;
2836 case '1': 2836 switch (event->keyval)
2837 edit_val = 0; 2837 {
2838 break; 2838 case '1':
2839 case '2': 2839 edit_val = 0;
2840 edit_val = 1; 2840 break;
2841 break; 2841 case '2':
2842 case '3': 2842 edit_val = 1;
2843 edit_val = 2; 2843 break;
2844 break; 2844 case '3':
2845 case '4': 2845 edit_val = 2;
2846 edit_val = 3; 2846 break;
2847 break; 2847 case '4':
2848 case '5': 2848 edit_val = 3;
2849 edit_val = 4; 2849 break;
2850 break; 2850 case '5':
2851 case '6': 2851 edit_val = 4;
2852 edit_val = 5; 2852 break;
2853 break; 2853 case '6':
2854 case '7': 2854 edit_val = 5;
2855 edit_val = 6; 2855 break;
2856 break; 2856 case '7':
2857 case '8': 2857 edit_val = 6;
2858 edit_val = 7; 2858 break;
2859 break; 2859 case '8':
2860 case '9': 2860 edit_val = 7;
2861 edit_val = 8; 2861 break;
2862 break; 2862 case '9':
2863 case '0': 2863 edit_val = 8;
2864 edit_val = 9; 2864 break;
2865 break; 2865 case '0':
2866 case 'C': case 'c': 2866 edit_val = 9;
2867 stop_signal = TRUE; 2867 break;
2868 file_util_copy(NULL, dupe_listview_get_selection(dw, listview), NULL, dw->window); 2868 case 'C': case 'c':
2869 break; 2869 file_util_copy(NULL, dupe_listview_get_selection(dw, listview),
2870 case 'M': case 'm': 2870 NULL, dw->window);
2871 file_util_move(NULL, dupe_listview_get_selection(dw, listview), NULL, dw->window); 2871 break;
2872 stop_signal = TRUE; 2872 case 'M': case 'm':
2873 break; 2873 file_util_move(NULL, dupe_listview_get_selection(dw, listview),
2874 case 'R': case 'r': 2874 NULL, dw->window);
2875 file_util_rename(NULL, dupe_listview_get_selection(dw, listview), dw->window); 2875 break;
2876 stop_signal = TRUE; 2876 case 'R': case 'r':
2877 break; 2877 file_util_rename(NULL, dupe_listview_get_selection(dw, listview), dw->window);
2878 case 'D': case 'd': 2878 break;
2879 file_util_delete(NULL, dupe_listview_get_selection(dw, listview), dw->window); 2879 case 'D': case 'd':
2880 stop_signal = TRUE; 2880 file_util_delete(NULL, dupe_listview_get_selection(dw, listview), dw->window);
2881 break; 2881 break;
2882 case 'P': case 'p': 2882 case 'P': case 'p':
2883 info_window_new(NULL, dupe_listview_get_selection(dw, listview)); 2883 info_window_new(NULL, dupe_listview_get_selection(dw, listview));
2884 stop_signal = TRUE; 2884 break;
2885 break; 2885 default:
2886 default: 2886 stop_signal = FALSE;
2887 break; 2887 break;
2888 } 2888 }
2889 2889 }
2890 switch (event->keyval) 2890
2891 { 2891 if (!stop_signal)
2892 case 'A': case 'a': 2892 {
2893 if (event->state & GDK_SHIFT_MASK) 2893 stop_signal = TRUE;
2894 { 2894 switch (event->keyval)
2895 gtk_tree_selection_unselect_all(selection); 2895 {
2896 } 2896 case 'A': case 'a':
2897 else 2897 if (event->state & GDK_SHIFT_MASK)
2898 { 2898 {
2899 gtk_tree_selection_select_all(selection); 2899 gtk_tree_selection_unselect_all(selection);
2900 } 2900 }
2901 stop_signal = TRUE; 2901 else
2902 break; 2902 {
2903 case GDK_Delete: case GDK_KP_Delete: 2903 gtk_tree_selection_select_all(selection);
2904 if (on_second) 2904 }
2905 { 2905 break;
2906 dupe_second_clear(dw); 2906 case GDK_Delete: case GDK_KP_Delete:
2907 dupe_window_recompare(dw); 2907 if (on_second)
2908 } 2908 {
2909 else 2909 dupe_second_clear(dw);
2910 { 2910 dupe_window_recompare(dw);
2911 dupe_window_clear(dw); 2911 }
2912 } 2912 else
2913 stop_signal = TRUE; 2913 {
2914 break; 2914 dupe_window_clear(dw);
2915 case 'L': case 'l': 2915 }
2916 dupe_window_append_file_list(dw, FALSE); 2916 break;
2917 stop_signal = TRUE; 2917 case 'L': case 'l':
2918 break; 2918 dupe_window_append_file_list(dw, FALSE);
2919 case 'T': case 't': 2919 break;
2920 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_thumbs), 2920 case 'T': case 't':
2921 !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dw->button_thumbs))); 2921 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_thumbs),
2922 stop_signal = TRUE; 2922 !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dw->button_thumbs)));
2923 break; 2923 break;
2924 case 'W': case 'w': 2924 case 'W': case 'w':
2925 dupe_window_close(dw); 2925 dupe_window_close(dw);
2926 stop_signal = TRUE; 2926 break;
2927 break; 2927 default:
2928 default: 2928 stop_signal = FALSE;
2929 break; 2929 break;
2930 }
2930 } 2931 }
2931 2932
2932 if (edit_val >= 0) 2933 if (edit_val >= 0)
2933 { 2934 {
2934 dupe_window_edit_selected(dw, edit_val); 2935 dupe_window_edit_selected(dw, edit_val);
2935 stop_signal = TRUE;
2936 } 2936 }
2937 } 2937 }
2938 else 2938 else
2939 { 2939 {
2940 stop_signal = TRUE;
2940 switch (event->keyval) 2941 switch (event->keyval)
2941 { 2942 {
2942 case GDK_Return: case GDK_KP_Enter: 2943 case GDK_Return: case GDK_KP_Enter:
2943 dupe_menu_view(dw, di, listview, FALSE); 2944 dupe_menu_view(dw, di, listview, FALSE);
2944 stop_signal = TRUE;
2945 break; 2945 break;
2946 case 'V': case 'v': 2946 case 'V': case 'v':
2947 stop_signal = TRUE;
2948 dupe_menu_view(dw, di, listview, TRUE); 2947 dupe_menu_view(dw, di, listview, TRUE);
2949 break; 2948 break;
2950 case GDK_Delete: case GDK_KP_Delete: 2949 case GDK_Delete: case GDK_KP_Delete:
2951 dupe_window_remove_selection(dw, listview); 2950 dupe_window_remove_selection(dw, listview);
2952 stop_signal = TRUE;
2953 break; 2951 break;
2954 case 'C': case 'c': 2952 case 'C': case 'c':
2955 if (!on_second) 2953 if (!on_second)
2956 { 2954 {
2957 dupe_window_collection_from_selection(dw); 2955 dupe_window_collection_from_selection(dw);
2958 stop_signal = TRUE;
2959 } 2956 }
2960 break; 2957 break;
2961 case '1': 2958 case '1':
2962 dupe_listview_select_dupes(dw, TRUE); 2959 dupe_listview_select_dupes(dw, TRUE);
2963 stop_signal = TRUE;
2964 break; 2960 break;
2965 case '2': 2961 case '2':
2966 dupe_listview_select_dupes(dw, FALSE); 2962 dupe_listview_select_dupes(dw, FALSE);
2967 stop_signal = TRUE;
2968 break; 2963 break;
2969 case GDK_Menu: 2964 case GDK_Menu:
2970 case GDK_F10: 2965 case GDK_F10:
2971 if (!on_second) 2966 if (!on_second)
2972 { 2967 {
2984 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, 2979 gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
2985 dupe_popup_menu_pos_cb, listview, 0, GDK_CURRENT_TIME); 2980 dupe_popup_menu_pos_cb, listview, 0, GDK_CURRENT_TIME);
2986 } 2981 }
2987 break; 2982 break;
2988 default: 2983 default:
2984 stop_signal = FALSE;
2989 break; 2985 break;
2990 } 2986 }
2991 } 2987 }
2992 2988
2993 return stop_signal; 2989 return stop_signal;