From: Damyan Ivanov Date: Mon, 19 Jun 2017 12:46:43 +0000 (+0000) Subject: remove legacy XPCOM implementation X-Git-Tag: 2.0~19 X-Git-Url: https://git.ktnx.net/?p=icedeb.git;a=commitdiff_plain;h=a616d47af8df39cffe632272af83772d904d5cbf remove legacy XPCOM implementation --- diff --git a/Makefile b/Makefile index 61187fe..da40095 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,15 @@ #!/usr/bin/make -f -# vim: noet ts=8 ft=makefile +# vim: noet sts=8 sw=8 ts=8 ft=makefile PKG := icedeb -ALL_FILES := README TODO install.rdf chrome.manifest \ - $(shell find res -type f) $(shell find chrome -type f) +ALL_FILES := README TODO manifest.json icedeb.js icedeb.css icedeb.html icedeb-content.js \ + $(shell find res -type f) icons/openlogo-nd.svg icons/icedeb-addon.png all: $(PKG).xpi $(PKG).xpi: $(ALL_FILES) rm -f $@ zip $@ $^ -XCF := res/button-bts.xcf - -chrome/content/icedeb-bts.png: $(XCF) - xcf2png -o "$@" "$<" "base" "bts small" "bts big" -chrome/content/icedeb-buildd.png: $(XCF) - xcf2png -o "$@" "$<" "base" "buildd small" "buildd big" -chrome/content/icedeb-ddpo.png: $(XCF) - xcf2png -o "$@" "$<" "base" "DD small" "DD big" -chrome/content/icedeb-deb.png: $(XCF) - xcf2png -o "$@" "$<" "base" "deb small" "deb big" -chrome/content/icedeb-ml.png: $(XCF) - xcf2png -o "$@" "$<" "base" "ML small" "ML big" -chrome/content/icedeb-pts.png: $(XCF) - xcf2png -o "$@" "$<" "base" "pts small" "pts big" -chrome/content/icedeb-security.png: $(XCF) - xcf2png -o "$@" "$<" "base" "security small" "security big" +icons/icedeb-addon.png: res/icon.xcf + xcf2png -o "$@" $< -f -T diff --git a/build b/build index 08d261a..c9b7c2a 100644 --- a/build +++ b/build @@ -5,23 +5,8 @@ set -u export PKG=icedeb -btn2png() { - local tag="$1" - local btn="${2:-$tag}" - - xcf2png -o "chrome/content/$PKG-$btn.png" res/button-bts.xcf "base" "$tag small" "$tag big" -} - xcf2png -o "icons/icedeb-addon.png" res/icon.xcf -f -T -btn2png bts -btn2png pts -btn2png deb -btn2png ML ml -btn2png DD ddpo -btn2png buildd -btn2png security - [ ! -e $PKG.xpi ] || rm $PKG.xpi zip -r $PKG.xpi README TODO res \ diff --git a/chrome.manifest b/chrome.manifest deleted file mode 100644 index 88666b5..0000000 --- a/chrome.manifest +++ /dev/null @@ -1,8 +0,0 @@ -content icedeb chrome/content/ -style chrome://global/content/customizeToolbar.xul chrome://icedeb/content/icedeb.css - -locale icedeb en-US chrome/locale/en-US/ -locale icedeb bg-BG chrome/locale/bg-BG/ - -# Firefox -overlay chrome://browser/content/browser.xul chrome://icedeb/content/icedeb.xul diff --git a/chrome/content/icedeb-bts.png b/chrome/content/icedeb-bts.png deleted file mode 100644 index c691b25..0000000 Binary files a/chrome/content/icedeb-bts.png and /dev/null differ diff --git a/chrome/content/icedeb-buildd.png b/chrome/content/icedeb-buildd.png deleted file mode 100644 index 977755f..0000000 Binary files a/chrome/content/icedeb-buildd.png and /dev/null differ diff --git a/chrome/content/icedeb-ddpo.png b/chrome/content/icedeb-ddpo.png deleted file mode 100644 index 2bd850e..0000000 Binary files a/chrome/content/icedeb-ddpo.png and /dev/null differ diff --git a/chrome/content/icedeb-deb.png b/chrome/content/icedeb-deb.png deleted file mode 100644 index 3718c76..0000000 Binary files a/chrome/content/icedeb-deb.png and /dev/null differ diff --git a/chrome/content/icedeb-ml.png b/chrome/content/icedeb-ml.png deleted file mode 100644 index 90eaee8..0000000 Binary files a/chrome/content/icedeb-ml.png and /dev/null differ diff --git a/chrome/content/icedeb-pts.png b/chrome/content/icedeb-pts.png deleted file mode 100644 index d13f38e..0000000 Binary files a/chrome/content/icedeb-pts.png and /dev/null differ diff --git a/chrome/content/icedeb-security.png b/chrome/content/icedeb-security.png deleted file mode 100644 index b45ab7d..0000000 Binary files a/chrome/content/icedeb-security.png and /dev/null differ diff --git a/chrome/content/icedeb.css b/chrome/content/icedeb.css deleted file mode 100644 index acd8e43..0000000 --- a/chrome/content/icedeb.css +++ /dev/null @@ -1,34 +0,0 @@ -#icedeb-bts, -#wrapper-icedeb-bts -{list-style-image: url("chrome://icedeb/content/icedeb-bts.png");} - -#icedeb-pts, -#wrapper-icedeb-pts -{list-style-image: url("chrome://icedeb/content/icedeb-pts.png");} - -#icedeb-deb, -#wrapper-icedeb-deb -{list-style-image: url("chrome://icedeb/content/icedeb-deb.png");} - -#icedeb-ml, -#wrapper-icedeb-ml -{list-style-image: url("chrome://icedeb/content/icedeb-ml.png");} - -#icedeb-ddpo, -#wrapper-icedeb-ddpo -{list-style-image: url("chrome://icedeb/content/icedeb-ddpo.png");} - -#icedeb-buildd, -#wrapper-icedeb-buildd -{list-style-image: url("chrome://icedeb/content/icedeb-buildd.png");} - -#icedeb-security, -#wrapper-icedeb-security -{list-style-image: url("chrome://icedeb/content/icedeb-security.png");} - -/* common style for all custom buttons */ -.icedeb-button -{-moz-image-region: rect( 0px 24px 24px 0px);} - -[iconsize="small"] .icedeb-button -{-moz-image-region: rect( 0px 40px 16px 24px);} diff --git a/chrome/content/icedeb.js b/chrome/content/icedeb.js deleted file mode 100644 index a8db84b..0000000 --- a/chrome/content/icedeb.js +++ /dev/null @@ -1,195 +0,0 @@ -IceDeb = { - getClipboardText: function() { - var clip = Components.classes['@mozilla.org/widget/clipboard;1'] - .getService(Components.interfaces.nsIClipboard); - if (!clip) return null; - - var trans = Components.classes['@mozilla.org/widget/transferable;1'] - .createInstance(Components.interfaces.nsITransferable); - if (!trans) return null; - - if (typeof(trans.init) === 'function') - trans.init(null); - - trans.addDataFlavor("text/unicode"); - clip.getData(trans, - clip.supportsSelectionClipboard() - ? clip.kSelectionClipboard - : clip.kGlobalClipboard - ); - - var s = new Object; - var p; - var len = new Object; - trans.getTransferData("text/unicode", s, len); - - var text = null; - var res; - - if (s) - p = s.value.QueryInterface(Components.interfaces.nsISupportsString, res); - if (p) - text = p.data.substring(0, len.value / 2); - - return text; - }, - trim_keyword: function(word) { - if (!word) return word; - - var oldword; - do { - oldword = word; - - word = word.replace(/^[^a-zA-Z0-9]+/, ''); - word = word.replace(/[^a-zA-Z0-9]+$/, ''); - word = word.replace(/^Bug#/i, ''); - } while ( oldword != word ); - - return word; - }, - lookup_bts: function(in_new) { - var bug = IceDeb.trim_keyword(IceDeb.getClipboardText()); - if (!bug) return null; - var uri="https://bugs.debian.org/" + bug; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_pts: function(in_new) { - var pkg = IceDeb.trim_keyword(IceDeb.getClipboardText()); - if (!pkg) return null; - var uri="https://tracker.debian.org/" + pkg; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_deb: function(in_new) { - var pkg = IceDeb.trim_keyword(IceDeb.getClipboardText()); - if (!pkg) return null; - var uri="https://packages.debian.org/" + pkg; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_ml: function(in_new) { - var msg_id = IceDeb.trim_keyword(IceDeb.getClipboardText()); - if (!msg_id) msg_id = ''; - var uri="https://lists.debian.org/msgid-search/" + msg_id; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_ddpo: function(in_new) { - var keyword = IceDeb.trim_keyword(IceDeb.getClipboardText()); - var uri="https://qa.debian.org/developer.php"; - - if (keyword) uri += "?login=" + keyword; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_buildd: function(in_new) { - var keyword = IceDeb.trim_keyword(IceDeb.getClipboardText()); - var uri="https://buildd.debian.org/"; - - if (keyword) uri += keyword; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - lookup_security: function(in_new) { - var keyword = IceDeb.trim_keyword(IceDeb.getClipboardText()); - var uri="https://security-tracker.debian.org/"; - - if (keyword) uri += "tracker/" + keyword; - - if (in_new) { - var b = getBrowser(); - var new_tab = b.addTab(uri); - b.selectedTab = new_tab; - } - else { - loadURI(uri); - } - }, - - btsButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_bts(false) - else if ( e.button == 1 ) - IceDeb.lookup_bts(true); - }, - ptsButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_pts(false) - else if ( e.button == 1 ) - IceDeb.lookup_pts(true); - }, - debButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_deb(false) - else if ( e.button == 1 ) - IceDeb.lookup_deb(true); - }, - mlButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_ml(false) - else if ( e.button == 1 ) - IceDeb.lookup_ml(true); - }, - ddpoButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_ddpo(false) - else if ( e.button == 1 ) - IceDeb.lookup_ddpo(true); - }, - builddButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_buildd(false) - else if ( e.button == 1 ) - IceDeb.lookup_buildd(true); - }, - securityButton: function (e) { - if ( e.button == 0 ) - IceDeb.lookup_security(false) - else if ( e.button == 1 ) - IceDeb.lookup_security(true); - } -} - diff --git a/chrome/content/icedeb.xul b/chrome/content/icedeb.xul deleted file mode 100644 index 7b8e347..0000000 --- a/chrome/content/icedeb.xul +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - -