hrev47852 adds 1 changeset to branch 'master' old head: b52b1047983e703a1d1c6691ec9ad9f13574bdc1 new head: fcc65d4a33f115931a1e514ce76a975f12875e76 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=fcc65d4+%5Eb52b104 ---------------------------------------------------------------------------- fcc65d4: Fix #6865: [Tracker] Use default checkboxes for permissions [ Janus <janus2@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev47852 Commit: fcc65d4a33f115931a1e514ce76a975f12875e76 URL: http://cgit.haiku-os.org/haiku/commit/?id=fcc65d4 Author: Janus <janus2@xxxxxxxxx> Date: Sat Jan 4 13:32:55 2014 UTC Committer: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> Commit-Date: Fri Sep 12 05:11:49 2014 UTC Ticket: https://dev.haiku-os.org/ticket/6865 ---------------------------------------------------------------------------- 2 files changed, 11 insertions(+), 30 deletions(-) src/kits/tracker/FilePermissionsView.cpp | 4 +-- src/kits/tracker/FilePermissionsView.h | 37 +++++++--------------------- ---------------------------------------------------------------------------- diff --git a/src/kits/tracker/FilePermissionsView.cpp b/src/kits/tracker/FilePermissionsView.cpp index eeced90..5aeb73c 100644 --- a/src/kits/tracker/FilePermissionsView.cpp +++ b/src/kits/tracker/FilePermissionsView.cpp @@ -135,7 +135,7 @@ FilePermissionsView::FilePermissionsView(BRect rect, Model* model) kVerticalSpacing = kRowLabelVerticalSpacing, kCheckBoxWidth = 18, kCheckBoxHeight = 18; - FocusCheckBox** checkBoxArray[3][3] = { + BCheckBox** checkBoxArray[3][3] = { { &fReadUserCheckBox, &fReadGroupCheckBox, @@ -156,7 +156,7 @@ FilePermissionsView::FilePermissionsView(BRect rect, Model* model) for (int32 x = 0; x < 3; x++) { for (int32 y = 0; y < 3; y++) { *checkBoxArray[y][x] = - new FocusCheckBox(BRect(kLeftMargin + kHorizontalSpacing * x, + new BCheckBox(BRect(kLeftMargin + kHorizontalSpacing * x, kTopMargin + kVerticalSpacing * y, kLeftMargin + kHorizontalSpacing * x + kCheckBoxWidth, kTopMargin + kVerticalSpacing * y + kCheckBoxHeight), diff --git a/src/kits/tracker/FilePermissionsView.h b/src/kits/tracker/FilePermissionsView.h index c67bee6..0db28b1 100644 --- a/src/kits/tracker/FilePermissionsView.h +++ b/src/kits/tracker/FilePermissionsView.h @@ -43,25 +43,6 @@ All rights reserved. namespace BPrivate { -class FocusCheckBox : public BCheckBox { - public: - FocusCheckBox(BRect rect, const char* name, const char* label, - BMessage* message) - : BCheckBox(rect, name, label, message) - { - } - - virtual void Draw(BRect rect) - { - BCheckBox::Draw(rect); - - if (IsFocus()) { - SetHighColor(0, 0, 255); - StrokeRect(BRect(2 , 4, 12, 14)); - } - } -}; - class FilePermissionsView : public BView { public: @@ -76,17 +57,17 @@ class FilePermissionsView : public BView { private: Model* fModel; - FocusCheckBox* fReadUserCheckBox; - FocusCheckBox* fReadGroupCheckBox; - FocusCheckBox* fReadOtherCheckBox; + BCheckBox* fReadUserCheckBox; + BCheckBox* fReadGroupCheckBox; + BCheckBox* fReadOtherCheckBox; - FocusCheckBox* fWriteUserCheckBox; - FocusCheckBox* fWriteGroupCheckBox; - FocusCheckBox* fWriteOtherCheckBox; + BCheckBox* fWriteUserCheckBox; + BCheckBox* fWriteGroupCheckBox; + BCheckBox* fWriteOtherCheckBox; - FocusCheckBox* fExecuteUserCheckBox; - FocusCheckBox* fExecuteGroupCheckBox; - FocusCheckBox* fExecuteOtherCheckBox; + BCheckBox* fExecuteUserCheckBox; + BCheckBox* fExecuteGroupCheckBox; + BCheckBox* fExecuteOtherCheckBox; BTextControl* fOwnerTextControl; BTextControl* fGroupTextControl;