チェンジセット 75

更新日時:

2009/08/23 22:17:21 (2 年 前)

更新者:

h

ログメッセージ:

refs #4
greasemonkey入ってない場合はボタン押せなくする。

パス:

branches/release-1.0/chrome

ファイル:

• content/config.js (変更) (5 diff)
• content/config.xul (変更) (1 diff)
• content/overlay.xul (変更) (1 diff)
• content/vocalofx.js (変更) (1 diff)
• locale/ja/vocalofx.dtd (変更) (1 diff)

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

@@ -6 +6 @@
 const SPLASH_VOICE = "splash_voice";
 const USE_ALLPARET = "use_allparet";
-const TOOL_STARTUP = "tool_onstartup";
+const TOOL_ONSTARTUP = "tool_onstartup";
+const PIAPROGM_BUTTON = "piapro_gm.button";
+const PIAPROGM_NOTINST = "piapro_gm.notinstalled";
 
+const ENABLED_ITEMS = "extensions.enabledItems";
 const ALERT_THEME = "extensions.vocalofx.skin_theme_alert";
 const DEFAULT_THEME = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
@@ -16 +19 @@
 const SPLASH_PROPERTY_VOICE = "extensions.vocalofx.skin_splash.voice";
 const SKIN_PROPERTY_USE_ALLPARET = "extensions.vocalofx.skin_use_allparet";
+const GREASEMONKEY_ID = "{e4a8a97b-f2ed-450b-b12d-ee082ba24781}";
 
 var icons_default = 
@@ -66 +70 @@
         splash_voice.checked = (prefBrc2.getCharPref(SPLASH_PROPERTY_VOICE) == "");
 
-        var tool_onstartup = document.getElementById(TOOL_STARTUP);
+        var tool_onstartup = document.getElementById(TOOL_ONSTARTUP);
         tool_onstartup.addEventListener("command", observe, true);
         tool_onstartup.checked = !prefBrc2.getBoolPref(TOOL_PROPERTY_STARTUP);
@@ -73 +77 @@
         use_allparet.addEventListener("command", observe, true);
         use_allparet.checked = prefBrc2.getBoolPref(SKIN_PROPERTY_USE_ALLPARET);
+
+        var items = prefBrc2.getCharPref(ENABLED_ITEMS);
+        if(items.indexOf(GREASEMONKEY_ID) == -1){
+                document.getElementById(PIAPROGM_NOTINST).collapsed = false;
+                document.getElementById(PIAPROGM_BUTTON).disabled = true;
+        }
 }
 
@@ -99 +109 @@
                 prefBrc2.setCharPref(SPLASH_PROPERTY_VOICE, voice);
         }
-        else if(target.id == TOOL_STARTUP){
+        else if(target.id == TOOL_ONSTARTUP){
                 prefBrc2.setBoolPref(TOOL_PROPERTY_STARTUP, !target.checked);
         }

branches/release-1.0/chrome/content/config.xul

@@ -59 +59 @@
                 <checkbox id="tool_onstartup" label="&vocalofx.config.other.tool_onstartup.label;"/>
                 <checkbox id="use_allparet" label="&vocalofx.config.other.use_allparet.label;"/>
-                <hbox><label id="piapro_gm.label" style="padding-top:0.5em;" value="&vocalofx.config.other.piapro_gm.label;"/><button label="&vocalofx.config.other.piapro_gm.button;" oncommand="openPiaprogmDialog();"/></hbox>
+                <hbox><label id="piapro_gm.label" style="padding-top:0.5em;" value="&vocalofx.config.other.piapro_gm.label;"/><button id="piapro_gm.button" label="&vocalofx.config.other.piapro_gm.button;" oncommand="openPiaprogmDialog();"/></hbox>
+                <label id="piapro_gm.notinstalled" value="&vocalofx.config.other.piapro_gm.notinstalled;" style="font-weight:bold;color:red;" collapsed="true"/>
         </groupbox>
 <!--

branches/release-1.0/chrome/content/overlay.xul

@@ -22 +22 @@
 
         <menupopup id="menu_HelpPopup">
-                <menuitem id="vocalofx-help" label="&vocalofx.menu.help.label;" oncommand="vocalofx.openReadMe();"/>
+                <menuitem id="vocalofx-help" label="&vocalofx.menu.help.label;" oncommand="vocalofx.openReadMeOrEE();"/>
         </menupopup>
 

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

@@ -368 +368 @@
         ,
         openReadMe: function(){
+                window.openNewTabWith("about:vocalofx");
+        }
+        ,
+        openReadMeOrEE: function(){
                 try{
                         var category = this.pref.getCharPref(this.SKIN_PROPERTY_CATEGORY);

branches/release-1.0/chrome/locale/ja/vocalofx.dtd

@@ -30 +30 @@
 <!ENTITY vocalofx.config.other.piapro_gm.label "ピアプロユーザー支援ツールを">
 <!ENTITY vocalofx.config.other.piapro_gm.button "インストール">
+<!ENTITY vocalofx.config.other.piapro_gm.notinstalled "Greasemonkeyがインストールされていません！">
 
 <!ENTITY vocalofx.alert.title "競合アドオンの警告">