Configtool patch

[John Dallaway <john@dallaway.org.uk>]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

This patch causes the eCos Configuration Tool to observe the item/macro
name setting on initial invocation and to search for a new eCos
repository if the previously stored repository no-longer exists. Checked-in.

John Dallaway

[-- Attachment #2: ct-080903.patch --]
[-- Type: text/x-patch, Size: 2817 bytes --]

Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.73
diff -U5 -r1.73 ChangeLog
--- ChangeLog	12 Dec 2008 21:36:46 -0000	1.73
+++ ChangeLog	22 Dec 2008 15:59:57 -0000
@@ -14,10 +14,19 @@
 2008-12-08  John Dallaway  <jld@ecoscentric.com>
 
 	* 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.
 
 2008-08-13  John Dallaway  <jld@ecoscentric.com>
Index: standalone/wxwin/configitem.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configitem.cpp,v
retrieving revision 1.6
diff -U5 -r1.6 configitem.cpp
--- standalone/wxwin/configitem.cpp	13 Aug 2008 09:37:07 -0000	1.6
+++ standalone/wxwin/configitem.cpp	22 Dec 2008 15:59:58 -0000
@@ -234,11 +234,11 @@
 }
 
 // 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);
     static wxColour disabledColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
 #else
Index: standalone/wxwin/configtool.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configtool.cpp,v
retrieving revision 1.23
diff -U5 -r1.23 configtool.cpp
--- standalone/wxwin/configtool.cpp	16 Dec 2008 06:08:09 -0000	1.23
+++ standalone/wxwin/configtool.cpp	22 Dec 2008 15:59:58 -0000
@@ -552,11 +552,12 @@
             return FALSE;
         }
     }
     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
             wxFileName repository = wxFileName (m_appDir, wxEmptyString);
             repository.Normalize(); // remove trailing "./" if present