diff options
Diffstat (limited to 'atari/settings.c')
| -rw-r--r-- | atari/settings.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/atari/settings.c b/atari/settings.c index 8143cdcc6..0aa78cc52 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -31,11 +31,12 @@ #include "desktop/plot_style.h"
#include "atari/res/netsurf.rsh"
#include "atari/settings.h"
-#include "atari/global_evnt.h"
-#include "atari/misc.h"
+#include "atari/deskmenu.h"
+#include "atari/misc.h" #include "atari/plot/plot.h"
#include "atari/bitmap.h"
-#include "atari/findfile.h"
+#include "atari/findfile.h" +#include "atari/gemtk/gemtk.h"
extern char options[PATH_MAX];
@@ -232,7 +233,7 @@ saveform( WINDOW *win, int index, int unused, void *unused2) close_settings();
ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
form_alert(1, "[1][Some options require an netsurf restart!][OK]");
- main_menu_update();
+ deskmenu_update();
}
static void __CDECL clear_history( WINDOW *win, int index, int unused,
@@ -391,7 +392,7 @@ static char * toolbar_iconset_popup( int x, int y ) /* Get current set (for pre-selection): */
memset( avail, 0, MAX_SETS );
- current = nsoption_charp(atari_image_toolbar_folder);
+ current = "";
/* locate the toolbar folder: */
atari_find_resource( toolbar_folder, fullpath, fullpath );
@@ -845,14 +846,6 @@ static void display_settings( void ) snprintf( spare, 255, "%3d", nsoption_int(font_size) );
set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 );
- set_text(CHOICES_BT_TOOLBAR_ICONSET,
- nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN);
-
- tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
- snprintf( spare, 255, "%06x", tmp_option_atari_toolbar_bg);
- set_text(CHOICES_INPUT_TOOLBAR_BGCOLOR, spare,
- INPUT_TOOLBAR_COLOR_MAX_LEN );
-
/* Only first tab is refreshed: */
ObjcDraw( OC_FORM, dlgwin, CHOICES_TAB_BROWSER, 4 );
@@ -891,10 +884,6 @@ static void apply_settings( void ) /* "Style" tab: */
nsoption_set_int(font_min_size, tmp_option_font_min_size);
nsoption_set_int(font_size, tmp_option_font_size);
- nsoption_set_colour(atari_toolbar_bg, tmp_option_atari_toolbar_bg);
- nsoption_set_charp(atari_image_toolbar_folder,
- ObjcString( dlgtree, CHOICES_BT_TOOLBAR_ICONSET, NULL)
- );
/* "Rendering" tab: */
nsoption_set_charp(atari_font_driver,
|