From c285bb369724f6ebd963b978bdd216712eae360f Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Fri, 13 Oct 2006 14:53:45 +0000
Subject: [PATCH] Fixed bug on the dialogs unit.

git-svn-id: trunk@10064 -
---
 lcl/interfaces/qt/qtwinapi.inc   |  4 ++++
 lcl/interfaces/qt/qtwsdialogs.pp | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lcl/interfaces/qt/qtwinapi.inc b/lcl/interfaces/qt/qtwinapi.inc
index d1257278ff..5be0f7f31f 100644
--- a/lcl/interfaces/qt/qtwinapi.inc
+++ b/lcl/interfaces/qt/qtwinapi.inc
@@ -360,6 +360,7 @@ begin
       ObjType := 'Font';
     {$endif}
     
+//    TQtFont(aObject).Free;
   end
   {------------------------------------------------------------------------------
     Brush
@@ -370,6 +371,7 @@ begin
       ObjType := 'Brush';
     {$endif}
 
+//    TQtBrush(aObject).Free;
   end
   {------------------------------------------------------------------------------
     Image
@@ -379,6 +381,8 @@ begin
     {$ifdef VerboseQtWinAPI}
       ObjType := 'Image';
     {$endif}
+
+//    TQtImage(aObject).Free;
   end;
 
   // Find out if we want to release internal GDI object
diff --git a/lcl/interfaces/qt/qtwsdialogs.pp b/lcl/interfaces/qt/qtwsdialogs.pp
index ce7e43f774..1a2e316153 100644
--- a/lcl/interfaces/qt/qtwsdialogs.pp
+++ b/lcl/interfaces/qt/qtwsdialogs.pp
@@ -130,6 +130,7 @@ end;
 class procedure TQtWSCommonDialog.ShowModal(const ACommonDialog: TCommonDialog);
 var
   Caption, Dir, Filter, selectedFilter, ReturnText: WideString;
+  TmpFilter: string;
   FileDialog: TFileDialog;
   options: QFileDialogOptions;
   Parent: QWidgetH;
@@ -146,6 +147,7 @@ begin
   Parent := TQtWidget(TWinControl(ACommonDialog.Owner).Handle).Widget;
 
   ReturnText := '';
+  TmpFilter := '';
   
   Caption := UTF8Decode(ACommonDialog.Title);
 
@@ -155,8 +157,6 @@ begin
 
     Dir := UTF8Decode(FileDialog.InitialDir);
 
-    Filter := UTF8Decode(FileDialog.Filter);
-
     {------------------------------------------------------------------------------
       This is a parser that converts LCL filter strings to Qt filter strings
       
@@ -180,10 +180,10 @@ begin
         ParserState := ParserState + 1;
 
         if ParserState = 1 then
-         Filter := Filter + Copy(FileDialog.Filter, Position, i - Position) + ' '
+         TmpFilter := TmpFilter + Copy(FileDialog.Filter, Position, i - Position) + ' '
         else if ParserState = 2 then
         begin
-          Filter := Filter + '(' + Copy(FileDialog.Filter, Position, i - Position) + ')' + LineEnding;
+          TmpFilter := TmpFilter + '(' + Copy(FileDialog.Filter, Position, i - Position) + ')' + LineEnding;
           ParserState := 0;
         end;
 
@@ -191,7 +191,9 @@ begin
       end;
     end;
     
-    Filter := Filter + '(' + Copy(FileDialog.Filter, Position, i + 1 - Position) + ')';
+    TmpFilter := TmpFilter + '(' + Copy(FileDialog.Filter, Position, i + 1 - Position) + ')';
+
+    Filter := UTF8Decode(TmpFilter);
 
     {------------------------------------------------------------------------------
       Sets the selected filter
@@ -230,11 +232,17 @@ begin
   else if ACommonDialog is TOpenDialog then
   begin
     if ofAllowMultiSelect in TOpenDialog(ACommonDialog).Options then
-     QFileDialog_getOpenFileNames(ReturnList, Parent, @Caption, @Dir, @Filter, @selectedFilter, options)
+    begin
+      QFileDialog_getOpenFileNames(ReturnList, Parent, @Caption, @Dir, @Filter, @selectedFilter, options)
+      
+      // TODO: Convert ReturnList into a WideString and then into a utf-8 string and return that
+    end
     else
-     QFileDialog_getOpenFileName(@ReturnText, Parent, @Caption, @Dir, @Filter, @selectedFilter, options);
+    begin
+      QFileDialog_getOpenFileName(@ReturnText, Parent, @Caption, @Dir, @Filter, @selectedFilter, options);
 
-    FileDialog.FileName := UTF8Encode(ReturnText);
+      FileDialog.FileName := UTF8Encode(ReturnText);
+    end;
 
     if ReturnText = '' then ACommonDialog.UserChoice := mrCancel
     else ACommonDialog.UserChoice := mrOK;