<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210494] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210494">210494</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-01-07 17:22:46 -0800 (Sat, 07 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210493 => 210494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-07 23:39:32 UTC (rev 210493)
+++ trunk/Tools/ChangeLog 2017-01-08 01:22:46 UTC (rev 210494)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ 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 <timothy_horton@apple.com>
+
</ins><span class="cx"> Fix the 32-bit build.
</span><span class="cx">
</span><span class="cx"> * MiniBrowser/mac/BrowserWindowController.h:
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (210493 => 210494)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -128,9 +128,10 @@
</span><span class="cx"> BOOL useWebKit2 = NO;
</span><span class="cx"> BOOL makeEditable = NO;
</span><span class="cx">
</span><del>- if (![sender respondsToSelector:@selector(tag)])
</del><ins>+ if (![sender respondsToSelector:@selector(tag)]) {
</ins><span class="cx"> useWebKit2 = [SettingsController shared].useWebKit2ByDefault;
</span><del>- else {
</del><ins>+ makeEditable = [SettingsController shared].createEditorByDefault;
+ } else {
</ins><span class="cx"> useWebKit2 = [sender tag] == WebKit2NewWindowTag || [sender tag] == WebKit2NewEditorTag;
</span><span class="cx"> makeEditable = [sender tag] == WebKit1NewEditorTag || [sender tag] == WebKit2NewEditorTag;
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +203,10 @@
</span><span class="cx">
</span><span class="cx"> [self _updateNewWindowKeyEquivalents];
</span><span class="cx">
</span><del>- [self newWindow:self];
</del><ins>+ if ([SettingsController shared].createEditorByDefault)
+ [self newEditorWindow:self];
+ else
+ [self newWindow:self];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BrowserWindowController *)frontmostBrowserWindowController
</span><span class="lines">@@ -275,10 +279,18 @@
</span><span class="cx"> NSEventModifierFlags webKit1Flags = [SettingsController shared].useWebKit2ByDefault ? NSEventModifierFlagOption : 0;
</span><span class="cx"> NSEventModifierFlags webKit2Flags = [SettingsController shared].useWebKit2ByDefault ? 0 : NSEventModifierFlagOption;
</span><span class="cx">
</span><ins>+ NSString *normalWindowEquivalent = [SettingsController shared].createEditorByDefault ? @"N" : @"n";
+ NSString *editorEquivalent = [SettingsController shared].createEditorByDefault ? @"n" : @"N";
+
</ins><span class="cx"> _newWebKit1WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
</span><span class="cx"> _newWebKit2WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
</span><span class="cx"> _newWebKit1EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
</span><span class="cx"> _newWebKit2EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
</span><ins>+
+ _newWebKit1WindowItem.keyEquivalent = normalWindowEquivalent;
+ _newWebKit2WindowItem.keyEquivalent = normalWindowEquivalent;
+ _newWebKit1EditorItem.keyEquivalent = editorEquivalent;
+ _newWebKit2EditorItem.keyEquivalent = editorEquivalent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)showExtensionsManager:(id)sender
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (210493 => 210494)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> @property (nonatomic, readonly) NSMenu *menu;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) BOOL useWebKit2ByDefault;
</span><ins>+@property (nonatomic, readonly) BOOL createEditorByDefault;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL useTransparentWindows;
</span><span class="cx"> @property (nonatomic, readonly) BOOL usePaginatedMode;
</span><span class="cx"> @property (nonatomic, readonly) BOOL layerBordersVisible;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (210493 => 210494)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> static NSString * const DefaultURLPreferenceKey = @"DefaultURL";
</span><span class="cx">
</span><span class="cx"> static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
</span><ins>+static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
</ins><span class="cx"> static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
</span><span class="cx"> static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
</span><span class="cx"> static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx"> _menu = [[NSMenu alloc] initWithTitle:@"Settings"];
</span><span class="cx">
</span><span class="cx"> [self _addItemWithTitle:@"Use WebKit2 By Default" action:@selector(toggleUseWebKit2ByDefault:) indented:NO];
</span><ins>+ [self _addItemWithTitle:@"Create Editor By Default" action:@selector(toggleCreateEditorByDefault:) indented:NO];
</ins><span class="cx"> [self _addItemWithTitle:@"Set Default URL to Current URL" action:@selector(setDefaultURLToCurrentURL:) indented:NO];
</span><span class="cx">
</span><span class="cx"> [_menu addItem:[NSMenuItem separatorItem]];
</span><span class="lines">@@ -194,6 +196,8 @@
</span><span class="cx">
</span><span class="cx"> if (action == @selector(toggleUseWebKit2ByDefault:))
</span><span class="cx"> [menuItem setState:[self useWebKit2ByDefault] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleCreateEditorByDefault:))
+ [menuItem setState:[self createEditorByDefault] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleUseTransparentWindows:))
</span><span class="cx"> [menuItem setState:[self useTransparentWindows] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleUsePaginatedMode:))
</span><span class="lines">@@ -265,6 +269,16 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:UseWebKit2ByDefaultPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleCreateEditorByDefault:(id)sender
+{
+ [self _toggleBooleanDefault:CreateEditorByDefaultPreferenceKey];
+}
+
+- (BOOL)createEditorByDefault
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:CreateEditorByDefaultPreferenceKey];
+}
+
</ins><span class="cx"> - (void)toggleUseTransparentWindows:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:UseTransparentWindowsPreferenceKey];
</span></span></pre>
</div>
</div>
</body>
</html>