Skip to content

Commit

Permalink
HaikuDepot: Switched back to actual BTabView
Browse files Browse the repository at this point in the history
 * Instead of showing all package actions along the bottom
   of the window, only the applicable actions are shown, but
   besides the package title.
 * The radio buttons are gone, instead an actual BTabView is
   used, but now in a more pretty way.
 * The package info content stretches to the window border
   which will make showing a vertical scroll bar look better.
  • Loading branch information
stippi committed Aug 3, 2013
1 parent 68ed4f7 commit 601d751
Show file tree
Hide file tree
Showing 8 changed files with 173 additions and 225 deletions.
2 changes: 0 additions & 2 deletions src/apps/haiku-depot/Jamfile
Expand Up @@ -8,7 +8,6 @@ Application HaikuDepot :
main.cpp
MainWindow.cpp
Model.cpp
PackageActionsView.cpp
PackageInfo.cpp
PackageInfoView.cpp
PackageListView.cpp
Expand All @@ -25,7 +24,6 @@ DoCatalogs HaikuDepot :
App.cpp
FilterView.cpp
MainWindow.cpp
PackageActionsView.cpp
PackageInfoView.cpp
PackageListView.cpp
PackageManager.cpp
Expand Down
16 changes: 7 additions & 9 deletions src/apps/haiku-depot/MainWindow.cpp
Expand Up @@ -19,7 +19,6 @@
#include <TabView.h>

#include "FilterView.h"
#include "PackageActionsView.h"
#include "PackageInfoView.h"
#include "PackageListView.h"

Expand All @@ -39,22 +38,21 @@ MainWindow::MainWindow(BRect frame)

fFilterView = new FilterView();
fPackageListView = new PackageListView();
fPackageInfoView = new PackageInfoView();
fPackageActionsView = new PackageActionsView();
fPackageInfoView = new PackageInfoView(&fPackageManager);

fSplitView = new BSplitView(B_VERTICAL, B_USE_SMALL_SPACING);

BLayoutBuilder::Group<>(this, B_VERTICAL, 0.0f)
.Add(menuBar)
.Add(fFilterView)
.AddGroup(B_VERTICAL)
.AddSplit(fSplitView)
.AddSplit(fSplitView)
.AddGroup(B_VERTICAL)
.Add(fPackageListView)
.Add(fPackageInfoView)
.SetInsets(
B_USE_DEFAULT_SPACING, 0.0f,
B_USE_DEFAULT_SPACING, 0.0f)
.End()
.Add(fPackageActionsView)
.SetInsets(B_USE_DEFAULT_SPACING, 0.0f, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING)
.Add(fPackageInfoView)
.End()
;

Expand Down
4 changes: 3 additions & 1 deletion src/apps/haiku-depot/MainWindow.h
Expand Up @@ -8,6 +8,7 @@
#include <Window.h>

#include "Model.h"
#include "PackageManager.h"


class BSplitView;
Expand Down Expand Up @@ -43,11 +44,12 @@ class MainWindow : public BWindow {
FilterView* fFilterView;
PackageListView* fPackageListView;
PackageInfoView* fPackageInfoView;
PackageActionsView* fPackageActionsView;
BSplitView* fSplitView;

Model fModel;
PackageInfoList fVisiblePackages;

PackageManager fPackageManager;
};

#endif // MAIN_WINDOW_H
81 changes: 0 additions & 81 deletions src/apps/haiku-depot/PackageActionsView.cpp

This file was deleted.

29 changes: 0 additions & 29 deletions src/apps/haiku-depot/PackageActionsView.h

This file was deleted.

0 comments on commit 601d751

Please sign in to comment.