Commit: 2ab493b0d7460d58b51e227b8c27c9bc94fbe2c3 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 2ab493b0d7460d58b51e227b8c27c9bc94fbe2c3 (tree)
• l'heure: 2008-08-20 12:41:44
• Auteur: John E. <tdragon@user...>
• Commiter: John E.

Message de Log

Lots more UI additions

Change Summary

• add: buttons.bmp
• modified: inst_manager.cpp
• modified: inst_manager.hpp
• modified: mainwnd.c
• modified: mingw-get.cbp
• modified: package.cpp
• modified: package.hpp
• modified: resource.h
• modified: resource.rc
• modified: ui.hpp
• modified: ui_windowed.cpp

Modification

Binary files /dev/null and b/buttons.bmp differ

--- a/inst_manager.cpp
+++ b/inst_manager.cpp
@@ -10,8 +10,18 @@
 
 char InstManager::sm_lasterror[2048] = {0};
 std::string InstManager::sm_inst_loc;
-std::vector< std::string > InstManager::sm_categories;
-InstManager::IDPackageMap InstManager::sm_id_packages;
+std::vector< std::string > InstManager::sm_index_categories;
+InstManager::StringIntMap InstManager::sm_id_categories;
+InstManager::StringPackageMap InstManager::sm_id_packages;
+
+
+extern "C" void InstMgr_SetAllPkgsShowUnstable(int show)
+{
+	for (InstManager::PackageIter it = InstManager::Packages_Begin();
+	 it != InstManager::Packages_End();
+	 ++it)
+		it->second->m_show_unstable = show;
+}
 
 
 const char* InstManager::GetError()
@@ -82,6 +92,7 @@ bool InstManager::Load(const std::string& inst_loc, bool create)
 			}
 			changes->Push(FileCreated(sm_inst_loc + "\\mingw_inst.mft"));
 
+			UI::ResetLists();
 			if (!LoadManifest(sm_inst_loc + "\\mingw_inst.mft"))
 				break;
 
@@ -108,13 +119,22 @@ void InstManager::Save()
 
 int InstManager::NumCategories()
 {
-	return sm_categories.size();
+	return sm_index_categories.size();
 }
 
 
 const char* InstManager::GetCategory(int cat)
 {
-	return sm_categories[cat].c_str();
+	return sm_index_categories[cat].c_str();
+}
+
+
+int InstManager::CategoryIndex(const char* cat_id)
+{
+	StringIntMap::iterator found = sm_id_categories.find(cat_id);
+	if (found == sm_id_categories.end())
+		return -1;
+	return found->second;
 }
 
 
@@ -155,43 +175,46 @@ bool InstManager::LoadManifest(const std::string& mfile)
 		SetError("Couldn't load '%s' as XML", mfile.c_str());
 		return false;
 	}
-	int newpkgct = 0;
 	for (TiXmlElement* cat_el =
-	  doc.RootElement()->FirstChildElement("Category");
+	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-categories")).
+	  FirstChildElement("category").ToElement();
 	 cat_el;
-	 cat_el = cat_el->NextSiblingElement("Category"))
+	 cat_el = cat_el->NextSiblingElement("category"))
 	{
+		const char* id = NonEmptyAttribute(cat_el, "id");
+		if (!id)
+			continue;
 		const char* name = NonEmptyAttribute(cat_el, "name");
 		if (!name)
 			continue;
-		sm_categories.push_back(name);
-		for (TiXmlElement* package_el =
-		  cat_el->FirstChildElement("Package");
-		 package_el;
-		 package_el = package_el->NextSiblingElement("Package"))
-		{
-			const char* id = NonEmptyAttribute(package_el, "id");
-			if (!id)
-				continue;
-			IDPackageMap::iterator found = sm_id_packages.find(id);
-			if (found != sm_id_packages.end())
-				continue;
-			++newpkgct;
-			Package::Ref newpkg(
-			 new Package(id, sm_categories.size() - 1, package_el)
-			 );
-			InsertPackage(newpkg);
-		}
+		sm_id_categories[id] = sm_index_categories.size();
+		sm_index_categories.push_back(name);
+		UI::NotifyNewCategory(name);
+	}
+	for (TiXmlElement* package_el =
+	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-collection")).
+	  FirstChildElement("package").ToElement();
+	 package_el;
+	 package_el = package_el->NextSiblingElement("package"))
+	{
+		const char* id = NonEmptyAttribute(package_el, "id");
+		if (!id)
+			continue;
+		StringPackageMap::iterator found = sm_id_packages.find(id);
+		if (found != sm_id_packages.end())
+			continue;
+		Package::Ref newpkg(new Package(id, package_el));
+		InsertPackage(newpkg);
+		UI::NotifyNewPackage(*newpkg);
 	}
