[GTK] Web Inspector: Add new GTK+ icons for garbage collect and clean buttons in...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 May 2017 20:28:17 +0000 (20:28 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 May 2017 20:28:17 +0000 (20:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167356

Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-05-24
Reviewed by Michael Catanzaro.

* UserInterface/Images/gtk/NavigationItemClear.svg: Aligned for 16x16 dimension.
* UserInterface/Images/gtk/NavigationItemGarbageCollect.svg: Added.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView): Removed the Clear image dimension's conditional expression.
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView): Ditto.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemClear.svg
Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemGarbageCollect.svg [new file with mode: 0644]
Source/WebInspectorUI/UserInterface/Views/LogContentView.js
Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js
Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

index 4c1950d..0b8acc3 100644 (file)
@@ -1,3 +1,19 @@
+2017-05-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK] Web Inspector: Add new GTK+ icons for garbage collect and clean buttons in Console
+        https://bugs.webkit.org/show_bug.cgi?id=167356
+
+        Reviewed by Michael Catanzaro.
+
+        * UserInterface/Images/gtk/NavigationItemClear.svg: Aligned for 16x16 dimension.
+        * UserInterface/Images/gtk/NavigationItemGarbageCollect.svg: Added.
+        * UserInterface/Views/LogContentView.js:
+        (WebInspector.LogContentView): Removed the Clear image dimension's conditional expression.
+        * UserInterface/Views/NetworkGridContentView.js:
+        (WebInspector.NetworkGridContentView): Ditto.
+        * UserInterface/Views/TimelineRecordingContentView.js:
+        (WebInspector.TimelineRecordingContentView): Ditto.
+
 2017-05-24  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: Don't load the active recording until a Timeline view needs to be shown
index 9559188..b94c5ce 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
 <svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
- <path fill="currentColor" d="m3.5 5v9h9v-9h2v9c0 2-2 2-2 2h-9c-2 0-2-2-2-2v-9zm4 1h1v6h-1zm2 0h1v6h-1zm-4 0h0.99999v6h-0.99999zm-1-6c-2 0-2 2-2 2h-2v2h15v-2h-2c0-2-2-2-2-2h-7zm0 1h7v1h-7v-1z"/>
+ <path fill="currentColor" d="m4 0c-2 0-2 2-2 2h-2v2h15v-2h-2c0-2-2-2-2-2h-7zm-3 5v9s0 2 2 2h9s2 0 2-2v-9h-2v9h-9v-9h-2zm4 1v6h1v-6h-1zm2 0v6h1v-6h-1zm2 0v6h1v-6h-1z"/>
 </svg>
diff --git a/Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemGarbageCollect.svg b/Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemGarbageCollect.svg
new file mode 100644 (file)
index 0000000..3b0a0a5
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <path fill="currentColor" d="m7.8223 0.93359c-1.632 0.01287-3.2157 0.85571-4.2266 2.2754l2.1543 1.5332c0.7601-1.0674 1.8085-1.3991 2.8203-1.041 0.7717 0.2731 1.4567 0.9971 1.7987 1.9746l-3.2596 0.6406 5.4276 4.5236 3.34-6.2482-2.904 0.5723c-0.52-1.824-1.77-3.3371-3.5218-3.9571-0.5351-0.1893-1.085-0.2777-1.6289-0.27341zm-4.3731 4.5898l-3.3418 6.2476 2.9043-0.572c0.5199 1.824 1.7696 3.337 3.5215 3.957 2.1404 0.758 4.5098-0.109 5.8578-2.002l-2.157-1.533c-0.7597 1.068-1.8062 1.399-2.818 1.041-0.7718-0.273-1.4576-0.997-1.8008-1.974l3.2598-0.641-5.4258-4.5236z"/>
+</svg>
index 8190ec1..0c74ceb 100644 (file)
@@ -80,8 +80,7 @@ WebInspector.LogContentView = class LogContentView extends WebInspector.ContentV
         this._garbageCollectNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Collect garbage"), "Images/NavigationItemGarbageCollect.svg", 16, 16);
         this._garbageCollectNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._garbageCollect, this);
 
-        let clearImageDimensions = WebInspector.Platform.name === "mac" ? 16 : 15;
-        this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(WebInspector.clearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", clearImageDimensions, clearImageDimensions);
+        this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(WebInspector.clearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
         this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
 
         this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", WebInspector.UIString("Show Console tab"), "Images/SplitToggleUp.svg", 16, 16);
index eab529b..4449880 100644 (file)
@@ -140,8 +140,7 @@ WebInspector.NetworkGridContentView = class NetworkGridContentView extends WebIn
             WebInspector.resourceCachingDisabledSetting.addEventListener(WebInspector.Setting.Event.Changed, this._resourceCachingDisabledSettingChanged, this);
         }
 
-        let clearImageDimensions = WebInspector.Platform.name === "mac" ? 16 : 15;
-        this._clearNetworkItemsNavigationItem = new WebInspector.ButtonNavigationItem("clear-network-items", WebInspector.UIString("Clear Network Items (%s)").format(WebInspector.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", clearImageDimensions, clearImageDimensions);
+        this._clearNetworkItemsNavigationItem = new WebInspector.ButtonNavigationItem("clear-network-items", WebInspector.UIString("Clear Network Items (%s)").format(WebInspector.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
         this._clearNetworkItemsNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, () => this.reset());
 
         this._pendingRecords = [];
index f05fadc..6e028e8 100644 (file)
@@ -57,8 +57,7 @@ WebInspector.TimelineRecordingContentView = class TimelineRecordingContentView e
         this._timelineContentBrowser.navigationBar.addNavigationItem(this._filterBarNavigationItem);
         this.addSubview(this._timelineContentBrowser);
 
-        let clearImageDimensions = WebInspector.Platform.name === "mac" ? 16 : 15;
-        this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline (%s)").format(WebInspector.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", clearImageDimensions, clearImageDimensions);
+        this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline (%s)").format(WebInspector.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
         this._clearTimelineNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this);
 
         this._overviewTimelineView = new WebInspector.OverviewTimelineView(recording);