Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Deskbar preferences to use tabs instead of listview

Browse Source
This commit is contained in:
John Scipione 2013-01-14 14:24:42 -05:00
parent 06d477cd64
commit 075d3e60f4
2 changed files with 12 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/apps/deskbar/PreferencesWindow.cpp
View File

@ -12,7 +12,6 @@
#include <ctype.h>
#include <Box.h>
#include <Button.h>
#include <Catalog.h>
#include <CheckBox.h>
@ -25,10 +24,9 @@
#include <OpenWithTracker.h>
#include <RadioButton.h>
#include <Roster.h>
#include <ScrollView.h>
#include <SeparatorView.h>
#include <Slider.h>
#include <StringItem.h>
#include <TabView.h>
#include <TextControl.h>
#include <View.h>
@ -36,29 +34,6 @@
#include "StatusView.h"
namespace BPrivate {
class SettingsItem : public BStringItem {
public:
SettingsItem(const char* label, BView* view)
:
BStringItem(label),
fSettingsView(view)
{
}
BView* View()
{
return fSettingsView;
}
private:
BView* fSettingsView;
};
} // namespace BPrivate
static const float kIndentSpacing
= be_control_look->DefaultItemSpacing() * 2.3;
static const uint32 kSettingsViewChanged = 'Svch';
@ -73,15 +48,6 @@ PreferencesWindow::PreferencesWindow(BRect frame)
BWindow(frame, B_TRANSLATE("Deskbar preferences"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE)
{
// Main view controls
fSettingsTypeListView = new BListView("List View",
B_SINGLE_SELECTION_LIST);
BScrollView* scrollView = new BScrollView("scrollview",
fSettingsTypeListView, 0, false, true);
fSettingsContainerBox = new BBox("SettingsContainerBox");
// Menu controls
fMenuRecentDocuments = new BCheckBox(B_TRANSLATE("Recent documents:"),
new BMessage(kUpdateRecentCounts));
@ -223,6 +189,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
.End()
.View();
menuSettingsView->SetName(B_TRANSLATE("Menu"));
BView* applicationsSettingsView = BLayoutBuilder::Group<>()
.AddGroup(B_VERTICAL, 0)
@ -243,6 +210,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
.End()
.View();
applicationsSettingsView->SetName(B_TRANSLATE("Applications"));
BView* windowSettingsView = BLayoutBuilder::Group<>()
.AddGroup(B_VERTICAL, 0)
@ -254,33 +222,19 @@ PreferencesWindow::PreferencesWindow(BRect frame)
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
.End()
.View();
windowSettingsView->SetName(B_TRANSLATE("Window"));
BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL);
tabView->AddTab(menuSettingsView);
tabView->AddTab(applicationsSettingsView);
tabView->AddTab(windowSettingsView);
BLayoutBuilder::Group<>(this)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
.Add(scrollView)
.Add(fSettingsContainerBox)
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
.Add(tabView)
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
.End();
fSettingsTypeListView->AddItem(new SettingsItem(B_TRANSLATE("Menu"),
menuSettingsView));
fSettingsTypeListView->AddItem(new SettingsItem(B_TRANSLATE("Applications"),
applicationsSettingsView));
fSettingsTypeListView->AddItem(new SettingsItem(B_TRANSLATE("Window"),
windowSettingsView));
// constraint the listview width so that the longest item fits
float width = 0;
fSettingsTypeListView->GetPreferredSize(&width, NULL);
width += B_V_SCROLL_BAR_WIDTH;
fSettingsTypeListView->SetExplicitMinSize(BSize(width, 0));
fSettingsTypeListView->SetExplicitMaxSize(BSize(width, B_SIZE_UNLIMITED));
fSettingsTypeListView->SetSelectionMessage(
new BMessage(kSettingsViewChanged));
fSettingsTypeListView->Select(0);
CenterOnScreen();
}
@ -312,10 +266,6 @@ PreferencesWindow::MessageReceived(BMessage* message)
EnableDisableDependentItems();
break;
case kSettingsViewChanged:
_HandleChangedSettingsView();
break;
default:
BWindow::MessageReceived(message);
break;
@ -388,35 +338,3 @@ PreferencesWindow::EnableDisableDependentItems()
fWindowAutoRaise->SetEnabled(
fWindowAlwaysOnTop->Value() == B_CONTROL_OFF);
}
// #pragma mark -
void
PreferencesWindow::_HandleChangedSettingsView()
{
int32 currentSelection = fSettingsTypeListView->CurrentSelection();
if (currentSelection < 0)
return;
BView* oldView = fSettingsContainerBox->ChildAt(0);
if (oldView != NULL)
oldView->RemoveSelf();
SettingsItem* selectedItem =
dynamic_cast<SettingsItem*>
(fSettingsTypeListView->ItemAt(currentSelection));
if (selectedItem != NULL) {
fSettingsContainerBox->SetLabel(selectedItem->Text());
BView* view = selectedItem->View();
view->SetViewColor(fSettingsContainerBox->ViewColor());
view->Hide();
fSettingsContainerBox->AddChild(view);
view->Show();
}
}

5
src/apps/deskbar/PreferencesWindow.h
View File

@ -45,11 +45,6 @@ public:
void EnableDisableDependentItems();
private:
void _HandleChangedSettingsView();
BListView* fSettingsTypeListView;
BBox* fSettingsContainerBox;
BCheckBox* fMenuRecentDocuments;
BCheckBox* fMenuRecentApplications;
BCheckBox* fMenuRecentFolders;