Ticket #11563: bug#11563_contents_tab.patch

src/apps/haikudepot/Jamfile

@@ -51 +51 @@
     Model.cpp
     PackageAction.cpp
     PackageActionHandler.cpp
+    PackageContentsView.cpp
     PackageInfo.cpp
     PackageInfoListener.cpp
     PackageInfoView.cpp
@@ -85 +86 @@
     FilterView.cpp
     MainWindow.cpp
     Model.cpp
+    PackageContentsView.cpp
     PackageInfoView.cpp
     PackageListView.cpp
     PackageManager.cpp

new file src/apps/haikudepot/ui/PackageContentsView.cpp

@@ +1 @@
+#include "PackageContentsView.h"
+
+#include <algorithm>
+#include <stdio.h>
+
+#include <Autolock.h>
+#include <Catalog.h>
+#include <MessageFormat.h>
+#include <ScrollBar.h>
+#include <Window.h>
+#include <LayoutBuilder.h>
+#include <LayoutUtils.h>
+#include <OutlineListView.h>
+#include <Path.h>
+#include <ScrollView.h>
+
+#include <package/hpkg/PackageReader.h>
+#include <package/hpkg/NoErrorOutput.h>
+#include <package/hpkg/PackageContentHandler.h>
+#include <package/hpkg/PackageEntry.h>
+#include "MainWindow.h"
+#include "PackageAction.h"
+
+using BPackageKit::BHPKG::BNoErrorOutput;
+using BPackageKit::BHPKG::BPackageContentHandler;
+using BPackageKit::BHPKG::BPackageEntry;
+using BPackageKit::BHPKG::BPackageEntryAttribute;
+using BPackageKit::BHPKG::BPackageInfoAttributeValue;
+using BPackageKit::BHPKG::BPackageReader;
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageContentsView"
+
+
+//! Layouts the scrollbar so it looks nice with no border and the document
+// window look.
+class CustomScrollView : public BScrollView {
+public:
+    CustomScrollView(const char* name, BView* target)
+        :
+        BScrollView(name, target, 0, false, true, B_NO_BORDER)
+    {
+    }
+
+    virtual void DoLayout()
+    {
+        BRect innerFrame = Bounds();
+        innerFrame.right -= B_V_SCROLL_BAR_WIDTH + 1;
+
+        BView* target = Target();
+        if (target != NULL) {
+            Target()->MoveTo(innerFrame.left, innerFrame.top);
+            Target()->ResizeTo(innerFrame.Width(), innerFrame.Height());
+        }
+
+        BScrollBar* scrollBar = ScrollBar(B_VERTICAL);
+        if (scrollBar != NULL) {
+            BRect rect = innerFrame;
+            rect.left = rect.right + 1;
+            rect.right = rect.left + B_V_SCROLL_BAR_WIDTH;
+            rect.bottom -= B_H_SCROLL_BAR_HEIGHT;
+
+            scrollBar->MoveTo(rect.left, rect.top);
+            scrollBar->ResizeTo(rect.Width(), rect.Height());
+        }
+    }
+};
+
+
+//  #pragma mark - PackageContentOutliner
+
+
+class PackageContentsView::PackageContentOutliner
+            : public BPackageContentHandler {
+    public:
+    PackageContentOutliner(BOutlineListView* contentsList)
+    {
+        fContents = contentsList;
+    }
+
+    virtual status_t HandleEntry(BPackageEntry* entry)
+    {
+        if (entry->Parent() == NULL) {
+            fSuperParent = entry;
+            fSuperParentItem = new BStringItem(fSuperParent->Name());
+            fContents->AddItem(fSuperParentItem);
+            fParent = fSuperParent;
+            fParentItem = fSuperParentItem;
+        } else {
+            if (entry->Parent() == fParent) {
+                BListItem* item = new BStringItem(entry->Name());
+                fContents->AddUnder(item, fParentItem);
+                fParent = entry;
+                fParentItem = item;
+            } else if (entry->Parent() == fSuperParent) {
+                BListItem* item = new BStringItem(entry->Name());
+                fContents->AddUnder(item, fSuperParentItem);
+                fParent = entry;
+                fParentItem = item;
+            }
+        }
+        return B_OK;
+    }
+
+    virtual status_t HandleEntryAttribute(BPackageEntry* entry,
+        BPackageEntryAttribute* attribute)
+    {
+        return B_OK;
+    }
+
+    virtual status_t HandleEntryDone(BPackageEntry* entry)
+    {
+        return B_OK;
+    }
+
+    virtual status_t HandlePackageAttribute(
+        const BPackageInfoAttributeValue& value)
+    {
+        return B_OK;
+    }
+    
+    virtual void HandleErrorOccurred()
+    {
+    }
+    
+    BOutlineListView* GetContentsList() {
+        return fContents;
+    }
+    
+    private:
+    BOutlineListView* fContents;
+    BListItem* fParentItem;
+    BListItem* fSuperParentItem;
+    BPackageEntry* fParent;
+    BPackageEntry* fSuperParent;
+};
+
+
+// #pragma mark - PackageContentView
+
+
+PackageContentsView::PackageContentsView(BRect frame, const char* name)
+    :
+    BView("package_contents_view",B_WILL_DRAW),
+    fLayout(new BGroupLayout(B_HORIZONTAL))
+{
+    BRect frame = Bounds();
+    frame.InsetBy(5,5);
+    
+    fContentsList = new BOutlineListView(frame, "contents_list", 
+                                    B_SINGLE_SELECTION_LIST);
+    
+    BScrollView* scrollView = new CustomScrollView("contents scroll view", 
+                                                            fContentsList);
+                                                            
+    BLayoutBuilder::Group<>(this)
+        .Add(scrollView, 1.0f)
+        .SetInsets(B_USE_DEFAULT_SPACING, -1.0f, -1.0f, -1.0f)
+    ;
+}
+
+
+PackageContentsView::~PackageContentsView()
+{
+    MakeEmpty();
+}
+
+
+void
+PackageContentsView::AttachedToWindow()
+{
+    BView::AttachedToWindow();
+}
+
+
+void
+PackageContentsView::AllAttached()
+{
+    BView::AllAttached();
+}
+
+
+void
+PackageContentsView::AddPackage(const PackageInfo& package)
+{
+    fContentsList->MakeEmpty();
+    status_t status;
+    
+    if (package.IsLocalFile() ) {
+        BString pathString = package.LocalFilePath();
+        BPath packagePath;
+        packagePath.SetTo(pathString.String());
+    
+        BNoErrorOutput errorOutput;
+        BPackageReader reader(&errorOutput);
+    
+        status = reader.Init(packagePath.Path());
+            if (status != B_OK) {
+                printf("failed to init BPackageReader(%s): %s\n",
+                    packagePath.Path(), strerror(status));
+                return;
+            }
+    
+        // Scan package contents and populate list
+        PackageContentOutliner contentHandler(fContentsList);
+        status = reader.ParseContent(&contentHandler);
+        if (status != B_OK) {
+            printf("PackageContnetsView::PackageContentsView(): "
+                "failed parse package contents: %s\n", strerror(status));
+        } else {
+            fContentsList = contentHandler.GetContentsList();
+        }
+    }
+    Invalidate();
+}
+
+
+void 
+PackageContentsView::MakeEmpty() {
+    fContentsList->MakeEmpty();
+}