-	if (newpkgct > 0)
-		UI::NotifyNewPackages();
 	return true;
 }
 
 
 void InstManager::ClearPackages()
 {
-	sm_categories.clear();
+	sm_index_categories.clear();
+	sm_id_categories.clear();
 	sm_id_packages.clear();
 }
 

--- a/inst_manager.hpp
+++ b/inst_manager.hpp
@@ -26,6 +26,7 @@ public:
 
 	static int NumCategories();
 	static const char* GetCategory(int cat);
+	static int CategoryIndex(const char* cat_id);
 
 	typedef std::map< std::string, RefType< Package >::Ref >::const_iterator
 	 PackageIter;
@@ -40,9 +41,11 @@ private:
 
 	static char sm_lasterror[];
 	static std::string sm_inst_loc;
-	static std::vector< std::string > sm_categories;
-	typedef std::map< std::string, RefType< Package >::Ref > IDPackageMap;
-	static IDPackageMap sm_id_packages;
+	static std::vector< std::string > sm_index_categories;
+	typedef std::map< std::string, int > StringIntMap;
+	static StringIntMap sm_id_categories;
+	typedef std::map< std::string, RefType< Package >::Ref > StringPackageMap;
+	static StringPackageMap sm_id_packages;
 };
 
 

--- a/mainwnd.c
+++ b/mainwnd.c
@@ -8,26 +8,41 @@
 #include "resource.h"
 
 
+#define ID_SHOW_STABLE 10001
+#define ID_SHOW_UNSTABLE 10002
+
+
 static int g_vert_grip_x = 150;
 static float g_horz_grip_prop = 0.5f;
 static HACCEL g_haccel;
 static HINSTANCE g_instance = 0;
 
 
-static void InsertColumn(HWND hlv, const char* txt, int index, int fmt)
+static void InsertColumn
+ (HWND hlv,
+  const char* txt,
+  int index,
+  int fmt,
+  int width)
 {
 	int tlen = strlen(txt);
 	if (tlen >= 200)
 		return;
 	char* tcopy = malloc(tlen + 1);
 	strcpy(tcopy, txt);
-	SIZE sz;
-	if (!GetTextExtentPoint32(GetDC(hlv), tcopy, tlen, &sz))
-		return;
 	LVCOLUMN lvc;
 	lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT;
 	lvc.fmt = fmt;
-	lvc.cx = sz.cx + 15;
+	if (width > 0)
+		lvc.cx = width;
+	else
+	{
+		SIZE sz;
+		if (GetTextExtentPoint32(GetDC(hlv), tcopy, tlen, &sz))
+			lvc.cx = sz.cx + 15;
+		else
+			lvc.cx = 100;
+	}
 	lvc.pszText = tcopy;
 	lvc.cchTextMax = tlen;
 	ListView_InsertColumn(hlv, index, &lvc);
@@ -52,9 +67,14 @@ static void TransToClient(HWND hwnd, RECT* rc)
 
 
 void SelectInst(HINSTANCE, HWND);
-const char* PackageGetSubItemText(LPARAM, int);
+const char* Pkg_GetSubItemText(LPARAM, int);
 void UI_NotifyCategoryChange(int);
 void UI_SortListView(int);
+void UI_OnListViewSelect(int);
+void DescWnd_SetHWND(HWND);
+int Pkg_UnstableShown(LPARAM);
+void Pkg_SetUnstableShown(LPARAM, int);
+void InstMgr_SetAllPkgsShowUnstable(int);
 
 static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -102,12 +122,24 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			HWND hlv = GetDlgItem(hwndDlg, IDC_COMPLIST);
 			ListView_SetExtendedListViewStyle(hlv,
 			 LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);
-			InsertColumn(hlv, "S", 0, LVCFMT_LEFT);
-			InsertColumn(hlv, "Package", 1, LVCFMT_LEFT);
-			InsertColumn(hlv, "Installed Version", 2, LVCFMT_LEFT);
-			InsertColumn(hlv, "Latest Version", 3, LVCFMT_LEFT);
-			InsertColumn(hlv, "Size", 4, LVCFMT_RIGHT);
-			InsertColumn(hlv, "Description", 5, LVCFMT_LEFT);
+			HIMAGELIST il =
+			 ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 10, 0);
+			HBITMAP buttonsbmp =
+			 LoadBitmap(g_instance, MAKEINTRESOURCE(IDB_STATES));
+			ImageList_AddMasked(il, buttonsbmp, RGB(255, 0, 255));
+			DeleteObject(buttonsbmp);
+			(void)ListView_SetImageList(hlv, il, LVSIL_SMALL);
+			SIZE sz;
+			sz.cx = 100;
+			HDC lvdc = GetDC(hlv);
+			GetTextExtentPoint32(lvdc, "sample string", 13, &sz);
+			ReleaseDC(hlv, lvdc);
+			InsertColumn(hlv, "S", 0, LVCFMT_LEFT, 0);
+			InsertColumn(hlv, "Package", 1, LVCFMT_LEFT, sz.cx);
+			InsertColumn(hlv, "Installed Version", 2, LVCFMT_LEFT, 0);
+			InsertColumn(hlv, "Latest Version", 3, LVCFMT_LEFT, 0);
+			InsertColumn(hlv, "Size (DL)", 4, LVCFMT_RIGHT, 0);
+			InsertColumn(hlv, "Description", 5, LVCFMT_LEFT, sz.cx);
 		}
 		return TRUE;
 
