diff options
author | Ole Loots <ole@monochrom.net> | 2014-09-17 00:47:26 +0200 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2014-09-17 00:47:26 +0200 |
commit | 2c0407d7d4151e759597faee614a9a0f75a57585 (patch) | |
tree | 17fd330755e847669acb87e860964582695357e7 | |
parent | a63715a319b6a9046202b7635179a144e5a8550c (diff) | |
download | netsurf-2c0407d7d4151e759597faee614a9a0f75a57585.tar.gz netsurf-2c0407d7d4151e759597faee614a9a0f75a57585.tar.bz2 |
Moved Save/Abort buttons into a toolbar
-rwxr-xr-x | atari/res/netsurf.rsc | bin | 38832 -> 38896 bytes | |||
-rwxr-xr-x | atari/res/netsurf.rsh | 8 | ||||
-rwxr-xr-x | atari/res/netsurf.rsm | 15 | ||||
-rw-r--r-- | atari/settings.c | 22 |
4 files changed, 23 insertions, 22 deletions
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc Binary files differindex b056c4d02..9c7d8dd74 100755 --- a/atari/res/netsurf.rsc +++ b/atari/res/netsurf.rsc diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh index 72d957d92..c856501ae 100755 --- a/atari/res/netsurf.rsh +++ b/atari/res/netsurf.rsh @@ -192,9 +192,7 @@ #define SETTINGS_BT_CLEAR_CACHE 105 /* BUTTON in tree SETTINGS */
#define SETTINGS_INC_CACHE_AGE 107 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_DEC_CACHE_AGE 108 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_CACHE_AGE 114 /* FTEXT in tree SETTINGS */
-#define SETTINGS_ABORT 112 /* BUTTON in tree SETTINGS */
-#define SETTINGS_SAVE 113 /* BUTTON in tree SETTINGS */
+#define SETTINGS_EDIT_CACHE_AGE 110 /* FTEXT in tree SETTINGS */
#define MAINMENU 18 /* menu */
#define MAINMENU_T_FILE 4 /* TITLE in tree MAINMENU */
@@ -237,3 +235,7 @@ #define MAINMENU_M_CHOICES 61 /* STRING in tree MAINMENU */
#define MAINMENU_M_VLOG 62 /* STRING in tree MAINMENU */
#define MAINMENU_M_HELP_CONTENT 64 /* STRING in tree MAINMENU */
+
+#define TOOLBAR_SETTINGS 19 /* form/dial */
+#define TOOLBAR_SETTINGS_ABORT 1 /* BOXTEXT in tree TOOLBAR_SETTINGS */
+#define TOOLBAR_SETTINGS_SAVE 2 /* BOXTEXT in tree TOOLBAR_SETTINGS */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm index 06e0a31a3..6c240d371 100755 --- a/atari/res/netsurf.rsm +++ b/atari/res/netsurf.rsm @@ -1,9 +1,9 @@ ResourceMaster v3.651
-#C 19@0@0@0@
+#C 20@0@0@0@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 11110100@0@7728@668@
+#M 11110100@0@7728@671@
#T 0@2@TOOLBAR@@20@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
@@ -112,7 +112,7 @@ ResourceMaster v3.651 #T 15@2@TOOLBAR_HISTORY@@1@@
#T 16@2@TOOLBAR_SSL_CERT@@2@@
#O 1@26@TRUSTED@@
-#T 17@2@SETTINGS@@115@@
+#T 17@2@SETTINGS@@112@@
#O 3@29@EDIT_DOWNLOAD_PATH@@
#O 4@29@EDIT_HOTLIST_FILE@@
#O 5@29@EDIT_CA_BUNDLE@@
@@ -177,9 +177,7 @@ ResourceMaster v3.651 #O 105@26@BT_CLEAR_CACHE@@
#O 107@27@INC_CACHE_AGE@@
#O 108@27@DEC_CACHE_AGE@@
-#O 114@29@EDIT_CACHE_AGE@@
-#O 112@26@ABORT@@
-#O 113@26@SAVE@@
+#O 110@29@EDIT_CACHE_AGE@@
#T 18@1@MAINMENU@@65@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -221,4 +219,7 @@ ResourceMaster v3.651 #O 61@28@M_CHOICES@@
#O 62@28@M_VLOG@@
#O 64@28@M_HELP_CONTENT@@
-#c 10993@
+#T 19@2@TOOLBAR_SETTINGS@@3@@
+#O 1@22@ABORT@@
+#O 2@22@SAVE@@
+#c 10775@
diff --git a/atari/settings.c b/atari/settings.c index d7864e54a..23a23e3f2 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -415,18 +415,6 @@ static void form_event(int index, int external) switch(index) { - case SETTINGS_SAVE: - OBJ_UNCHECK(index); - OBJ_REDRAW(index); - save_settings(); - break; - - case SETTINGS_ABORT: - OBJ_UNCHECK(index); - OBJ_REDRAW(index); - close_settings(); - break; - case SETTINGS_CB_USE_PROXY: if( checked ) { ENABLE_OBJ(SETTINGS_EDIT_PROXY_HOST); @@ -888,6 +876,13 @@ static short on_aes_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8]) case WM_TOOLBAR: switch(msg[4]) { + case TOOLBAR_SETTINGS_SAVE: + save_settings(); + break; + + case TOOLBAR_SETTINGS_ABORT: + close_settings(); + break; default: break; } @@ -916,11 +911,13 @@ void open_settings(void) if (h_aes_win == 0) { GRECT curr, area; + OBJECT * toolbartree; struct gemtk_wm_scroll_info_s *slid; uint32_t kind = CLOSER | NAME | MOVER | VSLIDE | HSLIDE | UPARROW | DNARROW | LFARROW | RTARROW | SIZER | FULLER; dlgtree = gemtk_obj_get_tree(SETTINGS); + toolbartree = gemtk_obj_get_tree(TOOLBAR_SETTINGS); area.g_x = area.g_y = 0; area.g_w = MIN(dlgtree->ob_width, desk_area.g_w); area.g_h = MIN(dlgtree->ob_height, desk_area.g_h); @@ -944,6 +941,7 @@ void open_settings(void) wind_open_grect(h_aes_win, &curr); + gemtk_wm_set_toolbar(settings_guiwin, toolbartree, 0, 0); gemtk_wm_set_form(settings_guiwin, dlgtree, 0); gemtk_wm_set_scroll_grid(settings_guiwin, 32, 32); gemtk_wm_get_grect(settings_guiwin, GEMTK_WM_AREA_CONTENT, &area); |