チェンジセット 74 : branches

更新日時:

2009/08/23 21:51:23 (3 年 前)

更新者:

h

ログメッセージ:

fixes #33
選択中の目印実装。アイコンはネギ。

パス:

branches/release-1.0/chrome/content

ファイル:

• overlay.xul (変更) (1 diff)
• tool/tool.js (変更) (2 diff)
• vocalofx.js (変更) (9 diff)

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

@@ -40 +40 @@
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-miku" label="&vocalofx.skin_menu.miku.label;">
+                                <menu id="vocalofx-skin-menu-miku" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.miku.label;">
                                 <menupopup id="vocalofx-skin-popup-miku">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-sdmiku" label="&vocalofx.skin_menu.sdmiku.label;">
+                                <menu id="vocalofx-skin-menu-sdmiku" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.sdmiku.label;">
                                 <menupopup id="vocalofx-skin-popup-sdmiku">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-rinlen" label="&vocalofx.skin_menu.rinlen.label;">
+                                <menu id="vocalofx-skin-menu-rinlen" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.rinlen.label;">
                                 <menupopup id="vocalofx-skin-popup-rinlen">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-sdrinlen" label="&vocalofx.skin_menu.sdrinlen.label;">
+                                <menu id="vocalofx-skin-menu-sdrinlen" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.sdrinlen.label;">
                                 <menupopup id="vocalofx-skin-popup-sdrinlen">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-luka" label="&vocalofx.skin_menu.luka.label;">
+                                <menu id="vocalofx-skin-menu-luka" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.luka.label;">
                                 <menupopup id="vocalofx-skin-popup-luka">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-meiko" label="&vocalofx.skin_menu.meiko.label;">
+                                <menu id="vocalofx-skin-menu-meiko" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.meiko.label;">
                                 <menupopup id="vocalofx-skin-popup-meiko">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-kaito" label="&vocalofx.skin_menu.kaito.label;">
+                                <menu id="vocalofx-skin-menu-kaito" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.kaito.label;">
                                 <menupopup id="vocalofx-skin-popup-kaito">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-gackpo" label="&vocalofx.skin_menu.gackpo.label;">
+                                <menu id="vocalofx-skin-menu-gackpo" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.gackpo.label;">
                                 <menupopup id="vocalofx-skin-popup-gackpo">
                                 </menupopup>
                                 </menu>
-                                <menu id="vocalofx-skin-menu-gumi" label="&vocalofx.skin_menu.gumi.label;">
+                                <menu id="vocalofx-skin-menu-gumi" class="menu-iconic vocalofx-skin-menu" label="&vocalofx.skin_menu.gumi.label;">
                                 <menupopup id="vocalofx-skin-popup-gumi">
                                 </menupopup>

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

@@ -12 +12 @@
         toolhtml.style.width = window.innerWidth + "px";
         toolhtml.style.height = window.innerHeight + "px";
+        window.opener.vocalofx.setVocalofxToolOpened(tool, true);
 }
 
@@ -26 +27 @@
                 startup = true;
         }
+        else{
+                window.opener.vocalofx.setVocalofxToolOpened(tool, false);
+        }
         pref.setCharPref(TOOL_PROPERTY_POSITION + "." + tool, left + "," + top);
         pref.setBoolPref(TOOL_PROPERTY_STARTUP + "." + tool, startup);

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

@@ -47 +47 @@
         }
         ,
+        setVocalofxToolOpened: function(tool, onoff){
+                this.setMenuitemIcon(document.getElementById("vocalofx-tool-" + tool), onoff);
+        }
+        ,
         selectVocalofxSkin: function(skin){
                 var position = this.skin_properties.getString(skin + ".position");
@@ -87 +91 @@
                 this.main_window.style.backgroundRepeat = "no-repeat";
                 this.main_window.style.backgroundImage = "url('" + image + "')";
+
+                var skin = image.substring(image.lastIndexOf("/") + 1, image.length - 4);
+                this.selectMenuitemIcon("vocalofx-skin-image", skin);
         }
         ,
@@ -103 +110 @@
                 this.pref.setCharPref(this.SKIN_PROPERTY_PALLET, pallet);
                 this.setVocalofxPalletMenu();
+                this.selectMenuitemIcon("vocalofx-skin-menu", category);
         }
         ,
@@ -144 +152 @@
                 this.setCSSImportRule(document, this.CHROME_SKIN + "skin.css", this.CHROME_SKIN + pallet + ".css");
                 this.setSidebarVocalofxSkin();
+                this.selectMenuitemIcon("vocalofx-skin-pallet", pallet);
         }
         ,
@@ -243 +252 @@
                 for(var i = 0; i < skins.length; i++){
                         var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-skin-" + skins[i]);
+                        menuitem.setAttribute("id", "vocalofx-skin-image-" + skins[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-skin-image");
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin." + skins[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkin('" + skins[i] + "')");
@@ -256 +266 @@
                 for(var i = 0; i < pallets.length; i++){
                         var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-skin-" + pallets[i]);
+                        menuitem.setAttribute("id", "vocalofx-skin-pallet-" + pallets[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-skin-pallet");
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin.pallet." + pallets[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkinPallet('" + pallets[i] + "')");
@@ -268 +279 @@
                         var menuitem = document.createElement("menuitem");
                         menuitem.setAttribute("id", "vocalofx-tool-" + tools[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-tool");
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.tool." + tools[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.openVocalofxTool('" + tools[i] + "')");
@@ -280 +292 @@
                         }
                 }
+        }
+        ,
+        setMenuitemIcon: function(menuitem, onoff){
+                if(onoff){
+                        menuitem.setAttribute("image", "chrome://vocalofx/content/icons/defaultFavicon.png");
+                }
+                else{
+                        menuitem.setAttribute("image", "");
+                }
+        }
+        ,
+        selectMenuitemIcon: function(clazz, item){
+                var menuitems = document.getElementsByClassName(clazz);
+                for(var i = 0; i < menuitems.length; i++){
+                        this.setMenuitemIcon(menuitems[i], false);
+                }
+                this.setMenuitemIcon(document.getElementById(clazz + "-" + item), true);
         }
         ,
@@ -391 +420 @@
                 vocalofx_navigator_toolbox.init(this.navigator_toolbox);
 
+                this.setVocalofxMenu();
                 this.setVocalofxIconsAll();
+                this.setVocalofxSkinCategory();
                 this.setVocalofxSkinPallet();
                 this.setVocalofxSkinImage();
-                this.setVocalofxMenu();
                 this.setVocalofxPalletMenu();
         }