Thread: [Gridarta-commit] SF.net SVN: gridarta: [1005] trunk (Page 11)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1005
          http://svn.sourceforge.net/gridarta/?rev=1005&view=rev
Author:   akirschbaum
Date:     2006-12-10 05:37:25 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Unify options dialog.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CFJavaEditor.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/CMainView.java
    trunk/crossfire/src/cfeditor/CSettings.java
    trunk/crossfire/src/cfeditor/action.properties
    trunk/crossfire/src/cfeditor/messages.properties
    trunk/crossfire/src/cfeditor/messages_de.properties
    trunk/daimonin/src/daieditor/messages.properties
    trunk/src/app/net/sf/gridarta/messages.properties

Added Paths:
-----------
    trunk/crossfire/resource/icons/development/
    trunk/crossfire/resource/icons/development/Host24.gif
    trunk/crossfire/resource/icons/general/
    trunk/crossfire/resource/icons/general/Open16.gif
    trunk/crossfire/resource/icons/general/Save24.gif
    trunk/crossfire/src/cfeditor/gui/prefs/
    trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
    trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java
    trunk/crossfire/src/cfeditor/gui/prefs/package.html
    trunk/crossfire/src/cfeditor/io/PathManager.java

Removed Paths:
-------------
    trunk/crossfire/src/cfeditor/COptionDialog.java

Added: trunk/crossfire/resource/icons/development/Host24.gif
===================================================================
(Binary files differ)


Property changes on: trunk/crossfire/resource/icons/development/Host24.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/crossfire/resource/icons/general/Open16.gif
===================================================================
(Binary files differ)


Property changes on: trunk/crossfire/resource/icons/general/Open16.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/crossfire/resource/icons/general/Save24.gif
===================================================================
(Binary files differ)


Property changes on: trunk/crossfire/resource/icons/general/Save24.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/crossfire/src/cfeditor/CFJavaEditor.java
===================================================================

--- trunk/crossfire/src/cfeditor/CFJavaEditor.java	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/CFJavaEditor.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -24,6 +24,7 @@
 
 package cfeditor;
 
+import static cfeditor.CMainControl.PREFS_LANGUAGE;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -31,6 +32,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import net.sf.japi.swing.ActionFactory;
 import org.apache.log4j.Logger;
 
@@ -51,6 +53,12 @@
      * @param args The command line parameters given to the level editor.
      */
     public static void main(final String[] args) {
+        // Make sure the locale is set before any ActionFactory is used.
+        final String locName = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PREFS_LANGUAGE, null);
+        if (locName != null) {
+            Locale.setDefault(new Locale(locName));
+        }
+        // Now add prefs to the ActionFactory.
         final ActionFactory actionFactory = ActionFactory.getFactory("cfeditor");
         actionFactory.addParent(ActionFactory.getFactory("net.sf.gridarta"));
         final List<String> infiles = new ArrayList<String>(); // map file names to open initially

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -30,6 +30,8 @@
 import cfeditor.gameobject.anim.AnimationObjects;
 import cfeditor.gameobject.face.FaceObjects;
 import cfeditor.gui.map.MapPropertiesDialog;
+import cfeditor.gui.prefs.GUIPrefs;
+import cfeditor.gui.prefs.ResPrefs;
 import cfeditor.io.CMapReader;
 import cfeditor.io.CMapWriter;
 import cfeditor.map.MapArchObject;
@@ -41,6 +43,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
@@ -51,6 +54,7 @@
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.MainControl;
+import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.Collector;
 import net.sf.gridarta.gui.HideFileFilterProxy;
@@ -58,6 +62,8 @@
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ActionMethod;
+import net.sf.japi.swing.prefs.PreferencesGroup;
+import static net.sf.japi.swing.prefs.PreferencesPane.showPreferencesDialog;
 import net.sf.japi.util.ThrowableHandler;
 import net.sf.japi.util.filter.file.EndingFileFilter;
 import org.apache.log4j.Logger;
@@ -82,14 +88,17 @@
 
     private static final String DOCU_VERSION_KEY = "docuVersion";
 
-    private static final String USE_IMAGESET = "useImageSet";
+    public static final String USE_IMAGESET = "useImageSet";
 
     private static final String USE_FONT = "useFont";
 
-    private static final String LOAD_ARCH_COLL = "loadArchFromCollection";
+    public static final String LOAD_ARCH_COLL = "loadArchFromCollection";
 
     public static final String PICKMAPS_LOCKED = "pickmapsLocked";
 
+    /** Preferences key for language. */
+    public static final String PREFS_LANGUAGE = "language";
+
     /** The main view. */
     private final CMainView mainView;
 
@@ -348,11 +357,31 @@
         currentMap.getMapViewFrame().setMapAndArchPosition(gameObject, pos);
     }
 
-    /**
-     * Set all global settings (mostly read from the
-     * 'CFJavaEditor.ini'-file)
-     */
-    private void readGlobalSettings() {
+    /** Set all global settings from the preferences. */
+    public void readGlobalSettings() {
+        imageSet = new String(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(USE_IMAGESET, "base"));
+        if (imageSet.equalsIgnoreCase("none")) {
+            imageSet = null;
+        }
+        initDirs();
+
+        loadFromArchive = new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(LOAD_ARCH_COLL, "true")).booleanValue();
+
+        getMainView().setMapTileListBottom(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainView.MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT))).booleanValue());
+
+        setLockAllPickmaps(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false")).booleanValue());
+
+        // docu version
+        if (IGUIConstants.DOCU_VERSION > (new Integer(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(DOCU_VERSION_KEY, "0"))).intValue()) {
+            // remember to open docu
+            autoPopupDocu = true;
+            // update docu version right now, because we want the help popup only one time
+            CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(DOCU_VERSION_KEY, String.valueOf(IGUIConstants.DOCU_VERSION));
+        }
+    }
+
+    /** (Re-)initializes the directories. */
+    public void initDirs() {
         // Get the directories
         strMapDir = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(ResourceFileManager.MAP_DIR_KEY, ResourceFileManager.DEFAULT_MAP_DIR);
         strArchDir = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(ResourceFileManager.ARCH_DIR_KEY, ResourceFileManager.DEFAULT_ARCH_DIR);
@@ -373,25 +402,6 @@
                 !mapDir.isAbsolute() && !hasChangedDir) {
             mapDir = new File(currentDir.getAbsolutePath(), mapDir.getPath());
         }
