Mercurial > flash_v2

changeset 816:b4a3f003fc22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/appsettings.cpp: Look in the right place for the eCos repository location under Linux. * standalone/wxwin/admindlg.cpp: Allow addition of EPKs with no pkgadd.txt since this file should be optional.
author jld
date Fri, 07 Mar 2003 15:09:06 +0000
parents f90e00669a21
children ca97f6817eda
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/admindlg.cpp host/tools/configtool/standalone/wxwin/appsettings.cpp
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-07  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/appsettings.cpp: Look in the right place for the
+	eCos repository location under Linux.
+
+	* standalone/wxwin/admindlg.cpp: Allow addition of EPKs with no
+	pkgadd.txt since this file should be optional.
+
 2003-02-25  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/makefile.gnu: No need to specify -L /usr/lib for
--- a/host/tools/configtool/standalone/wxwin/admindlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/admindlg.cpp
@@ -255,7 +255,7 @@ void ecAdminDialog::OnAdd(wxCommandEvent
                 // read the license file
                 
                 wxFile fileLicenseFile;
-                if (fileLicenseFile.Open (strLicenseFile, wxFile::read))
+                if (fileLicenseFile.Exists (strLicenseFile) && fileLicenseFile.Open (strLicenseFile, wxFile::read))
                 {
                     //TRACE (_T("License file found at %s\n"), strLicenseFile);
                     const off_t dwLicenseLength = fileLicenseFile.Length ();
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp
+++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp
@@ -533,7 +533,7 @@ bool ecSettings::LoadConfig()
     
     // Load current repository from eCos Configuration Tool/Paths/RepositoryDir
     {
-        wxConfig eCosConfig(wxT("eCos Configuration Tool"), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE|wxCONFIG_USE_LOCAL_FILE);
+        wxConfig eCosConfig(wxGetApp().GetSettings().GetConfigAppName(), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE|wxCONFIG_USE_LOCAL_FILE);
         wxConfigPathChanger path(& config, wxT("/Repository/"));
         
         //if (!eCosConfig.Read(wxT("Folder"), & m_strRepository))