--- a/CHANGELOG.txt	Sun Jun 03 10:26:05 2007 +0000
+++ b/CHANGELOG.txt	Sun Jun 03 10:33:01 2007 +0000
@@ -1,8 +1,24 @@
+2007-05-03 Version 0.6.0 Beta
+[add] Feature Request ID 1700557 : Added a settings dialog for handling more possible settings with better usabiltiy.
+[add] Feature Request ID 1700556 : Added option to load last file or not on startup.
+[add] Feature Request ID 1684011 : Added option to set the width used to display tabs (default is four spaces).
+[add] Feature Request ID 1651718 : Added multiple choices, for the indenter configuration, with for the user readable text. Before the text inside of the combo boxes for the indenter parameters was exactly the same text as the command line parameter of the indenter. Now with "ChoicesReadable" a list with the same length as "Choices" can be used to insert readable text into the combo box. If this list is not set, the content of "Choices" will be used.
+[add] Partly Japanese translation. Thanks to Nirvash.
+[add] The language selection show the countries flag in front of its name to identify the language faster.
+[add] Feature Request ID 1657253 : If now configuration ini file for any indenter can be found, a warning will be displayed.
+[change] Feature Request ID 1723228 : The default font for all syntax highlighters is now mono spaced, Courier.
+[change] Along with the settings dialog cleaned up the user interface. Moved some not that often needed settings away to the settings dialog.
+[change] The full text of the GPL in the about dialog did slow down the program startup and translation. Now only a hint and link to the GPL is given in the about dialog.
+[fix] Bug ID 1692511 : UniversalIndentGui crashed, if a by the syntax highlighter unsupported file extension was opened.
+[fix] Bug ID 1727538 : The setting for syntax highlighting was allways enabled on startup, even if disabled on closing.
+[fix] Bug ID 1729026 : The highlighting style was not correct when changed to another highlighter than the current. Only after toggling preview for example the style was correct.
+[fix] The editors column showing the line numbers did not adapt its width to the maximum line number.
+
 2007-03-19 Version 0.5.1 Beta
 [add] Supporting syntax highlightning for the programming language D.
 [change] The live typing and indenting feature was not adapted to QScintilla. Now works again (depending on the used indenter).
-[fix] Bug ID 1678783: Files other encoded than ascii were not displayed correctly. Now allways displaying files using UTF-8 encoding.
-[fix] Bug ID 1678783: The new syntax highlighter selection menu was not translated.
+[fix] Bug ID 1678783 : Files other encoded than ascii were not displayed correctly. Now allways displaying files using UTF-8 encoding.
+[fix] Bug ID 1678783 : The new syntax highlighter selection menu was not translated.
 [fix] When file was reloaded with other encoding the file was allways set to be modified even if it wasn't.
 
 2007-03-14 Version 0.5.0 Beta

--- a/README.txt	Sun Jun 03 10:26:05 2007 +0000
+++ b/README.txt	Sun Jun 03 10:33:01 2007 +0000
@@ -1,7 +1,7 @@
 UniversalIndentGUI
 ==================
 
-This application is released under the GPL. Read the file "LICENSE.GPL" in the same directory as this readme for more information!
+This application is released under the GPL version 2. Read the file "LICENSE.GPL" in the same directory as this readme for more information or have a look at http://www.gnu.org/licenses/gpl.html!
 
 
 1. About UniversalIndentGUI

--- a/buildLinuxAMD64Release.sh	Sun Jun 03 10:26:05 2007 +0000
+++ b/buildLinuxAMD64Release.sh	Sun Jun 03 10:33:01 2007 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
-echo setting Qt path to /usr/local/Trolltech/Qt-4.2.2/bin
+echo setting Qt path to /usr/local/Trolltech/Qt-4.2.3/bin
 echo ----------------------------------------------------
-PATH=/usr/local/Trolltech/Qt-4.2.2/bin:$PATH
+PATH=/usr/local/Trolltech/Qt-4.2.3/bin:$PATH
 export PATH
 echo calling rm -r release/debug
 echo ---------------------------
@@ -59,6 +59,7 @@
 cp ./data/uigui_phpCB.ini ./UniversalIndentGUI_linuxAMD64/data/
 cp ./data/uigui_gnuindent.ini ./UniversalIndentGUI_linuxAMD64/data/
 cp ./data/uigui_uncrustify.ini ./UniversalIndentGUI_linuxAMD64/data/
