preferences moved to desktop

[jalview.git] / src / jalview / jbgui / GPreferences.java

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 06dc81a..8f30fb3 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -102,27 +102,27 @@ public class GPreferences
     jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);\r
     jLabel3.setText("Font");\r
     jLabel3.setBounds(new Rectangle(83, 114, 34, 15));\r
-    fontSize.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    fontSize.setBounds(new Rectangle(304, 109, 49, 21));\r
-    fontStyle.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    fontStyle.setBounds(new Rectangle(353, 109, 80, 21));\r
-    fontName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    fontName.setBounds(new Rectangle(121, 109, 183, 21));\r
-    gapSymbol.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    gapSymbol.setBounds(new Rectangle(121, 140, 67, 21));\r
+    fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontSizeCB.setBounds(new Rectangle(304, 109, 49, 21));\r
+    fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontStyleCB.setBounds(new Rectangle(353, 109, 80, 21));\r
+    fontNameCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontNameCB.setBounds(new Rectangle(121, 109, 183, 21));\r
+    gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21));\r
     jPanel2.add(annotations);\r
     jPanel2.add(fullScreen);\r
     jPanel2.add(conservation);\r
     jPanel2.add(quality);\r
     jPanel2.add(fullID);\r
-    jPanel2.add(gapSymbol);\r
+    jPanel2.add(gapSymbolCB);\r
     jPanel2.add(jLabel1);\r
-    jPanel2.add(fontName);\r
+    jPanel2.add(fontNameCB);\r
     jPanel2.add(jLabel2);\r
     jPanel2.add(jLabel3);\r
     jPanel2.add(colour);\r
-    jPanel2.add(fontSize);\r
-    jPanel2.add(fontStyle);\r
+    jPanel2.add(fontSizeCB);\r
+    jPanel2.add(fontStyleCB);\r
     jPanel2.add(identity);\r
     jPanel1.add(ok);\r
     jPanel1.add(cancel);\r
@@ -133,7 +133,7 @@ public class GPreferences
 \r
     DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
     dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER);\r
-    gapSymbol.setRenderer(dlcr);\r
+    gapSymbolCB.setRenderer(dlcr);\r
 \r
   }\r
 \r
@@ -155,10 +155,10 @@ public class GPreferences
   protected JComboBox colour = new JComboBox();\r
   JLabel jLabel2 = new JLabel();\r
   JLabel jLabel3 = new JLabel();\r
-  protected JComboBox fontSize = new JComboBox();\r
-  protected JComboBox fontStyle = new JComboBox();\r
-  protected JComboBox fontName = new JComboBox();\r
-  protected JComboBox gapSymbol = new JComboBox();\r
+  protected JComboBox fontSizeCB = new JComboBox();\r
+  protected JComboBox fontStyleCB = new JComboBox();\r
+  protected JComboBox fontNameCB = new JComboBox();\r
+  protected JComboBox gapSymbolCB = new JComboBox();\r
   public void ok_actionPerformed(ActionEvent e)\r
   {\r
 \r