From 035cb25ef24b32d6652016ff8f5c7024f4f42827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 5 Jan 2010 17:26:48 +0000 Subject: [PATCH] * Simplify the interface layout (don't use struts for the purpose of item spacing and insets). * Added a check box for disalbling the index generation on BFS volumes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34908 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../bfs/InitializeParameterEditor.cpp | 43 +++++++++++-------- .../bfs/InitializeParameterEditor.h | 12 ++++-- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp index c0c57162bc..ab00f1ece5 100644 --- a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp +++ b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2009-2010, Stephan Aßmus * Copyright 2009, Bryce Groff, brycegroff@gmail.com. * Distributed under the terms of the MIT License. */ @@ -9,13 +10,15 @@ #include "InitializeParameterEditor.h" #include -#include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -29,6 +32,7 @@ InitializeBFSEditor::InitializeBFSEditor() fView(NULL), fNameTC(NULL), fBlockSizeMF(NULL), + fUseIndicesCB(NULL), fParameters(NULL) { _CreateViewControls(); @@ -59,6 +63,9 @@ InitializeBFSEditor::FinishedEditing() // TODO: use libroot driver settings API fParameters << "block_size " << size << ";\n"; } + if (fUseIndicesCB->Value() == B_CONTROL_OFF) + fParameters << "noindex;\n"; + fParameters << "name \"" << fNameTC->Text() << "\";\n"; return true; @@ -111,26 +118,28 @@ InitializeBFSEditor::_CreateViewControls() fBlockSizeMF = new BMenuField("Blocksize", blocksizeMenu, NULL); defaultItem->SetMarked(true); - fView = BGroupLayoutBuilder(B_VERTICAL, 5) - .Add(BSpaceLayoutItem::CreateVerticalStrut(10)) + fUseIndicesCB = new BCheckBox("Enable query support", NULL); + fUseIndicesCB->SetValue(true); + fUseIndicesCB->SetToolTip("Disabling query support may speed up " + "certain file system operations, but should only be used " + "if one is absolutely certain that one will not need queries.\n" + "Any volume that is intended for booting Haiku must have query " + "support enabled."); - // test views - .Add(BGridLayoutBuilder(10, 10) - // row 1 - .Add(BSpaceLayoutItem::CreateHorizontalStrut(5), 0, 0) + float spacing = be_control_look->DefaultItemSpacing(); - .Add(fNameTC->CreateLabelLayoutItem(), 1, 0) - .Add(fNameTC->CreateTextViewLayoutItem(), 2, 0) + fView = BGridLayoutBuilder(spacing, spacing) + // row 1 + .Add(fNameTC->CreateLabelLayoutItem(), 0, 0) + .Add(fNameTC->CreateTextViewLayoutItem(), 1, 0) - .Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 3, 0) + // row 2 + .Add(fBlockSizeMF->CreateLabelLayoutItem(), 0, 1) + .Add(fBlockSizeMF->CreateMenuBarLayoutItem(), 1, 1) - // row 2 - .Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 0, 1) + // row 3 + .Add(fUseIndicesCB, 0, 2, 2) - .Add(fBlockSizeMF->CreateLabelLayoutItem(), 1, 1) - .Add(fBlockSizeMF->CreateMenuBarLayoutItem(), 2, 1) - - .Add(BSpaceLayoutItem::CreateHorizontalStrut(5), 3, 1) - ) + .SetInsets(spacing, spacing, spacing, spacing) ; } diff --git a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.h b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.h index 574c5461c8..339cea0519 100644 --- a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.h +++ b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.h @@ -1,4 +1,5 @@ /* + * Copyright 2009-2010, Stephan Aßmus * Copyright 2009, Bryce Groff, brycegroff@gmail.com. * Distributed under the terms of the MIT License. */ @@ -7,11 +8,12 @@ #include - -#include -#include #include -#include + +class BCheckBox; +class BMenuField; +class BTextControl; +class BView; class InitializeBFSEditor : public BPartitionParameterEditor { @@ -31,6 +33,8 @@ private: BView* fView; BTextControl* fNameTC; BMenuField* fBlockSizeMF; + BCheckBox* fUseIndicesCB; + BString fParameters; };