@@ -119,13 +151,31 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 	case WM_COMMAND:
 		switch(LOWORD(wParam))
 		{
-		case IDI_FILE_EXIT:
+		case IDM_FILE_EXIT:
 			DestroyWindow(hwndDlg);
 			PostQuitMessage(0);
 			return TRUE;
-		case IDI_FILE_CHANGEINST:
+		case IDM_FILE_CHANGEINST:
 			SelectInst(g_instance, hwndDlg);
 			return TRUE;
+		case IDM_VIEW_SHOWSTABLE:
+			InstMgr_SetAllPkgsShowUnstable(0);
+			if (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_COMPLIST)) > 0)
+			{
+				ListView_RedrawItems(GetDlgItem(hwndDlg, IDC_COMPLIST), 0,
+				 ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_COMPLIST)) - 1);
+				UpdateWindow(GetDlgItem(hwndDlg, IDC_COMPLIST));
+			}
+			return TRUE;
+		case IDM_VIEW_SHOWUNSTABLE:
+			InstMgr_SetAllPkgsShowUnstable(1);
+			if (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_COMPLIST)) > 0)
+			{
+				ListView_RedrawItems(GetDlgItem(hwndDlg, IDC_COMPLIST), 0,
+				 ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_COMPLIST)) - 1);
+				UpdateWindow(GetDlgItem(hwndDlg, IDC_COMPLIST));
+			}
+			return TRUE;
 		case IDC_CATLIST:
 			if (HIWORD(wParam) == LBN_SELCHANGE)
 			{
@@ -137,6 +187,32 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 		break;
 
 	case WM_NOTIFY:
+		if (((LPNMHDR)lParam)->code == NM_RCLICK &&
+		 ((LPNMHDR)lParam)->hwndFrom ==
+		  ListView_GetHeader(GetDlgItem(hwndDlg, IDC_COMPLIST)))
+		{
+			DWORD dwpos = GetMessagePos();
+			HD_HITTESTINFO hdhti;
+			hdhti.pt.x = GET_X_LPARAM(dwpos);
+			hdhti.pt.y = GET_Y_LPARAM(dwpos);
+			ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hdhti.pt);
+			int hit = SendMessage(((LPNMHDR)lParam)->hwndFrom, HDM_HITTEST, 0,
+			 (LPARAM)&hdhti);
+			if ((hdhti.flags & HHT_ONHEADER) && hit == 3)
+			{
+				HMENU menu = CreatePopupMenu();
+				AppendMenu(menu, MF_STRING, IDM_VIEW_SHOWSTABLE,
+				 "Show only &stable versions\tCtrl+Shift+S");
+				AppendMenu(menu, MF_STRING, IDM_VIEW_SHOWUNSTABLE,
+				 "Show &unstable versions\tCtrl+Shift+U");
+				TrackPopupMenuEx(menu,
+				 TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON,
+				 GET_X_LPARAM(dwpos), GET_Y_LPARAM(dwpos), hwndDlg, 0);
+				DestroyMenu(menu);
+				return 0;
+			}
+			break;
+		}
 		switch (((LPNMHDR)lParam)->idFrom)
 		{
 		case IDC_COMPLIST:
@@ -145,13 +221,106 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			case LVN_GETDISPINFO:
 				{
 					((NMLVDISPINFO*)lParam)->item.pszText =
-					 (char*)PackageGetSubItemText(((NMLVDISPINFO*)lParam)->item.lParam,
+					 (char*)Pkg_GetSubItemText(((NMLVDISPINFO*)lParam)->item.lParam,
 					  ((NMLVDISPINFO*)lParam)->item.iSubItem);
 				}
 				return 0;
 			case LVN_COLUMNCLICK:
 				UI_SortListView(((LPNMLISTVIEW)lParam)->iSubItem);
 				return 0;
+			case LVN_ITEMCHANGED:
+				if ((((LPNMLISTVIEW)lParam)->uChanged & LVIF_STATE)
+				 && (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED))
+					UI_OnListViewSelect(((LPNMLISTVIEW)lParam)->iItem);
+				return 0;
+			case NM_RCLICK:
+				{
+					DWORD dwpos = GetMessagePos();
+					LVHITTESTINFO lvhti;
+					lvhti.pt.x = GET_X_LPARAM(dwpos);
+					lvhti.pt.y = GET_Y_LPARAM(dwpos);
+					ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &lvhti.pt);
+					int hit = ListView_HitTest(((LPNMHDR)lParam)->hwndFrom,
+					 &lvhti);
+					if (hit >= 0)
+					{
+						HMENU menu = CreatePopupMenu();
+						LVITEM lvitem;
+						lvitem.iItem = hit;
+						lvitem.mask = LVIF_PARAM;
+						ListView_GetItem(((LPNMHDR)lParam)->hwndFrom, &lvitem);
+						if (Pkg_UnstableShown(lvitem.lParam))
+						{
+							AppendMenu(menu, MF_STRING, ID_SHOW_STABLE,
+							 "Show &stable version");
+						}
+						else
+						{
+							AppendMenu(menu, MF_STRING, ID_SHOW_UNSTABLE,
+							 "Show &unstable version");
+						}
+						int ret = TrackPopupMenuEx(menu,
+						 TPM_LEFTALIGN | TPM_TOPALIGN | TPM_NONOTIFY |
+						  TPM_RETURNCMD | TPM_RIGHTBUTTON,
+						 GET_X_LPARAM(dwpos), GET_Y_LPARAM(dwpos),
+						 ((LPNMHDR)lParam)->hwndFrom, 0);
+						switch (ret)
+						{
+						case ID_SHOW_STABLE:
+							Pkg_SetUnstableShown(lvitem.lParam, 0);
+							ListView_RedrawItems(((LPNMHDR)lParam)->hwndFrom,
+							 hit, hit);
+							UpdateWindow(((LPNMHDR)lParam)->hwndFrom);
+							break;
+						case ID_SHOW_UNSTABLE:
+							Pkg_SetUnstableShown(lvitem.lParam, 1);
+							ListView_RedrawItems(((LPNMHDR)lParam)->hwndFrom,
+							 hit, hit);
+							UpdateWindow(((LPNMHDR)lParam)->hwndFrom);
+							break;
+						}
+						DestroyMenu(menu);
+					}
+				}
+				return 0;
+			case NM_CUSTOMDRAW:
+				{
+					static COLORREF old_color;
+					LRESULT ret = CDRF_DODEFAULT;
+					switch (((LPNMCUSTOMDRAW)lParam)->dwDrawStage)
+					{
+					case CDDS_PREPAINT:
+						ret = CDRF_NOTIFYITEMDRAW;
+						break;
+					case CDDS_ITEMPREPAINT:
+						if (Pkg_UnstableShown(
+						 ((LPNMCUSTOMDRAW)lParam)->lItemlParam
+						 ))
+						{
+							old_color = ((LPNMLVCUSTOMDRAW)lParam)->clrText;
+							((LPNMLVCUSTOMDRAW)lParam)->clrText =
+							 RGB(255, 128, 0);
+							HFONT hFont =
+							 (HFONT)SendMessage(((LPNMHDR)lParam)->hwndFrom,
+							  WM_GETFONT, 0, 0);
+							LOGFONT lf = {0};
+							GetObject(hFont, sizeof(LOGFONT), &lf);
+							lf.lfWeight |= FW_BOLD;
+							HFONT hFontBold = CreateFontIndirect(&lf);
+							SelectObject(((LPNMCUSTOMDRAW)lParam)->hdc,
+							 hFontBold);
+							ret = CDRF_NEWFONT | CDRF_NOTIFYPOSTPAINT;
+						}
+						else
+							ret = CDRF_DODEFAULT;
+						break;
+					case CDDS_ITEMPOSTPAINT:
+						((LPNMLVCUSTOMDRAW)lParam)->clrText = old_color;
+						ret = CDRF_DODEFAULT;
+					}
+					SetWindowLong(hwndDlg, DWL_MSGRESULT, ret);
+					return TRUE;
+				}
 			}
 			break;
 		}
