hrev48575 adds 2 changesets to branch 'master' old head: 5c120e23640abd2f3b39038c25ed6f5bc8178a64 new head: ee13e7f8ddbcc2b7f6a79a6e0fe58328c47fa81a overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=ee13e7f+%5E5c120e2 ---------------------------------------------------------------------------- 7b20626: HaikuDepot: Hide Size column until it can be implemented Fixes #10394. ee13e7f: HaikuDepot: Hide up/down rating votes UI These are not implemented yet at all. [ Stephan Aßmus <superstippi@xxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) src/apps/haikudepot/ui/PackageInfoView.cpp | 72 +++++++++++++------------- src/apps/haikudepot/ui/PackageListView.cpp | 8 +-- ############################################################################ Commit: 7b206268ab32f60b2a64c84a3c914651dcdfc570 URL: http://cgit.haiku-os.org/haiku/commit/?id=7b20626 Author: Stephan Aßmus <superstippi@xxxxxx> Date: Sun Dec 28 21:29:22 2014 UTC Ticket: https://dev.haiku-os.org/ticket/10394 HaikuDepot: Hide Size column until it can be implemented Fixes #10394. ---------------------------------------------------------------------------- diff --git a/src/apps/haikudepot/ui/PackageListView.cpp b/src/apps/haikudepot/ui/PackageListView.cpp index fde9029..0758a47 100644 --- a/src/apps/haikudepot/ui/PackageListView.cpp +++ b/src/apps/haikudepot/ui/PackageListView.cpp @@ -451,7 +451,7 @@ enum { kTitleColumn, kRatingColumn, kDescriptionColumn, - kSizeColumn, +// kSizeColumn, kStatusColumn, }; @@ -480,7 +480,7 @@ PackageRow::PackageRow(const PackageInfoRef& packageRef, // Size // TODO: Store package size - SetField(new BStringField("0 KiB"), kSizeColumn); +// SetField(new BStringField("0 KiB"), kSizeColumn); // Status SetField(new BStringField(package_state_to_string(fPackage)), @@ -640,8 +640,8 @@ PackageListView::PackageListView(BLocker* modelLock) B_TRUNCATE_MIDDLE), kRatingColumn); AddColumn(new PackageColumn(B_TRANSLATE("Description"), 300, 80, 1000, B_TRUNCATE_MIDDLE), kDescriptionColumn); - AddColumn(new PackageColumn(B_TRANSLATE("Size"), 60, 50, 100, - B_TRUNCATE_END), kSizeColumn); +// AddColumn(new PackageColumn(B_TRANSLATE("Size"), 60, 50, 100, +// B_TRUNCATE_END), kSizeColumn); AddColumn(new PackageColumn(B_TRANSLATE("Status"), 60, 60, 100, B_TRUNCATE_END), kStatusColumn); ############################################################################ Revision: hrev48575 Commit: ee13e7f8ddbcc2b7f6a79a6e0fe58328c47fa81a URL: http://cgit.haiku-os.org/haiku/commit/?id=ee13e7f Author: Stephan Aßmus <superstippi@xxxxxx> Date: Sun Dec 28 21:32:20 2014 UTC HaikuDepot: Hide up/down rating votes UI These are not implemented yet at all. ---------------------------------------------------------------------------- diff --git a/src/apps/haikudepot/ui/PackageInfoView.cpp b/src/apps/haikudepot/ui/PackageInfoView.cpp index 93bcda0..08b78d8 100644 --- a/src/apps/haikudepot/ui/PackageInfoView.cpp +++ b/src/apps/haikudepot/ui/PackageInfoView.cpp @@ -890,31 +890,31 @@ public: fPackageVersionView->SetHighColor(kLightBlack); // TODO: User rating IDs to identify which rating to vote up or down - BMessage* voteUpMessage = new BMessage(MSG_VOTE_UP); - voteUpMessage->AddInt32("rating id", -1); - BMessage* voteDownMessage = new BMessage(MSG_VOTE_DOWN); - voteDownMessage->AddInt32("rating id", -1); - - fVoteUpIconView = new BitmapButton("vote up icon", voteUpMessage); - fUpVoteCountView = new BStringView("up vote count", ""); - fVoteDownIconView = new BitmapButton("vote down icon", voteDownMessage); - fDownVoteCountView = new BStringView("up vote count", ""); - - fVoteUpIconView->SetBitmap( - voteUpIcon->Bitmap(SharedBitmap::SIZE_16)); - fVoteDownIconView->SetBitmap( - voteDownIcon->Bitmap(SharedBitmap::SIZE_16)); - - fUpVoteCountView->SetFont(&versionFont); - fUpVoteCountView->SetHighColor(kLightBlack); - fDownVoteCountView->SetFont(&versionFont); - fDownVoteCountView->SetHighColor(kLightBlack); - - BString voteCountLabel; - voteCountLabel.SetToFormat("%" B_PRId32, rating.UpVotes()); - fUpVoteCountView->SetText(voteCountLabel); - voteCountLabel.SetToFormat("%" B_PRId32, rating.DownVotes()); - fDownVoteCountView->SetText(voteCountLabel); +// BMessage* voteUpMessage = new BMessage(MSG_VOTE_UP); +// voteUpMessage->AddInt32("rating id", -1); +// BMessage* voteDownMessage = new BMessage(MSG_VOTE_DOWN); +// voteDownMessage->AddInt32("rating id", -1); +// +// fVoteUpIconView = new BitmapButton("vote up icon", voteUpMessage); +// fUpVoteCountView = new BStringView("up vote count", ""); +// fVoteDownIconView = new BitmapButton("vote down icon", voteDownMessage); +// fDownVoteCountView = new BStringView("up vote count", ""); +// +// fVoteUpIconView->SetBitmap( +// voteUpIcon->Bitmap(SharedBitmap::SIZE_16)); +// fVoteDownIconView->SetBitmap( +// voteDownIcon->Bitmap(SharedBitmap::SIZE_16)); +// +// fUpVoteCountView->SetFont(&versionFont); +// fUpVoteCountView->SetHighColor(kLightBlack); +// fDownVoteCountView->SetFont(&versionFont); +// fDownVoteCountView->SetHighColor(kLightBlack); +// +// BString voteCountLabel; +// voteCountLabel.SetToFormat("%" B_PRId32, rating.UpVotes()); +// fUpVoteCountView->SetText(voteCountLabel); +// voteCountLabel.SetToFormat("%" B_PRId32, rating.DownVotes()); +// fDownVoteCountView->SetText(voteCountLabel); fTextView = new TextView("rating text"); fTextView->SetViewColor(ViewColor()); @@ -934,13 +934,13 @@ public: .AddGlue(0.1f) .Add(fPackageVersionView) .AddGlue(5.0f) - .AddGroup(B_HORIZONTAL, 0.0f, 0.0f) - .Add(fVoteUpIconView) - .Add(fUpVoteCountView) - .AddStrut(B_USE_HALF_ITEM_SPACING) - .Add(fVoteDownIconView) - .Add(fDownVoteCountView) - .End() +// .AddGroup(B_HORIZONTAL, 0.0f, 0.0f) +// .Add(fVoteUpIconView) +// .Add(fUpVoteCountView) +// .AddStrut(B_USE_HALF_ITEM_SPACING) +// .Add(fVoteDownIconView) +// .Add(fDownVoteCountView) +// .End() .End() .Add(fTextView) .End() @@ -955,10 +955,10 @@ private: BStringView* fRatingLabelView; BStringView* fPackageVersionView; - BitmapView* fVoteUpIconView; - BStringView* fUpVoteCountView; - BitmapView* fVoteDownIconView; - BStringView* fDownVoteCountView; +// BitmapView* fVoteUpIconView; +// BStringView* fUpVoteCountView; +// BitmapView* fVoteDownIconView; +// BStringView* fDownVoteCountView; TextView* fTextView; };