From 239247aa814bc96c724b31918ba8fb841bcac52d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 29 Mar 2013 04:19:49 -0400
Subject: [PATCH] Make the prefwindow somewhat less of a disaster on fr-FR

And probably other locales.

(Also, there must be a better way to deal with bottom elements getting
cut off than these extra <separator/> elements that result in extra
space when they're not needed.)
---
 chrome/content/zotero/preferences/preferences_advanced.xul | 6 ++++--
 chrome/content/zotero/preferences/preferences_export.xul   | 1 +
 chrome/content/zotero/preferences/preferences_firefox.xul  | 3 ++-
 chrome/content/zotero/preferences/preferences_general.xul  | 3 +++
 chrome/content/zotero/preferences/preferences_search.xul   | 1 +
 chrome/content/zotero/preferences/preferences_sync.xul     | 3 ++-
 chrome/skin/default/zotero/preferences.css                 | 4 ++++
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index e95bc6aa8..d0b0cf547 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -112,7 +112,7 @@
 					
 					<groupbox id="zotero-prefpane-advanced-miscellaneous">
 						<caption label="&zotero.preferences.miscellaneous;"/>
-						<hbox id="zotero-prefpane-advanced-openbuttons" align="center">
+						<hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block">
 							<button id="openAboutConfig"
 								label="&zotero.preferences.openAboutConfig;"
 								oncommand="Zotero_Preferences.openInViewer('about:config')"/>
@@ -186,7 +186,7 @@
 					<groupbox>
 						<caption label="&zotero.preferences.dbMaintenance;"/>
 						
-						<hbox>
+						<hbox style="display: block">
 							<button label="&zotero.preferences.dbMaintenance.integrityCheck;"
 								oncommand="Zotero_Preferences.Advanced.runIntegrityCheck()"/>
 							<button label="&zotero.preferences.dbMaintenance.resetTranslators;"
@@ -200,6 +200,8 @@
 		</tabbox>
 		
 		<separator/>
+		<separator/>
+		<separator/>
 	</prefpane>
 	
 	<script src="preferences_advanced.js" type="application/javascript;version=1.8"/>
diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul
index a9df43d72..4a414c626 100644
--- a/chrome/content/zotero/preferences/preferences_export.xul
+++ b/chrome/content/zotero/preferences/preferences_export.xul
@@ -77,6 +77,7 @@
 		<separator/>
 		<separator/>
 		<separator/>
+		<separator/>
 		
 		<script src="preferences_export.js" type="application/javascript;version=1.8"/>
 	</prefpane>
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index 859216189..5292d0288 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -50,7 +50,7 @@
 			<vbox style="margin-left: 1em">
 				<checkbox id="zotero-proxies-autoRecognize" label="&zotero.preferences.proxies.autoRecognize;"
 					command="zotero-proxies-update"/>
-				<hbox>
+				<hbox style="display: block">
 					<checkbox id="zotero-proxies-disableByDomain-checkbox" label="&zotero.preferences.proxies.disableByDomain;"
 						command="zotero-proxies-update"/>
 					<textbox id="zotero-proxies-disableByDomain-textbox" onchange="Zotero_Preferences.Proxies.updateProxyPrefs()"/>
@@ -77,6 +77,7 @@
 			</groupbox>
 			
 			<separator/>
+			<separator/>
 		</prefpane>
 		
 		<script src="preferences_proxies.js" type="application/javascript;version=1.8"/>
diff --git a/chrome/content/zotero/preferences/preferences_general.xul b/chrome/content/zotero/preferences/preferences_general.xul
index f1217034f..58d9c7d91 100644
--- a/chrome/content/zotero/preferences/preferences_general.xul
+++ b/chrome/content/zotero/preferences/preferences_general.xul
@@ -129,6 +129,9 @@
 				<checkbox label="&zotero.preferences.groups.tags;" preference="pref-groups-copyTags"/>
 			</vbox>
 		</groupbox>
+		
+		<separator/>
+		<separator/>
 	</prefpane>
 	
 	<script src="preferences_general.js" type="application/javascript;version=1.8"/>
diff --git a/chrome/content/zotero/preferences/preferences_search.xul b/chrome/content/zotero/preferences/preferences_search.xul
index 23bc8ff58..280b8dc7f 100644
--- a/chrome/content/zotero/preferences/preferences_search.xul
+++ b/chrome/content/zotero/preferences/preferences_search.xul
@@ -114,6 +114,7 @@
 		</groupbox>
 		
 		<separator/>
+		<separator/>
 	</prefpane>
 	
 	<script src="preferences_search.js" type="application/javascript;version=1.8"/>
diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul
index 2a4d41bb1..296b7898c 100644
--- a/chrome/content/zotero/preferences/preferences_sync.xul
+++ b/chrome/content/zotero/preferences/preferences_sync.xul
@@ -229,7 +229,7 @@
 						<separator class="thin"/>
 						
 						<vbox>
-							<hbox id="storage-terms" style="margin-top: .4em" align="center">
+							<hbox id="storage-terms" style="margin-top: .4em; display: block" align="center">
 								<label>&zotero.preferences.sync.fileSyncing.tos1;</label>
 								<label class="zotero-text-link" href="http://www.digitalscholar.org/z_terms" value="&zotero.preferences.sync.fileSyncing.tos2;"/>
 								<label>&zotero.preferences.period;</label>
@@ -313,6 +313,7 @@
 		</tabbox>
 		
 		<separator/>
+		<separator/>
 	</prefpane>
 	
 	<script src="preferences_sync.js" type="application/javascript;version=1.8"/>
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index 1fcdea355..08b492f79 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -7,6 +7,10 @@ prefwindow {
    min-width: 600px;
 }
 
+description, label, checkbox {
+	max-width: 630px;
+}
+
 radio[pane]
 {
 	min-width: 5.5em;