-
-        imageSet = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(USE_IMAGESET, "base");
-        if (imageSet.equalsIgnoreCase("none")) {
-            imageSet = null;
-        }
-
-        loadFromArchive = Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(LOAD_ARCH_COLL, "true"));
-
-        getMainView().setMapTileListBottom(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainView.MAPTILE_BOTTOM_KEY, "false")));
-
-        setLockAllPickmaps(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false")));
-
-        // docu version
-        if (IGUIConstants.DOCU_VERSION > new Integer(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(DOCU_VERSION_KEY, "0"))) {
-            // remember to open docu
-            autoPopupDocu = true;
-            // update docu version right now, because we want the help popup only one time
-            CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(DOCU_VERSION_KEY, String.valueOf(IGUIConstants.DOCU_VERSION));
-        }
     }
 
     /**
@@ -404,18 +414,7 @@
      * @param mapTileBottom <code>true</code> if the map tile list should be displayed on the window bottom, otherwise (right border) <code>false</code>.
      */
     void setGlobalSettings(final String arch, String map, final String script, final boolean baseImageSet, final boolean load, final boolean mapTileBottom) {
-        map = map.replace('\\', '/');
-        if (map.endsWith("/")) {
-            map = map.substring(0, map.length() - 1); // path should not end with slash
-        }
-
-        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.ARCH_DIR_KEY, arch);
-        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.MAP_DIR_KEY, map);
-        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.SCRIPT_DIR_KEY, script);
-
         CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(USE_IMAGESET, baseImageSet ? "base" : "none");
-        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(LOAD_ARCH_COLL, load ? "true" : "false");
-        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainView.MAPTILE_BOTTOM_KEY, mapTileBottom ? "true" : "false");
         CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(PICKMAPS_LOCKED, pickmapsLocked ? "true" : "false");
 
         readGlobalSettings();
@@ -1126,8 +1125,17 @@
     void toggleShowTiles() {
     }
 
