Commit: 9b2dfcffa65acbb35725b3d21fdd1233424461e1 - mingw-get (git)

The MinGW.OSDN Installation Manager Tool

Commit MetaInfo

• Revision: 9b2dfcffa65acbb35725b3d21fdd1233424461e1 (tree)
• Zeit: 2013-01-09 00:34:36
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Implement "Mark All Upgrades" GUI capability.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: src/guidata.rc
• modified: src/guiexec.cpp
• modified: src/guimain.h
• modified: src/pkgbase.h

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2013-01-08  Keith Marshall  <[e-mail]>
 
+	Implement "Mark All Upgrades" GUI capability.
+
+	* src/guimain.h (IDM_REPO_APPLY): Renumbered; make room for...
+	(IDM_REPO_MARK_UPGRADES): ...this new constant; define it.
+
+	* src/guidata.rc (IDM_REPO_MARK_UPGRADES): New option; add it...
+	(ID_MAIN_WINDOW_WINDOW) [Installation]: ...to this drop-down menu.
+
+	* src/pkgbase.h (pkgActionItem::SuppressRedundantUpgrades): New
+	public inline method; declare it.
+
+	* src/guiexec.cpp (AppWindowMaker::OnCommand):
+	[IDM_REPO_MARK_UPGRADES]: Add case handler for this menu selection.
+	(pkgActionItem::SuppressRedundantUpgrades): New method; implement it.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Avoid unnecessary reloading of package list.
 
 	* src/guiexec.cpp (AppWindowMaker::OnCommand) [IDM_REPO_APPLY]:

--- a/src/guidata.rc
+++ b/src/guidata.rc
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, MinGW.org Project
+ * Copyright (C) 2012, 2013, MinGW.org Project
  *
  *
  * Resource definitions for the mingw-get GUI implementation.
@@ -74,6 +74,7 @@ BEGIN
   POPUP 	"&Installation"
   BEGIN
     MENUITEM	  "&Update Catalogue",			IDM_REPO_UPDATE
+    MENUITEM	  "&Mark All Upgrades",			IDM_REPO_MARK_UPGRADES
     MENUITEM	  "&Apply Changes",			IDM_REPO_APPLY, GRAYED
     MENUITEM	  SEPARATOR
     MENUITEM	  "&Quit\tAlt+F4", 			IDM_REPO_QUIT

--- a/src/guiexec.cpp
+++ b/src/guiexec.cpp
@@ -440,6 +440,41 @@ inline unsigned long AppWindowMaker::EnumerateActions( int classified )
   return pkgData->Schedule()->EnumeratePendingActions( classified );
 }
 
+inline pkgActionItem *pkgActionItem::SuppressRedundantUpgrades( void )
+{
+  /* Helper method to adjust the schedule of upgrades, after marking
+   * all installed packages, to exclude all those which are already at
+   * the most recently available release.
+   */
+  pkgActionItem *head;
+  if( (head = this) != NULL )
+  {
+    /* First, provided the schedule is not empty, we walk the list
+     * of scheduled actions, until we find the true first entry...
+     */
+    while( head->prev != NULL ) head = head->prev;
+    for( pkgActionItem *ref = head; ref != NULL; ref = ref->next )
+    {
+      /* ...and then, we process the list from first entry to last,
+       * selecting those entries which schedule an upgrade action...
+       */
+      if( ((ref->flags & ACTION_MASK) == ACTION_UPGRADE)
+      /*
+       * ...and for which the currently installed release is the
+       * same as that which an upgrade would install...
+       */
+      &&  (ref->selection[ to_install ] == ref->selection[ to_remove ])  )
+	/*
+	 * ...in which case, we mark this entry for "no action".
+	 */
+	ref->flags &= ~ACTION_MASK;
+    }
+  }
+  /* Finally, we return a pointer to the first entry in the schedule.
+   */
+  return head;
+}
+
 static int pkgActionCount( HWND dlg, int id, const char *fmt, int classified )
 {
   /* Helper function to itemise the currently scheduled actions
@@ -620,6 +655,27 @@ long AppWindowMaker::OnCommand( WPARAM cmd )
       DispatchDialogueThread( IDD_REPO_UPDATE, pkgInvokeUpdate );
       break;
 
+    case IDM_REPO_MARK_UPGRADES:
+      /* Initiated when the user selects the "Mark All Upgrades"
+       * option; in this case, we identify all packages which are
+       * already installed, and for which upgrades are available,
+       * and schedule an upgrade action in respect of each.
+       */
+      pkgData->RescheduleInstalledPackages( ACTION_UPGRADE );
+      {
+	/* After scheduling all available upgrades, we must
+	 * update the package list view marker icons...
+	 */
+	pkgListViewMaker pkglist( PackageListView );
+	pkglist.MarkScheduledActions(
+	    pkgData->Schedule()->SuppressRedundantUpgrades()
+	  );
+      }
+      /* ...and also adjust the menu bindings accordingly.
+       */
+      UpdatePackageMenuBindings();
+      break;
+
     case IDM_REPO_APPLY:
       /* Initiated when the user selects the "Apply Changes" option,
        * we first reset the error trapping and download request state

--- a/src/guimain.h
+++ b/src/guimain.h
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, MinGW.org Project
+ * Copyright (C) 2012, 2013, MinGW.org Project
  *
  *
  * Resource definitions and window management class declarations for
@@ -49,7 +49,8 @@
 
 #define IDM_MAIN_MENU			 300
 #define IDM_REPO_UPDATE 		 301
-#define IDM_REPO_APPLY	 		 302
+#define IDM_REPO_MARK_UPGRADES		 302
+#define IDM_REPO_APPLY	 		 303
 #define IDM_REPO_QUIT			 312
 
 #define IDM_PACKAGE_UNMARK		 400

--- a/src/pkgbase.h
+++ b/src/pkgbase.h
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009, 2010, 2011, 2012, MinGW.org Project
+ * Copyright (C) 2009, 2010, 2011, 2012, 2013, MinGW.org Project
  *
  *
  * Public interface for the package directory management routines;
@@ -299,6 +299,7 @@ class pkgActionItem
     pkgActionItem* GetReference( pkgXmlNode* );
     pkgActionItem* GetReference( pkgActionItem& );
     pkgActionItem* Schedule( unsigned long, pkgActionItem& );
+    inline pkgActionItem* SuppressRedundantUpgrades( void );
     inline unsigned long CancelScheduledAction( void );
     inline void SetPrimary( pkgActionItem* );