Changeset 614

Timestamp:

01/31/10 18:10:55 (3 years ago)

Author:

stefan

Message:

font name and size are preselected in font window

Location:

trunk/src

Files:

• jlatexeditor/gproperties/GProperties.java (modified) (1 diff)
• jlatexeditor/JLatexEditorJFrame.java (modified) (1 diff)
• sce/component/SCEFontWindow.java (modified) (2 diffs)

trunk/src/jlatexeditor/gproperties/GProperties.java

@@ -145 +145 @@
   public static void setEditorFont(Font editorFont) {
     GProperties.editorFont = editorFont;
-    properties.setProperty(EDITOR_FONT_NAME, editorFont.getFontName());
+    properties.setProperty(EDITOR_FONT_NAME, editorFont.getFamily());
     properties.setProperty(EDITOR_FONT_SIZE, "" + editorFont.getSize());
     save();

trunk/src/jlatexeditor/JLatexEditorJFrame.java

@@ -813 +813 @@
 */
     if(action.equals("font")){
-      SCEFontWindow fontDialog = new SCEFontWindow(GProperties.getEditorFont().getFontName(), GProperties.getEditorFont().getSize(), this);
+      SCEFontWindow fontDialog = new SCEFontWindow(GProperties.getEditorFont().getFamily(), GProperties.getEditorFont().getSize(), this);
       fontDialog.setVisible(true);
     } else

trunk/src/sce/component/SCEFontWindow.java

@@ -21 +21 @@
   private int fontSize;
   private int prevFontSize;
+  private boolean init = true;
 
   private ActionListener actionListener;
@@ -123 +124 @@
     pack();
     setVisible(true);
+
+    // select the current font and size
+    int nr = 0;
+    fontList.setSelectedValue(fontName, true);
+    /*
+    for (String aFontName : GProperties.getMonospaceFonts()) {
+      if (((String) aFontName).equals(fontName)) {
+        fontList.setSelectedIndex(nr);
+        System.out.println(nr);
+      }
+      nr++;
+    }
+    */
+    sizeList.setSelectedIndex(GProperties.getEditorFont().getSize() - 6);
+    
+    init = false;
   }
 
   public void valueChanged(ListSelectionEvent e) {
+    if (init) return;
+
     if(e.getSource() == fontList.getSelectionModel()) {
       fontName = fontList.getSelectedValue().toString();