Add "Basic Setup" as a built-in standard package group.

diff --git a/ChangeLog b/ChangeLog
index b5423b0..9cfbaa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-07-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Add "Basic Setup" as a built-in standard package group.
+
+       * src/guimain.h (AppWindowMaker::SetupToolInvoked): New private
+       static member variable; declare it.
+
+       * src/guimain.cpp (AppWindowMaker::SetupToolInvoked): Define and
+       initialise it; this instance is specific to guimain.exe, where it
+       must always remain false.
+
+       * src/pkgtree.cpp (PKG_AFFILIATE_ALL): New constant; define it.
+       (load_package_group_hierarchy): Use it to specify those groups which
+       have all packages as affiliates, rather than just first root group.
+       (group_attributes): New static inline function; implement it, then...
+       (is_affiliated) [PKG_AFFILIATE_ALL]: ...use it to identify groups
+       which are specified as having all packages as affiliates.
+       (AppWindowMaker::InitPackageTreeView): Construct a temporary XML
+       specification for the "Basic Setup" package group, thence add it to
+       the package tree view; mark it as default group selection when...
+       [AppWindowMaker::SetupToolInvoked]: ...this is true.
+
 2013-07-14  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Implement GUI filtering of package list by group selection.

diff --git a/src/guimain.cpp b/src/guimain.cpp
index e4c89d7..2b0e11a 100644 (file)
--- a/src/guimain.cpp
+++ b/src/guimain.cpp
@@ -29,6 +29,12 @@
 #include "pkglock.h"
 #include "dmh.h"
 
+/* This is the main program source for the full, free-standing
+ * mingw-get GUI installer; initialise this static AppWindowMaker
+ * attribute, indicating that this is not a setup tool plugin.
+ */
+bool AppWindowMaker::SetupToolInvoked = false;
+
 using WTK::StringResource;
 using WTK::WindowClassMaker;
 using WTK::MainWindowMaker;

diff --git a/src/guimain.h b/src/guimain.h
index 0677e6b..383727f 100644 (file)
--- a/src/guimain.h
+++ b/src/guimain.h
@@ -212,6 +212,7 @@ class AppWindowMaker: public WTK::MainWindowMaker
     HFONT DefaultFont;
 
     static HWND PackageTreeView;
+    static bool SetupToolInvoked;
     void InitPackageTreeView( void );
 
     HWND PackageListView;

diff --git a/src/pkgtree.cpp b/src/pkgtree.cpp
index 4cfdc52..62ac2ee 100644 (file)
--- a/src/pkgtree.cpp
+++ b/src/pkgtree.cpp
@@ -32,6 +32,8 @@
 #include "pkgbase.h"
 #include "pkgkeys.h"
 
+#define PKG_AFFILIATE_ALL  1
+
 static const char *package_group_key = "package-group";
 static const char *package_group_all = "All Packages";
 
@@ -148,12 +150,15 @@ load_package_group_hierarchy( HWND display, HTREEITEM parent, pkgXmlNode *group
    * database representation, into a Windows tree view control.
    */
   TVINSERTSTRUCT ref;
+  static long root_affiliate = PKG_AFFILIATE_ALL;
 
   /* Establish initial state for the tree view item insertion control.
    */
   ref.hParent = parent;
-  ref.item.mask = TVIF_TEXT | TVIF_CHILDREN;
   ref.hInsertAfter = TVI_FIRST;
+  ref.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_CHILDREN;
+  ref.item.lParam = root_affiliate;
+  root_affiliate = 0;
 
   do { /* For each package group specified at the current level in the
        * package group hierarchy, retrieve its name from the XML record...
@@ -168,6 +173,7 @@ load_package_group_hierarchy( HWND display, HTREEITEM parent, pkgXmlNode *group
        * ...and add a corresponding entry to the tree view.
        */
        ref.hInsertAfter = TreeView_InsertItem( display, &ref );
+       ref.item.lParam = 0;
 
        /* Check if the current group is to be made the initial selection,
        * when the tree view is first displayed; the last entry so marked
@@ -274,12 +280,36 @@ void AppWindowMaker::InitPackageTreeView()
     TreeView_InsertItem( PackageTreeView, &entry );
   }
   else
-    /* The package group hierarchy has been incorporated into
+  { /* The package group hierarchy has been incorporated into
      * the in-core image of the XML database; create a windows
      * "tree view", into which we load a representation of the
      * structure of this hierarchy.
      */
     load_package_group_hierarchy( PackageTreeView, TVI_ROOT, tree );
+
+    /* Augment this "All Packages" hierarchy...
+     */
+    if( (tree = new pkgXmlNode( package_group_key )) != NULL )
+    {
+      /* ...by the addition of a further "Basic Setup"
+       * category at root level...
+       */
+      tree->SetAttribute( name_key, "Basic Setup" );
+      if( SetupToolInvoked )
+       /*
+        * ...which becomes the default group selection when
+        * running the installer from within the setup tool.
+        */
+       tree->SetAttribute( select_key, value_true );
+      load_package_group_hierarchy( PackageTreeView, TVI_ROOT, tree );
+
+      /* The XML node, from which we created the "Basic Setup"
+       * group entry, has not been attached to the in-core image
+       * of the XML database; we have no need to keep it.
+       */
+      delete tree;
+    }
+  }
 }
 
 static bool is_child_affiliate( HWND tree, TVITEM *ref, const char *name )
@@ -322,6 +352,16 @@ static bool is_child_affiliate( HWND tree, TVITEM *ref, const char *name )
   return false;
 }
 
+static inline long group_attributes( HWND tree, TVITEM *ref )
+{
+  /* Helper to retrieve the application specific attributes
+   * which are associated with a package group tree item.
+   */
+  ref->mask = TVIF_PARAM;
+  TreeView_GetItem( tree, ref );
+  return ref->lParam;
+}
+
 static inline bool is_affiliated( HWND tree, const char *name )
 {
   /* Helper to initiate a determination if a specified package
@@ -331,11 +371,11 @@ static inline bool is_affiliated( HWND tree, const char *name )
    */
   TVITEM ref;
   if(  ((ref.hItem = TreeView_GetSelection( tree )) == NULL)
-  ||    (ref.hItem == TreeView_GetRoot( tree ))                      )
+  ||   ((group_attributes( tree, &ref ) & PKG_AFFILIATE_ALL) != 0)  )
     /*
      * Before proceeding further, we may note that ANY group name
-     * is considered to be IMPLICITLY matched, at the root of the
-     * package group tree.
+     * is considered to be IMPLICITLY matched, for specified groups
+     * (nominally at the root) within the package group tree.
      */
     return true;