From d84adeb6ee77b3ab7c5c11edeb8678df239e1f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Delgado?= <idn@adatio.es>
Date: Mon, 8 Feb 2021 21:25:40 +0100
Subject: [PATCH] Other UI changes

---
 settings.xml        | 11 +++++------
 src/tm/ui/TMUI.java | 10 ++++++----
 tmspec.xml          |  8 ++++++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/settings.xml b/settings.xml
index aa91dd7..a2bb638 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE settings SYSTEM "settings.dtd">
 <settings>
-  <property key="locale" value="en_US"/>
   <property key="viewStatusBar" value="true"/>
   <property key="viewToolBar" value="true"/>
   <property key="maxRecentFiles" value="10"/>
-  <property key="MenuBG" value="#1b2224"/>
-  <property key="WindowBG" value="#141a1b"/>
-  <property key="AsideBG" value="#1b2224"/>
-  <property key="FrameBG" value="#222b2e"/>
-  <property key="DarkIcons" value="false"/>
+  <property key="MenuBG" value="#f0f0f0"/>
+  <property key="WindowBG" value="#d2d2d2"/>
+  <property key="AsideBG" value="#f0f0f0"/>
+  <property key="FrameBG" value="#b5b5b5"/>
+  <property key="DarkIcons" value="true"/>
 </settings>
diff --git a/src/tm/ui/TMUI.java b/src/tm/ui/TMUI.java
index 0e512e5..c01afaa 100644
--- a/src/tm/ui/TMUI.java
+++ b/src/tm/ui/TMUI.java
@@ -781,6 +781,7 @@ public class TMUI extends JFrame {
 **/
 
     public void loadSettings() {
+		boolean loadedLocale = false;
         Document doc = null;
         try {
             doc = XMLParser.parse(settingsFile);
@@ -797,7 +798,7 @@ public class TMUI extends JFrame {
         NodeList properties = settings.getElementsByTagName("property");
         // process all the properties
         for (int i=0; i<properties.getLength(); i++) {
-            // get property (key, value) pair
+			// get property (key, value) pair
             Element property = (Element)properties.item(i);
             String key = property.getAttribute("key");
             String value = property.getAttribute("value");
@@ -807,7 +808,8 @@ public class TMUI extends JFrame {
                 if (st.countTokens() != 2) continue;
                 String language = st.nextToken();
                 String country = st.nextToken();
-                locale = new Locale(language, country);
+				locale = new Locale(language, country);
+				loadedLocale = true;
             }
             if (key.equals("viewStatusBar")) {
                 viewStatusBar = value.equals("true");
@@ -842,8 +844,8 @@ public class TMUI extends JFrame {
 			else if (key.equals("DarkIcons")) {
                 DarkIcons = value.equals("true");
 			}
-			
-        }
+		}
+		if(!loadedLocale) selectLanguage();
     }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/tmspec.xml b/tmspec.xml
index 86fa42d..da485a8 100644
--- a/tmspec.xml
+++ b/tmspec.xml
@@ -192,6 +192,9 @@
         <filefilter extensions="nds" tileformat="LN06" mode="2D">
             <description>Nintendo DS (*.nds)</description>
         </filefilter>
+        <filefilter extensions="sch,cgx,bak" tileformat="CP02" mode="1D">
+            <description>Character File (*.sch, *.cgx)</description>
+        </filefilter>
 
     </filefilters>
 
@@ -217,10 +220,11 @@
             <description>Tile Layer Pro palette (*.tpl)</description>
         </palettefilter>
 
-        <palettefilter extensions="pal" colorformat="RIFF" size="256" offset="24" endianness="big">
-            <description>Windows Palette (*.pal)</description>
+		<palettefilter extensions="col,pal,bak" colorformat="CF00" size="256" offset="0">
+            <description>Raw palette file (*.col,*.pal)</description>
         </palettefilter>
 
+
     </palettefilters>
 
     <filelisteners>