From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26488 invoked by alias); 30 Dec 2008 10:20:39 -0000 Received: (qmail 26479 invoked by uid 22791); 30 Dec 2008 10:20:38 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_64 X-Spam-Check-By: sourceware.org Received: from mtaout03-winn.ispmail.ntl.com (HELO mtaout03-winn.ispmail.ntl.com) (81.103.221.49) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 30 Dec 2008 10:19:56 +0000 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout03-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20081230101938.LPMA7670.mtaout03-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com> for ; Tue, 30 Dec 2008 10:19:38 +0000 Received: from cog.dallaway.org.uk ([213.106.92.119]) by aamtaout03-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20081230101938.THYI2093.aamtaout03-winn.ispmail.ntl.com@cog.dallaway.org.uk> for ; Tue, 30 Dec 2008 10:19:38 +0000 Received: from cog.dallaway.org.uk (cog.dallaway.org.uk [127.0.0.1]) by cog.dallaway.org.uk (8.13.8/8.13.8) with ESMTP id mBUAJZgX005213 for ; Tue, 30 Dec 2008 10:19:36 GMT Message-ID: <4959F5B7.2060200@dallaway.org.uk> Date: Tue, 30 Dec 2008 10:20:00 -0000 From: John Dallaway User-Agent: Thunderbird 2.0.0.18 (X11/20081120) MIME-Version: 1.0 To: ecos-patches@ecos.sourceware.org Subject: Configtool viewer selection Content-Type: multipart/mixed; boundary="------------050807090809060501050102" Mailing-List: contact ecos-patches-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: ecos-patches-owner@ecos.sourceware.org X-SW-Source: 2008-12/txt/msg00063.txt.bz2 This is a multi-part message in MIME format. --------------050807090809060501050102 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 119 This patch allows for the selection of text viewer and HTML viewer executables under Linux. Checked-in. John Dallaway --------------050807090809060501050102 Content-Type: text/x-patch; name="settingsdlg-081230.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="settingsdlg-081230.patch" Content-length: 2788 Index: ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v retrieving revision 1.74 diff -u -5 -r1.74 ChangeLog --- ChangeLog 22 Dec 2008 21:37:03 -0000 1.74 +++ ChangeLog 30 Dec 2008 10:09:09 -0000 @@ -1,5 +1,10 @@ +2008-12-30 John Dallaway + + * standalone/wxwin/settingsdlg.cpp: Browse all files when selecting + HTML and text viewer applications under Linux. + 2008-12-12 John Dallaway * standalone/wxwin/configtooldoc.cpp: Provide additional default state for a new test platform. Index: standalone/wxwin/settingsdlg.cpp =================================================================== RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/settingsdlg.cpp,v retrieving revision 1.5 diff -u -5 -r1.5 settingsdlg.cpp --- standalone/wxwin/settingsdlg.cpp 13 Aug 2008 09:37:07 -0000 1.5 +++ standalone/wxwin/settingsdlg.cpp 30 Dec 2008 10:09:11 -0000 @@ -26,12 +26,12 @@ // appsettings.cpp : // //=========================================================================== //#####DESCRIPTIONBEGIN#### // -// Author(s): julians -// Contact(s): julians +// Author(s): julians, jld +// Contact(s): julians, jld // Date: 2000/09/11 // Version: $Id: settingsdlg.cpp,v 1.16 2002/02/15 17:40:01 julians Exp $ // Purpose: // Description: Implementation file for ecSettingsDialog // Requires: @@ -673,11 +673,16 @@ void ecViewerOptionsDialog::OnBrowseForViewer(wxCommandEvent& event) { wxString currentViewer = ((wxTextCtrl*) FindWindow(ecID_VIEWER_DIALOG_HEADER_TEXT))->GetValue(); wxFileDialog dialog(this, _("Choose a viewer executable"), wxPathOnly(currentViewer), - wxFileNameFromPath(currentViewer), wxT("*.exe")); + wxFileNameFromPath(currentViewer), +#ifdef __WXMSW__ + wxT("Executable files (*.exe)|*.exe")); +#else + wxT("All files (*)|*")); +#endif if (dialog.ShowModal() == wxID_OK) { ((wxTextCtrl*) FindWindow(ecID_VIEWER_DIALOG_HEADER_TEXT))->SetValue(dialog.GetPath()); } @@ -686,11 +691,16 @@ void ecViewerOptionsDialog::OnBrowseForBrowser(wxCommandEvent& event) { wxString currentViewer = ((wxTextCtrl*) FindWindow(ecID_VIEWER_DIALOG_DOC_TEXT))->GetValue(); wxFileDialog dialog(this, _("Choose a browser executable"), wxPathOnly(currentViewer), - wxFileNameFromPath(currentViewer), wxT("*.exe")); + wxFileNameFromPath(currentViewer), +#ifdef __WXMSW__ + wxT("Executable files (*.exe)|*.exe")); +#else + wxT("All files (*)|*")); +#endif if (dialog.ShowModal() == wxID_OK) { ((wxTextCtrl*) FindWindow(ecID_VIEWER_DIALOG_DOC_TEXT))->SetValue(dialog.GetPath()); } --------------050807090809060501050102--