From bd9501218edda493dfbbd353eb4ce4367275f2d3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 22 Dec 2016 06:31:51 -0500
Subject: [PATCH] Apply UI font size change immediately

And change "Changes take effect in new windows" to "Changes take effect
after restart"

(The note font size still requires a restart, as do the shortcut keys in
the Advaned pane.)
---
 chrome/content/zotero/preferences/preferences_general.xul | 4 ++--
 chrome/content/zotero/xpcom/zotero.js                     | 5 +++++
 chrome/locale/en-US/zotero/preferences.dtd                | 2 +-
 chrome/skin/default/zotero/preferences.css                | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_general.xul b/chrome/content/zotero/preferences/preferences_general.xul
index 0776e9bbbb..2ef9b2814b 100644
--- a/chrome/content/zotero/preferences/preferences_general.xul
+++ b/chrome/content/zotero/preferences/preferences_general.xul
@@ -100,12 +100,12 @@
 									<menuitem label="96"/>
 								</menupopup>
 							</menulist>
+							
+							<label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/>
 						</hbox>
 					</row>
 				</rows>
 			</grid>
-			
-			<label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/>
 		</groupbox>
 		
 		<groupbox id="zotero-prefpane-miscellaneous-groupbox">
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 0716fdc3e0..9b6ae69206 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -2035,6 +2035,11 @@ Zotero.Prefs = new function(){
 				Zotero.Schema.stopRepositoryTimer();
 			}
 		}],
+		["fontSize", function (val) {
+			Zotero.setFontSize(
+				Zotero.getActiveZoteroPane().document.getElementById('zotero-pane')
+			);
+		}],
 		[ "layout", function(val) {
 			Zotero.getActiveZoteroPane().updateLayout();
 		}],
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index ec1cbb8bb9..964d851c23 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -147,7 +147,7 @@
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard		"Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard		"Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard		"Import from Clipboard">
-<!ENTITY zotero.preferences.keys.changesTakeEffect		"Changes take effect in new windows only">
+<!ENTITY zotero.preferences.keys.changesTakeEffect             "Changes take effect after restart">
 
 <!ENTITY zotero.preferences.prefpane.proxies				"Proxies">
 
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index 4ca9dbc107..015aa41fd4 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -78,6 +78,9 @@ grid row hbox:first-child
 	margin-right: 20px;
 }
 
+#zotero-prefpane-general .statusLine {
+	margin-left: .75em;
+}
 
 /*
  * Sync pane