[or-cvs] r18785: {torbutton} Implement feature request 836: redesign the startup prefs a (in torbutton/trunk/src/chrome: content locale/en-US)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-03-06 04:23:08 -0500 (Fri, 06 Mar 2009)
New Revision: 18785

Modified:
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/preferences.xul
   torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
Log:

Implement feature request 836: redesign the startup prefs a
bit to make them less confusing.



Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2009-03-05 18:12:15 UTC (rev 18784)
+++ torbutton/trunk/src/chrome/content/preferences.js	2009-03-06 09:23:08 UTC (rev 18785)
@@ -231,8 +231,8 @@
             break;
     }
 
-    doc.getElementById('torbutton_noTorSessionStore').checked = o_torprefs.getBoolPref('notor_sessionstore');
-    doc.getElementById('torbutton_noNonTorSessionStore').checked = o_torprefs.getBoolPref('nonontor_sessionstore');
+    doc.getElementById('torbutton_torSessionStore').checked = !o_torprefs.getBoolPref('notor_sessionstore');
+    doc.getElementById('torbutton_nonTorSessionStore').checked = !o_torprefs.getBoolPref('nonontor_sessionstore');
 
     //doc.getElementById('torbutton_reloadCrashedJar').checked = o_torprefs.getBoolPref('reload_crashed_jar');
     
@@ -381,8 +381,8 @@
         o_torprefs.setIntPref('startup_state', 2);
     }
 
-    o_torprefs.setBoolPref('notor_sessionstore', doc.getElementById('torbutton_noTorSessionStore').checked);
-    o_torprefs.setBoolPref('nonontor_sessionstore', doc.getElementById('torbutton_noNonTorSessionStore').checked);
+    o_torprefs.setBoolPref('notor_sessionstore', !doc.getElementById('torbutton_torSessionStore').checked);
+    o_torprefs.setBoolPref('nonontor_sessionstore', !doc.getElementById('torbutton_nonTorSessionStore').checked);
     //o_torprefs.setBoolPref('reload_crashed_jar', doc.getElementById('torbutton_reloadCrashedJar').checked);
     o_torprefs.setBoolPref('block_thread', doc.getElementById('torbutton_blockTorHRead').checked);
     o_torprefs.setBoolPref('block_thwrite', doc.getElementById('torbutton_blockTorHWrite').checked);

Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul	2009-03-05 18:12:15 UTC (rev 18784)
+++ torbutton/trunk/src/chrome/content/preferences.xul	2009-03-06 09:23:08 UTC (rev 18785)
@@ -261,10 +261,13 @@
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
              </radiogroup>
             </hbox>
-            <checkbox class="indent" id="torbutton_noTorSessionStore" label="&torbutton.prefs.notor_sessionstore;" 
+            <vbox>
+             <label value="&torbutton.prefs.session_restore;" control="torbutton_restoreTorGroup"/>
+             <checkbox class="indent" id="torbutton_torSessionStore" label="&torbutton.prefs.tor_tabs;" 
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
-            <checkbox class="indent" id="torbutton_noNonTorSessionStore" label="&torbutton.prefs.nonontor_sessionstore;" 
+             <checkbox class="indent" id="torbutton_nonTorSessionStore" label="&torbutton.prefs.nontor_tabs;" 
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
+            </vbox>
             
            </vbox>
           </tabpanel>

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2009-03-05 18:12:15 UTC (rev 18784)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2009-03-06 09:23:08 UTC (rev 18785)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms            "Forms">
 <!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor    "Tor">
 <!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor   "On session restored startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
 <!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar          "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar       "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore   "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs   "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs   "Tabs loaded in Tor">