チェンジセット 72

更新日時:

2009/08/23 19:53:14 (2 年 前)

更新者:

h

ログメッセージ:

refs #33
並び順の変更、表示名の変更、常に全配色ができたのでコミット。

パス:

branches/release-1.0

ファイル:

• chrome/content/overlay.xul (変更) (1 diff)
• chrome/content/skin/skin.properties (変更) (1 diff)
• chrome/content/vocalofx.js (変更) (6 diff)
• chrome/locale/en-US/vocalofx.properties (変更) (1 diff)
• chrome/locale/ja/vocalofx.properties (変更) (1 diff)
• defaults/preferences/vocalofx.js (変更) (1 diff)

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

@@ -23 +23 @@
         <menupopup id="menu_HelpPopup">
                 <menuitem id="vocalofx-help" label="&vocalofx.menu.help.label;" oncommand="vocalofx.openReadMe();"/>
-                <menuitem id="vocalofx-icecream" collapsed="true" label="&vocalofx.menu.help.label;" oncommand="vocalofx.openIcecream();"/>
-                <menuitem id="vocalofx-onecup" collapsed="true" label="&vocalofx.menu.help.label;" oncommand="vocalofx.openOnecup();"/>
         </menupopup>
 

branches/release-1.0/chrome/content/skin/skin.properties

@@ -1 +1 @@
 skinmenu=kei_miku,kei_miku_sing,kei_miku_sd,hachune_miku,sanari_miku,nagamon_miku,amino_miku,mayo_miku,yuki_miku,yuki_miku2,kei_rinlen2,kei_rinlen,kei_rinlen_sd,sanari_rinlen,nendloid_rinlen,roadroller_rinlen,yuki_rinlen,komore_rinlen,zasikiusa_rinlen,karuru_rinlen,yuki_rinlen2,kei_luka,sanpati_takoluka,sarahimuro_luka,sanari_luka,momonenami_luka,t_tomoe_luka,miura_gackpo1,miura_gackpo2,miura_gackpo3,atora_gackpo,asaki3103_gackpo,hachimetre_gackpo,yuuki_gumi1,NASHI_K_gumi,kaya_meiko,rumeco_meiko,ruchi_kk_meiko,sanari_meiko,necco1211_kaito,hachimetre_kaito,bsxxx5419_kaito,sanari_kaito
+palletmenu=miku,miku2,miku3,miku4,miku5,rinlen1,rinlen2,rinlen3,rinlen4,rinlen5,luka1,luka2,luka3,luka4,luka5,meiko1,meiko2,kaito1,kaito2,gackpo1,gackpo2,gackpo3,gackpo4,gumi1,gumi2,mikuonly
 palletmenu.miku=miku,miku2,miku3,miku4,miku5,mikuonly
 palletmenu.rinlen=rinlen1,rinlen2,rinlen3,rinlen4,rinlen5,mikuonly

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

@@ -8 +8 @@
         SKIN_PROPERTY_THEME_ALERT: "extensions.vocalofx.skin_theme_alert",
         SKIN_PROPERTY_CATEGORY: "extensions.vocalofx.skin_category",
+        SKIN_PROPERTY_USE_ALLPARET: "extensions.vocalofx.skin_use_allparet",
         TOOL_PROPERTY_POSITION: "extensions.vocalofx.tool.position",
         TOOL_PROPERTY_STARTUP: "extensions.vocalofx.tool.startup",
@@ -251 +252 @@
                 }
 
+                var skin_popup_pallet = document.getElementById("vocalofx-skin-popup-pallet");
+                var pallets = this.skin_properties.getString("palletmenu").split(",");
+                for(var i = 0; i < pallets.length; i++){
+                        var menuitem = document.createElement("menuitem");
+                        menuitem.setAttribute("id", "vocalofx-skin-" + pallets[i]);
+                        menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin.pallet." + pallets[i]));
+                        menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkinPallet('" + pallets[i] + "')");
+                        skin_popup_pallet.appendChild(menuitem);
+                }
+
                 var tool_onstartup = this.pref.getBoolPref(this.TOOL_PROPERTY_TOOL_ONSTARTUP);
                 var tool_popup = document.getElementById("vocalofx-tool-popup");
@@ -283 +294 @@
                 this.menuroot.src = this.CHROME_SKIN + category + "_logo.png";
 