@@ -210,16 +379,6 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 }
 
 
-static LRESULT CALLBACK DescWndProc
- (HWND hwnd,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam)
-{
-	return DefWindowProc(hwnd, uMsg, wParam, lParam);
-}
-
-
 static int ProcessQueuedMessages(HWND wnd)
 {
 	MSG msg;
@@ -243,6 +402,8 @@ static int ProcessQueuedMessages(HWND wnd)
 }
 
 
+int DescWnd_RegisterClass(HINSTANCE);
+
 HWND CreateMainWnd(HINSTANCE hInstance)
 {
 	g_instance = hInstance;
@@ -250,20 +411,6 @@ HWND CreateMainWnd(HINSTANCE hInstance)
 	InitCommonControls();
 	OleInitialize(0);
 
-	WNDCLASS wc;
-	wc.style = CS_OWNDC;
-	wc.lpfnWndProc = DescWndProc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-	wc.hInstance = hInstance;
-	wc.hIcon = 0;
-	wc.hCursor = 0;
-	wc.hbrBackground = (HBRUSH)COLOR_BACKGROUND;
-	wc.lpszMenuName = 0;
-	wc.lpszClassName = FULLDESCCLASSNAME;
-	if (!RegisterClass(&wc))
-		return 0;
-
 	g_haccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDA_MAINACCEL));
 
 	HWND wnd = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_MAINDLG), 0,

