comparison src/collect.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 d907d608745f
children d063f97503b7
comparison
equal deleted inserted replaced
84:ba3c39002a24 85:9d5c75b5ec28
778 gint edit_val = -1; 778 gint edit_val = -1;
779 GList *list; 779 GList *list;
780 780
781 if (event->state & GDK_CONTROL_MASK) 781 if (event->state & GDK_CONTROL_MASK)
782 { 782 {
783 stop_signal = TRUE;
783 switch (event->keyval) 784 switch (event->keyval)
784 { 785 {
785 case '1': 786 case '1':
786 edit_val = 0; 787 edit_val = 0;
787 break; 788 break;
819 } 820 }
820 else 821 else
821 { 822 {
822 collection_table_select_all(cw->table); 823 collection_table_select_all(cw->table);
823 } 824 }
824 stop_signal = TRUE;
825 break; 825 break;
826 case 'L': case 'l': 826 case 'L': case 'l':
827 list = layout_list(NULL); 827 list = layout_list(NULL);
828 if (list) 828 if (list)
829 { 829 {
830 collection_table_add_path_list(cw->table, list); 830 collection_table_add_path_list(cw->table, list);
831 path_list_free(list); 831 path_list_free(list);
832 } 832 }
833 stop_signal = TRUE;
834 break; 833 break;
835 case 'C': case 'c': 834 case 'C': case 'c':
836 file_util_copy(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window); 835 file_util_copy(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window);
837 stop_signal = TRUE;
838 break; 836 break;
839 case 'M': case 'm': 837 case 'M': case 'm':
840 file_util_move(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window); 838 file_util_move(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window);
841 stop_signal = TRUE;
842 break; 839 break;
843 case 'R': case 'r': 840 case 'R': case 'r':
844 file_util_rename(NULL, collection_table_selection_get_list(cw->table), cw->window); 841 file_util_rename(NULL, collection_table_selection_get_list(cw->table), cw->window);
845 stop_signal = TRUE;
846 break; 842 break;
847 case 'D': case 'd': 843 case 'D': case 'd':
848 file_util_delete(NULL, collection_table_selection_get_list(cw->table), cw->window); 844 file_util_delete(NULL, collection_table_selection_get_list(cw->table), cw->window);
849 stop_signal = TRUE;
850 break; 845 break;
851 case 'P': case 'p': 846 case 'P': case 'p':
852 info_window_new(NULL, collection_table_selection_get_list(cw->table)); 847 info_window_new(NULL, collection_table_selection_get_list(cw->table));
853 stop_signal = TRUE;
854 break; 848 break;
855 case 'S': case 's': 849 case 'S': case 's':
856 collection_dialog_save_as(NULL, cw->cd); 850 collection_dialog_save_as(NULL, cw->cd);
857 stop_signal = TRUE;
858 break; 851 break;
859 case 'W': case 'w': 852 case 'W': case 'w':
860 collection_window_close(cw); 853 collection_window_close(cw);
861 stop_signal = TRUE;
862 break; 854 break;
863 default: 855 default:
856 stop_signal = FALSE;
864 break; 857 break;
865 } 858 }
866 } 859 }
867 else 860 else
868 { 861 {
862 stop_signal = TRUE;
869 switch (event->keyval) 863 switch (event->keyval)
870 { 864 {
871 case GDK_Return: case GDK_KP_Enter: 865 case GDK_Return: case GDK_KP_Enter:
872 layout_image_set_collection(NULL, cw->cd, 866 layout_image_set_collection(NULL, cw->cd,
873 collection_table_get_focus_info(cw->table)); 867 collection_table_get_focus_info(cw->table));
874 stop_signal = TRUE;
875 break; 868 break;
876 case 'V': case 'v': 869 case 'V': case 'v':
877 view_window_new_from_collection(cw->cd, 870 view_window_new_from_collection(cw->cd,
878 collection_table_get_focus_info(cw->table)); 871 collection_table_get_focus_info(cw->table));
879 stop_signal = TRUE;
880 break; 872 break;
881 case 'S': case 's': 873 case 'S': case 's':
882 if (!cw->cd->path) 874 if (!cw->cd->path)
883 { 875 {
884 collection_dialog_save_as(NULL, cw->cd); 876 collection_dialog_save_as(NULL, cw->cd);
885 } 877 }
886 else if (!collection_save(cw->cd, cw->cd->path)) 878 else if (!collection_save(cw->cd, cw->cd->path))
887 { 879 {
888 printf("failed saving to collection path: %s\n", cw->cd->path); 880 printf("failed saving to collection path: %s\n", cw->cd->path);
889 } 881 }
890 stop_signal = TRUE;
891 break; 882 break;
892 case 'A': case 'a': 883 case 'A': case 'a':
893 if (!(event->state & GDK_CONTROL_MASK)) 884 collection_dialog_append(NULL, cw->cd);
894 {
895 collection_dialog_append(NULL, cw->cd);
896 stop_signal = TRUE;
897 }
898 break; 885 break;
899 case 'N': case 'n': 886 case 'N': case 'n':
900 collection_set_sort_method(cw->cd, SORT_NAME); 887 collection_set_sort_method(cw->cd, SORT_NAME);
901 stop_signal = TRUE;
902 break; 888 break;
903 #ifdef HAVE_STRVERSCMP 889 #ifdef HAVE_STRVERSCMP
904 case 'I': case 'i': 890 case 'I': case 'i':
905 collection_set_sort_method(cw->cd, SORT_NUMBER); 891 collection_set_sort_method(cw->cd, SORT_NUMBER);
906 stop_signal = TRUE;
907 break; 892 break;
908 #endif 893 #endif
909 case 'D': case 'd': 894 case 'D': case 'd':
910 collection_set_sort_method(cw->cd, SORT_TIME); 895 collection_set_sort_method(cw->cd, SORT_TIME);
911 stop_signal = TRUE;
912 break; 896 break;
913 case 'B': case 'b': 897 case 'B': case 'b':
914 collection_set_sort_method(cw->cd, SORT_SIZE); 898 collection_set_sort_method(cw->cd, SORT_SIZE);
915 stop_signal = TRUE;
916 break; 899 break;
917 case 'P': case 'p': 900 case 'P': case 'p':
918 collection_set_sort_method(cw->cd, SORT_PATH); 901 collection_set_sort_method(cw->cd, SORT_PATH);
919 stop_signal = TRUE;
920 break; 902 break;
921 case GDK_Delete: case GDK_KP_Delete: 903 case GDK_Delete: case GDK_KP_Delete:
922 list = g_list_copy(cw->table->selection); 904 list = g_list_copy(cw->table->selection);
923 if (list) 905 if (list)
924 { 906 {
927 } 909 }
928 else 910 else
929 { 911 {
930 collection_remove_by_info(cw->cd, collection_table_get_focus_info(cw->table)); 912 collection_remove_by_info(cw->cd, collection_table_get_focus_info(cw->table));
931 } 913 }
932 stop_signal = TRUE;
933 break; 914 break;
934 default: 915 default:
916 stop_signal = FALSE;
935 break; 917 break;
936 } 918 }
937 } 919 }
938 920
939 if (edit_val != -1) 921 if (edit_val != -1)
940 { 922 {
941 list = collection_table_selection_get_list(cw->table); 923 list = collection_table_selection_get_list(cw->table);
942 start_editor_from_path_list(edit_val, list); 924 start_editor_from_path_list(edit_val, list);
943 path_list_free(list); 925 path_list_free(list);
944 stop_signal = TRUE;
945 } 926 }
946 927
947 return stop_signal; 928 return stop_signal;
948 } 929 }
949 930