From: jkkn <jkkn>
Date: Fri, 2 Nov 2007 02:55:17 +0000 (+0000)
Subject: mac instant apply fixes
X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=45c91349a266e34cfb7d5cb86dee232645949ebe;p=tv2developer

mac instant apply fixes
---

diff --git a/content/browser_overlay.xul b/content/browser_overlay.xul
index 7570721..f8cd06e 100755
--- a/content/browser_overlay.xul
+++ b/content/browser_overlay.xul
@@ -14,10 +14,10 @@
 <popupset id="mainPopupSet">
     <popup id="tv2developer-contextmenu">
         <menuitem label="&config.label;..." accesskey="&config.accesskey;"
-                  oncommand="window.openDialog('chrome://tv2developer/content/options.xul','tv2options','chrome,dialog,modal')" />
+                  oncommand="TV2Developer.openOptionsDialog(event)" />
         <menuseparator />
         <menuitem label="&about.label;" accesskey="&about.accesskey;"
-                  oncommand="window.openDialog('chrome://tv2developer/content/about.xul','tv2about','chrome,dialog,modal')" />
+                  oncommand="window.openDialog('chrome://tv2developer/content/about.xul','tv2about','modal,centerscreen,chrome,resizable=no')" />
     </popup>
 </popupset>
 
diff --git a/content/options.js b/content/options.js
index 86528dc..1543dea 100755
--- a/content/options.js
+++ b/content/options.js
@@ -2,21 +2,22 @@
 var TV2Options = {
     
     _keyBranch: null,
+    _prefBranch: null,
     _hackEnabled: false,
     init: function() {
         var hacks = document.getElementById('mac-hacks');
-        this._keyBranch =
-            Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService)
-            .getBranch('ui.key.');
+        var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+        this._keyBranch = prefs.getBranch('ui.key.');
+        this._prefBranch = prefs.getBranch('browser.preferences.');
         // we show the options for hacing accesskeys if user has set a preference or accesskeys are disabled
         this._hackEnabled =
             this._keyBranch.prefHasUserValue('menuAccessKey') ||
-            (this._keyBranch.getIntPref('menuAccessKey') == -1);
+            (this._keyBranch.getIntPref('menuAccessKey') == 0);
         if (!this._hackEnabled) {
             hacks.style.display = 'none';
         } else {
             document.getElementById('mac-accesskeys').checked =
-                (this._keyBranch.getIntPref('menuAccessKey') != -1);
+                (this._keyBranch.getIntPref('menuAccessKey') != 0);
         }
     },
     
@@ -29,6 +30,11 @@ var TV2Options = {
                 this._keyBranch.clearUserPref('menuAccessKey');
             }
         }
+    },
+    
+    update: function() {
+       var instantApply = this._prefBranch.getBoolPref("instantApply", false);
+       if (instantApply) this.save();
     }
     
 }
\ No newline at end of file
diff --git a/content/options.xul b/content/options.xul
index 37acd15..e8f2407 100755
--- a/content/options.xul
+++ b/content/options.xul
@@ -6,8 +6,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	        title="&optionsDialog.title;"
 	        onload="TV2Options.init()"
-	        ondialogaccept="TV2Options.save()"
-	        >
+	        ondialogaccept="TV2Options.save()">
 <script type="application/x-javascript" src="options.js" />
   
   <prefpane id="pane1" label="&optionsDialog.options.label;">
@@ -21,7 +20,9 @@
     </groupbox>
 
     <groupbox id="mac-hacks">
-        <checkbox id="mac-accesskeys" label="&optionsDialog.mac.accesskeys;" tooltiptext="&optionsDialog.mac.accesskeys.tooltiptext;"/>
+        <checkbox id="mac-accesskeys" label="&optionsDialog.mac.accesskeys;"
+          oncommand="TV2Options.update()"
+          tooltiptext="&optionsDialog.mac.accesskeys.tooltiptext;"/>
     </groupbox>
   </prefpane>
 
diff --git a/content/tv2developer.js b/content/tv2developer.js
index c2a246b..efc1c02 100755
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -671,7 +671,15 @@ var TV2Developer = {
 	},
 	
 	openQuickbox: function(event) {
-	    window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','chrome,dialog,modal');
-	}
+	    window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','modal,centerscreen,chrome,resizable=no');
+	},
+	
+	/* Options */
+	openOptionsDialog: function(event) {
+      var instantApply = getBoolPref("browser.preferences.instantApply", false);
+      var features = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
+      window.openDialog('chrome://tv2developer/content/options.xul','tv2options',features);
+  }
+
 
 }
diff --git a/version b/version
index a918a2a..ef5e445 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6.0
+0.6.5
diff --git a/webroot/index.html b/webroot/index.html
index e875c15..61ef39c 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -31,7 +31,7 @@
                 <li>Åbn siden op i Tangos requeue værktøj (evt. udfra Tango_URL hvis siden har sat denne).</li>
                 <li>Se alle database forespørgsler på siden ved at køre DB_PDO_Logging værktøjet på siden.</li>
                    <em>Browserens cache tømmes desuden automatisk</em>.</li>
-                <li>Quick link dialog, hvor man hurtig kan navigere hen til et tv2.dk site (genvej <code>ALT+3</code>, (På mac, <code>CTRL+1</code>)</li>
+                <li>Quick link dialog, hvor man hurtig kan navigere hen til et tv2.dk site - genvej <code>ALT+3</code>, (På mac, <code>CTRL+3</code>)</li>
             </ul>
             <h3>Feature liste på i2-images og i2-files:</h3>
             <ul>