+    private PreferencesGroup prefsGroup;
+
     public void options() {
-        new COptionDialog(this, mainView);
+        if (prefsGroup == null) {
+            prefsGroup = new PreferencesGroup(
+                    "Gridarta for Daimonin",
+                    new ResPrefs(this),
+                    new GUIPrefs(this)
+            ); // prefsGroup
+        }
+        showPreferencesDialog(mainView, prefsGroup, false);
     }
 
     void setLockAllPickmaps(final boolean state) {

Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainView.java	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/CMainView.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -89,8 +89,11 @@
     private static final String DIVIDER_LOCATION_KEY3 = "MainWindow.dividerLocation3";
 
     /** Key for info whether map-tile panel is seperate or at bottom. */
-    public static final String MAPTILE_BOTTOM_KEY = "MapTileBottom";
+    public static final String MAP_TILE_LIST_BOTTOM_KEY = "MapTileBottom";
 
+    /** Default value for {@link #MAP_TILE_LIST_BOTTOM_KEY}. */
+    public static final boolean MAP_TILE_LIST_BOTTOM_DEFAULT = false;
+
     /** Border size for the split panes. */
     private static final int BORDER_SIZE = 5;
 

Deleted: trunk/crossfire/src/cfeditor/COptionDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/COptionDialog.java	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/COptionDialog.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -1,270 +0,0 @@
-/*
- * Crossfire Java Editor.
- * Copyright (C) 2000  Michael Toennies
- * Copyright (C) 2001  Andreas Vogl
- *
- * (code based on: Gridder. 2D grid based level editor. (C) 2000  Pasi Keränen)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package cfeditor;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.TitledBorder;
-
-/**
- * Dialog used to ask the user the properties for the new level.
- * @author <a href="mailto:mic...@no...">Michael Toennies</a>
- * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
- */
-public final class COptionDialog extends CDialogBase {
-
-    private final JTextField m_archField;
-
-    private final JTextField m_mapField;
-
-    private final JTextField m_scriptField;
-
-    private final JCheckBox m_loadArches;     // load arches from collected archives?
-
-    private JComboBox m_ImageSet;       // selection box for Image Set
-
-    private final JCheckBox m_mapPanelBottom; // is map-tile panel in bottom panel?
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Constructs a new option dialog.
-     * @param mainControl     The controller of this dialog.
-     * @param parentFrame The parent frame of this dialog.
-     */
-    COptionDialog(final CMainControl mainControl, final Frame parentFrame) {
-        super(parentFrame, "Options");
-        getContentPane().setLayout(new BorderLayout());
-
-        final JPanel mainPanel = new JPanel();
-        mainPanel.setBorder(new EmptyBorder(
-                IGUIConstants.DIALOG_INSETS,
-                IGUIConstants.DIALOG_INSETS,
-                IGUIConstants.DIALOG_INSETS,
-                IGUIConstants.DIALOG_INSETS));
-        mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
-
-        // --- Resource Path ---
-        final JPanel optionPathPanel = new JPanel();
-        optionPathPanel.setLayout(new BoxLayout(optionPathPanel, BoxLayout.Y_AXIS));
-        optionPathPanel.setBorder(new CompoundBorder(
-                new TitledBorder(new EtchedBorder(), "Resource Path"),
-                new EmptyBorder(
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS)));
-
-        final JPanel archPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        archPanel.add(new JLabel("Archfiles: "));
-        m_archField = new JTextField(16);
-        m_archField.setText(mainControl.getArchDefaultFolder());
-        archPanel.add(m_archField);
-        optionPathPanel.add(archPanel);
-
-        final JPanel mapPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        mapPanel.add(new JLabel("Maps: "));
-        m_mapField = new JTextField(16);
-        m_mapField.setText(mainControl.getMapDefaultFolder());
-        mapPanel.add(m_mapField);
-        optionPathPanel.add(mapPanel);
-
-        final JPanel scriptPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        scriptPanel.add(new JLabel("Scripts: "));
-        m_scriptField = new JTextField(16);
-        m_scriptField.setText(mainControl.getScriptDefaultFolder());
-        scriptPanel.add(m_scriptField);
-
-        mainPanel.add(optionPathPanel);
-
-        // --- globals ---
-        final JPanel optionPartPanel = new JPanel(new GridLayout(2, 1));
-        optionPartPanel.setBorder(new CompoundBorder(
-                new TitledBorder(new EtchedBorder(), "Globals"),
-                new EmptyBorder(
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS)));
-
-        final JPanel cbox;
-        if (mainControl.getImageSet() != null) {
-            cbox = buildImageSetBox(mainControl.getImageSet().equalsIgnoreCase("base"));
-        } else {
-            cbox = buildImageSetBox(false);
-        }
-        optionPartPanel.add(cbox);
-
-        m_loadArches = new JCheckBox(" Load Arches from Collection");
-        m_loadArches.setSelected(mainControl.isArchLoadedFromCollection());
-        m_loadArches.addActionListener(new SelectArchLoadAL(m_loadArches, this));
-        optionPartPanel.add(m_loadArches);
-        if (mainControl.isArchLoadedFromCollection()) {
-            m_archField.setEnabled(false);
-        }
-
-        mainPanel.add(optionPartPanel);
-
-        // --- layout settings ---
-        final JPanel optionLayoutPanel = new JPanel(new GridLayout(2, 1));
-        optionLayoutPanel.setBorder(new CompoundBorder(
-                new TitledBorder(new EtchedBorder(), "Layout Settings"),
-                new EmptyBorder(
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS,
-                        IGUIConstants.DIALOG_INSETS)));
-
-        m_mapPanelBottom = new JCheckBox(" Separate Map-Tile Panel");
-        m_mapPanelBottom.setSelected(!mainControl.getMainView().isMapTileListBottom());
-        optionLayoutPanel.add(m_mapPanelBottom);
-        optionLayoutPanel.add(new JLabel("(Takes effect on next application start)"));
-        mainPanel.add(optionLayoutPanel);
-
-        // --- button line ---
-        final JPanel buttonPanel = new JPanel();
-        buttonPanel.setBorder(new EmptyBorder(
-                IGUIConstants.SPACE_BETWEEN_BUTTON_AREA_AND_MAIN_DIALOG,
-                IGUIConstants.DIALOG_INSETS,
-                IGUIConstants.DIALOG_INSETS,
-                IGUIConstants.DIALOG_INSETS));
-        buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
-        buttonPanel.add(Box.createGlue());
-
-        /*
-        final JButton button = new JButton("Restore");
-        button.addActionListener(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-            }
-        });
-        buttonPanel.add(button);
-
-        buttonPanel.add(Box.createRigidArea(
-            new Dimension(IGUIConstants.SPACE_BETWEEN_BUTTON_GROUPS, 1)));
-        */
-        final JButton okButton = new JButton("OK");
-        okButton.addActionListener(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-                mainControl.setGlobalSettings(m_archField.getText(),
-                        m_mapField.getText(), m_scriptField.getText(),
-                        m_ImageSet.getSelectedIndex() != 0,
-                        m_loadArches.isSelected(), !m_mapPanelBottom.isSelected());
-                dispose();
-            }
-        });
-        buttonPanel.add(okButton);
-
-        buttonPanel.add(Box.createRigidArea(
-                new Dimension(IGUIConstants.SPACE_BETWEEN_BUTTONS, 1)));
-
-        final JButton cancelButton = new JButton("Cancel");
-        cancelButton.addActionListener(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-                dispose();
-            }
-        });
-        buttonPanel.add(cancelButton);
-
-        getContentPane().add(mainPanel, BorderLayout.CENTER);
-        getContentPane().add(buttonPanel, BorderLayout.SOUTH);
-        pack();
-        setVisible(true);
-    }
-
-    /**
-     * Creates the ComboBox for the selection of Image Sets.
-     * @param baseSet <code>true</code> to select the base set, otherwise <code>false</code>.
-     * @return A Panel with the combobox plus label.
-     */
-    /** Construct the Combo box for the selection of Image Sets. */
-    private JPanel buildImageSetBox(final boolean baseSet) {
-        final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT)); // layout for this line
-
-        // list of available Image Sets:
-        final String []list = new String[2];
-        list[0] = " Disabled";
-        list[1] = " Base";
-
-        lineLayout.add(new JLabel("Use Image Set: "));  // create label
-
-        m_ImageSet = new JComboBox(list);     // set "content"
-        m_ImageSet.setPreferredSize(new Dimension(150, 25));
-        m_ImageSet.setSelectedIndex(baseSet ? 1 : 0); // set active selection
-
-        m_ImageSet.setBackground(Color.white);  // white background
-        m_ImageSet.setName("Image Set");
-
-        lineLayout.add(m_ImageSet);
-        return lineLayout;
-    }
-
-    /**
-     * Action-listener for the checkbox "Load Arches from Collection".
-     * While it is selected, the arch path should be disabled.
-     * @todo Turn this into an Action.
-     */
-    private final class SelectArchLoadAL implements ActionListener {
-
-        final COptionDialog frame; // the frame (options dialog window)
-
-        final JCheckBox cbox;      // input checkbox
-
-        public SelectArchLoadAL(final JCheckBox cbox, final COptionDialog frame) {
-            this.cbox = cbox;
-            this.frame = frame;
-        }
-
-        /** {@inheritDoc} */
-        public void actionPerformed(final ActionEvent event) {
-            // state has changed
-            if (cbox.isSelected()) {
-                m_archField.setEnabled(false);
-                frame.update(frame.getGraphics());
-            } else {
-                m_archField.setEnabled(true);
-                frame.update(frame.getGraphics());
-            }
-        }
-
-    } // class SelectArchLoadAL
-
-} // class COptionDialog

