Release 0.3.3 (minor enhancements)

[xournal.git] / src / xo-misc.h

diff --git a/src/xo-misc.h b/src/xo-misc.h
index 8662cd3a5bb147b5ca39d0c1c327f77e0e10c6ae..a82d3716dbeabdd86bac0b03e3c89ad0a53ec0cf 100644 (file)
--- a/src/xo-misc.h
+++ b/src/xo-misc.h
@@ -41,13 +41,17 @@ void update_color_menu(void);
 void update_pen_props_menu(void);
 void update_eraser_props_menu(void);
 void update_highlighter_props_menu(void);
+void update_mappings_menu_linkings(void);
+void update_mappings_menu(void);
 void update_page_stuff(void);
 void update_toolbar_and_menu(void);
 void update_file_name(char *filename);
 void update_undo_redo_enabled(void);
 void update_copy_paste_enabled(void);
+void update_vbox_order(int *order);
 
-void do_switch_page(int pg, gboolean rescroll);
+void update_mapping_linkings(int toolno);
+void do_switch_page(int pg, gboolean rescroll, gboolean refresh_all);
 void set_cur_color(int color);
 void process_color_activate(GtkMenuItem *menuitem, int color);
 void process_thickness_activate(GtkMenuItem *menuitem, int tool, int val);
@@ -60,15 +64,22 @@ gboolean page_ops_forbidden(void);
 // selection / clipboard stuff
 
 void reset_selection(void);
-void move_journal_items_by(GList *itemlist, double dx, double dy);
+void move_journal_items_by(GList *itemlist, double dx, double dy,
+                           struct Layer *l1, struct Layer *l2, GList *depths);
+
+// switch between mappings
+
+void switch_mapping(int m);
+void process_mapping_activate(GtkMenuItem *menuitem, int m, int tool);
+
 
 // defines for paper rulings
 
 #define RULING_MARGIN_COLOR 0xff0080ff
 #define RULING_COLOR 0x40a0ffff
 #define RULING_THICKNESS 0.5
-#define RULING_LEFTMARGIN 72
-#define RULING_TOPMARGIN 80
-#define RULING_SPACING 24
+#define RULING_LEFTMARGIN 72.0
+#define RULING_TOPMARGIN 80.0
+#define RULING_SPACING 24.0
 #define RULING_BOTTOMMARGIN RULING_SPACING
 #define RULING_GRAPHSPACING 14.17