Title: [210494] trunk/Tools
- Revision
- 210494
- Author
- [email protected]
- Date
- 2017-01-07 17:22:46 -0800 (Sat, 07 Jan 2017)
Log Message
Add a setting to create editable MiniBrowser windows by default
https://bugs.webkit.org/show_bug.cgi?id=166806
Reviewed by Beth Dakin.
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate createBrowserWindowController:]):
(-[BrowserAppDelegate applicationDidFinishLaunching:]):
(-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleCreateEditorByDefault:]):
(-[SettingsController createEditorByDefault]):
Add a setting and update the key equivalents accordingly.
Also make sure to make the right kind of window on launch.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (210493 => 210494)
--- trunk/Tools/ChangeLog 2017-01-07 23:39:32 UTC (rev 210493)
+++ trunk/Tools/ChangeLog 2017-01-08 01:22:46 UTC (rev 210494)
@@ -1,5 +1,25 @@
2017-01-07 Tim Horton <[email protected]>
+ Add a setting to create editable MiniBrowser windows by default
+ https://bugs.webkit.org/show_bug.cgi?id=166806
+
+ Reviewed by Beth Dakin.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate createBrowserWindowController:]):
+ (-[BrowserAppDelegate applicationDidFinishLaunching:]):
+ (-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleCreateEditorByDefault:]):
+ (-[SettingsController createEditorByDefault]):
+ Add a setting and update the key equivalents accordingly.
+ Also make sure to make the right kind of window on launch.
+
+2017-01-07 Tim Horton <[email protected]>
+
Fix the 32-bit build.
* MiniBrowser/mac/BrowserWindowController.h:
Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (210493 => 210494)
--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2017-01-07 23:39:32 UTC (rev 210493)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2017-01-08 01:22:46 UTC (rev 210494)
@@ -128,9 +128,10 @@
BOOL useWebKit2 = NO;
BOOL makeEditable = NO;
- if (![sender respondsToSelector:@selector(tag)])
+ if (![sender respondsToSelector:@selector(tag)]) {
useWebKit2 = [SettingsController shared].useWebKit2ByDefault;
- else {
+ makeEditable = [SettingsController shared].createEditorByDefault;
+ } else {
useWebKit2 = [sender tag] == WebKit2NewWindowTag || [sender tag] == WebKit2NewEditorTag;
makeEditable = [sender tag] == WebKit1NewEditorTag || [sender tag] == WebKit2NewEditorTag;
}
@@ -202,7 +203,10 @@
[self _updateNewWindowKeyEquivalents];
- [self newWindow:self];
+ if ([SettingsController shared].createEditorByDefault)
+ [self newEditorWindow:self];
+ else
+ [self newWindow:self];
}
- (BrowserWindowController *)frontmostBrowserWindowController
@@ -275,10 +279,18 @@
NSEventModifierFlags webKit1Flags = [SettingsController shared].useWebKit2ByDefault ? NSEventModifierFlagOption : 0;
NSEventModifierFlags webKit2Flags = [SettingsController shared].useWebKit2ByDefault ? 0 : NSEventModifierFlagOption;
+ NSString *normalWindowEquivalent = [SettingsController shared].createEditorByDefault ? @"N" : @"n";
+ NSString *editorEquivalent = [SettingsController shared].createEditorByDefault ? @"n" : @"N";
+
_newWebKit1WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
_newWebKit2WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
_newWebKit1EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
_newWebKit2EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
+
+ _newWebKit1WindowItem.keyEquivalent = normalWindowEquivalent;
+ _newWebKit2WindowItem.keyEquivalent = normalWindowEquivalent;
+ _newWebKit1EditorItem.keyEquivalent = editorEquivalent;
+ _newWebKit2EditorItem.keyEquivalent = editorEquivalent;
}
- (IBAction)showExtensionsManager:(id)sender
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (210493 => 210494)
--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-01-07 23:39:32 UTC (rev 210493)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-01-08 01:22:46 UTC (rev 210494)
@@ -34,6 +34,7 @@
@property (nonatomic, readonly) NSMenu *menu;
@property (nonatomic, readonly) BOOL useWebKit2ByDefault;
+@property (nonatomic, readonly) BOOL createEditorByDefault;
@property (nonatomic, readonly) BOOL useTransparentWindows;
@property (nonatomic, readonly) BOOL usePaginatedMode;
@property (nonatomic, readonly) BOOL layerBordersVisible;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (210493 => 210494)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-01-07 23:39:32 UTC (rev 210493)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-01-08 01:22:46 UTC (rev 210494)
@@ -37,6 +37,7 @@
static NSString * const DefaultURLPreferenceKey = @"DefaultURL";
static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
+static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
@@ -119,6 +120,7 @@
_menu = [[NSMenu alloc] initWithTitle:@"Settings"];
[self _addItemWithTitle:@"Use WebKit2 By Default" action:@selector(toggleUseWebKit2ByDefault:) indented:NO];
+ [self _addItemWithTitle:@"Create Editor By Default" action:@selector(toggleCreateEditorByDefault:) indented:NO];
[self _addItemWithTitle:@"Set Default URL to Current URL" action:@selector(setDefaultURLToCurrentURL:) indented:NO];
[_menu addItem:[NSMenuItem separatorItem]];
@@ -194,6 +196,8 @@
if (action == @selector(toggleUseWebKit2ByDefault:))
[menuItem setState:[self useWebKit2ByDefault] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleCreateEditorByDefault:))
+ [menuItem setState:[self createEditorByDefault] ? NSOnState : NSOffState];
else if (action == @selector(toggleUseTransparentWindows:))
[menuItem setState:[self useTransparentWindows] ? NSOnState : NSOffState];
else if (action == @selector(toggleUsePaginatedMode:))
@@ -265,6 +269,16 @@
return [[NSUserDefaults standardUserDefaults] boolForKey:UseWebKit2ByDefaultPreferenceKey];
}
+- (void)toggleCreateEditorByDefault:(id)sender
+{
+ [self _toggleBooleanDefault:CreateEditorByDefaultPreferenceKey];
+}
+
+- (BOOL)createEditorByDefault
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:CreateEditorByDefaultPreferenceKey];
+}
+
- (void)toggleUseTransparentWindows:(id)sender
{
[self _toggleBooleanDefault:UseTransparentWindowsPreferenceKey];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
