Mercurial > nand-ecoscentric

changeset 2697:d6e76cd040e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/configitem.cpp: Observe item/macro name setting when updating tree items. * standalone/wxwin/configtool.cpp: Search for the eCos repository if the saved location no-longer exists.
author jld
date Mon, 22 Dec 2008 21:37:03 +0000
parents b1cdd12003cd
children fd17f9bfa79f
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/configitem.cpp host/tools/configtool/standalone/wxwin/configtool.cpp
diffstat 3 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -16,6 +16,15 @@ 2008-12-08  John Dallaway  <jld@ecoscent
 	* standalone/wxwin/mainwin.cpp: Make menu acceleration keys unique.
 	[ Bugzilla 1000618 ]
 
+2008-09-03  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/configitem.cpp: Observe item/macro name setting
+	when updating tree items.
+	* standalone/wxwin/docsystem.cpp: Tweak naming of root node in
+	documentation tree.
+	* standalone/wxwin/configtool.cpp: Search for the eCos repository if
+	the saved location no-longer exists. [ Bugzilla 1000465 ]
+ 
 2008-08-15  Bart Veer  <bartv@ecoscentric.com>
 
 	* common/common/build.cxx: avoid compiler warning.
--- a/host/tools/configtool/standalone/wxwin/configitem.cpp
+++ b/host/tools/configtool/standalone/wxwin/configitem.cpp
@@ -236,7 +236,7 @@ wxString ecConfigItem::GetItemNameOrMacr
 // Sets the text and icon for this item
 bool ecConfigItem::UpdateTreeItem(ecConfigTreeCtrl& treeCtrl)
 {
-    treeCtrl.SetItemText(m_treeItem, m_name);
+    treeCtrl.SetItemText(m_treeItem, GetItemNameOrMacro());
 
 #if wxCHECK_VERSION(2, 6, 0)
     static wxColour normalColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
--- a/host/tools/configtool/standalone/wxwin/configtool.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtool.cpp
@@ -554,7 +554,8 @@ bool ecApp::OnInit()
     }
     else
     {
-        if (GetSettings().m_strRepository.IsEmpty()) // first invocation by this user
+        if (GetSettings().m_strRepository.IsEmpty() ||
+            !wxFileName::DirExists(GetSettings().m_strRepository)) // first invocation by this user
         {
             // we have no clues as to the location of the repository so
             // test for ../../packages relative to the configtool location