PackageManager: Add ChangeLog and Content Tree views for installed packages

Author: Numerio

headers/os/experimental/package/PackageRoster.h

@@ -16,7 +16,8 @@
 // The kit's read entry point: every query is request-in/reply-out via
 // a BMessenger, never a synchronous container return. Each reply
 // (codes in PackageDefs.h) carries int32 "status"; on failure it is
-// kVMsgQueryError with int32 "error" and BString "detail". On success:
+// kVMsgQueryError with int32 "error" and BString "detail", plus
+// BString "name" when the failed request named a package. On success:
 //   kVMsgPackageListReply: repeated B_POINTER "package"; ownership of
 //     each reference transfers to the receiver (wrap in VPackageInfoRef
 //     or ReleaseReference() it).

src/apps/packagemanager/AptBackend.cpp

@@ -523,14 +523,18 @@ AptBackend::_CheckDpkgLock()
 		char mode[16] = { 0 };
 		char rw[16] = { 0 };
 		int pid = -1;
-		if (sscanf(line.String(), "%d: %15s %15s %15s %d", &id, type, mode,
-				rw, &pid) == 5) {
+		bool havePid = sscanf(line.String(), "%d: %15s %15s %15s %d", &id,
+			type, mode, rw, &pid) == 5;
+		if (havePid)
 			fLockHolderPid = (pid_t)pid;
-		}
 		fLockPath.SetTo(kLockPaths[i]);
 
 		BString detail;
-		detail.SetToFormat("%s held by pid %d", kLockPaths[i], pid);
+		if (havePid)
+			detail.SetToFormat("%s held by pid %d", kLockPaths[i], pid);
+		else
+			detail.SetToFormat("%s held by an unknown process",
+				kLockPaths[i]);
 		_SetError(kAptErrorLockHeld, detail.String());
 		return false;
 	}

src/apps/packagemanager/CMakeLists.txt

@@ -11,7 +11,7 @@ Application(PackageManager
 	PackageRow.cpp
 	PackageWorker.cpp
 	WorkStatusView.cpp
-	LIBS shared tracker localestub vpackage
+	LIBS shared tracker localestub vpackage apt-pkg
 	RDEF PackageManager.rdef
 )
 UsePrivateHeaders(PackageManager app interface shared storage tracker)

src/apps/packagemanager/MainWindow.cpp

@@ -148,8 +148,28 @@ MainWindow::MessageReceived(BMessage* message)
 			break;
 
 		case kMsgRefreshList:
+		{
+			// Only this path warns: the startup and post-transaction
+			// refreshes must consume marks silently.
+			int32 marked = _CountMarked();
+			if (marked > 0 && !fTransactionActive) {
+				BString text(B_TRANSLATE(
+					"There are %count% marked changes that have not been "
+					"applied. Refreshing now will discard them."));
+				BString countText;
+				countText << marked;
+				text.ReplaceFirst("%count%", countText);
+				BAlert* alert = new BAlert(B_TRANSLATE("Package manager"),
+					text.String(), B_TRANSLATE("Cancel"),
+					B_TRANSLATE("Refresh anyway"), NULL, B_WIDTH_AS_USUAL,
+					B_WARNING_ALERT);
+				alert->SetShortcut(0, B_ESCAPE);
+				if (alert->Go() != 1)
+					break;
+			}
 			fWorker->PostMessage(kMsgRefreshList);
 			break;
+		}
 
 		case kMsgReloadLog:
 			fWorker->PostMessage(kMsgLoadLog);

src/apps/packagemanager/PackageInfo.cpp

@@ -5,7 +5,6 @@
 
 #include "PackageInfo.h"
 
-#include <Bitmap.h>
 #include <Catalog.h>
 
 
@@ -21,15 +20,13 @@ PackageInfo::PackageInfo(const char* name)
 	fState(kPackageAvailable),
 	fChannel(kChannelUnknown),
 	fMark(kMarkNone),
-	fHasDetails(false),
-	fIcon(NULL)
+	fHasDetails(false)
 {
 }
 
 
 PackageInfo::~PackageInfo()
 {
-	delete fIcon;
 }
 
 
@@ -131,17 +128,6 @@ PackageInfo::SetHasDetails(bool hasDetails)
 }
 
 
-void
-PackageInfo::SetIcon(BBitmap* icon)
-{
-	if (fIcon == icon)
-		return;
-
-	delete fIcon;
-	fIcon = icon;
-}
-
-
 const char*
 PackageInfo::ChannelLabel() const
 {

src/apps/packagemanager/PackageInfo.h

@@ -10,9 +10,6 @@
 #include "PackageManagerDefs.h"
 
 
-class BBitmap;
-
-
 class PackageInfo {
 public:
 								PackageInfo(const char* name);
@@ -64,11 +61,6 @@ class PackageInfo {
 			void				SetMark(package_mark mark);
 			void				SetHasDetails(bool hasDetails);
 
-			// PackageInfo takes ownership of the icon.
-			const BBitmap*		Icon() const
-									{ return fIcon; }
-			void				SetIcon(BBitmap* icon);
-
 			const char*			ChannelLabel() const;
 
 private:
@@ -87,7 +79,6 @@ class PackageInfo {
 			package_channel		fChannel;
 			package_mark		fMark;
 			bool				fHasDetails;
-			BBitmap*			fIcon;
 };