--- a/mingw-get.cbp
+++ b/mingw-get.cbp
@@ -11,6 +11,7 @@
 				<Option object_output="obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>

--- a/package.cpp
+++ b/package.cpp
@@ -1,19 +1,22 @@
 
 #include "package.hpp"
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "inst_manager.hpp"
 
 
-extern "C" const char* PackageGetSubItemText(LPARAM lv_lparam, int index)
+extern "C" const char* Pkg_GetSubItemText(LPARAM lv_lparam, int index)
 {
 	Package* pkg = reinterpret_cast< Package* >(lv_lparam);
 	switch (index)
 	{
 	case 1:
 		return pkg->m_id.c_str();
+	case 2:
+		return pkg->m_installed_version.c_str();
 	case 3:
-		return pkg->m_latest_version.c_str();
+		return pkg->m_stable_version.c_str();
+	case 5:
+		return pkg->m_description.c_str();
 	default:
 		break;
 	}
@@ -21,16 +24,55 @@ extern "C" const char* PackageGetSubItemText(LPARAM lv_lparam, int index)
 }
 
 
-Package::Package(const char* id, int cat, const TiXmlElement* pack_el)
+extern "C" int Pkg_UnstableShown(LPARAM lv_lparam)
+{
+	return (reinterpret_cast< Package* >(lv_lparam)->m_show_unstable) ? 1 : 0;
+}
+
+
+extern "C" void Pkg_SetUnstableShown(LPARAM lv_lparam, int shown)
+{
+	reinterpret_cast< Package* >(lv_lparam)->m_show_unstable = shown;
+}
+
+
+Package::Package(const char* id, const TiXmlElement* pack_el)
  : m_id(id),
