SVN Commit by dpage: r4952 - in trunk/pgadmin3: . src/frm

Author: dpage
Date: 2006-01-23 13:48:10 +0000 (Mon, 23 Jan 2006)
New Revision: 4952

Modified:
trunk/pgadmin3/CHANGELOG
trunk/pgadmin3/src/frm/frmConfig.cpp
Log:
Read config files as uTF-8 [Magnus Hagander]
Replace some missing changelog entries that I seem to have lost

Modified: trunk/pgadmin3/CHANGELOG
===================================================================
--- trunk/pgadmin3/CHANGELOG 2006-01-23 13:39:29 UTC (rev 4951)
+++ trunk/pgadmin3/CHANGELOG 2006-01-23 13:48:10 UTC (rev 4952)
@@ -28,24 +28,37 @@
- MP Marc Persuy
- DAP Darko Prenosil
- FGP Florian G. Pflug
+- MH Magnus Hagander

Changes
-------

Date Dev Ver Change details
---------- --- ----- --------------
-2006-01-11 DP 1.6.0 Allow result copy quoting configuration to be set
+2006-01-23 MH 1.4.2 Read config files as UTF-8
+2006-01-22 DP 1.6.0 Rename text docs to match GNUish standards, remove all
+ HTML markup and wrap at col 80.
+2006-01-19 DP 1.6.0 Fix capitalisation of menu items. Add '...' to the end of
+ items that open dialogues [Peter Eisentraut]
+2006-01-19 MH 1.6.0 Display the client start time on the status dialogue with
+ PostgreSQL 8.1+
+2006-01-17 DP 1.6.0 Allow set returning functions to be created.
+2006-01-17 DP 1.4.2 Display the definition of set returning procedures
+ correctly.
+2006-01-17 DP 1.4.2 Fix drop procedure by including IN/OUT parameter flags in
+ the name.
+2006-01-13 DP 1.4.2 Fix role SQL - correctly define CREATEROLE/NOCREATEROLE
+ per Andrus.
+2006-01-11 MH 1.6.0 Allow result copy quoting configuration to be set
explicitly rather than using the result export settings
- [Magnus Hagander]
-2006-01-09 DP 1.6.0 Add -a and -q command line options to auto connect to a
- server and open a query window respectively [Magnus
- Hagander]
-2006-01-09 DP 1.4.2 Honour the copy quoting setting properly in the SQL
- results pane [Magnus Hagander]
-2006-01-09 DP 1.6.0 Use Ctrl-A to select all results in the query results
- pane. [Magnus Hagander]
-2006-01-09 DP 1.4.2 Set the initial Unicode/Local charset options correctly
- in the Export dialogue [Magnus Hagander]
+2006-01-09 MH 1.6.0 Add -a and -q command line options to auto connect to a
+ server and open a query window respectively
+2006-01-09 MH 1.4.2 Honour the copy quoting setting properly in the SQL
+ results pane
+2006-01-09 MH 1.6.0 Use Ctrl-A to select all results in the query results
+ pane.
+2006-01-09 MH 1.4.2 Set the initial Unicode/Local charset options correctly
+ in the Export dialogue
2005-12-26 AP 1.4.2 Fix PK detection in EditGrid per Andrus Moor
2005-12-26 AP 1.4.2 Fix Bitmap Index explain per Alexander Kirpa
2005-12-23 DP 1.4.2 Use ELSIF not ELSEIF in pgagent.sql for compatibility

Modified: trunk/pgadmin3/src/frm/frmConfig.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 13:39:29 UTC (rev 4951)
+++ trunk/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 13:48:10 UTC (rev 4952)
@@ -312,7 +312,7 @@
buffer[cnt] = 0;
file.Close();

- DisplayFile(wxString::FromAscii(buffer));
+ DisplayFile(wxString(buffer, wxConvUTF8));

delete buffer;
statusBar->SetStatusText(wxString::Format(_(" Configuration read from %s"), lastPath.c_str()));