Mercurial > ecos-v2_0-branch

comparison host/tools/configtool/standalone/wxwin/appsettings.cpp @ 763:7617ab51641e ecos-v2_0b1-release

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:14:23 +0000
parents 215c4f8f2246
children 261830f283c6
comparison
equal deleted inserted replaced
762:215c4f8f2246 763:7617ab51641e
532 } 532 }
533 } 533 }
534 534
535 // Load current repository from eCos Configuration Tool/Paths/RepositoryDir 535 // Load current repository from eCos Configuration Tool/Paths/RepositoryDir
536 { 536 {
537 wxConfig eCosConfig(wxT("eCos Configuration Tool"), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE|wxCONFIG_USE_LOCAL_FILE); 537 wxConfig eCosConfig(wxGetApp().GetSettings().GetConfigAppName(), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE|wxCONFIG_USE_LOCAL_FILE);
538 wxConfigPathChanger path(& config, wxT("/Repository/")); 538 wxConfigPathChanger path(& config, wxT("/Repository/"));
539 539
540 //if (!eCosConfig.Read(wxT("Folder"), & m_strRepository)) 540 //if (!eCosConfig.Read(wxT("Folder"), & m_strRepository))
541 if (!eCosConfig.Read(wxT("/Paths/RepositoryDir"), & m_strRepository)) 541 if (!eCosConfig.Read(wxT("/Paths/RepositoryDir"), & m_strRepository))
542 { 542 {
543 #ifdef __WXMSW__ 543 #ifdef __WXMSW__
544 // If we can't find the current folder, look for clues in the registry. 544 // If we can't find the current folder, look for clues in the registry.
633 633
634 config.Write(_("/Paths/UserToolsDir"), m_userToolsDir); 634 config.Write(_("/Paths/UserToolsDir"), m_userToolsDir);
635 config.Write(_("/Paths/BuildToolsDir"), m_buildToolsDir); 635 config.Write(_("/Paths/BuildToolsDir"), m_buildToolsDir);
636 636
637 config.Write(_("/Build/Make Options"), m_strMakeOptions); 637 config.Write(_("/Build/Make Options"), m_strMakeOptions);
638 638
639 // Find dialog settings 639 // Find dialog settings
640 config.Write(_("/Find/Text"), m_findText); 640 config.Write(_("/Find/Text"), m_findText);
641 config.Write(_("/Find/MatchWholeWord"), m_findMatchWholeWord); 641 config.Write(_("/Find/MatchWholeWord"), m_findMatchWholeWord);
642 config.Write(_("/Find/MatchCase"), m_findMatchCase); 642 config.Write(_("/Find/MatchCase"), m_findMatchCase);
643 config.Write(_("/Find/Direction"), m_findDirection); 643 config.Write(_("/Find/Direction"), m_findDirection);
714 714
715 // Go looking for potential candidates in SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths 715 // Go looking for potential candidates in SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths
716 int ecSettings::GetRepositoryRegistryClues(wxArrayString& arstr, const wxString& pszPrefix) 716 int ecSettings::GetRepositoryRegistryClues(wxArrayString& arstr, const wxString& pszPrefix)
717 { 717 {
718 arstr.Clear(); 718 arstr.Clear();
719 719
720 #ifdef __WXMSW__ 720 #ifdef __WXMSW__
721 wxConfig config(wxT("Windows"), wxT("Microsoft"), wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE); 721 wxConfig config(wxT("Windows"), wxT("Microsoft"), wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE);
722 config.SetPath(wxT("/CurrentVersion/App Paths")); 722 config.SetPath(wxT("/CurrentVersion/App Paths"));
723 723
724 wxString key(wxT("")); 724 wxString key(wxT(""));
725 long index; 725 long index;
726 bool bMore = config.GetFirstGroup(key, index); 726 bool bMore = config.GetFirstGroup(key, index);
727 while (bMore) 727 while (bMore)
728 { 728 {