From b83e0b46d5376546336a8bbecde8b71538caf6ad Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 15 Mar 2015 08:17:38 -0400 Subject: [PATCH] move platform-specific images to their respective platform --- {src => doc}/img/ublock-16.svg | 0 {src => doc}/img/ublock.svg | 0 .../chromium}/img/browsericons/icon19-off.png | Bin .../chromium}/img/browsericons/icon19.png | Bin .../chromium}/img/browsericons/icon38-off.png | Bin .../chromium}/img/browsericons/icon38.png | Bin .../firefox/img/browsericons/icon16-off.svg | 0 .../firefox/img/browsericons/icon16.svg | 0 platform/firefox/vapi-background.js | 6 +++--- .../safari}/img/browsericons/safari-icon16-off.png | Bin .../safari}/img/browsericons/safari-icon16-off.svg | 0 .../img/browsericons/safari-icon16-off@2x.png | Bin .../safari}/img/browsericons/safari-icon16.png | Bin .../safari}/img/browsericons/safari-icon16.svg | 0 .../safari}/img/browsericons/safari-icon16@2x.png | Bin tools/make-chromium.sh | 1 + tools/make-firefox.sh | 1 + tools/make-safari.sh | 1 + 18 files changed, 6 insertions(+), 3 deletions(-) rename {src => doc}/img/ublock-16.svg (100%) rename {src => doc}/img/ublock.svg (100%) rename {src => platform/chromium}/img/browsericons/icon19-off.png (100%) rename {src => platform/chromium}/img/browsericons/icon19.png (100%) rename {src => platform/chromium}/img/browsericons/icon38-off.png (100%) rename {src => platform/chromium}/img/browsericons/icon38.png (100%) rename src/img/browsericons/ff-icon16-off.svg => platform/firefox/img/browsericons/icon16-off.svg (100%) rename src/img/browsericons/ff-icon16.svg => platform/firefox/img/browsericons/icon16.svg (100%) rename {src => platform/safari}/img/browsericons/safari-icon16-off.png (100%) rename {src => platform/safari}/img/browsericons/safari-icon16-off.svg (100%) rename {src => platform/safari}/img/browsericons/safari-icon16-off@2x.png (100%) rename {src => platform/safari}/img/browsericons/safari-icon16.png (100%) rename {src => platform/safari}/img/browsericons/safari-icon16.svg (100%) rename {src => platform/safari}/img/browsericons/safari-icon16@2x.png (100%) diff --git a/src/img/ublock-16.svg b/doc/img/ublock-16.svg similarity index 100% rename from src/img/ublock-16.svg rename to doc/img/ublock-16.svg diff --git a/src/img/ublock.svg b/doc/img/ublock.svg similarity index 100% rename from src/img/ublock.svg rename to doc/img/ublock.svg diff --git a/src/img/browsericons/icon19-off.png b/platform/chromium/img/browsericons/icon19-off.png similarity index 100% rename from src/img/browsericons/icon19-off.png rename to platform/chromium/img/browsericons/icon19-off.png diff --git a/src/img/browsericons/icon19.png b/platform/chromium/img/browsericons/icon19.png similarity index 100% rename from src/img/browsericons/icon19.png rename to platform/chromium/img/browsericons/icon19.png diff --git a/src/img/browsericons/icon38-off.png b/platform/chromium/img/browsericons/icon38-off.png similarity index 100% rename from src/img/browsericons/icon38-off.png rename to platform/chromium/img/browsericons/icon38-off.png diff --git a/src/img/browsericons/icon38.png b/platform/chromium/img/browsericons/icon38.png similarity index 100% rename from src/img/browsericons/icon38.png rename to platform/chromium/img/browsericons/icon38.png diff --git a/src/img/browsericons/ff-icon16-off.svg b/platform/firefox/img/browsericons/icon16-off.svg similarity index 100% rename from src/img/browsericons/ff-icon16-off.svg rename to platform/firefox/img/browsericons/icon16-off.svg diff --git a/src/img/browsericons/ff-icon16.svg b/platform/firefox/img/browsericons/icon16.svg similarity index 100% rename from src/img/browsericons/ff-icon16.svg rename to platform/firefox/img/browsericons/icon16.svg diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index 37a1410f1..e7c342a84 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -1463,7 +1463,7 @@ vAPI.toolbarButton.init = function() { this.styleURI = [ '#' + this.id + ' {', 'list-style-image: url(', - vAPI.getURL('img/browsericons/ff-icon16-off.svg'), + vAPI.getURL('img/browsericons/icon16-off.svg'), ');', '}', '#' + this.viewId + ', #' + this.viewId + ' > iframe {', @@ -1675,7 +1675,7 @@ vAPI.toolbarButton.updateState = function(win, tabId) { icon = ''; } else { - icon = 'url(' + vAPI.getURL('img/browsericons/ff-icon16.svg') + ')'; + icon = 'url(' + vAPI.getURL('img/browsericons/icon16.svg') + ')'; } button.style.listStyleImage = icon; @@ -1766,7 +1766,7 @@ vAPI.contextMenu.register = function(doc) { var menuitem = doc.createElement('menuitem'); menuitem.setAttribute('id', this.menuItemId); menuitem.setAttribute('label', this.menuLabel); - menuitem.setAttribute('image', vAPI.getURL('img/browsericons/ff-icon16.svg')); + menuitem.setAttribute('image', vAPI.getURL('img/browsericons/icon16.svg')); menuitem.setAttribute('class', 'menuitem-iconic'); menuitem.addEventListener('command', this.onCommand); contextMenu.addEventListener('popupshowing', this.displayMenuItem); diff --git a/src/img/browsericons/safari-icon16-off.png b/platform/safari/img/browsericons/safari-icon16-off.png similarity index 100% rename from src/img/browsericons/safari-icon16-off.png rename to platform/safari/img/browsericons/safari-icon16-off.png diff --git a/src/img/browsericons/safari-icon16-off.svg b/platform/safari/img/browsericons/safari-icon16-off.svg similarity index 100% rename from src/img/browsericons/safari-icon16-off.svg rename to platform/safari/img/browsericons/safari-icon16-off.svg diff --git a/src/img/browsericons/safari-icon16-off@2x.png b/platform/safari/img/browsericons/safari-icon16-off@2x.png similarity index 100% rename from src/img/browsericons/safari-icon16-off@2x.png rename to platform/safari/img/browsericons/safari-icon16-off@2x.png diff --git a/src/img/browsericons/safari-icon16.png b/platform/safari/img/browsericons/safari-icon16.png similarity index 100% rename from src/img/browsericons/safari-icon16.png rename to platform/safari/img/browsericons/safari-icon16.png diff --git a/src/img/browsericons/safari-icon16.svg b/platform/safari/img/browsericons/safari-icon16.svg similarity index 100% rename from src/img/browsericons/safari-icon16.svg rename to platform/safari/img/browsericons/safari-icon16.svg diff --git a/src/img/browsericons/safari-icon16@2x.png b/platform/safari/img/browsericons/safari-icon16@2x.png similarity index 100% rename from src/img/browsericons/safari-icon16@2x.png rename to platform/safari/img/browsericons/safari-icon16@2x.png diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index 5d0ac1542..c032634af 100755 --- a/tools/make-chromium.sh +++ b/tools/make-chromium.sh @@ -19,6 +19,7 @@ cp -R src/_locales $DES/ cp -R $DES/_locales/nb $DES/_locales/no cp src/*.html $DES/ cp platform/chromium/*.js $DES/js/ +cp -R platform/chromium/img $DES/ cp platform/chromium/*.html $DES/ cp platform/chromium/manifest.json $DES/ cp LICENSE.txt $DES/ diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index 91f3e5fc3..221ceffa1 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -20,6 +20,7 @@ mv $DES/img/icon_128.png $DES/icon.png cp platform/firefox/vapi-*.js $DES/js/ cp platform/firefox/bootstrap.js $DES/ cp platform/firefox/frame*.js $DES/ +cp -R platform/firefox/img $DES/ cp platform/firefox/chrome.manifest $DES/ cp platform/firefox/install.rdf $DES/ cp platform/firefox/*.xul $DES/ diff --git a/tools/make-safari.sh b/tools/make-safari.sh index 5d774be57..57aec1668 100755 --- a/tools/make-safari.sh +++ b/tools/make-safari.sh @@ -18,6 +18,7 @@ cp -R src/_locales $DES/ cp src/*.html $DES/ mv $DES/img/icon_128.png $DES/Icon.png cp platform/safari/*.js $DES/js/ +cp -R platform/safari/img $DES/ cp platform/safari/Info.plist $DES/ cp platform/safari/Settings.plist $DES/ cp LICENSE.txt $DES/