チェンジセット 68 : branches

更新日時:

2009/07/16 02:51:17 (3 年 前)

更新者:

h

ログメッセージ:

fixes #4
これもとりあえずだがコミット。
変更したらその場で反映するタイプ。キャンセルボタンはない。

パス:

branches/release-1.0

ファイル:

• chrome/content/config.js (追加)
• chrome/content/config.xul (追加)
• chrome/content/overlay.xul (変更) (1 diff)
• chrome/content/vocalofx.js (変更) (5 diff)
• defaults/preferences/vocalofx.js (変更) (1 diff)
• install.rdf (変更) (2 diff)
• platform/Linux/chrome/icons/default/vocalofx-config.xpm (追加)
• platform/WINNT/chrome/icons/default/vocalofx-config.ico (追加)

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

@@ -24 +24 @@
                 <statusbarpanel id="vocalofx-menuroot" class="statusbarpanel-menu-iconic" src="">
                 <menupopup id="vocalofx-popup">
-                        <menuitem id="vocalofx-about" label="about ..." oncommand="vocalofx.openAboutDialog();"/>
-                        <menuitem id="vocalofx-config" label="config ..." oncommand="vocalofx.openConfigDialog();"/>
+                        <menuitem id="vocalofx-icecream" collapsed="true" label="icecream" oncommand="vocalofx.openIcecream();"/>
+                        <menuitem id="vocalofx-onecup" collapsed="true" label="onecup" oncommand="vocalofx.openOnecup();"/>
+                        <menuitem id="vocalofx-readme" label="README" oncommand="vocalofx.openReadMe();"/>
+                        <menuitem id="vocalofx-config" label="設定" oncommand="vocalofx.openConfigDialog();"/>
                         <menu id="vocalofx-tool-menu" label="&vocalofx.tool_menu.label;">
                         <menupopup id="vocalofx-tool-popup">

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

@@ -10 +10 @@
         TOOL_PROPERTY_POSITION: "extensions.vocalofx.tool.position",
         TOOL_PROPERTY_STARTUP: "extensions.vocalofx.tool.startup",
+        TOOL_PROPERTY_TOOL_ONSTARTUP: "extensions.vocalofx.tool_onstartup",
         TOOL_PROPERTY_PIAPROGM_ALERT: "extensions.vocalofx.tool_piaprogm_alert",
         TOOLDIALOG_URL: "chrome://vocalofx/content/tool/tool.xul",
@@ -250 +251 @@
                 }
 
+                var tool_onstartup = this.pref.getBoolPref(this.TOOL_PROPERTY_TOOL_ONSTARTUP);
                 var tool_popup = document.getElementById("vocalofx-tool-popup");
                 var tools = this.tool_properties.getString("toolmenu").split(",");
@@ -259 +261 @@
                         tool_popup.appendChild(menuitem);
                         try{
-                                if(this.pref.getBoolPref(this.TOOL_PROPERTY_STARTUP + "." + tools[i])){
+                                if(tool_onstartup && this.pref.getBoolPref(this.TOOL_PROPERTY_STARTUP + "." + tools[i])){
                                         this.openVocalofxTool(tools[i]);
                                 }
@@ -294 +296 @@
                         menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkinPallet('" + pallets[i] + "')");
                         skin_popup.appendChild(menuitem);
+                }
+
+                var icecream = document.getElementById("vocalofx-icecream");
+                var onecup = document.getElementById("vocalofx-onecup");
+                icecream.collapsed = true;
+                onecup.collapsed = true;
+                if(category == "kaito"){
+                        icecream.collapsed = false;
+                }
+                if(category == "meiko"){
+                        onecup.collapsed = false;
                 }
         }
@@ -320 +333 @@
         }
         ,
+        openIcecream: function(){
+                window.openNewTabWith("about:icecream");
+        }
+        ,
+        openOnecup: function(){
+                window.openNewTabWith("about:onecup");
+        }
+        ,
+        openReadMe: function(){
+                window.openNewTabWith("about:vocalofx");
+        }
+        ,
         openAboutDialog: function(){
                 var config = "chrome://vocalofx/content/about.xul";

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

@@ -24 +24 @@
 pref("extensions.vocalofx.skin_theme_alert", true);
 pref("extensions.vocalofx.tool_piaprogm_alert", true);
+pref("extensions.vocalofx.tool_onstartup", true);
 pref("extensions.vocalofx.alert_addon.personas@christopher.beard", true);
 pref("extensions.vocalofx.alert_addon.greengoo@goo.ne.jp", true);

branches/release-1.0/install.rdf

@@ -3 +3 @@
         <Description about="urn:mozilla:install-manifest">
                 <em:id>vocalofx@rayflood.org</em:id>
-                <em:version>1.0</em:version>
+                <em:version>1.0pre</em:version>
                 <em:type>2</em:type>
 
@@ -12 +12 @@
                 <em:iconURL>chrome://vocalofx/content/icons/Firemiku_icon32.png</em:iconURL>
                 <em:aboutURL>chrome://vocalofx/content/about.xul</em:aboutURL>
+                <em:optionsURL>chrome://vocalofx/content/config.xul</em:optionsURL>
 
                 <em:localized>