From 62f5ce138a90db72989209fc9bc2561961e8e05e Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Mon, 2 Jan 2006 00:37:10 +0000 Subject: [project @ 2006-01-02 00:37:10 by rjw] Move print dialog icon definitions. svn path=/import/netsurf/; revision=1935 --- riscos/gui.h | 18 ------------------ riscos/print.c | 22 +++++++++++++++++++++- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/riscos/gui.h b/riscos/gui.h index cdae349cd..53d0e6af5 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -383,24 +383,6 @@ bool ro_gui_theme_install_apply(wimp_w w); #define ICON_SEARCH_STATUS 5 #define ICON_SEARCH_MENU 8 -#define ICON_PRINT_TO_BOTTOM 1 -#define ICON_PRINT_SHEETS 2 -#define ICON_PRINT_SHEETS_VALUE 3 -#define ICON_PRINT_SHEETS_DOWN 4 -#define ICON_PRINT_SHEETS_UP 5 -#define ICON_PRINT_SHEETS_TEXT 6 -#define ICON_PRINT_FG_IMAGES 7 -#define ICON_PRINT_BG_IMAGES 8 -#define ICON_PRINT_IN_BACKGROUND 9 -#define ICON_PRINT_UPRIGHT 10 -#define ICON_PRINT_SIDEWAYS 11 -#define ICON_PRINT_COPIES 12 -#define ICON_PRINT_COPIES_DOWN 13 -#define ICON_PRINT_COPIES_UP 14 -#define ICON_PRINT_CANCEL 15 -#define ICON_PRINT_PRINT 16 -#define ICON_PRINT_TEXT_BLACK 20 - #define ICON_THEME_INSTALL_MESSAGE 0 #define ICON_THEME_INSTALL_INSTALL 1 #define ICON_THEME_INSTALL_CANCEL 2 diff --git a/riscos/print.c b/riscos/print.c index 2f04d0a5f..da2150d11 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -22,7 +22,6 @@ #include "netsurf/render/html.h" #include "netsurf/render/layout.h" #include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" #include "netsurf/riscos/menus.h" #include "netsurf/riscos/print.h" #include "netsurf/riscos/wimp.h" @@ -31,6 +30,26 @@ #include "netsurf/utils/messages.h" #include "netsurf/utils/utils.h" + +#define ICON_PRINT_TO_BOTTOM 1 +#define ICON_PRINT_SHEETS 2 +#define ICON_PRINT_SHEETS_VALUE 3 +#define ICON_PRINT_SHEETS_DOWN 4 +#define ICON_PRINT_SHEETS_UP 5 +#define ICON_PRINT_SHEETS_TEXT 6 +#define ICON_PRINT_FG_IMAGES 7 +#define ICON_PRINT_BG_IMAGES 8 +#define ICON_PRINT_IN_BACKGROUND 9 +#define ICON_PRINT_UPRIGHT 10 +#define ICON_PRINT_SIDEWAYS 11 +#define ICON_PRINT_COPIES 12 +#define ICON_PRINT_COPIES_DOWN 13 +#define ICON_PRINT_COPIES_UP 14 +#define ICON_PRINT_CANCEL 15 +#define ICON_PRINT_PRINT 16 +#define ICON_PRINT_TEXT_BLACK 20 + + /** \todo landscape format pages * \todo be somewhat more intelligent and try not to crop pages * half way up a line of text @@ -82,6 +101,7 @@ void ro_gui_print_init(void) { ro_gui_wimp_event_register_checkbox(dialog_print, ICON_PRINT_FG_IMAGES); ro_gui_wimp_event_register_checkbox(dialog_print, ICON_PRINT_BG_IMAGES); ro_gui_wimp_event_register_checkbox(dialog_print, ICON_PRINT_IN_BACKGROUND); + ro_gui_wimp_event_register_checkbox(dialog_print, ICON_PRINT_TEXT_BLACK); ro_gui_wimp_event_register_text_field(dialog_print, ICON_PRINT_SHEETS_TEXT); ro_gui_wimp_event_register_numeric_field(dialog_print, ICON_PRINT_COPIES, ICON_PRINT_COPIES_UP, ICON_PRINT_COPIES_DOWN, 1, 99, 1, 0); -- cgit v1.2.3