チェンジセット 79

更新日時:

2009/08/25 01:06:08 (2 年 前)

更新者:

h

ログメッセージ:

refs #33
右上絵選択時のフォルダアイコンの場所間違えてたので修正。
 http://piapro.jp/content/?id=6two84dn9f3itqvm&cdate=2009-08-24%2001%3A07%3A52

ファイル:

• branches/release-1.0/chrome/content/vocalofx.js (変更) (12 diff)

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

@@ -13 +13 @@
         TOOL_PROPERTY_TOOL_ONSTARTUP: "extensions.vocalofx.tool_onstartup",
         TOOL_PROPERTY_PIAPROGM_ALERT: "extensions.vocalofx.tool_piaprogm_alert",
+        ICONCLASS_TOOL: "vocalofx-tool",
+        ICONCLASS_SKIN_PALLET: "vocalofx-skin-pallet",
+        ICONCLASS_SKIN_IMAGE: "vocalofx-skin-image",
+        ICONCLASS_SKIN_MENU: "vocalofx-skin-menu",
         TOOLDIALOG_URL: "chrome://vocalofx/content/tool/tool.xul",
         CHROME_TOOL: "chrome://vocalofx/content/tool/",
@@ -48 +52 @@
         ,
         setVocalofxToolOpened: function(tool, onoff){
-                this.setMenuitemIcon(document.getElementById("vocalofx-tool-" + tool), onoff);
+                this.setMenuitemIcon(document.getElementById(this.ICONCLASS_TOOL + "-" + tool), onoff);
         }
         ,
@@ -93 +97 @@
 
                 var skin = image.substring(image.lastIndexOf("/") + 1, image.length - 4);
-                this.selectMenuitemIcon("vocalofx-skin-image", skin);
+                this.selectMenuitemIcon(this.ICONCLASS_SKIN_IMAGE, skin);
+                var category = this.skin_properties.getString(skin + ".category_sub");
+                this.selectMenuitemIcon(this.ICONCLASS_SKIN_MENU, category);
         }
         ,
@@ -110 +116 @@
                 this.pref.setCharPref(this.SKIN_PROPERTY_PALLET, pallet);
                 this.setVocalofxPalletMenu();
-                this.selectMenuitemIcon("vocalofx-skin-menu", category);
         }
         ,
@@ -152 +157 @@
                 this.setCSSImportRule(document, this.CHROME_SKIN + "skin.css", this.CHROME_SKIN + pallet + ".css");
                 this.setSidebarVocalofxSkin();
-                this.selectMenuitemIcon("vocalofx-skin-pallet", pallet);
+                this.selectMenuitemIcon(this.ICONCLASS_SKIN_PALLET, pallet);
         }
         ,
@@ -209 +214 @@
                 }
 
-                this.setCSSImportRule(document, "chrome://vocalofx/content/icons/" + target + ".css", "chrome://vocalofx-platform/content/" + icon + ".css");
+                this.setCustomIcon(document, target, icon);
                 this.setSidebarVocalofxIcons(target);
         }
@@ -225 +230 @@
                 }
 
-                this.setCSSImportRule(this.sidebar.contentDocument, "chrome://vocalofx/content/icons/" + target + ".css", "chrome://vocalofx-platform/content/" + icon + ".css");
+                this.setCustomIcon(this.sidebar.contentDocument, target, icon);
+        }
+        ,
+        setCustomIcon: function(doc, target, icon){
+                this.setCSSImportRule(doc, "chrome://vocalofx/content/icons/" + target + ".css", "chrome://vocalofx-platform/content/" + icon + ".css");
         }
         ,
@@ -252 +261 @@
                 for(var i = 0; i < skins.length; i++){
                         var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-skin-image-" + skins[i]);
-                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-skin-image");
+                        menuitem.setAttribute("id", this.ICONCLASS_SKIN_IMAGE + "-" + skins[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic " + this.ICONCLASS_SKIN_IMAGE);
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin." + skins[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkin('" + skins[i] + "')");
@@ -266 +275 @@
                 for(var i = 0; i < pallets.length; i++){
                         var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-skin-pallet-" + pallets[i]);
-                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-skin-pallet");
+                        menuitem.setAttribute("id", this.ICONCLASS_SKIN_PALLET + "-" + pallets[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic " + this.ICONCLASS_SKIN_PALLET);
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.skin.pallet." + pallets[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.selectVocalofxSkinPallet('" + pallets[i] + "')");
@@ -278 +287 @@
                 for(var i = 0; i < tools.length; i++){
                         var menuitem = document.createElement("menuitem");
-                        menuitem.setAttribute("id", "vocalofx-tool-" + tools[i]);
-                        menuitem.setAttribute("class", "menuitem-iconic vocalofx-tool");
+                        menuitem.setAttribute("id", this.ICONCLASS_TOOL + "-" + tools[i]);
+                        menuitem.setAttribute("class", "menuitem-iconic " + this.ICONCLASS_TOOL);
                         menuitem.setAttribute("label", this.vocalofx_properties.getString("vocalofx.tool." + tools[i]));
                         menuitem.setAttribute("oncommand", "vocalofx.openVocalofxTool('" + tools[i] + "')");
@@ -338 +347 @@
                         var pallets = this.skin_properties.getString("palletmenu." + category).split(",");
                         for(var i = 0; i < pallets.length; i++){
-                                var menuitem = document.getElementById("vocalofx-skin-pallet-" + pallets[i]);
+                                var menuitem = document.getElementById(this.ICONCLASS_SKIN_PALLET + "-" + pallets[i]);
                                 menuitem.collapsed = false;
                         }
@@ -426 +435 @@
                 this.setVocalofxMenu();
                 this.setVocalofxIconsAll();
-                this.setVocalofxSkinCategory();
                 this.setVocalofxSkinPallet();
                 this.setVocalofxSkinImage();