Modified: trunk/crossfire/src/cfeditor/CSettings.java
===================================================================
--- trunk/crossfire/src/cfeditor/CSettings.java	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/CSettings.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -134,7 +134,9 @@
     public synchronized String getProperty(final String strKey, final String strDefaultValue) {
         final String strValue = properties.getProperty(strKey);
         if (strValue == null) {
-            setProperty(strKey, strDefaultValue);
+            if (strDefaultValue != null) {
+                setProperty(strKey, strDefaultValue);
+            }
             return strDefaultValue;
         }
         return strValue;

Modified: trunk/crossfire/src/cfeditor/action.properties
===================================================================
--- trunk/crossfire/src/cfeditor/action.properties	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/action.properties	2006-12-10 13:37:25 UTC (rev 1005)
@@ -2,3 +2,8 @@
 # See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
 
 ActionFactory.additionalBundles=cfeditor.messages
+# Extend this if you add a new locale. The order is irrelevant.
+availableLocales=en de fr sv
+
+prefsRes.icon=general/Save24
+prefsGUI.icon=development/Host24

Added: trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -0,0 +1,188 @@
+/*
+ * Daimonin Java Editor.
+ * Copyright (C) 2005  Christian Hujer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ */
+
+package cfeditor.gui.prefs;
+
+import cfeditor.CMainControl;
+import static cfeditor.CMainControl.PREFS_LANGUAGE;
+import static cfeditor.CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT;
+import static cfeditor.CMainView.MAP_TILE_LIST_BOTTOM_KEY;
+import cfeditor.CSettings;
+import cfeditor.IGUIConstants;
+import static cfeditor.IGUIConstants.DIALOG_BORDER;
+import java.awt.Component;
+import static java.util.Arrays.binarySearch;
+import static java.util.Arrays.sort;
+import java.util.Locale;
+import java.util.prefs.Preferences;
+import javax.swing.Box;
+import static javax.swing.Box.createHorizontalBox;
+import static javax.swing.Box.createVerticalBox;
+import static javax.swing.Box.createVerticalGlue;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.TitledBorder;
+import net.sf.japi.swing.ActionFactory;
+import net.sf.japi.swing.LocaleComparator;
+import net.sf.japi.swing.LocaleListCellRenderer;
+import net.sf.japi.swing.prefs.AbstractPrefs;
+
+/**
+ * Preferences Module for user interface preferences.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @serial exclude
+ */
+public final class GUIPrefs extends AbstractPrefs {
+
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
+
+    private final CMainControl mainControl;
+
+    /** ComboBox for choosing the locale. */
+    private JComboBox localeBox;
+
+    /** Wether to place the map tile panel at the bottom or the right. */
+    private JCheckBox mapPanelBottom;
+
+    /** Locale[]. */
+    private Locale[] locales;
+
+    /** LocaleComparator. */
+    private LocaleComparator comp = new LocaleComparator();
+
+    /**
+     * Create a GUIPrefs pane.
+     */
+    public GUIPrefs(final CMainControl mainControl) {
+        this.mainControl = mainControl;
+
+        setListLabelText(ACTION_FACTORY.getString("prefsGUI.title"));
+        setListLabelIcon(ACTION_FACTORY.getIcon("prefsGUI.icon"));
+
+        add(createGlobalPanel());
+        add(createLayoutPanel());
+        add(createVerticalGlue());
+    }
+
+    /**
+     * Create a titled border.
+     * @param titleKey Action Key for border title
+     * @return titled border
+     */
+    private static Border createTitledBorder(final String titleKey) {
+        return new CompoundBorder(new TitledBorder(ACTION_FACTORY.getString(titleKey)), DIALOG_BORDER);
+    }
+
+    /** {@inheritDoc} */
+    public void apply() {
+        final Locale loc = (Locale) localeBox.getSelectedItem();
+        if (loc != null) {
+            CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(PREFS_LANGUAGE, loc.getLanguage());
+        } else {
+            CSettings.getInstance(IGUIConstants.APP_NAME).clearProperty(PREFS_LANGUAGE);
+        }
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(MAP_TILE_LIST_BOTTOM_KEY, mapPanelBottom.isSelected() ? "true" : "false");
+        mainControl.readGlobalSettings();
+        mainControl.refreshMenusAndToolbars();
+    }
+
+    /** {@inheritDoc} */
+    public void revert() {
+        final String current = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PREFS_LANGUAGE, null);
+        localeBox.setSelectedIndex(binarySearch(locales, current != null ? new Locale(current) : null, comp));
+        mapPanelBottom.setSelected(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(MAP_TILE_LIST_BOTTOM_DEFAULT))).booleanValue());
+    }
+
+    /** {@inheritDoc} */
+    public void defaults() {
+        localeBox.setSelectedIndex(binarySearch(locales, null, comp));
+        mapPanelBottom.setSelected(MAP_TILE_LIST_BOTTOM_DEFAULT);
+    }
+
+    /** {@inheritDoc} */
+    public boolean isChanged() {
+        final Locale loc = (Locale) localeBox.getSelectedItem();
+        final String currentName = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PREFS_LANGUAGE, null);
+        final Locale current = currentName != null ? new Locale(currentName) : null;
+        return !(
+                (loc == null ? loc == current : loc.equals(current))
+                        && mapPanelBottom.isSelected() == new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(MAP_TILE_LIST_BOTTOM_DEFAULT))).booleanValue());
+    }
+
+    /**
+     * Construct the Combo box for the selection of locales.
+     * @return combo box with locales to select
+     */
+    private Component buildLocaleBox() {
+        final Box lineLayout = createHorizontalBox();
+
+        final String[] locNames = ACTION_FACTORY.getString("availableLocales").split("\\s+");
+        locales = new Locale[locNames.length + 1];
+        // locales[0] is intentionally null. It will be displayed as default and always get sorted to the top.
+        for (int i = 0; i < locNames.length; i++) {
+            locales[i + 1] = new Locale(locNames[i]);
+        }
+        sort(locales, comp);
+
+        lineLayout.add(new JLabel(ACTION_FACTORY.getString("optionsLanguage")));  // create label
+
+        localeBox = new JComboBox(locales);     // set "content"
+        localeBox.setRenderer(new LocaleListCellRenderer());
+        //localeBox.setPreferredSize(new Dimension(150, 25));
+        final String current = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PREFS_LANGUAGE, null);
+        localeBox.setSelectedIndex(binarySearch(locales, current != null ? new Locale(current) : null, comp));
+
+        lineLayout.add(localeBox);
+        return lineLayout;
+    }
+
+    /**
+     * Creates the subpanel with the global settings.
+     * @return subpanel
+     */
+    private Component createGlobalPanel() {
+        final Box globalPanel = createVerticalBox();
+        globalPanel.setBorder(createTitledBorder("optionsGlobal"));
+
+        globalPanel.add(buildLocaleBox());
+
+        return globalPanel;
+    }
+
+    /**
+     * Creates the subpanel with the layout settings.
+     * @return subpanel
+     */
+    private Component createLayoutPanel() {
+        final Box layoutPanel = createVerticalBox();
+        layoutPanel.setBorder(createTitledBorder("optionsLayout"));
+
+        mapPanelBottom = new JCheckBox(ACTION_FACTORY.createAction(false, "optionsSepMapTile"));
+        mapPanelBottom.setSelected(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(MAP_TILE_LIST_BOTTOM_DEFAULT))).booleanValue());
+        layoutPanel.add(mapPanelBottom);
+        return layoutPanel;
+    }
+
+} // class GUIPrefs