+cp ./data/highlighter.ini ./UniversalIndentGUI_linuxAMD64/data/
 cp ./data/example.cpp ./UniversalIndentGUI_linuxAMD64/data/
 cp ./translations/*.qm ./UniversalIndentGUI_linuxAMD64/translations/
 cp ./doc/iniFileFormat.html ./UniversalIndentGUI_linuxAMD64/doc/
@@ -66,6 +67,6 @@
 cd UniversalIndentGUI_linuxAMD64
 echo compressing UniversalIndentGUI_linuxAMD64
 echo ----------------------------------------
-tar czf UniversalIndentGUI_0.5.1_Beta_linuxAMD64.tgz *
+tar czf UniversalIndentGUI_0.6.0_Beta_linuxAMD64.tgz *
 cd ..
 read -p "press any key to continue"

--- a/buildLinuxRelease.sh	Sun Jun 03 10:26:05 2007 +0000
+++ b/buildLinuxRelease.sh	Sun Jun 03 10:33:01 2007 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
-echo setting Qt path to /usr/local/Trolltech/Qt-4.2.1/bin
+echo setting Qt path to /usr/local/Trolltech/Qt-4.2.3/bin
 echo ----------------------------------------------------
-PATH=/usr/local/Trolltech/Qt-4.2.1/bin:$PATH
+PATH=/usr/local/Trolltech/Qt-4.2.3/bin:$PATH
 export PATH
 echo calling rm -r release/debug
 echo ---------------------------
@@ -59,6 +59,7 @@
 cp ./data/uigui_phpCB.ini ./UniversalIndentGUI_linux32/data/
 cp ./data/uigui_gnuindent.ini ./UniversalIndentGUI_linux32/data/
 cp ./data/uigui_uncrustify.ini ./UniversalIndentGUI_linux32/data/
+cp ./data/highlighter.ini ./UniversalIndentGUI_linux32/data/
 cp ./data/example.cpp ./UniversalIndentGUI_linux32/data/
 cp ./translations/*.qm ./UniversalIndentGUI_linux32/translations/
 cp ./doc/iniFileFormat.html ./UniversalIndentGUI_linux32/doc/
@@ -66,6 +67,6 @@
 cd UniversalIndentGUI_linux32
 echo compressing UniversalIndentGUI_linux32
 echo ----------------------------------------
-tar czf UniversalIndentGUI_0.5.0_Beta_linux32.tgz *
+tar czf UniversalIndentGUI_0.6.0_Beta_linux32.tgz *
 cd ..
 read -p "press any key to continue"

--- a/buildSrcRelease.bat	Sun Jun 03 10:26:05 2007 +0000
+++ b/buildSrcRelease.bat	Sun Jun 03 10:33:01 2007 +0000
@@ -14,7 +14,8 @@
 copy .\data\uigui_greatcode.ini .\UniversalIndentGUI_src\data
 copy .\data\uigui_gnuindent.ini .\UniversalIndentGUI_src\data
 copy .\data\uigui_phpCB.ini .\UniversalIndentGUI_win32\data
-copy .\data\uigui_uncrustify.ini .\UniversalIndentGUI_win32\datas
+copy .\data\uigui_uncrustify.ini .\UniversalIndentGUI_win32\data
+copy .\data\highlighter.ini .\UniversalIndentGUI_win32\data
 copy .\resources\* .\UniversalIndentGUI_src\resources
 copy .\src\* .\UniversalIndentGUI_src\src
 del .\UniversalIndentGUI_src\src\*.user
@@ -28,5 +29,5 @@
 copy .\doc\iniFileFormat.html .\UniversalIndentGUI_src\doc\
 copy .\translations\*.ts .\UniversalIndentGUI_src\translations\
 cd UniversalIndentGUI_src
-7z.exe a -tzip UniversalIndentGUI_0.5.1_Beta_src.zip
+7z.exe a -tzip UniversalIndentGUI_0.6.0_Beta_src.zip
 cd ..

--- a/buildwin32release_gcc.bat	Sun Jun 03 10:26:05 2007 +0000
+++ b/buildwin32release_gcc.bat	Sun Jun 03 10:33:01 2007 +0000
@@ -41,6 +41,7 @@
 copy .\data\uigui_greatcode.ini .\UniversalIndentGUI_win32\data
 copy .\data\uigui_phpCB.ini .\UniversalIndentGUI_win32\data
 copy .\data\uigui_uncrustify.ini .\UniversalIndentGUI_win32\data
+copy .\data\highlighter.ini .\UniversalIndentGUI_win32\data
 copy .\data\example.cpp .\UniversalIndentGUI_win32\data
 copy .\CHANGELOG.txt .\UniversalIndentGUI_win32\
 copy .\LICENSE.GPL .\UniversalIndentGUI_win32\
@@ -50,6 +51,6 @@
 copy .\doc\iniFileFormat.html .\UniversalIndentGUI_win32\doc\
 copy .\release\UniversalIndentGUI.exe .\UniversalIndentGUI_win32\
 cd UniversalIndentGUI_win32
-7z.exe a -tzip UniversalIndentGUI_0.5.2_Beta_win32.zip
+7z.exe a -tzip UniversalIndentGUI_0.6.0_Beta_win32.zip
 cd ..
 pause

--- a/src/mainwindow.cpp	Sun Jun 03 10:26:05 2007 +0000
+++ b/src/mainwindow.cpp	Sun Jun 03 10:33:01 2007 +0000
@@ -33,9 +33,9 @@
  */
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
     // set the program version, revision and date, which is shown in the main window title and in the about dialog.
-    version = "0.5.1 Beta";
-    revision = "300";
-    QDate buildDate(2007, 3, 21);
+    version = "0.6.0 Beta";
+    revision = "370";
+    QDate buildDate(2007, 6, 3);
     buildDateStr = buildDate.toString("d. MMMM yyyy");
 
     // Create the settings object, which loads all UiGui settings from a file.