-                var skin_popup = document.getElementById("vocalofx-skin-popup-pallet");
-                var oldmenu = skin_popup.getElementsByTagName("menuitem");
-                while(oldmenu.length > 0){
-                        skin_popup.removeChild(oldmenu[0]);
-                }
-
-                var pallets = this.skin_properties.getString("palletmenu." + category).split(",");
-                for(var i = 0; i < pallets.length; i++){
-                        var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-skin-" + pallets[i]);
-                        menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin.pallet." + pallets[i]));
-                        menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkinPallet('" + pallets[i] + "')");
-                        skin_popup.appendChild(menuitem);
-                }
-
-                var help = document.getElementById("vocalofx-help");
-                var icecream = document.getElementById("vocalofx-icecream");
-                var onecup = document.getElementById("vocalofx-onecup");
-                help.collapsed = false;
-                icecream.collapsed = true;
-                onecup.collapsed = true;
-                if(category == "kaito"){
-                        help.collapsed = true;
-                        icecream.collapsed = false;
-                }
-                if(category == "meiko"){
-                        help.collapsed = true;
-                        onecup.collapsed = false;
+                if(this.pref.getBoolPref(this.SKIN_PROPERTY_USE_ALLPARET)){
+                        var skin_popup = document.getElementById("vocalofx-skin-popup-pallet");
+                        var oldmenu = skin_popup.getElementsByTagName("menuitem");
+                        for(var i = 0; i < oldmenu.length; i++){
+                                oldmenu[i].collapsed = false;
+                        }
+                }
+                else{
+                        var skin_popup = document.getElementById("vocalofx-skin-popup-pallet");
+                        var oldmenu = skin_popup.getElementsByTagName("menuitem");
+                        for(var i = 0; i < oldmenu.length; i++){
+                                oldmenu[i].collapsed = true;
+                        }
+                        var pallets = this.skin_properties.getString("palletmenu." + category).split(",");
+                        for(var i = 0; i < pallets.length; i++){
+                                var menuitem = document.getElementById("vocalofx-skin-" + pallets[i]);
+                                menuitem.collapsed = false;
+                        }
                 }
         }
@@ -337 +338 @@
         }
         ,
-        openIcecream: function(){
-                window.openNewTabWith("about:icecream");
-        }
-        ,
-        openOnecup: function(){
-                window.openNewTabWith("about:onecup");
-        }
-        ,
         openReadMe: function(){
-                window.openNewTabWith("about:vocalofx");
+                try{
+                        var category = this.pref.getCharPref(this.SKIN_PROPERTY_CATEGORY);
+                        switch(category){
+                        case "kaito":
+                                window.openNewTabWith("about:icecream");
+                        break;
+                        case "meiko":
+                                window.openNewTabWith("about:onecup");
+                        break;
+                        default:
+                                window.openNewTabWith("about:vocalofx");
+                        break;
+                        }
+                }
+                catch(e){
+                        window.openNewTabWith("about:vocalofx");
+                }
         }
         ,
@@ -385 +394 @@
                 this.setVocalofxSkinPallet();
                 this.setVocalofxSkinImage();
+                this.setVocalofxMenu();
                 this.setVocalofxPalletMenu();
-                this.setVocalofxMenu();
         }
         ,
@@ -412 +421 @@
                         case this.SKIN_PROPERTY_CATEGORY:
                                 this.setVocalofxSkinCategory();
+                        break;
+                        case this.SKIN_PROPERTY_USE_ALLPARET:
+                                this.setVocalofxPalletMenu();
                         break;
                         }

branches/release-1.0/chrome/locale/en-US/vocalofx.properties

@@ -65 +65 @@
 vocalofx.skin.pallet.luka4=Megurine Luka white
 vocalofx.skin.pallet.luka5=Megurine Luka gray
-vocalofx.skin.pallet.gackpo1=Kamui Gackpo
-vocalofx.skin.pallet.gackpo2=Kamui Gackpo purple
-vocalofx.skin.pallet.gackpo3=Kamui Gackpo light blue
-vocalofx.skin.pallet.gackpo4=Kamui Gackpo blue gray
-vocalofx.skin.pallet.gumi1=GUMI
-vocalofx.skin.pallet.gumi2=GUMI Green
+vocalofx.skin.pallet.gackpo1=Gackpoid
+vocalofx.skin.pallet.gackpo2=Gackpoid purple
+vocalofx.skin.pallet.gackpo3=Gackpoid light blue
+vocalofx.skin.pallet.gackpo4=Gackpoid blue gray
+vocalofx.skin.pallet.gumi1=Megpoid
+vocalofx.skin.pallet.gumi2=Megpoid Green
 vocalofx.skin.pallet.meiko1=MEIKO red
 vocalofx.skin.pallet.meiko2=MEIKO brown

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

@@ -65 +65 @@
 vocalofx.skin.pallet.luka4=巡音ルカ 白
 vocalofx.skin.pallet.luka5=巡音ルカ グレー
-vocalofx.skin.pallet.gackpo1=神威がくぽ
-vocalofx.skin.pallet.gackpo2=神威がくぽ 紫
-vocalofx.skin.pallet.gackpo3=神威がくぽ 水色
-vocalofx.skin.pallet.gackpo4=神威がくぽ 紫苑
-vocalofx.skin.pallet.gumi1=GUMI
-vocalofx.skin.pallet.gumi2=GUMI 緑
+vocalofx.skin.pallet.gackpo1=がくっぽいど
+vocalofx.skin.pallet.gackpo2=がくっぽいど 紫
+vocalofx.skin.pallet.gackpo3=がくっぽいど 水色
+vocalofx.skin.pallet.gackpo4=がくっぽいど 紫苑
+vocalofx.skin.pallet.gumi1=メグッポイド
+vocalofx.skin.pallet.gumi2=メグッポイド 緑
 vocalofx.skin.pallet.meiko1=MEIKO 赤
 vocalofx.skin.pallet.meiko2=MEIKO 茶

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_use_allparet", false);
 pref("extensions.vocalofx.skin_pallet_alert", false);
 pref("extensions.vocalofx.skin_theme_alert", true);