Property changes on: trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Added: trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -0,0 +1,314 @@
+/*
+ * Daimonin Java Editor.
+ * Copyright (C) 2005  Christian Hujer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ */
+
+package cfeditor.gui.prefs;
+
+import cfeditor.CMainControl;
+import cfeditor.CSettings;
+import cfeditor.IGUIConstants;
+import static cfeditor.IGUIConstants.DIALOG_BORDER;
+import cfeditor.ResourceFileManager;
+import cfeditor.io.PathManager;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import static java.util.Arrays.sort;
+import java.util.prefs.Preferences;
+import javax.swing.Box;
+import static javax.swing.Box.createHorizontalBox;
+import static javax.swing.Box.createVerticalBox;
+import static javax.swing.Box.createVerticalGlue;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import static javax.swing.JFileChooser.DIRECTORIES_ONLY;
+import javax.swing.JLabel;
+import static javax.swing.JOptionPane.WARNING_MESSAGE;
+import javax.swing.JTextField;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.TitledBorder;
+import net.sf.japi.swing.ActionFactory;
+import net.sf.japi.swing.JFileChooserButton;
+import net.sf.japi.swing.prefs.AbstractPrefs;
+
+/**
+ * Preferences Module for resource preferences.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @serial exclude
+ */
+public final class ResPrefs extends AbstractPrefs {
+
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
+
+    /** Main Control. */
+    private final CMainControl mainControl;
+
+    /** TextField for arch directory path. */
+    private FileField archField;
+
+    /** TextField for map directory path. */
+    private FileField mapField;
+
+    /** TextField for script directory path. */
+    private FileField scriptField;
+
+    /** Checbox whether arches are to be loaded from collection. */
+    private JCheckBox loadArches;
+
+    /** ComboBox for choosing the image set. */
+    private JComboBox imageSetBox;
+
+    /** Contains all supported image sets. */
+    private String[] imageSets;
+
+    /**
+     * Create a ResPrefs pane.
+     * @param mainControl The controller of this dialog.
+     */
+    public ResPrefs(final CMainControl mainControl) {
+        setListLabelText(ACTION_FACTORY.getString("prefsRes.title"));
+        setListLabelIcon(ACTION_FACTORY.getIcon("prefsRes.icon"));
+        this.mainControl = mainControl;
+
+        add(createResourcePanel());
+        add(createGlobalPanel());
+        add(createVerticalGlue());
+    }
+
+    /**
+     * Create a titled border.
+     * @param titleKey Action Key for border title
+     * @return titled border
+     */
+    private static Border createTitledBorder(final String titleKey) {
+        return new CompoundBorder(new TitledBorder(ACTION_FACTORY.getString(titleKey)), DIALOG_BORDER);
+    }
+
+    /** {@inheritDoc} */
+    public void apply() {
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.ARCH_DIR_KEY, PathManager.path(archField.getText()));
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.MAP_DIR_KEY, PathManager.path(mapField.getText()));
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(ResourceFileManager.SCRIPT_DIR_KEY, PathManager.path(scriptField.getText()));
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainControl.LOAD_ARCH_COLL, loadArches.isSelected() ? "true" : "false");
+
+        final String imageSet = (String) imageSetBox.getSelectedItem();
+        CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainControl.USE_IMAGESET, imageSet == null || imageSet.equals("disabled") ? "none" : imageSet);
+
+        mainControl.readGlobalSettings();
+        mainControl.refreshMenusAndToolbars();
+        ACTION_FACTORY.showOnetimeMessageDialog(this, WARNING_MESSAGE, "optionsRestart");
+    }
+
+    /** {@inheritDoc} */
+    public void revert() {
+        archField.setText(mainControl.getArchDefaultFolder());
+        mapField.setText(mainControl.getMapDefaultFolder());
+        scriptField.setText(mainControl.getScriptDefaultFolder());
+        loadArches.setSelected(mainControl.isArchLoadedFromCollection());
+        imageSetBox.setSelectedIndex(linearSearch(imageSets, getCurrentImageSet()));
+    }
+
+    /** {@inheritDoc} */
+    public void defaults() {
+        archField.setText(ResourceFileManager.DEFAULT_ARCH_DIR);
+        mapField.setText(ResourceFileManager.DEFAULT_MAP_DIR);
+        scriptField.setText(ResourceFileManager.DEFAULT_SCRIPT_DIR);
+        loadArches.setSelected(true);
+        imageSetBox.setSelectedIndex(linearSearch(imageSets, "disabled"));
+    }
+
+    /** {@inheritDoc} */
+    public boolean isChanged() {
+        final String selectedimageSet = (String) imageSetBox.getSelectedItem();
+        final String imageSet = selectedimageSet == null ? "disabled" : selectedimageSet;
+        return !(
+                archField.getText().equals(mainControl.getArchDefaultFolder())
+                        && mapField.getText().equals(mainControl.getMapDefaultFolder())
+                        && scriptField.getText().equals(mainControl.getScriptDefaultFolder())
+                        && loadArches.isSelected() == new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainControl.LOAD_ARCH_COLL, Boolean.toString(mainControl.isArchLoadedFromCollection()))).booleanValue()
+                        && imageSet.equals(getCurrentImageSet()));
+    }
+
+    /**
+     * Toggle action method for loading arches from collection.
+     * @param loadArchColl whether to load arches from collection
+     * @used
+     */
+    public void setOptionsLoadArchColl(final boolean loadArchColl) {
+        archField.setEnabled(!loadArchColl);
+    }
+
+    /**
+     * Toggle action method for loading arches from collection.
+     * @return whether arches are loaded from collection
+     * @used
+     */
+    public boolean isOptionsLoadArchColl() {
+        return !archField.isEnabled();
+    }
+
+    /**
+     * Creates the subpanel with the resource paths.
+     * @return subpanel
+     */
+    private Component createResourcePanel() {
+        final Box resourcePanel = createVerticalBox();
+        resourcePanel.setBorder(createTitledBorder("optionsResPaths"));
+        archField = createFileField(resourcePanel, "optionsResArch", mainControl.getArchDefaultFolder(), DIRECTORIES_ONLY);
+        mapField = createFileField(resourcePanel, "optionsResMaps", mainControl.getMapDefaultFolder(), DIRECTORIES_ONLY);
+        scriptField = createFileField(resourcePanel, "optionsResScripts", mainControl.getScriptDefaultFolder(), DIRECTORIES_ONLY);
+        return resourcePanel;
+    }
+
+    /**
+     * Creates the subpanel with the global settings.
+     * @return subpanel
+     */
+    private Component createGlobalPanel() {
+        final Box globalPanel = createVerticalBox();
+        globalPanel.setBorder(createTitledBorder("optionsGlobal"));
+
+        loadArches = new JCheckBox(ACTION_FACTORY.createToggle(false, "optionsLoadArchColl", this));
+        loadArches.setSelected(mainControl.isArchLoadedFromCollection());
+        globalPanel.add(loadArches);
+        if (mainControl.isArchLoadedFromCollection()) {
+            archField.setEnabled(false);
+        }
+
+        globalPanel.add(buildImageSetBox());
+
+        return globalPanel;
+    }
+
+    /**
+     * Construct the Combo box for the selection of image sets.
+     * @return combo box with image sets to select
+     */
+    private Component buildImageSetBox() {
+        final Box lineLayout = createHorizontalBox();
+
+        final String[] imageSetNames = ACTION_FACTORY.getString("availableImageSets").split("\\s+");
+        sort(imageSetNames);
+        imageSets = new String[imageSetNames.length + 1];
+        imageSets[0] = "disabled";
+        System.arraycopy(imageSetNames, 0, imageSets, 1, imageSetNames.length);
+
+        lineLayout.add(new JLabel(ACTION_FACTORY.getString("optionsImageSet")));  // create label
+
+        imageSetBox = new JComboBox(imageSets);     // set "content"
+        imageSetBox.setSelectedIndex(linearSearch(imageSets, getCurrentImageSet()));
+
+        lineLayout.add(imageSetBox);
+        return lineLayout;
+    }
+
+    /**
+     * Creats a textpanel for choosing a file and adds it to another panel.
+     * @param panel             JPanel to add field to
+     * @param key               Key for label
+     * @param initial           Initial value for textfield
+     * @param fileSelectionMode file selection mode
+     * @return the created JTextField
+     */
+    private static FileField createFileField(final Container panel, final String key, final String initial, final int fileSelectionMode) {
+        final FileField fileField = new FileField(ACTION_FACTORY.getString(key), initial, fileSelectionMode);
+        final String tooltip = ACTION_FACTORY.getString(key + ".shortdescription");
+        if (tooltip != null) {
+            fileField.setToolTipText(tooltip);
+        }
+        panel.add(fileField);
+        return fileField;
+    }
+
+    private static int linearSearch(final String[] a, final String key) {
+        for (int i = 0; i < a.length; i++) {
+            if (a[i].equals(key)) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    private static String getCurrentImageSet() {
+        final String imageSet = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainControl.USE_IMAGESET, "none");
+        return imageSet.equals("none") ? "disabled" : imageSet;
+    }
+
+    /** Class for selecting a file.
+     * @todo replace with JFileField from JAPI
+     */
+    private static class FileField extends JComponent {
+
+        /** The label. */
+        private final JLabel label;
+
+        /** The file field. */
+        private final JTextField fileField;
+
+        /** The button to start the JFileChooser. */
+        private final JFileChooserButton chooserButton;
+
+        /**
+         * Create a FileField.
+         * @param labelText         the text for the label
+         * @param initial           the initial path
+         * @param fileSelectionMode the mode for the file selection
+         */
+        private FileField(final String labelText, final String initial, final int fileSelectionMode) {
+            setLayout(new FlowLayout(FlowLayout.RIGHT));
+            fileField = new JTextField(initial, 16);
+            chooserButton = new JFileChooserButton(fileField, fileSelectionMode);
+            label = new JLabel(labelText);
+            add(label);
+            add(fileField);
+            add(chooserButton);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void setEnabled(final boolean enabled) {
+            super.setEnabled(enabled);
+            fileField.setEnabled(enabled);
+            chooserButton.setEnabled(enabled);
+            label.setEnabled(enabled);
+        }
+
+        /**
+         * Set the text, which is the filename.
+         * @param text filename
+         */
+        public void setText(final String text) {
+            fileField.setText(text);
+        }
+
+        /**
+         * Get the text, which is the filename.
+         * @return text (filename)
+         */
+        public String getText() {
+            return fileField.getText();
+        }
+
+    } // class FileField
+
+} // class ResPrefs


Property changes on: trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Added: trunk/crossfire/src/cfeditor/gui/prefs/package.html
===================================================================
--- trunk/crossfire/src/cfeditor/gui/prefs/package.html	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/gui/prefs/package.html	2006-12-10 13:37:25 UTC (rev 1005)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
+    <head>
+        <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+        <title></title>
+    </head>
+    <body>
+        <p>This package contains the preferences ui modules.</p>
+    </body>
+</html>


Property changes on: trunk/crossfire/src/cfeditor/gui/prefs/package.html
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Added: trunk/crossfire/src/cfeditor/io/PathManager.java
===================================================================
--- trunk/crossfire/src/cfeditor/io/PathManager.java	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/io/PathManager.java	2006-12-10 13:37:25 UTC (rev 1005)
@@ -0,0 +1,215 @@
+/*
+ * Daimonin Java Editor.
+ * Copyright (C) 2005  Christian Hujer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ */
+
+package cfeditor.io;
+
+import cfeditor.CMainControl;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * This class contains methods for converting relative map paths to absolute map paths and vice versa.
+ * Serverside, paths to maps always are URIs with the maps directory being the root directory for the maps.
+ * Therefore it makes sense to treat them as URIs in the editor as well.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @todo make more use of URI
+ * @todo This class knows CMainControl. The dependency should be flipped: instead CMainControl should use this class. Then this class could be used by crossfire, too.
+ */
+public final class PathManager {
+
+    // NOTE: There are certainly faster algorithms. But these methods are rarely used.
+
+    /**
+     * Private constructor.
+     * There are only static methods, so prevent this class from being instanciated.
+     */
+    private PathManager() {
+    }
+
+    /**
+     * Create arch path.
+     * Replaces all occurences of '\' with '/' and removes the path to the arch directory (absolute, relative or canonical) from the path.
+     * @param path to create arch path from
+     * @return fixed path
+     */
+    public static String getArchPath(final String path) {
+        final String archDirName = CMainControl.getInstance().getArchDefaultFolder();
+        String archPath = path.replace('\\', '/');
+        if (archPath.startsWith(archDirName)) {
+            archPath = archPath.substring(archDirName.length());
+        }
+        if (archPath.startsWith(new File(archDirName).getAbsolutePath())) {
+            archPath = archPath.substring(new File(archDirName).getAbsolutePath().length());
+        }
+        archPath = archPath.replace('\\', '/');
+        return archPath;
+    }
+
+    /**
+     * Create map path.
+     * Replaces all occurences of '\' with '/' and removes the path to the map directory (absolute, relative or canonical) from the path.
+     * @param path to create map path from
+     * @return fixed path
+     * @throws IOException In case of problems converting / creating the map path.
+     */
+    public static String getMapPath(final String path) throws IOException {
+        final String mapDirName = CMainControl.getInstance().getMapDefaultFolder();
+        String mapPath = path.replace('\\', '/');
+        if (mapPath.startsWith(mapDirName)) {
+            mapPath = mapPath.substring(mapDirName.length());
+        }
+        if (mapPath.startsWith(new File(mapDirName).getAbsolutePath())) {
+            mapPath = mapPath.substring(new File(mapDirName).getAbsolutePath().length());
+        }
+        if (mapPath.startsWith(new File(mapDirName).getCanonicalPath())) {
+            mapPath = mapPath.substring(new File(mapDirName).getCanonicalPath().length());
+        }
+        mapPath = mapPath.replace('\\', '/');
+        return mapPath;
+    }
+
+    /**
+     * Check whether a path is absolute.
+     * Paths starting with "/" are absolute, paths starting with other characters are relative.
+     * Empty paths are neither relative nor absolute.
+     * @param path Path to check
+     * @return <code>true</code> if <var>path</var> is absolute, <code>false</code> otherwise
+     * @see #isRelative(String) which nearly is the opposite of this method
+     */
+    public static boolean isAbsolute(final String path) {
+        return path.startsWith("/") || new File(path).isAbsolute();
+    }
+
+    /**
+     * Check whether a path is relative.
+     * Paths not starting with "/" are relative, paths starting with are absolute.
+     * Empty paths are neither relative nor absolute.
+     * @param path Path to check
+     * @return <code>true</code> if <var>path</var> is relative, <code>false</code> otherwise
+     * @see #isAbsolute(String) which nearly is the opposite of this method
+     */
+    public static boolean isRelative(final String path) {
+        return !path.startsWith("/") && !new File(path).isAbsolute();
+    }
+
+    /**
+     * Converts a relative path to an absolute path.
+     * If the path already is relative, this method simply returns the path.
+     * @param reference reference file the relative path works on (regular file, not directory)
+     * @param relative  destination file with relative path
+     * @return absolute path from the base directory
+     */
+    public static String relativeToAbsolute(final String reference, final String relative) {
+        if (reference.contains("\\") || relative.contains("\\")) {
+            return relativeToAbsolute(reference.replace('\\', '/'), relative.replace('\\', '/'));
+        }
+        if (isAbsolute(relative)) {
+            return relative;
+        }
+        String work = reference.substring(0, reference.lastIndexOf("/") + 1) + relative; // + 1 to include the "/"
+        String work2;
+        do {
+            work2 = work;
+            work = work2.replaceAll("[^/]+/\\.\\./", "");
+        } while (!work2.equals(work));
+        return work;
+    }
+
+    /**
+     * Converts an absolute path to a relative path.
+     * If the path already is absolute, this method simply returns the path.
+     * @param reference reference file the relative path works on (regular file, not directory)
+     * @param absolute  destination file with relative path
+     * @return absolute path from the base directory
+     */
+    public static String absoluteToRelative(final String reference, final String absolute) {
+        if (reference.contains("\\") || absolute.contains("\\")) {
+            return absoluteToRelative(reference.replace('\\', '/'), absolute.replace('\\', '/'));
+        }
+        if (isRelative(absolute)) {
+            return absolute;
+        }
+        //String reference2 =
+        // First: Strip equal path parts
+        final int difference = findDifference(reference, absolute);
+        final StringBuilder relative = new StringBuilder(absolute.substring(difference));
+        final String referencePath = reference.substring(difference);
+        for (int i = 0, l = findOccurrences(referencePath, '/'); i < l; i++) {
+            relative.insert(0, "../");
+        }
+        return relative.toString();
+    }
+
+    /**
+     * Helper method that returns the first string index at which two strings denoting paths aren't identical.
+     * That is, the index always points at the beginning or a '/'-character.
+     * The return value of this method is in every case good for a String.substring() invocation start index.
+     * @param s1 first string to compare
+     * @param s2 second string to compare
+     * @return index of first / after which s1 and s2 aren't identical or 0 if they differ from start
+     */
+    private static int findDifference(final String s1, final String s2) {
+        int s1slash = -1;
+        int s2slash = -1;
+        char c1 = (char) 0; // initialize for equality for first loop cycle
+        char c2 = (char) 0;
+        for (int index = 0, l1 = s1.length(), l2 = s2.length(); index < l1 && index < l2 && c1 == c2; index++) {
+            c1 = s1.charAt(index);
+            c2 = s2.charAt(index);
+            if (c1 == '/') {
+                s1slash = index;
+            }
+            if (c2 == '/') {
+                s2slash = index;
+            }
+        }
+        return Math.min(s1slash, s2slash) + 1;
+    }
+
+    /**
+     * Counts the occurrences of a character within a string.
+     * @param s String to count in
+     * @param c character to count
+     * @return number of occurences of <var>c</var> in <var>s</var>
+     */
+    private static int findOccurrences(final String s, final char c) {
+        int occurrences = 0;
+        for (int i = 0, l = s.length(); i < l; i++) {
+            if (s.charAt(i) == c) {
+                occurrences++;
+            }
+        }
+        return occurrences;
+    }
+
+    /**
+     * Create a reasonable path.
+     * @param str String to create path from
+     * @return path
+     */
+    public static String path(final String str) {
+        String path = str.replaceAll("\\\\", "/");
+        path = path.endsWith("/") ? path.substring(0, path.length() - 1) : path;
+        path = path.startsWith("file:") ? path.substring("file:".length()) : path;
+        return path;
+    }
+
+} // class PathManager


Property changes on: trunk/crossfire/src/cfeditor/io/PathManager.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/messages.properties	2006-12-10 13:37:25 UTC (rev 1005)
@@ -1,6 +1,10 @@
 # Warning: This file MUST be ISO-8859-1
 # See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
 
+# Supported image set. The values must match the image file names:
+# <name>.<image set name>.111
+availableImageSets=base
+
 # Dialogs
 
 collectArchesNotReady.title=Arches still loading
@@ -46,3 +50,7 @@
 mapSkySetting=Sky setting
 mapTop=Top
 mapBottom=Bottom
+
+# Options
+optionsImageSet=Image Set
+optionsImageSet.shortdescription=The image set to use

Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/crossfire/src/cfeditor/messages_de.properties	2006-12-10 13:37:25 UTC (rev 1005)
@@ -241,3 +241,29 @@
 scriptEditData.text=Daten \xE4ndern
 scriptEdit.text=Script \xE4ndern
 scriptRemove.text=Script l\xF6schen
+
+#####################
+# Preference Modules
+
+prefsRes.title=Pfade & Ressourcen
+prefsGUI.title=Aussehen
+
+# Options
+
+optionsLanguage=Sprache
+optionsLayout=Layout-Einstellungen
+optionsSepMapTile.text=Map-Tile-Panel unten anzeigen
+optionsSepMapTile.shortdescription=Map-Tile-Panel unten (anstatt rechts) anzeigen
+optionsLoadArchColl.text=Vorbereitete Archetypen laden
+optionsGlobal=Global
+optionsResPaths=Pfade
+optionsResArch=Archetypen
+optionsResArch.shortdescription=Dateiname der Archetypen-Datei
+optionsResMaps=Karten
+optionsResMaps.shortdescription=Verzeichnis f\xFCr Karten
+optionsResScripts=Skripte
+optionsResScripts.shortdescription=Verzeichnis f\xFCr Scripte
+optionsImageSet=Image Set
+optionsImageSet.shortdescription=Verwendetes Image Set zur Darstellung von Karten
+optionsRestart.title=Warnung
+optionsRestart.message=Viele Optionen erfordern einen Programmneustart, um effektiv zu werden.

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-10 13:37:25 UTC (rev 1005)
@@ -157,17 +157,8 @@
 # Options
 
 optionsTitle=Options
-optionsLanguage=Language
-optionsLayout=Layout Settings
 optionsUpdate=Automatic Update
-optionsSepMapTile.text=Display Map-Tile Panel at the bottom
-optionsSepMapTile.shortdescription=Unchecking this moves the Map-Tile Panel to the right side of the screen instead of the bottom right corner.
 optionsLoadArchColl.text=Load Arches from Collection
-optionsGlobal=Global
-optionsResPaths=Resource Paths
-optionsResArch=Archfiles
-optionsResMaps=Maps
-optionsResScripts=Scripts
 optionsResMedia=Media
 optionsResMedia.shortdescription=<html>The media directory is for choosing background sounds for maps.<br>Please know that you cannot simply choose any media directory you want.<br>The background sound will only work if the files exist on the client as well.<br>Therefore, choosing a standard daimonin media directory is crucial.</html>
 optionsMisc=Miscellaneous Options
@@ -180,8 +171,6 @@
 optionsAppServer=Server
 optionsAppClient=Client
 optionsAppEditor=Editor
-optionsRestart.title=Warning
-optionsRestart.message=Most options require restarting the editor to take effect.
 optionsValidation=Validation settings
 autoValidate.text=Automatically run validation after each change
 optionsValidators=Validators
@@ -713,9 +702,7 @@
 
 prefsApp.title=External applications
 prefsDev.title=Developers
-prefsRes.title=Paths & resources
 prefsMisc.title=Miscellaneous
-prefsGUI.title=Appearance
 prefsUpdate.title=Update
 prefsMapValidator.title=Map validation
 

Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties	2006-12-10 13:34:04 UTC (rev 1004)
+++ trunk/src/app/net/sf/gridarta/messages.properties	2006-12-10 13:37:25 UTC (rev 1005)
@@ -223,3 +223,27 @@
 scriptEditData.text=Edit Data
 scriptEdit.text=Edit Script
 scriptRemove.text=Remove Script
+
+#####################
+# Preference Modules
+
+prefsRes.title=Paths & resources
+prefsGUI.title=Appearance
+
+# Options
+
+optionsLanguage=Language
+optionsGlobal=Global
+optionsLayout=Layout Settings
+optionsSepMapTile.text=Display Map-Tile Panel at ...
 
[truncated message content]

Thread: [Gridarta-commit] SF.net SVN: gridarta: [1005] trunk (Page 11)

gridarta-commit