Changeset 85588 in webkit
- Timestamp:
- May 3, 2011 12:54:35 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 added
- 8 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r85587 r85588 1 2011-05-03 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: combine toolbar icon images. 6 https://bugs.webkit.org/show_bug.cgi?id=59931 7 8 * WebCore.gypi: 9 * inspector/front-end/Images/auditsIcon.png: Removed. 10 * inspector/front-end/Images/consoleIcon.png: Removed. 11 * inspector/front-end/Images/elementsIcon.png: Removed. 12 * inspector/front-end/Images/networkIcon.png: Removed. 13 * inspector/front-end/Images/profilesIcon.png: Removed. 14 * inspector/front-end/Images/resourcesIcon.png: Removed. 15 * inspector/front-end/Images/scriptsIcon.png: Removed. 16 * inspector/front-end/Images/timelineIcon.png: Removed. 17 * inspector/front-end/Images/toolbarIcons.png: Added. 18 * inspector/front-end/Images/toolbarIconsSmall.png: Added. 19 * inspector/front-end/WebKit.qrc: 20 * inspector/front-end/inspector.css: 21 (.toolbar-icon): 22 (#toolbar-dropdown .toolbar-icon): 23 (.toolbar-item:active .toolbar-icon): 24 (#toolbar-dropdown .toolbar-item:active .toolbar-icon): 25 (.toolbar-item.elements .toolbar-icon): 26 (.toolbar-item.resources .toolbar-icon): 27 (#toolbar-dropdown .toolbar-item.resources .toolbar-icon): 28 (.toolbar-item.network .toolbar-icon): 29 (#toolbar-dropdown .toolbar-item.network .toolbar-icon): 30 (.toolbar-item.scripts .toolbar-icon): 31 (#toolbar-dropdown .toolbar-item.scripts .toolbar-icon): 32 (.toolbar-item.timeline .toolbar-icon): 33 (#toolbar-dropdown .toolbar-item.timeline .toolbar-icon): 34 (.toolbar-item.profiles .toolbar-icon): 35 (#toolbar-dropdown .toolbar-item.profiles .toolbar-icon): 36 (.toolbar-item.audits .toolbar-icon): 37 (#toolbar-dropdown .toolbar-item.audits .toolbar-icon): 38 (.toolbar-item.console .toolbar-icon): 39 (#toolbar-dropdown .toolbar-item.console .toolbar-icon): 40 (.status-bar-item > .glyph): 41 1 42 2011-05-03 Pavel Feldman <pfeldman@chromium.org> 2 43 -
trunk/Source/WebCore/WebCore.gypi
r85587 r85588 6226 6226 'webinspector_image_files': [ 6227 6227 'inspector/front-end/Images/applicationCache.png', 6228 'inspector/front-end/Images/auditsIcon.png',6229 6228 'inspector/front-end/Images/back.png', 6230 6229 'inspector/front-end/Images/breakpointBorder.png', … … 6234 6233 'inspector/front-end/Images/checker.png', 6235 6234 'inspector/front-end/Images/closeButtons.png', 6236 'inspector/front-end/Images/consoleIcon.png',6237 6235 'inspector/front-end/Images/cookie.png', 6238 6236 'inspector/front-end/Images/database.png', … … 6252 6250 'inspector/front-end/Images/disclosureTriangleSmallRightDownWhite.png', 6253 6251 'inspector/front-end/Images/disclosureTriangleSmallRightWhite.png', 6254 'inspector/front-end/Images/elementsIcon.png',6255 6252 'inspector/front-end/Images/errorIcon.png', 6256 6253 'inspector/front-end/Images/errorMediumIcon.png', … … 6266 6263 'inspector/front-end/Images/graphLabelCalloutRight.png', 6267 6264 'inspector/front-end/Images/localStorage.png', 6268 'inspector/front-end/Images/networkIcon.png',6269 6265 'inspector/front-end/Images/paneAddButtons.png', 6270 6266 'inspector/front-end/Images/paneBottomGrow.png', … … 6276 6272 'inspector/front-end/Images/profileGroupIcon.png', 6277 6273 'inspector/front-end/Images/profileIcon.png', 6278 'inspector/front-end/Images/profilesIcon.png',6279 6274 'inspector/front-end/Images/profileSmallIcon.png', 6280 6275 'inspector/front-end/Images/profilesSilhouette.png', … … 6287 6282 'inspector/front-end/Images/resourcePlainIcon.png', 6288 6283 'inspector/front-end/Images/resourcePlainIconSmall.png', 6289 'inspector/front-end/Images/resourcesIcon.png',6290 6284 'inspector/front-end/Images/resourcesSizeGraphIcon.png', 6291 6285 'inspector/front-end/Images/resourcesTimeGraphIcon.png', 6292 'inspector/front-end/Images/scriptsIcon.png',6293 6286 'inspector/front-end/Images/scriptsSilhouette.png', 6294 6287 'inspector/front-end/Images/searchSmallBlue.png', … … 6328 6321 'inspector/front-end/Images/timelineHollowPillRed.png', 6329 6322 'inspector/front-end/Images/timelineHollowPillYellow.png', 6330 'inspector/front-end/Images/timelineIcon.png',6331 6323 'inspector/front-end/Images/timelineBarBlue.png', 6332 6324 'inspector/front-end/Images/timelineBarGray.png', … … 6345 6337 'inspector/front-end/Images/timelinePillRed.png', 6346 6338 'inspector/front-end/Images/timelinePillYellow.png', 6339 'inspector/front-end/Images/toolbarIcons.png', 6340 'inspector/front-end/Images/toolbarIconsSmall.png', 6347 6341 'inspector/front-end/Images/toolbarItemSelected.png', 6348 6342 'inspector/front-end/Images/trackHoriz.png', -
trunk/Source/WebCore/inspector/front-end/Toolbar.js
r79306 r85588 43 43 44 44 WebInspector.Toolbar.prototype = { 45 set attached(attached) 46 { 47 if (attached) 48 this.element.addStyleClass("toolbar-small"); 49 else 50 this.element.removeStyleClass("toolbar-small"); 51 this._updateDropdownButtonAndHideDropdown(); 52 }, 53 45 54 resize: function() 46 55 { … … 166 175 this.element = document.createElement("div"); 167 176 this.element.id = "toolbar-dropdown"; 177 this.element.className = "toolbar-small"; 168 178 this._contentElement = this.element.createChild("div", "scrollable-content"); 169 179 this._contentElement.tabIndex = 0; -
trunk/Source/WebCore/inspector/front-end/WebKit.qrc
r85587 r85588 139 139 <file>textViewer.css</file> 140 140 <file>Images/applicationCache.png</file> 141 <file>Images/auditsIcon.png</file>142 141 <file>Images/back.png</file> 143 142 <file>Images/breakpointBorder.png</file> … … 148 147 <file>Images/closeButtons.png</file> 149 148 <file>Images/cookie.png</file> 150 <file>Images/consoleIcon.png</file>151 149 <file>Images/database.png</file> 152 150 <file>Images/databaseTable.png</file> … … 165 163 <file>Images/disclosureTriangleSmallRightDownWhite.png</file> 166 164 <file>Images/disclosureTriangleSmallRightWhite.png</file> 167 <file>Images/elementsIcon.png</file>168 165 <file>Images/errorIcon.png</file> 169 166 <file>Images/errorMediumIcon.png</file> … … 179 176 <file>Images/graphLabelCalloutRight.png</file> 180 177 <file>Images/localStorage.png</file> 181 <file>Images/networkIcon.png</file>182 178 <file>Images/paneAddButtons.png</file> 183 179 <file>Images/paneBottomGrow.png</file> … … 189 185 <file>Images/profileGroupIcon.png</file> 190 186 <file>Images/profileIcon.png</file> 191 <file>Images/profilesIcon.png</file>192 187 <file>Images/profileSmallIcon.png</file> 193 188 <file>Images/profilesSilhouette.png</file> … … 200 195 <file>Images/resourcePlainIcon.png</file> 201 196 <file>Images/resourcePlainIconSmall.png</file> 202 <file>Images/resourcesIcon.png</file>203 197 <file>Images/resourcesSizeGraphIcon.png</file> 204 198 <file>Images/resourcesTimeGraphIcon.png</file> 205 <file>Images/scriptsIcon.png</file>206 199 <file>Images/scriptsSilhouette.png</file> 207 200 <file>Images/searchSmallBlue.png</file> … … 250 243 <file>Images/timelineHollowPillRed.png</file> 251 244 <file>Images/timelineHollowPillYellow.png</file> 252 <file>Images/timelineIcon.png</file>253 245 <file>Images/timelinePillBlue.png</file> 254 246 <file>Images/timelinePillGray.png</file> … … 258 250 <file>Images/timelinePillRed.png</file> 259 251 <file>Images/timelinePillYellow.png</file> 252 <file>Images/toolbarIcons.png</file> 253 <file>Images/toolbarIconsSmall.png</file> 260 254 <file>Images/toolbarItemSelected.png</file> 261 255 <file>Images/trackHoriz.png</file> -
trunk/Source/WebCore/inspector/front-end/inspector.css
r85587 r85588 132 132 width: 32px; 133 133 height: 32px; 134 -webkit-background-size: 100% auto; 135 } 136 137 body.attached .toolbar-icon, 138 #toolbar-dropdown .toolbar-icon { 134 background-image: url(Images/toolbarIcons.png); 135 } 136 137 .toolbar-small .toolbar-icon { 139 138 width: 24px; 140 139 height: 24px; 141 140 vertical-align: middle; 141 background-image: url(Images/toolbarIconsSmall.png); 142 142 } 143 143 144 144 .toolbar-item:active .toolbar-icon { 145 background-position : 032px;146 } 147 148 body.attached.toolbar-item:active .toolbar-icon {149 background-position : 024px;145 background-position-y: 32px; 146 } 147 148 .toolbar-small .toolbar-item:active .toolbar-icon { 149 background-position-y: 24px; 150 150 } 151 151 … … 160 160 } 161 161 162 body.attached .toolbar-label, 163 #toolbar-dropdown .toolbar-label { 162 .toolbar-small .toolbar-label { 164 163 display: inline-block; 165 164 margin-left: 3px; … … 254 253 } 255 254 256 #toolbar-dropdown .toolbar-item:active .toolbar-icon {257 background-position: 0 24px;258 }259 260 255 .scrollable-content { 261 256 position: static; … … 314 309 315 310 .toolbar-item.elements .toolbar-icon { 316 background- image: url(Images/elementsIcon.png);311 background-position-x: 0; 317 312 } 318 313 319 314 .toolbar-item.resources .toolbar-icon { 320 background-image: url(Images/resourcesIcon.png); 315 background-position-x: -32px; 316 } 317 318 .toolbar-small .toolbar-item.resources .toolbar-icon { 319 background-position-x: -24px; 321 320 } 322 321 323 322 .toolbar-item.network .toolbar-icon { 324 background-image: url(Images/networkIcon.png); 323 background-position-x: -64px; 324 } 325 326 .toolbar-small .toolbar-item.network .toolbar-icon { 327 background-position-x: -48px; 325 328 } 326 329 327 330 .toolbar-item.scripts .toolbar-icon { 328 background-image: url(Images/scriptsIcon.png); 331 background-position-x: -96px; 332 } 333 334 .toolbar-small .toolbar-item.scripts .toolbar-icon { 335 background-position-x: -72px; 329 336 } 330 337 331 338 .toolbar-item.timeline .toolbar-icon { 332 background-image: url(Images/timelineIcon.png); 339 background-position-x: -128px; 340 } 341 342 .toolbar-small .toolbar-item.timeline .toolbar-icon { 343 background-position-x: -96px; 333 344 } 334 345 335 346 .toolbar-item.profiles .toolbar-icon { 336 background-image: url(Images/profilesIcon.png); 347 background-position-x: -160px; 348 } 349 350 .toolbar-small .toolbar-item.profiles .toolbar-icon { 351 background-position-x: -120px; 337 352 } 338 353 339 354 .toolbar-item.audits .toolbar-icon { 340 background-image: url(Images/auditsIcon.png); 355 background-position-x: -192px; 356 } 357 358 .toolbar-small .toolbar-item.audits .toolbar-icon { 359 background-position-x: -144px; 341 360 } 342 361 343 362 .toolbar-item.console .toolbar-icon { 344 background-image: url(Images/consoleIcon.png); 363 background-position-x: -224px; 364 } 365 366 .toolbar-small .toolbar-item.console .toolbar-icon { 367 background-position-x: -168px; 345 368 } 346 369 … … 523 546 524 547 .status-bar-item > .glyph { 525 -webkit-mask-image: url(Images/status barButtonGlyphs.png);548 -webkit-mask-image: url(Images/statusBarButtonGlyphs.png); 526 549 } 527 550 -
trunk/Source/WebCore/inspector/front-end/inspector.js
r85587 r85588 29 29 */ 30 30 31 // Keep this ; so that concatenated version of the script worked.32 ;(function preloadImages()33 {34 (new Image()).src = "Images/statusbarButtonGlyphs.png";35 })();36 37 31 var WebInspector = { 38 32 resources: {}, … … 206 200 // This may be called before onLoadedDone, hence the bulk of inspector objects may 207 201 // not be created yet. 202 if (WebInspector.toolbar) 203 WebInspector.toolbar.attached = x; 204 208 205 if (WebInspector.searchController) 209 206 WebInspector.searchController.updateSearchLabel(); … … 445 442 this._panelHistory = new WebInspector.PanelHistory(); 446 443 this.toolbar = new WebInspector.Toolbar(); 444 this.toolbar.attached = WebInspector.attached; 447 445 448 446 this.panelOrder = [];
Note: See TracChangeset
for help on using the changeset viewer.