Mercurial > geeqie.yaz
comparison src/layout_util.c @ 654:6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
named clicked_mark.
Marks numbering is now consistent with menus (starting at 1, 0 is an
invalid mark), assertions were modified accordingly.
| author | zas_ |
|---|---|
| date | Tue, 13 May 2008 19:32:25 +0000 |
| parents | e34c1002e553 |
| children | 6d6f042b8ca5 |
comparison
equal
deleted
inserted
replaced
| 653:e06947d07086 | 654:6dcfac4b356f |
|---|---|
| 736 static void layout_menu_set_mark_sel_cb(GtkAction *action, gpointer data) | 736 static void layout_menu_set_mark_sel_cb(GtkAction *action, gpointer data) |
| 737 { | 737 { |
| 738 LayoutWindow *lw = data; | 738 LayoutWindow *lw = data; |
| 739 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 739 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 740 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 740 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 741 mark--; | |
| 742 | 741 |
| 743 layout_selection_to_mark(lw, mark, STM_MODE_SET); | 742 layout_selection_to_mark(lw, mark, STM_MODE_SET); |
| 744 } | 743 } |
| 745 | 744 |
| 746 static void layout_menu_res_mark_sel_cb(GtkAction *action, gpointer data) | 745 static void layout_menu_res_mark_sel_cb(GtkAction *action, gpointer data) |
| 747 { | 746 { |
| 748 LayoutWindow *lw = data; | 747 LayoutWindow *lw = data; |
| 749 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 748 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 750 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 749 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 751 mark--; | |
| 752 | 750 |
| 753 layout_selection_to_mark(lw, mark, STM_MODE_RESET); | 751 layout_selection_to_mark(lw, mark, STM_MODE_RESET); |
| 754 } | 752 } |
| 755 | 753 |
| 756 static void layout_menu_toggle_mark_sel_cb(GtkAction *action, gpointer data) | 754 static void layout_menu_toggle_mark_sel_cb(GtkAction *action, gpointer data) |
| 757 { | 755 { |
| 758 LayoutWindow *lw = data; | 756 LayoutWindow *lw = data; |
| 759 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 757 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 760 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 758 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 761 mark--; | |
| 762 | 759 |
| 763 layout_selection_to_mark(lw, mark, STM_MODE_TOGGLE); | 760 layout_selection_to_mark(lw, mark, STM_MODE_TOGGLE); |
| 764 } | 761 } |
| 765 | 762 |
| 766 static void layout_menu_sel_mark_cb(GtkAction *action, gpointer data) | 763 static void layout_menu_sel_mark_cb(GtkAction *action, gpointer data) |
| 767 { | 764 { |
| 768 LayoutWindow *lw = data; | 765 LayoutWindow *lw = data; |
| 769 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 766 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 770 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 767 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 771 mark--; | |
| 772 | 768 |
| 773 layout_mark_to_selection(lw, mark, MTS_MODE_SET); | 769 layout_mark_to_selection(lw, mark, MTS_MODE_SET); |
| 774 } | 770 } |
| 775 | 771 |
| 776 static void layout_menu_sel_mark_or_cb(GtkAction *action, gpointer data) | 772 static void layout_menu_sel_mark_or_cb(GtkAction *action, gpointer data) |
| 777 { | 773 { |
| 778 LayoutWindow *lw = data; | 774 LayoutWindow *lw = data; |
| 779 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 775 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 780 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 776 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 781 mark--; | |
| 782 | 777 |
| 783 layout_mark_to_selection(lw, mark, MTS_MODE_OR); | 778 layout_mark_to_selection(lw, mark, MTS_MODE_OR); |
| 784 } | 779 } |
| 785 | 780 |
| 786 static void layout_menu_sel_mark_and_cb(GtkAction *action, gpointer data) | 781 static void layout_menu_sel_mark_and_cb(GtkAction *action, gpointer data) |
| 787 { | 782 { |
| 788 LayoutWindow *lw = data; | 783 LayoutWindow *lw = data; |
| 789 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 784 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 790 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 785 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 791 mark--; | |
| 792 | 786 |
| 793 layout_mark_to_selection(lw, mark, MTS_MODE_AND); | 787 layout_mark_to_selection(lw, mark, MTS_MODE_AND); |
| 794 } | 788 } |
| 795 | 789 |
| 796 static void layout_menu_sel_mark_minus_cb(GtkAction *action, gpointer data) | 790 static void layout_menu_sel_mark_minus_cb(GtkAction *action, gpointer data) |
| 797 { | 791 { |
| 798 LayoutWindow *lw = data; | 792 LayoutWindow *lw = data; |
| 799 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); | 793 gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num")); |
| 800 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); | 794 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
| 801 mark--; | |
| 802 | 795 |
| 803 layout_mark_to_selection(lw, mark, MTS_MODE_MINUS); | 796 layout_mark_to_selection(lw, mark, MTS_MODE_MINUS); |
| 804 } | 797 } |
| 805 | 798 |
| 806 | 799 |