Toolbar icon/text setting implemented
|
@ -19,6 +19,7 @@ struct browser_window;
|
||||||
enum gui_pointer_shape lastRequestedPointer;
|
enum gui_pointer_shape lastRequestedPointer;
|
||||||
id searchBar;
|
id searchBar;
|
||||||
id searchImage;
|
id searchImage;
|
||||||
|
id searchLabel;
|
||||||
NSMutableArray *tabs;
|
NSMutableArray *tabs;
|
||||||
BOOL isClosing;
|
BOOL isClosing;
|
||||||
id activeTab;
|
id activeTab;
|
||||||
|
|
|
@ -97,6 +97,7 @@ static id newTabTarget;
|
||||||
object: nil];
|
object: nil];
|
||||||
urlSuggestionView = [[UrlSuggestionView alloc] initForUrlBar: urlBar
|
urlSuggestionView = [[UrlSuggestionView alloc] initForUrlBar: urlBar
|
||||||
inBrowserWindowController: self];
|
inBrowserWindowController: self];
|
||||||
|
[self reconfigureUrlBarButtons];
|
||||||
NSLog(@"Browser window loaded");
|
NSLog(@"Browser window loaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -537,12 +538,26 @@ static id newTabTarget;
|
||||||
-(void)reconfigureUrlBarButtons {
|
-(void)reconfigureUrlBarButtons {
|
||||||
NSLog(@"reconfigure url bar buttons");
|
NSLog(@"reconfigure url bar buttons");
|
||||||
UrlBarButtonType buttonType = [[Preferences defaultPreferences] urlBarButtonType];
|
UrlBarButtonType buttonType = [[Preferences defaultPreferences] urlBarButtonType];
|
||||||
NSLog(@"type: %d", buttonType);
|
|
||||||
switch (buttonType) {
|
switch (buttonType) {
|
||||||
case UrlBarButtonTypeImage:
|
case UrlBarButtonTypeImage:
|
||||||
|
[backButton setTitle: nil];
|
||||||
[backButton setImage: [NSImage imageNamed: @"back"]];
|
[backButton setImage: [NSImage imageNamed: @"back"]];
|
||||||
|
[forwardButton setTitle: nil];
|
||||||
|
[forwardButton setImage: [NSImage imageNamed: @"forward"]];
|
||||||
|
[refreshButton setTitle: nil];
|
||||||
|
[refreshButton setImage: [NSImage imageNamed: @"refresh"]];
|
||||||
|
[searchImage setImage: [NSImage imageNamed: @"search"]];
|
||||||
|
[searchLabel setStringValue: nil];
|
||||||
break;
|
break;
|
||||||
case UrlBarButtonTypeText:
|
case UrlBarButtonTypeText:
|
||||||
|
[backButton setTitle: @"Back"];
|
||||||
|
[backButton setImage: nil];
|
||||||
|
[forwardButton setTitle: @"Forward"];
|
||||||
|
[forwardButton setImage: nil];
|
||||||
|
[refreshButton setTitle: @"Refresh"];
|
||||||
|
[refreshButton setImage: nil];
|
||||||
|
[searchImage setImage: nil];
|
||||||
|
[searchLabel setStringValue: @"Search:"];
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
refreshButton,
|
refreshButton,
|
||||||
searchImage,
|
searchImage,
|
||||||
searchBar,
|
searchBar,
|
||||||
tabView
|
tabView,
|
||||||
|
searchLabel
|
||||||
);
|
);
|
||||||
Super = NSWindowController;
|
Super = NSWindowController;
|
||||||
};
|
};
|
||||||
|
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 109 B |
Before Width: | Height: | Size: 252 B After Width: | Height: | Size: 117 B |
Before Width: | Height: | Size: 847 B After Width: | Height: | Size: 248 B |
Before Width: | Height: | Size: 755 B After Width: | Height: | Size: 213 B |