mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 13:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

update cocoa frontend to not use depricated warn_user API

Browse Source
This commit is contained in:
Vincent Sanders 2016-05-02 10:24:49 +01:00
parent ad06f9e906
commit 505ae08df2
8 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocoa/BookmarksController.m
View File

@ -162,7 +162,7 @@ static const char *cocoa_hotlist_path( void )
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }

6
cocoa/BrowserView.m
View File

@ -587,7 +587,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }
@ -607,7 +607,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }
@ -678,7 +678,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
error = nsurl_create([urlstr UTF8String], &url); error = nsurl_create([urlstr UTF8String], &url);
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} else { } else {
browser_window_navigate(browser, browser_window_navigate(browser,
url, url,

4
cocoa/BrowserViewController.m
View File

@ -78,7 +78,7 @@
error = nsurl_create([url UTF8String], &urlns); error = nsurl_create([url UTF8String], &urlns);
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} else { } else {
browser_window_navigate(browser, browser_window_navigate(browser,
urlns, urlns,
@ -167,7 +167,7 @@
nsurl_unref(urlns); nsurl_unref(urlns);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }

2
cocoa/BrowserWindowController.m
View File

@ -171,7 +171,7 @@
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }

8
cocoa/NetSurfAppDelegate.m
View File

@ -60,7 +60,7 @@
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }
@ -83,7 +83,7 @@
nsurl_unref(u); nsurl_unref(u);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }
} }
@ -105,7 +105,7 @@
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }
@ -188,7 +188,7 @@
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
return YES; return YES;

2
cocoa/NetsurfApp.m
View File

@ -290,7 +290,7 @@ int main( int argc, char **argv )
nsurl_unref(url); nsurl_unref(url);
} }
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); cocoa_warning(messages_get_errorcode(error), 0);
} }
} }

2
cocoa/gui.h
View File

@ -31,3 +31,5 @@ extern NSString * const kAlwaysCancelDownload;
extern NSString * const kAlwaysCloseMultipleTabs; extern NSString * const kAlwaysCloseMultipleTabs;
void cocoa_autorelease( void ); void cocoa_autorelease( void );
nserror cocoa_warning(const char *warning, const char *detail);

57
cocoa/gui.m
View File

