チェンジセット 60

更新日時:

2009/07/09 00:29:42 (3 年 前)

更新者:

h

ログメッセージ:

いろいろやりかけだが、とりあえず一旦コミット。

パス:

branches/release-1.0

ファイル:

• chrome/content/about.js (変更) (1 diff)
• chrome/content/about.xul (変更) (1 diff)
• chrome/content/overlay.xul (変更) (1 diff)
• chrome/content/splash.js (変更) (1 diff)
• chrome/content/splash.xul (変更) (1 diff)
• chrome/content/vocalofx.js (変更) (3 diff)
• components/vocalofx.js (変更) (1 diff)
• defaults/preferences/vocalofx.js (変更) (1 diff)

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

@@ -104 +104 @@
         window.opener.openURL(aEvent.target.getAttribute("homepageURL"));
 }
+
+function openSplashScreen(){
+        var splash = "chrome://vocalofx/content/splash.xul";
+        var option = "chrome,centerscreen,alwaysRaised=yes,titlebar=no,modal=yes";
+        window.openDialog(splash, "vocalofx-splash", option, -1);
+}

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

@@ -17 +17 @@
         <vbox id="clientBox" flex="1">
                 <hbox>
-                        <image src='chrome://vocalofx/content/icons/Firemiku_icon64.png' width='64' height='64'/>
+                        <image src='chrome://vocalofx/content/icons/Firemiku_icon64.png' width='64' height='64' ondblclick="openSplashScreen();"/>
                         <vbox pack="end">
                                 <label id="extensionName" crop="right"/>

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();"/>
                         <menu id="vocalofx-tool-menu" label="&vocalofx.tool_menu.label;">
                         <menupopup id="vocalofx-tool-popup">

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

@@ -3 +3 @@
 
 function init(){
-        var sound = Cc["@mozilla.org/sound;1"].createInstance(Ci.nsISound);
-        var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-        var url = ios.newURI("chrome://vocalofx/content/splash.wav", null, null);
-        sound.init();
-        sound.play(url);
-        var timeoutID = setTimeout(function(){
-                clearTimeout(timeoutID);
-                window.close();
-        }, 3000);
+        var pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+
+        var image = pref.getCharPref("extensions.vocalofx.skin_splash.screen");
+        var width = pref.getIntPref("extensions.vocalofx.skin_splash.screen_width");
+        var height = pref.getIntPref("extensions.vocalofx.skin_splash.screen_height");
+        if(!image){
+                image = "chrome://vocalofx/content/icons/eclipse-3.4.png";
+                width = 455;
+                height = 295;
+        }
+        var screen = document.getElementById("screen");
+        screen.src = image;
+        screen.width = width;
+        screen.height = height;
+
+        var voice = pref.getCharPref("extensions.vocalofx.skin_splash.voice");
+        if(voice){
+                var sound = Cc["@mozilla.org/sound;1"].createInstance(Ci.nsISound);
+                var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+                var url = ios.newURI(voice, null, null);
+                sound.init();
+                sound.play(url);
+        }
+
+        if(!window.arguments){
+                var timeoutID = setTimeout(function(){
+                        clearTimeout(timeoutID);
+                        window.close();
+                }, 3000);
+        }
 }

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

@@ -3 +3 @@
 <!DOCTYPE dialog SYSTEM "chrome://vocalofx/locale/vocalofx.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="vocalofx-splash" onload="init();">
+        id="vocalofx-splash" onload="init();" hidechrome="true">
         <script type="application/x-javascript" src="chrome://vocalofx/content/splash.js"/>
-        <stringbundleset>
-                <stringbundle id="vocalofx-properties" src="chrome://vocalofx/locale/vocalofx.properties"/>
-        </stringbundleset>
         <keyset>
                 <key keycode="VK_ESCAPE" oncommand="window.close();"/>
         </keyset>
 
-        <image src="chrome://vocalofx/content/icons/eclipse-3.4.png"/>
+        <image id="screen" onclick="window.close();"/>
 </window>

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