new file src/apps/haikudepot/ui/PackageContentsView.h

@@ +1 @@
+/*
+ * Copyright 2013, Stephan Aßmus <superstippi@gmx.de>.
+ * Copyright 2013, Rene Gollent <rene@gollent.com>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef PACKAGE_CONTENTS_VIEW_H
+#define PACKAGE_CONTENTS_VIEW_H
+
+#include <OutlineListView.h>
+#include <View.h>
+#include "PackageInfo.h"
+#include "ScrollableGroupView.h"
+
+class PackageContentsView : public BView {
+public:
+                                PackageContentsView(BRect frame, const char* name);
+    virtual                     ~PackageContentsView();
+
+    virtual void                AttachedToWindow();
+    virtual void                AllAttached();
+
+            void                AddPackage(const PackageInfo& package);
+            void            MakeEmpty();
+private:
+            class PackageContentOutliner;
+            BGroupLayout*       fLayout;
+            BOutlineListView* fContentsList;
+};
+
+#endif // PACKAGE_CONTENTS_VIEW_H

src/apps/haikudepot/ui/PackageInfoView.cpp

@@ -20 +20 @@
 #include <LayoutUtils.h>
 #include <LocaleRoster.h>
 #include <Message.h>
-#include <TabView.h>
+#include <OutlineListView.h>
 #include <ScrollView.h>
 #include <SpaceLayoutItem.h>
 #include <StatusBar.h>
 #include <StringView.h>
+#include <TabView.h>
 #include <Url.h>
 
+#include <package/hpkg/PackageReader.h>
+#include <package/hpkg/NoErrorOutput.h>
+#include <package/hpkg/PackageContentHandler.h>
+#include <package/hpkg/PackageEntry.h>
+
 #include "BitmapButton.h"
 #include "BitmapView.h"
 #include "LinkView.h"
@@ -34 +40 @@
 #include "MarkupTextView.h"
 #include "MessagePackageListener.h"
 #include "PackageActionHandler.h"
+#include "PackageContentsView.h"
+#include "PackageInfo.h"
 #include "PackageManager.h"
 #include "RatingView.h"
 #include "ScrollableGroupView.h"
@@ -44 +52 @@
 #define B_TRANSLATION_CONTEXT "PackageInfoView"
 
 
-static const rgb_color kLightBlack = (rgb_color){ 60, 60, 60, 255 };
+static const rgb_color kLightBlack = (rgb_color) { 60, 60, 60, 255 };
 static const float kContentTint = (B_NO_TINT + B_LIGHTEN_1_TINT) / 2.0f;
 
 
@@ -1158 +1166 @@
 };
 
 
+// #pragma mark - ContentsView
+
+
+class ContentsView : public BView {
+public:
+    ContentsView()
+        :
+        BView("package contents view", B_WILL_DRAW),
+        fLayout(new BGroupLayout(B_HORIZONTAL))
+    {
+        SetViewColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
+            kContentTint));
+        BRect frame = Bounds();
+        frame.InsetBy(5,5) ;
+
+        SetLayout(fLayout);
+        fPackageContents = new PackageContentsView(frame, "contents_list");
+        AddChild(fPackageContents);
+
+    }
+
+    virtual ~ContentsView()
+    {
+    }
+
+    virtual void Draw(BRect updateRect)
+    {
+    }
+
+    void SetPackage(const PackageInfo& package)
+    {
+        fPackageContents -> AddPackage(package);
+    }
+
+    void Clear()
+    {
+        fPackageContents->MakeEmpty();
+    }
+    
+
+private:
+    BGroupLayout*       fLayout;
+    PackageContentsView*  fPackageContents;
+};
+
+
 // #pragma mark - ChangelogView
 
 
@@ -1230 +1284 @@
         fAboutView = new AboutView();
         fUserRatingsView = new UserRatingsView();
         fChangelogView = new ChangelogView();
+        fContentsView = new ContentsView();
 
         AddTab(fAboutView);
         AddTab(fUserRatingsView);
         AddTab(fChangelogView);
-
+        AddTab(fContentsView);
+        
         TabAt(0)->SetLabel(B_TRANSLATE("About"));
         TabAt(1)->SetLabel(B_TRANSLATE("Ratings"));
         TabAt(2)->SetLabel(B_TRANSLATE("Changelog"));
+        TabAt(3)->SetLabel(B_TRANSLATE("Contents"));
 
         Select(0);
     }
@@ -1253 +1310 @@
         fAboutView->SetPackage(package);
         fUserRatingsView->SetPackage(package);
         fChangelogView->SetPackage(package);
+        fContentsView->SetPackage(package);
     }
 
     void Clear()
@@ -1260 +1318 @@
         fAboutView->Clear();
         fUserRatingsView->Clear();
         fChangelogView->Clear();
+        fContentsView->Clear();
     }
 
 private:
@@ -1268 +1327 @@
     AboutView*          fAboutView;
     UserRatingsView*    fUserRatingsView;
     ChangelogView*      fChangelogView;
+    ContentsView*       fContentsView;
 };