- m_category(cat)
+ m_show_unstable(false)
 {
-	const TiXmlElement* latest_ver_el =
-	 pack_el->FirstChildElement("LatestVersion");
-	if (latest_ver_el)
+	const TiXmlElement* release_el =
+	 pack_el->FirstChildElement("stable-release");
+	if (release_el)
+	{
+		const char* rel_ver = release_el->Attribute("version");
+		if (rel_ver && rel_ver[0])
+			m_stable_version = rel_ver;
+	}
+	for (const TiXmlElement* aff_el = pack_el->FirstChildElement("affiliate");
+	 aff_el;
+	 aff_el = aff_el->NextSiblingElement("affiliate"))
+	{
+		const char* aff_id = aff_el->Attribute("id");
+		if (aff_id && aff_id[0])
+		{
+			int cat = InstManager::CategoryIndex(aff_id);
+			if (cat >= 0)
+			{
+				m_categories.insert(cat);
+			}
+		}
+	}
+	const TiXmlElement* desc_el = pack_el->FirstChildElement("description");
+	if (desc_el)
 	{
-		const char* latest_ver = latest_ver_el->Attribute("id");
-		if (latest_ver && latest_ver[0])
-			m_latest_version = latest_ver;
+		for (const TiXmlNode* node = desc_el->FirstChild();
+		 node;
+		 node = node->NextSibling())
+		{
+			if (node->ToText())
+				m_description += node->Value();
+			else if (node->ToElement() && strcmp(node->Value(), "p") == 0)
+				m_description += "\r\n\r\n";
+		}
 	}
 }

--- a/package.hpp
+++ b/package.hpp
@@ -3,6 +3,7 @@
 
 
 #include <string>
+#include <set>
 #include "ref.hpp"
 #include "tinyxml/tinyxml.h"
 
@@ -12,10 +13,14 @@ struct Package
 	typedef RefType< Package >::Ref Ref;
 
 	std::string m_id;
-	int m_category;
-	std::string m_latest_version;
-
-	Package(const char* id, int cat, const TiXmlElement* pack_el);
+	std::set< int > m_categories;
+	std::string m_installed_version;
+	std::string m_stable_version;
+	std::string m_unstable_version;
+	std::string m_description;
+	bool m_show_unstable;
+
+	Package(const char* id, const TiXmlElement* pack_el);
 };
 
 

--- a/resource.h
+++ b/resource.h
@@ -4,9 +4,6 @@
 #endif
 
 
-#define FULLDESCCLASSNAME "mpFullDescription"
-
-
 #define IDD_MAINDLG 101
 #define IDD_INSTSEL 102
 
@@ -24,8 +21,12 @@
 
 #define IDA_MAINACCEL 301
 
+#define IDB_STATES 401
+
 #define IDM_MAINMENU 1101
 
-#define IDI_FILE_EXIT 1201
-#define IDI_FILE_CHANGEINST 1202
-#define IDI_SOURCES_MIRRORS 1203
+#define IDM_FILE_EXIT 1201
+#define IDM_FILE_CHANGEINST 1202
+#define IDM_VIEW_SHOWSTABLE 1203
+#define IDM_VIEW_SHOWUNSTABLE 1204
+#define IDM_SOURCES_MIRRORS 1205

--- a/resource.rc
+++ b/resource.rc
@@ -11,24 +11,36 @@
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mingw-get.manifest"
 
 
+IDB_STATES BITMAP "buttons.bmp"
+
+
+IDA_MAINACCEL ACCELERATORS 
+BEGIN 
+    "I", IDM_FILE_CHANGEINST, CONTROL, ALT, VIRTKEY
+    "S", IDM_VIEW_SHOWSTABLE, CONTROL, SHIFT, VIRTKEY
+    "U", IDM_VIEW_SHOWUNSTABLE, CONTROL, SHIFT, VIRTKEY
+    "M", IDM_SOURCES_MIRRORS, CONTROL, VIRTKEY
+END
+
+
 IDM_MAINMENU MENU
 BEGIN
 	POPUP "&File"
 	BEGIN
-		MENUITEM "Select &Installation\tCtrl+Alt+I", IDI_FILE_CHANGEINST
-		MENUITEM "E&xit\tAlt+F4", IDI_FILE_EXIT
+		MENUITEM "Select &Installation...\tCtrl+Alt+I", IDM_FILE_CHANGEINST
+		MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
+	END
+	POPUP "&View"
+	BEGIN
+		MENUITEM "Show only &stable versions\tCtrl+Shift+S", IDM_VIEW_SHOWSTABLE
+		MENUITEM "Show &unstable versions\tCtrl+Shift+U", IDM_VIEW_SHOWUNSTABLE
 	END