@@ -1 +1 @@
 var vocalofx = {
         SKINPREF_OBSERVER: "extensions.vocalofx.skin_",
-        SKIN_PROPERTY_ICONS: "extensions.vocalofx.skin_icons_",
+        SKIN_PROPERTY_ICONS: "extensions.vocalofx.skin_icons.",
         SKIN_PROPERTY_IMAGE: "extensions.vocalofx.skin_image",
         SKIN_PROPERTY_POSITION: "extensions.vocalofx.skin_position",
@@ -14 +14 @@
         CHROME_TOOL: "chrome://vocalofx/content/tool/",
         CHROME_SKIN: "chrome://vocalofx/content/skin/",
-        SKIN_ATTRIBUTE: "vocalofx_skin",
         BROWSER_ONLOAD: "load",
         BROWSER_UNONLOAD: "unload",
@@ -321 +320 @@
         }
         ,
+        openAboutDialog: function(){
+                var config = "chrome://vocalofx/content/about.xul";
+                var option = "chrome,dependent=yes,close=yes,minimizable=yes,centerscreen";
+                window.openDialog(config, "vocalofx-about", option);
+        }
+        ,
+        openConfigDialog: function(){
+                var config = "chrome://vocalofx/content/config.xul";
+                var option = "chrome,dependent=yes,close=yes,minimizable=yes,centerscreen";
+                window.openDialog(config, "vocalofx-config", option);
+        }
+        ,
         init: function(){
                 window.removeEventListener(this.BROWSER_ONLOAD, this, false);

branches/release-1.0/components/vocalofx.js

@@ -14 +14 @@
 
         handle: function(commandLine){
-                var watcher = Cc['@mozilla.org/embedcomp/window-watcher;1'].getService(Ci.nsIWindowWatcher);
-                watcher.openWindow(null, "chrome://vocalofx/content/splash.xul", "vocalofx_splash", "chrome,centerscreen,alwaysRaised=yes,titlebar=no", null);
+                var pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+                if(pref.getCharPref("extensions.vocalofx.skin_splash.screen")){
+                        var watcher = Cc['@mozilla.org/embedcomp/window-watcher;1'].getService(Ci.nsIWindowWatcher);
+                        watcher.openWindow(null, "chrome://vocalofx/content/splash.xul", "vocalofx-splash", "chrome,centerscreen,alwaysRaised=yes,titlebar=no,modal=yes", null);
+                }
         }
 };

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

@@ -8 +8 @@
 pref("extensions.vocalofx.skin_pallet.meiko", "meiko1");
 pref("extensions.vocalofx.skin_pallet.kaito", "kaito1");
-pref("extensions.vocalofx.skin_icons_back-button", "back-button-rin");
-pref("extensions.vocalofx.skin_icons_forward-button", "forward-button-len");
-pref("extensions.vocalofx.skin_icons_back-forward-dropmarker", "back-forward-dropmarker-arrow-dn");
-pref("extensions.vocalofx.skin_icons_home-button", "home-button-spa");
-pref("extensions.vocalofx.skin_icons_bookmarks-button", "bookmarks-button-score");
-pref("extensions.vocalofx.skin_icons_throbber", "throbber-hachune");
-pref("extensions.vocalofx.skin_icons_favicon", "favicon-negi");
-pref("extensions.vocalofx.skin_icons_bookmark-item", "bookmark-item-negiroller");
-pref("extensions.vocalofx.skin_icons_sidebar-treechildren", "sidebar-treechildren-negiroller");
+pref("extensions.vocalofx.skin_icons.back-button", "back-button-rin");
+pref("extensions.vocalofx.skin_icons.forward-button", "forward-button-len");
+pref("extensions.vocalofx.skin_icons.back-forward-dropmarker", "back-forward-dropmarker-arrow-dn");
+pref("extensions.vocalofx.skin_icons.home-button", "home-button-spa");
+pref("extensions.vocalofx.skin_icons.bookmarks-button", "bookmarks-button-score");
+pref("extensions.vocalofx.skin_icons.throbber", "throbber-hachune");
+pref("extensions.vocalofx.skin_icons.favicon", "favicon-negi");
+pref("extensions.vocalofx.skin_icons.bookmark-item", "bookmark-item-negiroller");
+pref("extensions.vocalofx.skin_icons.sidebar-treechildren", "sidebar-treechildren-negiroller");
+pref("extensions.vocalofx.skin_splash.screen", "chrome://vocalofx/content/icons/Firemiku_about.png");
+pref("extensions.vocalofx.skin_splash.screen_width", 300);
+pref("extensions.vocalofx.skin_splash.screen_height", 216);
+pref("extensions.vocalofx.skin_splash.voice", "chrome://vocalofx/content/splash.wav");
 pref("extensions.vocalofx.skin_pallet_alert", true);
 pref("extensions.vocalofx.skin_theme_alert", true);