summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Loots <ole@monochrom.net>2013-12-13 00:26:00 +0100
committerOle Loots <ole@monochrom.net>2013-12-13 00:26:00 +0100
commit35115ed6061a7e4d1c3b3c38ea385960dbc5c5b8 (patch)
treee14f15b366b8ce28bde0e0624af329aa4efb8b3b
parent27b7b20108e6507b13a3ce678ab036f01badd32d (diff)
downloadnetsurf-35115ed6061a7e4d1c3b3c38ea385960dbc5c5b8.tar.gz
netsurf-35115ed6061a7e4d1c3b3c38ea385960dbc5c5b8.tar.bz2
Removed toolbar icons: favourite, ssl-indicator
(because it looks disgusting)
-rw-r--r--atari/deskmenu.c22
-rwxr-xr-xatari/res/netsurf.rscbin41232 -> 38236 bytes
-rwxr-xr-xatari/res/netsurf.rsh49
-rwxr-xr-xatari/res/netsurf.rsm59
-rw-r--r--atari/toolbar.c52
5 files changed, 69 insertions, 113 deletions
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index b1dca1216..0687fccd3 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -116,8 +116,8 @@ struct s_menu_item_evnt menu_evnt_tbl[] =
{T_EDIT, MAINMENU_M_PASTE, menu_paste, {'V',0,K_CTRL}, NULL},
{T_EDIT, MAINMENU_M_FIND, menu_find, {0,NK_F4,0}, NULL},
{T_VIEW, MAINMENU_M_RELOAD, menu_reload, {0,NK_F5,0}, NULL},
- {0, 0, menu_inc_scale, {'+',0,K_CTRL}, NULL},
- {0, 0, menu_dec_scale, {'-',0,K_CTRL}, NULL},
+ {T_VIEW, MAINMENU_INC_SCALE, menu_inc_scale, {'+',0,K_CTRL}, NULL},
+ {T_VIEW, MAINMENU_DEC_SCALE, menu_dec_scale, {'-',0,K_CTRL}, NULL},
{T_VIEW, MAINMENU_M_TOOLBARS, menu_toolbars, {0,NK_F1,K_CTRL}, NULL},
{T_VIEW, MAINMENU_M_SAVEWIN, menu_savewin, {0,0,0}, NULL},
{T_VIEW, MAINMENU_M_DEBUG_RENDER, menu_debug_render, {0,0,0}, NULL},
@@ -378,18 +378,25 @@ static void __CDECL menu_reload(short item, short title, void *data)
static void __CDECL menu_inc_scale(short item, short title, void *data)
-{
+{
+ int width = 0, heigth = 0;
+
if(input_window == NULL)
return;
float now = plot_get_scale();
plot_set_scale(now+0.25);
LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
- gui_window_redraw_window(input_window);
+
+ browser_window_reload(input_window->browser->bw, false);
+ gui_window_get_dimensions(input_window, &width, &heigth, true);
+ browser_window_reformat(input_window->browser->bw, false, width, heigth);
}
static void __CDECL menu_dec_scale(short item, short title, void *data)
-{
+{
+ int width = 0, heigth = 0;
+
if(input_window == NULL)
return;
float now = plot_get_scale();
@@ -397,7 +404,10 @@ static void __CDECL menu_dec_scale(short item, short title, void *data)
plot_set_scale(now-0.25);
}
LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
- gui_window_redraw_window(input_window);
+
+ browser_window_reload(input_window->browser->bw, false);
+ gui_window_get_dimensions(input_window, &width, &heigth, true);
+ browser_window_reformat(input_window->browser->bw, false, width, heigth);
}
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 0076e3322..84e70d27c 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
Binary files differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 8dae1774e..5ae722e52 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -13,14 +13,12 @@
#define TOOLBAR_AREA_URL 11 /* USERDEF in tree TOOLBAR */
#define TOOLBAR_AREA_RIGHT 12 /* IBOX in tree TOOLBAR */
#define TOOLBAR_THROBBER_AREA 13 /* IBOX in tree TOOLBAR */
-#define TOOLBAR_BT_CRYPTO 14 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_FAVORITE 15 /* CICON in tree TOOLBAR */
-#define TOOLBAR_AREA_LEFT 16 /* IBOX in tree TOOLBAR */
-#define TOOLBAR_BT_BACK 17 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_HOME 18 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_FORWARD 19 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_STOP 20 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_RELOAD 21 /* CICON in tree TOOLBAR */
+#define TOOLBAR_AREA_LEFT 14 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_BT_BACK 15 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_HOME 16 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_FORWARD 17 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_STOP 18 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_RELOAD 19 /* CICON in tree TOOLBAR */
#define ICONIFY 1 /* form/dial */
#define ICONIFY_GLOBE 1 /* CICON in tree ICONIFY */
@@ -209,20 +207,21 @@
#define MAINMENU_M_FIND 34 /* STRING in tree MAINMENU */
#define MAINMENU_M_STOP 36 /* STRING in tree MAINMENU */
#define MAINMENU_M_RELOAD 37 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SCALE 39 /* STRING in tree MAINMENU */
-#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
-#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
-#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
-#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
-#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
-#define MAINMENU_M_COOKIES 58 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CHOICES 60 /* STRING in tree MAINMENU */
-#define MAINMENU_M_VLOG 61 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HELP_CONTENT 63 /* STRING in tree MAINMENU */
+#define MAINMENU_INC_SCALE 39 /* STRING in tree MAINMENU */
+#define MAINMENU_DEC_SCALE 40 /* STRING in tree MAINMENU */
+#define MAINMENU_M_TOOLBARS 42 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SAVEWIN 44 /* STRING in tree MAINMENU */
+#define MAINMENU_M_DEBUG_RENDER 45 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BG_IMAGES 46 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FG_IMAGES 47 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BACK 49 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FORWARD 50 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HOME 51 /* STRING in tree MAINMENU */
+#define MAINMENU_M_LHISTORY 53 /* STRING in tree MAINMENU */
+#define MAINMENU_M_GHISTORY 54 /* STRING in tree MAINMENU */
+#define MAINMENU_M_ADD_BOOKMARK 56 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BOOKMARKS 57 /* STRING in tree MAINMENU */
+#define MAINMENU_M_COOKIES 59 /* STRING in tree MAINMENU */
+#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 */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index c3a7a64da..5b7168633 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -1,10 +1,10 @@
-ResourceMaster v3.65
+ResourceMaster v3.651
#C 19@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 11100100@0@7728@659@
-#T 0@2@TOOLBAR@@22@@
+#M 11110100@0@7728@660@
+#T 0@2@TOOLBAR@@20@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
#O 3@26@BT_SEARCH_BACK@@
@@ -17,14 +17,12 @@ ResourceMaster v3.65
#O 11@24@AREA_URL@@
#O 12@25@AREA_RIGHT@@
#O 13@25@THROBBER_AREA@@
-#O 14@33@BT_CRYPTO@@
-#O 15@33@BT_FAVORITE@@
-#O 16@25@AREA_LEFT@@
-#O 17@33@BT_BACK@@
-#O 18@33@BT_HOME@@
-#O 19@33@BT_FORWARD@@
-#O 20@33@BT_STOP@@
-#O 21@33@BT_RELOAD@@
+#O 14@25@AREA_LEFT@@
+#O 15@33@BT_BACK@@
+#O 16@33@BT_HOME@@
+#O 17@33@BT_FORWARD@@
+#O 18@33@BT_STOP@@
+#O 19@33@BT_RELOAD@@
#T 1@2@ICONIFY@@3@@
#O 1@33@GLOBE@@
#T 2@2@FAVICON@@2@@
@@ -170,7 +168,7 @@ ResourceMaster v3.65
#O 90@29@EDIT_HISTORY_AGE@@
#O 91@27@INC_HISTORY_AGE@@
#O 94@26@BT_GUI_TOUT@@
-#T 18@1@MAINMENU@@64@@
+#T 18@1@MAINMENU@@65@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
#O 6@32@T_VIEW@@
@@ -193,21 +191,22 @@ ResourceMaster v3.65
#O 34@28@M_FIND@@
#O 36@28@M_STOP@@
#O 37@28@M_RELOAD@@
-#O 39@28@M_SCALE@@
-#O 41@28@M_TOOLBARS@@
-#O 43@28@M_SAVEWIN@@
-#O 44@28@M_DEBUG_RENDER@@
-#O 45@28@M_BG_IMAGES@@
-#O 46@28@M_FG_IMAGES@@
-#O 48@28@M_BACK@@
-#O 49@28@M_FORWARD@@
-#O 50@28@M_HOME@@
-#O 52@28@M_LHISTORY@@
-#O 53@28@M_GHISTORY@@
-#O 55@28@M_ADD_BOOKMARK@@
-#O 56@28@M_BOOKMARKS@@
-#O 58@28@M_COOKIES@@
-#O 60@28@M_CHOICES@@
-#O 61@28@M_VLOG@@
-#O 63@28@M_HELP_CONTENT@@
-#c 20589@
+#O 39@28@INC_SCALE@@
+#O 40@28@DEC_SCALE@@
+#O 42@28@M_TOOLBARS@@
+#O 44@28@M_SAVEWIN@@
+#O 45@28@M_DEBUG_RENDER@@
+#O 46@28@M_BG_IMAGES@@
+#O 47@28@M_FG_IMAGES@@
+#O 49@28@M_BACK@@
+#O 50@28@M_FORWARD@@
+#O 51@28@M_HOME@@
+#O 53@28@M_LHISTORY@@
+#O 54@28@M_GHISTORY@@
+#O 56@28@M_ADD_BOOKMARK@@
+#O 57@28@M_BOOKMARKS@@
+#O 59@28@M_COOKIES@@
+#O 61@28@M_CHOICES@@
+#O 62@28@M_VLOG@@
+#O 64@28@M_HELP_CONTENT@@
+#c 4908@
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 9a3412ebd..8f4b201d4 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -142,18 +142,6 @@ static struct s_tb_button tb_buttons[] =
{0,0},
0, 0, 0, {0,0,0,0}
},
- {
- TOOLBAR_BT_FAVORITE,
- toolbar_favorite_click,
- {0,0},
- 0, 0, 0, {0,0,0,0}
- },
- {
- TOOLBAR_BT_CRYPTO,
- toolbar_crypto_click,
- {0,0},
- 0, 0, 0, {0,0,0,0}
- },
{ 0, 0, {0,0}, 0, -1, 0, {0,0,0,0}}
};
@@ -546,46 +534,6 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
}
}
- if (button == TOOLBAR_BT_FAVORITE || button <= 0) {
- bt = find_button(tb, TOOLBAR_BT_FAVORITE);
- ns_url = toolbar_get_nsurl(tb);
- if (ns_url != NULL) {
- if (hotlist_has_url(ns_url)) {
- bt->state = button_on;
- tb->form[TOOLBAR_BT_FAVORITE].ob_state |= OS_SELECTED;
- }
- else {
- bt->state = button_on;
- tb->form[TOOLBAR_BT_FAVORITE].ob_state &= ~OS_SELECTED;
- }
- }
- nsurl_unref(ns_url);
- }
-
- if (button == TOOLBAR_BT_CRYPTO|| button <= 0) {
- bt = find_button(tb, TOOLBAR_BT_CRYPTO);
- ns_url = toolbar_get_nsurl(tb);
- if (ns_url != NULL &&
- nsurl_get(ns_url, NSURL_SCHEME, &c_url, &c_url_len) == NSERROR_OK) {
- if (strncasecmp("https", c_url, 5) == 0) {
- bt->state = button_on;
- // TODO: this check actually doesn't work - why?
- if (urldb_get_cert_permissions(ns_url) == true) {
- tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
- }
- else {
- tb->form[TOOLBAR_BT_CRYPTO].ob_state |= OS_SELECTED;
- }
- }
- else {
- bt->state = button_off;
- tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
- }
- nsurl_unref(ns_url);
- free(c_url);
- }
- }
-
if (tb->attached) {
if (button > 0) {
toolbar_get_grect(tb, button, &area);