-	POPUP "&Sources"
+	POPUP "Sour&ces"
 	BEGIN
-		MENUITEM "&Mirrors\tCtrl+M", IDI_SOURCES_MIRRORS
+		MENUITEM "&Mirrors...\tCtrl+M", IDM_SOURCES_MIRRORS
 	END
 END
 
-IDA_MAINACCEL ACCELERATORS 
-BEGIN 
-    "I",  IDI_FILE_CHANGEINST, CONTROL, ALT, VIRTKEY
-    "M", IDI_SOURCES_MIRRORS, CONTROL, VIRTKEY
-END
 
 IDD_MAINDLG DIALOGEX 0, 0, 500, 300
 CAPTION "mingw-get"
@@ -39,8 +51,8 @@ BEGIN
 	CONTROL "", IDC_MAINTOOLBAR, TOOLBARCLASSNAME, TBSTYLE_WRAPABLE, 0, 0, 0, 0
 	COMBOBOX IDC_CATTYPE, 1, 28, 100, 271, CBS_DROPDOWNLIST|WS_TABSTOP
 	LISTBOX IDC_CATLIST, 1, 43, 100, 241, WS_BORDER|WS_VSCROLL|LBS_NOTIFY|LBS_NOINTEGRALHEIGHT|WS_TABSTOP
-	CONTROL "", IDC_COMPLIST, WC_LISTVIEW, WS_BORDER|/*LVS_LIST*/LVS_REPORT|LVS_SHOWSELALWAYS|LVS_SINGLESEL|WS_TABSTOP, 105, 28, 393, 128
-	CONTROL "", IDC_FULLDESC, FULLDESCCLASSNAME, WS_CHILD|WS_BORDER, 105, 157, 393, 128
+	CONTROL "", IDC_COMPLIST, WC_LISTVIEW, WS_BORDER|LVS_REPORT|LVS_SHOWSELALWAYS|LVS_SINGLESEL|WS_TABSTOP, 105, 28, 393, 128
+	EDITTEXT IDC_FULLDESC, 105, 157, 393, 128, ES_LEFT|ES_MULTILINE|ES_AUTOVSCROLL|ES_READONLY|WS_BORDER|WS_TABSTOP
 	CONTROL "", IDC_STATBAR, STATUSCLASSNAME, SBT_TOOLTIPS, 0, 0, 0, 0
 END
 

--- a/ui.hpp
+++ b/ui.hpp
@@ -11,7 +11,9 @@ class Package;
 class UI
 {
 public:
-	static void NotifyNewPackages();
+	static void ResetLists();
+	static void NotifyNewCategory(const char* name);
+	static void NotifyNewPackage(const Package& pkg);
 };
 
 

--- a/ui_windowed.cpp
+++ b/ui_windowed.cpp
@@ -35,11 +35,12 @@ static void LVAddPackage(const Package& pkg)
 {
 	HWND hlist = GetDlgItem(g_hmainwnd, IDC_COMPLIST);
 	LVITEM lvi;
-	lvi.mask = LVIF_TEXT | LVIF_PARAM;
+	lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
 	lvi.iItem = INT_MAX;
 	lvi.iSubItem = 0;
 	char emptystr = 0;
 	lvi.pszText = &emptystr;
+	lvi.iImage = 1;
 	lvi.lParam = reinterpret_cast< LPARAM >(&pkg);
 	lvi.iItem = ListView_InsertItem(hlist, &lvi);
 	lvi.pszText = LPSTR_TEXTCALLBACK;
@@ -48,18 +49,27 @@ static void LVAddPackage(const Package& pkg)
 		lvi.iSubItem = i;
 		ListView_SetItem(hlist, &lvi);
 	}