@ -52,13 +52,16 @@ NSString * const kAlwaysCloseMultipleTabs = @"AlwaysCloseMultipleTabs";
struct browser_window; struct browser_window;
static nserror cocoa_warn_user(const char *warning, const char *detail) /* exported function docuemnted in cocoa/gui.h */
nserror cocoa_warning(const char *warning, const char *detail)
{ {
NSRunAlertPanel( NSLocalizedString( @"Warning", @"Warning title" ), NSRunAlertPanel( NSLocalizedString( @"Warning",
NSLocalizedString( @"Warning %s%s%s", @"Warning message" ), @"Warning title" ),
NSLocalizedString( @"OK", @"" ), nil, nil, NSLocalizedString( @"Warning %s%s%s",
warning, detail != NULL ? ": " : "", @"Warning message" ),
detail != NULL ? detail : "" ); NSLocalizedString( @"OK", @"" ), nil, nil,
warning, detail != NULL ? ": " : "",
detail != NULL ? detail : "" );
return NSERROR_OK; return NSERROR_OK;
} }
@ -69,13 +72,14 @@ gui_window_create(struct browser_window *bw,
gui_window_create_flags flags) gui_window_create_flags flags)
{ {
BrowserWindowController *window = nil; BrowserWindowController *window = nil;
BrowserViewController *result;
browser_window_set_scale(bw, (float)nsoption_int(scale) / 100, false); browser_window_set_scale(bw, (float)nsoption_int(scale) / 100, false);
if (existing != NULL) { if (existing != NULL) {
window = [(BrowserViewController *)(existing) windowController]; window = [(BrowserViewController *)(existing) windowController];
} }
BrowserViewController *result = [[BrowserViewController alloc] initWithBrowser: bw]; result = [[BrowserViewController alloc] initWithBrowser: bw];
if (!(flags & GW_CREATE_TAB) || nil == window) { if (!(flags & GW_CREATE_TAB) || nil == window) {
window = [[[BrowserWindowController alloc] init] autorelease]; window = [[[BrowserWindowController alloc] init] autorelease];
@ -162,7 +166,8 @@ static void gui_window_update_extent(struct gui_window *g)
browser_window_get_extents(browser, false, &width, &height); browser_window_get_extents(browser, false, &width, &height);
[[window browserView] setMinimumSize: cocoa_scaled_size( browser_window_get_scale(browser), width, height )]; [[window browserView] setMinimumSize:
cocoa_scaled_size( browser_window_get_scale(browser), width, height )];
} }
static void gui_window_set_status(struct gui_window *g, const char *text) static void gui_window_set_status(struct gui_window *g, const char *text)
@ -205,7 +210,7 @@ static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape
static nserror gui_window_set_url(struct gui_window *g, struct nsurl *url) static nserror gui_window_set_url(struct gui_window *g, struct nsurl *url)
{ {
[(BrowserViewController *)g setUrl: [NSString stringWithUTF8String: nsurl_access(url)]]; [(BrowserViewController *)g setUrl: [NSString stringWithUTF8String: nsurl_access(url)]];
return NSERROR_OK; return NSERROR_OK;
} }
@ -223,9 +228,13 @@ static void gui_window_stop_throbber(struct gui_window *g)
static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
{ {
NSBitmapImageRep *bmp = icon != NULL ? (NSBitmapImageRep *)content_get_bitmap( icon ) : NULL; NSBitmapImageRep *bmp = NULL;
NSImage *image = nil; NSImage *image = nil;
if (icon != NULL) {
bmp = (NSBitmapImageRep *)content_get_bitmap( icon );
}
if (bmp != nil) { if (bmp != nil) {
image = [[NSImage alloc] initWithSize: NSMakeSize( 32, 32 )]; image = [[NSImage alloc] initWithSize: NSMakeSize( 32, 32 )];
[image addRepresentation: bmp]; [image addRepresentation: bmp];
@ -238,11 +247,13 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
[image release]; [image release];
} }
static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, static void
const struct rect *clip) gui_window_place_caret(struct gui_window *g, int x, int y, int height,
const struct rect *clip)
{ {
[[(BrowserViewController *)g browserView] addCaretAt: cocoa_point( x, y ) [[(BrowserViewController *)g browserView]
height: cocoa_px_to_pt( height )]; addCaretAt: cocoa_point( x, y )
height: cocoa_px_to_pt( height )];
} }
static void gui_window_remove_caret(struct gui_window *g) static void gui_window_remove_caret(struct gui_window *g)
@ -257,10 +268,12 @@ static void gui_window_new_content(struct gui_window *g)
static void gui_create_form_select_menu(struct gui_window *g, static void gui_create_form_select_menu(struct gui_window *g,
struct form_control *control) struct form_control *control)
{ {
BrowserViewController * const window = (BrowserViewController *)g; BrowserViewController * const window = (BrowserViewController *)g;
FormSelectMenu *menu = [[FormSelectMenu alloc] initWithControl: control forWindow: [window browser]]; FormSelectMenu *menu = [[FormSelectMenu alloc]
initWithControl: control
forWindow: [window browser]];
[menu runInView: [window browserView]]; [menu runInView: [window browserView]];
[menu release]; [menu release];
} }
@ -273,9 +286,11 @@ static nserror gui_launch_url(nsurl *url)
struct ssl_cert_info; struct ssl_cert_info;
static void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, static void
unsigned long num, nserror (*cb)(bool proceed, void *pw), gui_cert_verify(nsurl *url,
void *cbpw) const struct ssl_cert_info *certs,
unsigned long num,
nserror (*cb)(bool proceed,void *pw), void *cbpw)
{ {
cb( false, cbpw ); cb( false, cbpw );
} }
@ -310,7 +325,7 @@ struct gui_window_table *cocoa_window_table = &window_table;
static struct gui_misc_table browser_table = { static struct gui_misc_table browser_table = {
.schedule = cocoa_schedule, .schedule = cocoa_schedule,
.warning = cocoa_warn_user, .warning = cocoa_warning,
.launch_url = gui_launch_url, .launch_url = gui_launch_url,
.cert_verify = gui_cert_verify, .cert_verify = gui_cert_verify,