チェンジセット 67

更新日時:

2009/07/14 01:46:40 (3 年 前)

更新者:

h

ログメッセージ:

fixes #9
競合アドオン警告機能を実装。
アップデートチェック、ピアプロ支援ツールも全部移した。
言語リソースはまだベタなので、後で移す予定。

パス:

branches/release-1.0

ファイル:

• chrome/content/alert.js (追加)
• chrome/content/alert.xul (追加)
• chrome/content/tool/piapro_gm.js (変更) (4 diff)
• chrome/content/tool/piapro_gm.xul (変更) (1 diff)
• chrome/content/update.js (削除)
• chrome/content/vocalofx.js (変更) (1 diff)
• components/vocalofx-startup.js (追加)
• components/vocalofx.js (変更) (2 diff)
• defaults/preferences/vocalofx.js (変更) (1 diff)
• modules/common.js (変更) (1 diff)

branches/release-1.0/chrome/content/tool/piapro_gm.js

@@ +1 @@
+const Cc = Components.classes;
+const Ci = Components.interfaces;
 const TOOL_PROPERTY_PIAPROGM_ALERT = "extensions.vocalofx.tool_piaprogm_alert";
 const PIAPRO_GMSCRIPTS = [
@@ -11 +13 @@
 
 function openPiaproGMInstall(){
-        pref = window.arguments[0];
+        pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
         vocalofx_properties = document.getElementById("vocalofx-properties");
 }
@@ -42 +44 @@
 function install(script){
         install_failed = true;
-        var ioSvc = Components.classes["@mozilla.org/network/io-service;1"]
-                .getService(Components.interfaces.nsIIOService);
+        var ioSvc = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
         var uri_ = ioSvc.newURI(script, null, null);
         var req_ = new XMLHttpRequest();
         req_.onload = function(){
-                var config = Components.classes["@greasemonkey.mozdev.org/greasemonkey-service;1"]
-                        .getService(Components.interfaces.gmIGreasemonkeyService)
-                        .wrappedJSObject.config;
+                var config = Cc["@greasemonkey.mozdev.org/greasemonkey-service;1"].getService(Ci.gmIGreasemonkeyService).wrappedJSObject.config;
                 var source = req_.responseText;
                 var script = config.parse(source, uri_);
-                var file = Components.classes["@mozilla.org/file/directory_service;1"]
-                        .getService(Components.interfaces.nsIProperties)
-                        .get("TmpD", Components.interfaces.nsILocalFile);
+                var file = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties).get("TmpD", Ci.nsILocalFile);
                 var base = script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
                 file.append(base + ".user.js");
-                file.createUnique(Components.interfaces.nsILocalFile.NORMAL_FILE_TYPE, 0640);
-                var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
-                        .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+                file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
+                var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Ci.nsIScriptableUnicodeConverter);
                 converter.charset = "UTF-8";
                 source = converter.ConvertFromUnicode(source);
-                var ws = Components.classes["@mozilla.org/network/file-output-stream;1"]
-                        .createInstance(Components.interfaces.nsIFileOutputStream);
+                var ws = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
                 ws.init(file, 0x02 | 0x08 | 0x20, 420, -1);
                 ws.write(source, source.length);
@@ -79 +74 @@
         }
 }
-
-function loadHomepage(aEvent){
-        window.opener.openUILinkIn(aEvent.target.getAttribute("homepageURL"), "tab");
-}

branches/release-1.0/chrome/content/tool/piapro_gm.xul

@@ -19 +19 @@
         <separator/>
         <label style="margin-left: 2em;" value="&vocalofx.piapro_gm.poweredby;"/>
-        <label style="margin-left: 2em;" value="&vocalofx.piapro_gm.homepage;"
-                class="text-link" onclick="loadHomepage(event);"
-                homepageURL="&vocalofx.piapro_gm.homepage;"
-                tooltiptext="&vocalofx.piapro_gm.homepage;"/>
+        <label style="margin-left: 2em;" value="&vocalofx.piapro_gm.homepage;"/>
         <separator/>
 </dialog>

branches/release-1.0/chrome/content/vocalofx.js

@@ -334 +334 @@
         init: function(){
                 window.removeEventListener(this.BROWSER_ONLOAD, this, false);
-                vocalofx_update.check();
 
                 var Cc = Components.classes;

branches/release-1.0/components/vocalofx.js

@@ -2 +2 @@
 const Ci = Components.interfaces;
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-var ios=Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService)
-var resProt=ios.getProtocolHandler("resource").QueryInterface(Ci.nsIResProtocolHandler)
-var modulesDir=__LOCATION__.parent.parent
-modulesDir.append("modules")
-resProt.setSubstitution("p4v-jsm",ios.newFileURI(modulesDir))
 
 function VocaloFxSplash(){}
@@ -18 +12 @@
 
         helpInfo: this.classDescription,
-
         handle: function(commandLine){
                 var pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);

branches/release-1.0/defaults/preferences/vocalofx.js

@@ -21 +21 @@
 pref("extensions.vocalofx.skin_splash.screen_height", 295);
 pref("extensions.vocalofx.skin_splash.voice", "chrome://vocalofx/content/splash/miku_kidou.wav");
-pref("extensions.vocalofx.skin_pallet_alert", true);
+pref("extensions.vocalofx.skin_pallet_alert", false);
 pref("extensions.vocalofx.skin_theme_alert", true);
 pref("extensions.vocalofx.tool_piaprogm_alert", true);
+pref("extensions.vocalofx.alert_addon.personas@christopher.beard", true);
+pref("extensions.vocalofx.alert_addon.greengoo@goo.ne.jp", true);
+pref("extensions.vocalofx.alert_addon.splash@aldreneo.com", true);
+pref("extensions.vocalofx.alert_addon.abouticecream@mozilla.org", true);
+pref("extensions.vocalofx.alert_addon.{b065cadc-711c-4074-a257-63df8e2128d7}", true);
+pref("extensions.vocalofx.alert_addon.{7bc0198a-a87d-4620-bbcd-33aaceea99ed}", true);
+//pref("extensions.vocalofx.alert_addon.{c36127eb-3cfe-40dd-990e-3e72a85b43cf}", true);
+pref("extensions.vocalofx.alert_addon.{137E6D74-4113-499b-813F-3819B3764DC9}", true);
 pref("nglayout.debug.disable_xul_cache", true);

branches/release-1.0/modules/common.js

@@ -16 +16 @@
 
 var xpc={
+        lclstr:Components.Constructor("@mozilla.org/pref-localizedstring;1","nsIPrefLocalizedString"),
+        sptAry:Components.Constructor("@mozilla.org/supports-array;1","nsISupportsArray"),
+        strbndSvc:svConstructor("@mozilla.org/intl/stringbundle;1","nsIStringBundleService"),
         file:Components.Constructor("@mozilla.org/file/local;1","nsILocalFile","initWithPath"),
         fp:Components.Constructor("@mozilla.org/filepicker;1","nsIFilePicker","init"),
         ioSvc:svConstructor("@mozilla.org/network/io-service;1","nsIIOService2"),
         prefSvc:svConstructor("@mozilla.org/preferences-service;1","nsIPrefService"),
+        prefBrc2:svConstructor("@mozilla.org/preferences-service;1","nsIPrefBranch2"),
         dirSvc:svConstructor("@mozilla.org/file/directory_service;1","nsIProperties"),
         xferData:Components.Constructor("@mozilla.org/widget/transferable;1","nsITransferable"),