+	if (lvi.iItem == 0)
+	{
+		ListView_SetItemState(GetDlgItem(g_hmainwnd, IDC_COMPLIST), 0,
+		 LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
+	}
 }
 
 
 extern "C" void UI_NotifyCategoryChange(int sel)
 {
 	ListView_DeleteAllItems(GetDlgItem(g_hmainwnd, IDC_COMPLIST));
+	bool have_item = false;
 	if (sel == 0)
 	{
 		for (InstManager::PackageIter it = InstManager::Packages_Begin();
 		 it != InstManager::Packages_End();
 		 ++it)
+		{
 			LVAddPackage(*(it->second));
+			have_item = true;
+		}
 	}
 	else
 	{
@@ -67,10 +77,33 @@ extern "C" void UI_NotifyCategoryChange(int sel)
 		 it != InstManager::Packages_End();
 		 ++it)
 		{
-			if (it->second->m_category == sel - 1)
+			if (it->second->m_categories.count(sel - 1) > 0)
+			{
 				LVAddPackage(*(it->second));
+				have_item = true;
+			}
 		}
 	}
+	if (have_item)
+	{
+		ListView_SetItemState(GetDlgItem(g_hmainwnd, IDC_COMPLIST), 0,
+		 LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
+	}
+	else
+		Edit_SetText(GetDlgItem(g_hmainwnd, IDC_FULLDESC), "");
+}
+
+
+void DescWnd_SetDescription(const std::string&);
+
+extern "C" void UI_OnListViewSelect(int sel)
+{
+	LVITEM lvitem;
+	lvitem.iItem = sel;
+	lvitem.mask = LVIF_PARAM;
+	ListView_GetItem(GetDlgItem(g_hmainwnd, IDC_COMPLIST), &lvitem);
+	Edit_SetText(GetDlgItem(g_hmainwnd, IDC_FULLDESC),
+	 reinterpret_cast< Package* >(lvitem.lParam)->m_description.c_str());
 }
 
 
@@ -98,16 +131,19 @@ int CALLBACK LVSortCompare(LPARAM lp1, LPARAM lp2, LPARAM lpsort)
 		ret = strcmp(reinterpret_cast< Package* >(lp1)->m_id.c_str(),
 		 reinterpret_cast< Package* >(lp2)->m_id.c_str());
 		break;
+	case 2:
+		ret = VersionCompare(
+		 reinterpret_cast< Package* >(lp1)->m_installed_version.c_str(),
+		 reinterpret_cast< Package* >(lp2)->m_installed_version.c_str()
+		 );
+		break;
 	case 3:
 		ret = VersionCompare(
-		 reinterpret_cast< Package* >(lp1)->m_latest_version.c_str(),
-		 reinterpret_cast< Package* >(lp2)->m_latest_version.c_str()
+		 reinterpret_cast< Package* >(lp1)->m_stable_version.c_str(),
+		 reinterpret_cast< Package* >(lp2)->m_stable_version.c_str()
 		 );
 		break;
 	};
-	//Ensure an exact reverse sort
-	if (ret == 0 && st->m_reverse == -1)
-		return 1;
 	return ret * st->m_reverse;
 };
 
@@ -127,21 +163,24 @@ extern "C" void UI_SortListView(int column)
 }
 
 
-void UI::NotifyNewPackages()
+void UI::ResetLists()
 {
 	int ct = ListBox_GetCount(GetDlgItem(g_hmainwnd, IDC_CATLIST));
 	for (; ct > 1; --ct)
 		ListBox_DeleteString(GetDlgItem(g_hmainwnd, IDC_CATLIST), ct - 1);
 	ListView_DeleteAllItems(GetDlgItem(g_hmainwnd, IDC_COMPLIST));
+}
+
+
+void UI::NotifyNewCategory(const char* name)
+{
+	ListBox_AddString(GetDlgItem(g_hmainwnd, IDC_CATLIST), name);
+}
 
-	for (ct = 0; ct < InstManager::NumCategories(); ++ct)
-	{
-		ListBox_AddString(GetDlgItem(g_hmainwnd, IDC_CATLIST),
-		 InstManager::GetCategory(ct));
-	}
 
-	for (InstManager::PackageIter it = InstManager::Packages_Begin();
-	 it != InstManager::Packages_End();
-	 ++it)
-		LVAddPackage(*(it->second));
+void UI::NotifyNewPackage(const Package& pkg)
+{
+	int sel = ListBox_GetCurSel(GetDlgItem(g_hmainwnd, IDC_CATLIST));
+	if (sel <= 0 || pkg.m_categories.count(sel - 1) > 0)
+		LVAddPackage(pkg);
 }