チェンジセット 122

更新日時:

2010/11/26 01:02:11 (18 か月 前)

更新者:

h

ログメッセージ:

fixes #52 #53 #54
スプラッシュスクリーンが自動で閉じない問題は、単純にtry{}catch(){}でスルー。
外からファイル開いてスプラッシュスクリーンが出る問題は、nsIWindowMediatorで画面あるなし判断。
タブはとりあえず3.6で確認。3.0、3.5はあとで。

パス:

branches/release-1.0

ファイル:

• chrome/content/skin/piapro1.css (変更) (3 diff)
• chrome/content/splash/splash.js (変更) (1 diff)
• components/vocalofx.js (変更) (1 diff)
• platform/Linux/chrome/content/fx3/overlay.css (変更) (6 diff)

branches/release-1.0/chrome/content/skin/piapro1.css

@@ -75 +75 @@
 , #main-window
         #urlbar
+, #main-window
+        .searchbar-engine-button
 , #main-window
         .searchbar-textbox
@@ -123 +125 @@
 
 #main-window
+        #status-bar > statusbarpanel
+, #main-window
+        tabbrowser[treestyletab-mode]:not([treestyletab-tabbar-position="top"])
+, #main-window
         #sidebar-box > sidebarheader
 , #main-window
@@ -135 +141 @@
 
 #main-window
+        popup
+, #main-window
+        menupopup
+, #main-window
         #FindToolbar
 , #bookmarksPanel
+        popup
+, #bookmarksPanel
+        menupopup
+, #bookmarksPanel
         .sidebar-placesTree
 , #history-panel
+        popup
+, #history-panel
+        menupopup
+, #history-panel
         .sidebar-placesTree
-{
-        -moz-border-top-colors: #ffffff !important;
-}
-
-#main-window
-        #status-bar > statusbarpanel
-, #main-window
-        tabbrowser[treestyletab-mode]:not([treestyletab-tabbar-position="top"])
-{
-        border-top-color: #ffffff !important;
-}
-
-#main-window
-        popup
-, #main-window
-        menupopup
-, #bookmarksPanel
-        popup
-, #bookmarksPanel
-        menupopup
-, #history-panel
-        popup
-, #history-panel
-        menupopup
 , #history-panel
         #viewButton

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

@@ -40 +40 @@
         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);
+                try{
+                        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);
+                }
+                catch(e){
+                        // nop
+                }
         }
 

branches/release-1.0/components/vocalofx.js

@@ -14 +14 @@
         handle: function(commandLine){
                 var pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
-                if(pref.getCharPref("extensions.vocalofx.skin_splash.screen")){
+                var mediator = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
+                var wins = mediator.getEnumerator(null);
+                if(!wins.hasMoreElements() && 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/splash.xul", "vocalofx-splash", "chrome,centerscreen,alwaysRaised=yes,titlebar=no,modal=yes", null);

branches/release-1.0/platform/Linux/chrome/content/fx3/overlay.css

@@ -1 +1 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#main-window .findbar-textbox
-, #urlbar, .searchbar-textbox
+#main-window
+        .findbar-textbox
+, #main-window
+        #urlbar, .searchbar-textbox
 , #bookmarksPanel
         #search-box
@@ -11 +13 @@
 }
 
-#urlbar > .autocomplete-history-dropmarker
+#main-window
+        #urlbar > .autocomplete-history-dropmarker
 {
         -moz-appearance: toolbarbutton-dropdown;
+}
+
+#bookmarksPanel
+        .sidebar-placesTree
+, #history-panel
+        .sidebar-placesTree
+{
+        -moz-appearance: none;
+}
+
+#main-window
+        .tabbrowser-strip[treestyletab-mode]
+{
+        border-right: 0px !important;
 }
 
@@ -20 +37 @@
   margin: 0px;
   background: url("chrome://vocalofx/content/icons/tabstrip-bottom.png") repeat;
-  border-top: 1px solid threedshadow;
-  border-bottom: 1px solid threedshadow;
+  border-top: 1px solid;
+  border-bottom: 1px solid;
 }
 
@@ -27 +44 @@
   -moz-appearance: none;
   background: url("chrome://vocalofx/content/icons/tab-bkgnd.png") repeat-x;
-  margin: 4px -1px 3px 1px;
-  padding: 0px 1px 1px 0px;
-  border: 2px solid;
-  border-right-width: 1px;
-  border-bottom: none;
+  margin-left: 0px;
+  margin-right: 0px;
+  margin-top: 2px;
+  margin-bottom: 3px;
+  padding: 1px;
+  border: 1px solid !important;
+  border-bottom: none !important;
   -moz-border-radius-topleft: 2px;
   -moz-border-radius-topright: 2px;
-  -moz-border-top-colors: ThreeDShadow rgba(255,255,255,.3);
-  -moz-border-right-colors: rgba(0,0,0,.1);
-  -moz-border-left-colors: ThreeDShadow rgba(255,255,255,.3);
 }
 .tabbrowser-tab:hover,
 .tabbrowser-tab[selected="true"] {
-  border-width: 1px;
   -moz-border-radius-topleft: 4px;
   -moz-border-radius-topright: 4px;
-  -moz-border-top-colors: ThreeDShadow;
-  -moz-border-right-colors: ThreeDShadow;
-  -moz-border-left-colors: ThreeDShadow;
+  margin-top: 1px;
+  margin-bottom: 4px;
 }
+.tabbrowser-tab:hover > .tab-icon-image,
+.tabbrowser-tab[selected="true"] > .tab-icon-image,
+.tabbrowser-tab:hover > .tab-close-button,
+.tabbrowser-tab[selected="true"] > .tab-close-button {
+  margin-bottom: -1px;
+}
+
 .tabbrowser-tab:not([selected="true"]):hover {
-  margin: 2px 0px 3px;
-  padding: 2px 1px 1px;
+  padding-bottom: 0px;
   background-image: url("chrome://vocalofx/content/icons/tab-hover-bkgnd.png");
 }
 .tabbrowser-tab[selected="true"] {
-  margin: 2px 0px 3px;
-  padding: 1px;
+  margin-bottom: 3px;
   background-image: url("chrome://vocalofx/content/icons/tab-active-bkgnd.png");
 }
@@ -64 +83 @@
   -moz-appearance: none;
   width: 18px !important;
-  margin: 3px 0px 4px;
-  padding: 0px;
-  border: 2px solid;
-  border-right-width: 1px;
-  border-bottom: none;
-  -moz-border-top-colors: ThreeDShadow rgba(255,255,255,.3);
-  -moz-border-right-colors: ThreeDShadow;
-  -moz-border-left-colors: ThreeDShadow rgba(255,255,255,.3);
+  border: 1px solid !important;
+  border-bottom: none !important;
   background: url("chrome://vocalofx/content/icons/tab-bkgnd.png") repeat-x;
 }
@@ -78 +91 @@
 .tabs-newtab-button:hover,
 .tabs-alltabs-button:hover {
-  border-top-width: 1px;
-  padding-top: 1px;
-  -moz-border-top-colors: ThreeDShadow;
-  -moz-border-right-colors: ThreeDShadow;
-  -moz-border-left-colors: ThreeDShadow transparent;
   background-image: url("chrome://vocalofx/content/icons/tab-hover-bkgnd.png");
 }