[project @ 2004-07-04 14:59:29 by rjw]

Futher hotlst development. Minor GUI tweaks.

svn path=/import/netsurf/; revision=1044

!NetSurf/Resources/en/Messages

@@ -108,6 +108,8 @@ WimpError:An unexpected Window Manager error occurred:
 Template:A window template is missing from the Templates file. Please reinstall NetSurf.
 MiscError:An unexpected error occurred:
 FileError:File does not exist:
+HotlistSaveError:The hotlist was unable to be correctly saved.
+HotlistLoadError:The hotlist was unable to be correctly loaded.
 
 # Some general purpose words and phrases
 Bytes: B

!NetSurf/Resources/fr/Messages

@@ -108,6 +108,8 @@ WimpError:Une erreur inattendue du Window Manager s'est produite:
 Template:Un modèle de fenêtre est absent du fichier Templates. Réinstallez NetSurf SVP.
 MiscError:Une erreur inattendue s'est produite:
 FileError:Le fichier n'existe pas:
+HotlistSaveError:The hotlist was unable to be correctly saved.
+HotlistLoadError:The hotlist was unable to be correctly loaded.
 
 # Some general purpose words and phrases
 Bytes: O

riscos/gui.c

@@ -771,6 +771,17 @@ void ro_gui_drag_end(wimp_dragged *drag)
 void ro_gui_keypress(wimp_key *key)
 {
 	bool handled = false;
+	
+	/*	Check for hotlist windows
+	*/
+	if (key->w == hotlist_window) {
+		handled = ro_gui_hotlist_keypress(key->c);
+		if (!handled) wimp_process_key(key->c);
+		return;
+	}
+	
+	/*	Handle the rest
+	*/
 	gui_window *g = ro_gui_window_lookup(key->w);
 
 	if (!g) {

riscos/gui.h

@@ -183,6 +183,7 @@ void ro_gui_hotlist_redraw(wimp_draw *redraw);
 void ro_gui_hotlist_click(wimp_pointer *pointer);
 void ro_gui_hotlist_selection_drag_end(wimp_dragged *drag);
 void ro_gui_hotlist_move_drag_end(wimp_dragged *drag);
+bool ro_gui_hotlist_keypress(int key);
 
 /* in save.c */
 void ro_gui_save_click(wimp_pointer *pointer);

riscos/menus.c

@@ -16,6 +16,7 @@
 #include <string.h>
 #include "oslib/os.h"
 #include "oslib/wimp.h"
+#include "oslib/wimpspriteop.h"
 #include "netsurf/desktop/gui.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/help.h"
@@ -857,6 +858,14 @@ void ro_gui_menu_prepare_save(struct content *c)
 	if ((nice = url_nice(c->url)))
 		name = nice;
 
+	/*	Ensure the correct icon exists
+	*/
+	if (xwimpspriteop_read_sprite_info(icon, 0, 0, 0, 0)) {
+		icon = "file_xxx";
+	}
+
+	/*	Update the GUI
+	*/
 	ro_gui_set_icon_string(dialog_saveas, ICON_SAVE_ICON, icon);
 	ro_gui_set_icon_string(dialog_saveas, ICON_SAVE_PATH, name);
 }

riscos/window.c

@@ -809,7 +809,9 @@ void ro_gui_window_click(gui_window* g, wimp_pointer* pointer) {
 		return;
 	}
 
-	if (pointer->buttons == wimp_CLICK_SELECT && caret.w != state.w) {
+	if (((pointer->buttons == wimp_CLICK_SELECT) ||
+			(pointer->buttons == wimp_CLICK_ADJUST)) &&
+		 	(caret.w != state.w)) {
 		error = xwimp_set_caret_position(state.w, -1, -100,
 						-100, 32, -1);
 		if (error) {