Attachment 371986 Details for Bug 198803 – Patch

[patch] Patch

bug-198803-20190612143911.patch (text/plain), 10.51 KB, created by Devin Rousso on 2019-06-12 14:39:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-12 14:39:12 PDT

Size: 10.51 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index eaecae15bb51b34f2800dc6b54be72133ad7360e..d1f2d26576097d3c6d9e2843a7f66a8edca27fe2 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,32 @@
>+2019-06-12  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Settings: split the General panel into sub panels so it's less crowded
>+        https://bugs.webkit.org/show_bug.cgi?id=198803
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/SettingsTabContentView.js:
>+        (WI.SettingsTabContentView.prototype.initialLayout):
>+        (WI.SettingsTabContentView.prototype._createGeneralSettingsView):
>+        Many of the settings in General only affect a specific part of Web Inspector, and therefore
>+        aren't really "general".
>+
>+        (WI.SettingsTabContentView.prototype._createElementsSettingsView): Added.
>+         - Element Selection
>+         - CSS Changes
>+
>+        (WI.SettingsTabContentView.prototype._createSourcesSettingsView): Added.
>+         - Debugger
>+         - Source Maps
>+
>+        (WI.SettingsTabContentView.prototype._createConsoleSettingsView): Added.
>+         - Traces (renamed from "Console")
>+         - WebRTC Logging
>+         - Media Logging
>+         - MSE Logging
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+
> 2019-06-10  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Timelines: imported recordings do not have JavaScript call trees
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index 9a3c9ea4c4a35e98c0aa6440aee3fc91aae16296..de79b54aba82457e9eb7b98c438088b0730b4062 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -148,7 +148,7 @@ localizedStrings["Author Stylesheet"] = "Author Stylesheet";
> localizedStrings["Auto"] = "Auto";
> localizedStrings["Auto - %s"] = "Auto - %s";
> localizedStrings["Auto Increment"] = "Auto Increment";
>-localizedStrings["Auto-expand Traces"] = "Auto-expand Traces";
>+localizedStrings["Auto-expand"] = "Auto-expand";
> localizedStrings["Automatically continue after evaluating"] = "Automatically continue after evaluating";
> localizedStrings["Available Style Sheets"] = "Available Style Sheets";
> localizedStrings["Average CPU: %s"] = "Average CPU: %s";
>@@ -270,7 +270,6 @@ localizedStrings["Console Evaluation %d"] = "Console Evaluation %d";
> localizedStrings["Console Profile Recorded"] = "Console Profile Recorded";
> localizedStrings["Console cleared at %s"] = "Console cleared at %s";
> localizedStrings["Console opened at %s"] = "Console opened at %s";
>-localizedStrings["Console:"] = "Console:";
> localizedStrings["Containing"] = "Containing";
> localizedStrings["Content"] = "Content";
> localizedStrings["Content Security Policy violation of directive: %s"] = "Content Security Policy violation of directive: %s";
>@@ -1006,7 +1005,7 @@ localizedStrings["Sockets"] = "Sockets";
> localizedStrings["Sort Ascending"] = "Sort Ascending";
> localizedStrings["Sort Descending"] = "Sort Descending";
> localizedStrings["Source"] = "Source";
>-localizedStrings["Source maps:"] = "Source maps:";
>+localizedStrings["Source Maps:"] = "Source Maps:";
> localizedStrings["Sources"] = "Sources";
> localizedStrings["Sources:"] = "Sources:";
> localizedStrings["Space"] = "Space";
>@@ -1122,6 +1121,7 @@ localizedStrings["Total: %s"] = "Total: %s";
> localizedStrings["Totals:"] = "Totals:";
> localizedStrings["Trace"] = "Trace";
> localizedStrings["Trace: %s"] = "Trace: %s";
>+localizedStrings["Traces:"] = "Traces:";
> /* Amount of data sent over the network for a single resource */
> localizedStrings["Transfer Size"] = "Transfer Size";
> localizedStrings["Transferred"] = "Transferred";
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>index d1b0621394919318963cfa6bb922e91c721e6698..14aadeddc05d8b6d930e0adf5e205730161ffb90 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>@@ -162,6 +162,9 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>         this.addSubview(this._navigationBar);
> 
>         this._createGeneralSettingsView();
>+        this._createElementsSettingsView();
>+        this._createSourcesSettingsView();
>+        this._createConsoleSettingsView();
>         this._createExperimentalSettingsView();
> 
>         WI.notifications.addEventListener(WI.Notification.DebugUIEnabledDidChange, this._updateDebugSettingsViewVisibility, this);
>@@ -177,7 +180,6 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>         let generalSettingsView = new WI.SettingsView("general", WI.UIString("General"));
> 
>         const indentValues = [WI.UIString("Tabs"), WI.UIString("Spaces")];
>-
>         let indentEditor = generalSettingsView.addGroupWithCustomSetting(WI.UIString("Prefer indent using:"), WI.SettingEditor.Type.Select, {values: indentValues});
>         indentEditor.value = indentValues[WI.settings.indentWithTabs.value ? 0 : 1];
>         indentEditor.addEventListener(WI.SettingEditor.Event.ValueDidChange, () => {
>@@ -206,28 +208,12 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
> 
>         generalSettingsView.addSeparator();
> 
>-        generalSettingsView.addSetting(WI.UIString("Debugger:"), WI.settings.showScopeChainOnPause, WI.UIString("Show Scope Chain on pause"));
>-        generalSettingsView.addSetting(WI.UIString("Source maps:"), WI.settings.sourceMapsEnabled, WI.UIString("Enable source maps"));
>-        generalSettingsView.addSetting(WI.UIString("Console:"), WI.settings.consoleAutoExpandTrace, WI.UIString("Auto-expand Traces"));
>-
>-        generalSettingsView.addSeparator();
>-
>         let searchGroup = generalSettingsView.addGroup(WI.UIString("Search:", "Search: @ Settings", "Settings tab label for search related settings"));
>         searchGroup.addSetting(WI.settings.searchCaseSensitive, WI.UIString("Case Sensitive", "Case Sensitive @ Settings", "Settings tab checkbox label for whether searches should be case sensitive."));
>         searchGroup.addSetting(WI.settings.searchRegularExpression, WI.UIString("Regular Expression", "Regular Expression @ Settings", "Settings tab checkbox label for whether searches should be treated as regular expressions."));
> 
>         generalSettingsView.addSeparator();
> 
>-        generalSettingsView.addSetting(WI.UIString("CSS Changes:"), WI.settings.cssChangesPerNode, WI.UIString("Show only for selected node"));
>-
>-        generalSettingsView.addSeparator();
>-
>-        if (InspectorBackend.domains.DOM && InspectorBackend.domains.DOM.setInspectModeEnabled && InspectorBackend.domains.DOM.setInspectModeEnabled.supports("showRulers")) {
>-            generalSettingsView.addSetting(WI.UIString("Element Selection:"), WI.settings.showRulersDuringElementSelection, WI.UIString("Show page rulers and node border lines"));
>-
>-            generalSettingsView.addSeparator();
>-        }
>-
>         const zoomLevels = [0.6, 0.8, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.2, 2.4];
>         const zoomValues = zoomLevels.map((level) => [level, Number.percentageString(level, 0)]);
> 
>@@ -236,7 +222,49 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>         zoomEditor.addEventListener(WI.SettingEditor.Event.ValueDidChange, () => { WI.setZoomFactor(zoomEditor.value); });
>         WI.settings.zoomFactor.addEventListener(WI.Setting.Event.Changed, () => { zoomEditor.value = WI.getZoomFactor().maxDecimals(2); });
> 
>+        this.addSettingsView(generalSettingsView);
>+    }
>+
>+    _createElementsSettingsView()
>+    {
>+        if (!InspectorBackend.domains.DOM)
>+            return;
>+
>+        let elementsSettingsView = new WI.SettingsView("elements", WI.UIString("Elements"));
>+
>+        if (InspectorBackend.domains.DOM.setInspectModeEnabled && InspectorBackend.domains.DOM.setInspectModeEnabled.supports("showRulers")) {
>+            elementsSettingsView.addSetting(WI.UIString("Element Selection:"), WI.settings.showRulersDuringElementSelection, WI.UIString("Show page rulers and node border lines"));
>+
>+            elementsSettingsView.addSeparator();
>+        }
>+
>+        elementsSettingsView.addSetting(WI.UIString("CSS Changes:"), WI.settings.cssChangesPerNode, WI.UIString("Show only for selected node"));
>+
>+        this.addSettingsView(elementsSettingsView);
>+    }
>+
>+    _createSourcesSettingsView()
>+    {
>+        let sourcesSettingsView = new WI.SettingsView("sources", WI.UIString("Sources"));
>+
>+        sourcesSettingsView.addSetting(WI.UIString("Debugger:"), WI.settings.showScopeChainOnPause, WI.UIString("Show Scope Chain on pause"));
>+
>+        sourcesSettingsView.addSeparator();
>+
>+        sourcesSettingsView.addSetting(WI.UIString("Source Maps:"), WI.settings.sourceMapsEnabled, WI.UIString("Enable source maps"));
>+
>+        this.addSettingsView(sourcesSettingsView);
>+    }
>+
>+    _createConsoleSettingsView()
>+    {
>+        let consoleSettingsView = new WI.SettingsView("console", WI.UIString("Console"));
>+
>+        consoleSettingsView.addSetting(WI.UIString("Traces:"), WI.settings.consoleAutoExpandTrace, WI.UIString("Auto-expand"));
>+
>         if (WI.ConsoleManager.supportsLogChannels()) {
>+            consoleSettingsView.addSeparator();
>+
>             const logLevels = [
>                 [WI.LoggingChannel.Level.Off, WI.UIString("Off")],
>                 [WI.LoggingChannel.Level.Basic, WI.UIString("Basic")],
>@@ -250,7 +278,7 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
> 
>             let channels = WI.consoleManager.customLoggingChannels;
>             for (let channel of channels) {
>-                let logEditor = generalSettingsView.addGroupWithCustomSetting(editorLabels[channel.source], WI.SettingEditor.Type.Select, {values: logLevels});
>+                let logEditor = consoleSettingsView.addGroupWithCustomSetting(editorLabels[channel.source], WI.SettingEditor.Type.Select, {values: logLevels});
>                 logEditor.value = channel.level;
>                 logEditor.addEventListener(WI.SettingEditor.Event.ValueDidChange, () => {
>                     for (let target of WI.targets)
>@@ -259,7 +287,7 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>             }
>         }
> 
>-        this.addSettingsView(generalSettingsView);
>+        this.addSettingsView(consoleSettingsView);
>     }
> 
>     _createExperimentalSettingsView()

Actions: View | Formatted Diff | Diff

Attachments on bug 198803: 371986