Add refresh button, hook up back and forward buttons
This commit is contained in:
parent
08e0d3b003
commit
f6c82fd2dd
|
@ -10,11 +10,13 @@ struct browser_window;
|
||||||
struct browser_window *browser;
|
struct browser_window *browser;
|
||||||
id plotView;
|
id plotView;
|
||||||
id scrollView;
|
id scrollView;
|
||||||
|
id refreshButton;
|
||||||
}
|
}
|
||||||
|
|
||||||
-(id)initWithBrowser: (struct browser_window*)aBrowser;
|
-(id)initWithBrowser: (struct browser_window*)aBrowser;
|
||||||
-(id)back: (id)sender;
|
-(void)back: (id)sender;
|
||||||
-(id)forward: (id)sender;
|
-(void)forward: (id)sender;
|
||||||
|
-(void)stopOrRefresh: (id)sender;
|
||||||
|
|
||||||
// Browser control
|
// Browser control
|
||||||
-(NSSize)getBrowserSize;
|
-(NSSize)getBrowserSize;
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#import "PlotView.h"
|
#import "PlotView.h"
|
||||||
#import "netsurf/browser_window.h"
|
#import "netsurf/browser_window.h"
|
||||||
#import "utils/nsurl.h"
|
#import "utils/nsurl.h"
|
||||||
|
#import "desktop/browser_history.h"
|
||||||
|
|
||||||
@implementation BrowserWindowController
|
@implementation BrowserWindowController
|
||||||
|
|
||||||
|
@ -21,14 +22,27 @@
|
||||||
NSLog(@"Browser window loaded");
|
NSLog(@"Browser window loaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
-(id)back: (id)sender {
|
-(void)back: (id)sender {
|
||||||
NSLog(@"Browser backward");
|
NSLog(@"Browser backward");
|
||||||
|
if (browser_window_history_back_available(browser)) {
|
||||||
|
browser_window_history_back(browser, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-(id)forward: (id)sender {
|
-(void)forward: (id)sender {
|
||||||
NSLog(@"Browser forward");
|
NSLog(@"Browser forward");
|
||||||
|
if (browser_window_history_forward_available(browser)) {
|
||||||
|
browser_window_history_forward(browser, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)stopOrRefresh: (id)sender {
|
||||||
|
int tag = [sender tag];
|
||||||
|
if (tag == 1 && browser_window_stop_available(browser)) {
|
||||||
|
browser_window_stop(browser);
|
||||||
|
} else if (browser_window_reload_available(browser)) {
|
||||||
|
browser_window_reload(browser, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-(NSSize)getBrowserSize {
|
-(NSSize)getBrowserSize {
|
||||||
|
@ -60,10 +74,12 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
-(void)startThrobber {
|
-(void)startThrobber {
|
||||||
|
[refreshButton setTitle: @"Stop"];
|
||||||
|
[refreshButton setTag: 1];
|
||||||
}
|
}
|
||||||
-(void)stopThrobber {
|
-(void)stopThrobber {
|
||||||
|
[refreshButton setTitle: @"Refresh"];
|
||||||
|
[refreshButton setTag: 0];
|
||||||
}
|
}
|
||||||
-(void)setNavigationUrl: (NSString*)urlString {
|
-(void)setNavigationUrl: (NSString*)urlString {
|
||||||
[urlBar setStringValue: urlString];
|
[urlBar setStringValue: urlString];
|
||||||
|
|
|
@ -4,14 +4,16 @@
|
||||||
Actions = (
|
Actions = (
|
||||||
"back:",
|
"back:",
|
||||||
"forward:",
|
"forward:",
|
||||||
"navigate:"
|
"navigate:",
|
||||||
|
"stopOrRefresh:"
|
||||||
);
|
);
|
||||||
Outlets = (
|
Outlets = (
|
||||||
backButton,
|
backButton,
|
||||||
forwardButton,
|
forwardButton,
|
||||||
urlBar,
|
urlBar,
|
||||||
plotView,
|
plotView,
|
||||||
scrollView
|
scrollView,
|
||||||
|
refreshButton
|
||||||
);
|
);
|
||||||
Super = NSWindowController;
|
Super = NSWindowController;
|
||||||
};
|
};
|
||||||
|
@ -19,7 +21,8 @@
|
||||||
Actions = (
|
Actions = (
|
||||||
"back:",
|
"back:",
|
||||||
"forward:",
|
"forward:",
|
||||||
"navigate:"
|
"navigate:",
|
||||||
|
"stopOrRefresh:"
|
||||||
);
|
);
|
||||||
Super = NSObject;
|
Super = NSObject;
|
||||||
};
|
};
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue