チェンジセット 99

更新日時:

2010/01/08 01:31:21 (2 年 前)

更新者:

h

ログメッセージ:

fixes #40
対応した。
・起動時ダイアログ
・インストール時もダイアログ
・プレビュー解除時とデフォルト選択時で元に戻す

パス:

branches/release-1.0

ファイル:

• chrome/content/vocalofx.js (変更) (8 diff)
• components/vocalofx-startup.js (変更) (2 diff)

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

@@ -1 +1 @@
 var vocalofx = {
+        MOZ_LWTHEME_USED: "lightweightThemes.isThemeSelected",
+        MOZ_LWTHEME_INSTALL: "InstallBrowserTheme",
+        MOZ_LWTHEME_PREVIEW: "PreviewBrowserTheme",
+        MOZ_LWTHEME_PREVIEW_END: "ResetBrowserThemePreview",
+        MOZ_DEFAULT_THEME: "{972ce4c6-7e08-4474-a285-3208198ce6fd}",
         SKINPREF_OBSERVER: "extensions.vocalofx.skin_",
         SKIN_PROPERTY_ICONS: "extensions.vocalofx.skin_icons.",
@@ -12 +17 @@
         TOOL_PROPERTY_PIAPROGM_ALERT: "extensions.vocalofx.tool_piaprogm_alert",
         TOOL_PROPERTY_TO_WINDOW: "extensions.vocalofx.tool_opento_window",
+        ALERT_THEME: "extensions.vocalofx.skin_theme_alert",
         ICONCLASS_TOOL: "vocalofx-tool",
         ICONCLASS_SKIN_PALLET: "vocalofx-skin-pallet",
@@ -17 +23 @@
         ICONCLASS_SKIN_MENU: "vocalofx-skin-menu",
         TOOLDIALOG_URL: "chrome://vocalofx/content/tool/tool.xul",
+        ALERTDIALOG_URL: "chrome://vocalofx/content/alert.xul",
         CHROME_TOOL: "chrome://vocalofx/content/tool/",
         CHROME_SKIN: "chrome://vocalofx/content/skin/",
@@ -77 +84 @@
         ,
         setVocalofxSkinImage: function(){
+                if(this.pref.getBoolPref(this.MOZ_LWTHEME_USED) || this.lwt_preview){
+                        return;
+                }
+
                 var image;
                 try{
@@ -441 +452 @@
                 this.tool_properties = document.getElementById("vocalofx-tool-properties");
 
+                if(this.main_window._lightweightTheme){
+                        this.main_window._lightweightTheme._update_orig = this.main_window._lightweightTheme._update;
+                        this.main_window._lightweightTheme._update = function(aData){
+                                this._update_orig(aData);
+                                vocalofx.setVocalofxSkinImage();
+                        };
+                }
+                gBrowser.mPanelContainer.addEventListener(this.MOZ_LWTHEME_INSTALL, this, false, true);
+                gBrowser.mPanelContainer.addEventListener(this.MOZ_LWTHEME_PREVIEW, this, false, true);
+                gBrowser.mPanelContainer.addEventListener(this.MOZ_LWTHEME_PREVIEW_END, this, false, true);
+                this.pref.addObserver(this.MOZ_LWTHEME_USED, this, false);
+
                 this.pref.addObserver(this.SKINPREF_OBSERVER, this, false);
                 this.watcher.registerNotification(this);
@@ -454 +477 @@
         ,
         destroy: function(){
+                this.pref.removeObserver(this.MOZ_LWTHEME_USED, this, false);
+                gBrowser.mPanelContainer.removeEventListener(this.MOZ_LWTHEME_INSTALL, this, false);
+                gBrowser.mPanelContainer.removeEventListener(this.MOZ_LWTHEME_PREVIEW, this, false);
+                gBrowser.mPanelContainer.removeEventListener(this.MOZ_LWTHEME_PREVIEW_END, this, false);
                 window.removeEventListener(this.BROWSER_ONLOAD, this, false);
                 this.pref.removeObserver(this.SKINPREF_OBSERVER, this, false);
@@ -480 +507 @@
                                 this.setVocalofxPalletMenu();
                         break;
+                        case this.MOZ_LWTHEME_USED:
+                                if(!this.pref.getBoolPref(this.MOZ_LWTHEME_USED)){
+                                        this.setVocalofxSkinImage();
+                                }
+                        break;
                         }
                         if(aData.indexOf(this.SKIN_PROPERTY_ICONS) == 0){
@@ -498 +530 @@
                 case this.BROWSER_UNONLOAD:
                         this.destroy();
+                break;
+                case this.MOZ_LWTHEME_INSTALL:
+                        if(this.pref.getBoolPref(this.ALERT_THEME)){
+                                var dialog = window.openDialog(this.ALERTDIALOG_URL, "_blank", "chrome,centerscreen,alwaysRaised=yes,modal=yes", this.MOZ_DEFAULT_THEME);
+                                dialog.focus();
+                        }
+                break;
+                case this.MOZ_LWTHEME_PREVIEW:
+                        this.lwt_preview = true;
+                break;
+                case this.MOZ_LWTHEME_PREVIEW_END:
+                        this.lwt_preview = false;
                 break;
                 }

branches/release-1.0/components/vocalofx-startup.js

@@ -163 +163 @@
                 const ALERT_THEME = "extensions.vocalofx.skin_theme_alert";
                 const DEFAULT_THEME = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
+                const MOZ_LWTHEME_USED = "lightweightThemes.isThemeSelected";
                 var installedAddons = new xpc.sptAry;
 
@@ -177 +178 @@
                 }
 
-                if(prefBrc2.getBoolPref(ALERT_THEME) && prefBrc2.getCharPref("general.skins.selectedSkin") != "classic/1.0"){
+                if(prefBrc2.getBoolPref(ALERT_THEME)
+                                 && (prefBrc2.getCharPref("general.skins.selectedSkin") != "classic/1.0")
+                                || prefBrc2.getBoolPref(MOZ_LWTHEME_USED)){
                         var string = new xpc.supportsString;
                         string.data = DEFAULT_THEME;