diff --git a/src/preferences/media/MediaViews.cpp b/src/preferences/media/MediaViews.cpp index c9d7593728..8380e1cb1d 100644 --- a/src/preferences/media/MediaViews.cpp +++ b/src/preferences/media/MediaViews.cpp @@ -38,33 +38,6 @@ #define B_TRANSLATE_CONTEXT "Media views" -BarView::BarView() - : - BView("barView", B_WILL_DRAW ), - fDisplay(true) -{ -} - - -void -BarView::Draw(BRect updateRect) -{ - BRect r = Bounds(); - - if (fDisplay) { - // Display the 3D Look Divider Bar - SetHighColor(140,140,140,0); - StrokeLine(BPoint(r.left,r.top),BPoint(r.right,r.top)); - SetHighColor(255,255,255,0); - StrokeLine(BPoint(r.left,r.bottom),BPoint(r.right,r.bottom)); - } else { - SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - StrokeLine(BPoint(r.left,r.top),BPoint(r.right,r.top)); - StrokeLine(BPoint(r.left,r.bottom),BPoint(r.right,r.bottom)); - } -} - - SettingsView::SettingsView (bool isVideo) : BView("SettingsView", B_WILL_DRAW | B_SUPPORTS_LAYOUT), diff --git a/src/preferences/media/MediaViews.h b/src/preferences/media/MediaViews.h index c404e9c95c..9517fd7e39 100644 --- a/src/preferences/media/MediaViews.h +++ b/src/preferences/media/MediaViews.h @@ -30,16 +30,6 @@ const uint32 ML_DEFAULT_CHANGE = 'dech'; const uint32 ML_DEFAULTOUTPUT_CHANGE = 'doch'; -class BarView : public BView -{ -public: - BarView(); - virtual void Draw(BRect updateRect); - - bool fDisplay; -}; - - class SettingsItem : public BMenuItem { public: diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp index db0c2b4cc2..84ff94683e 100644 --- a/src/preferences/media/MediaWindow.cpp +++ b/src/preferences/media/MediaWindow.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -203,11 +204,9 @@ MediaWindow::InitWindow(void) GetLayout()->AddView(fBox); // StringViews - rgb_color titleFontColor = { 0, 0, 0, 0 }; - fTitleView = new BStringView("AudioSettings", - B_TRANSLATE("Audio settings"), B_WILL_DRAW); + fTitleView = new BSeparatorView(B_HORIZONTAL, B_FANCY_BORDER); + fTitleView->SetLabel(B_TRANSLATE("Audio settings")); fTitleView->SetFont(be_bold_font); - fTitleView->SetHighColor(titleFontColor); fContentView = new BBox("contentView", B_WILL_DRAW | B_FRAME_EVENTS, B_NO_BORDER); @@ -215,16 +214,11 @@ MediaWindow::InitWindow(void) fAudioView = new SettingsView(false); fVideoView = new SettingsView(true); - fBar = new BarView(); - BGroupView* titleGroupView = new BGroupView(B_HORIZONTAL); - titleGroupView->GroupLayout()->AddView(fTitleView); - titleGroupView->GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue()); // Layout all views BGroupView* rightView = new BGroupView(B_VERTICAL, 5); rightView->GroupLayout()->SetInsets(14, 0, 0, 0); - rightView->GroupLayout()->AddView(titleGroupView); - rightView->GroupLayout()->AddView(fBar, 0); + rightView->GroupLayout()->AddView(fTitleView); rightView->GroupLayout()->AddView(fContentView); BGroupLayout* rootLayout = new BGroupLayout(B_HORIZONTAL); @@ -602,7 +596,7 @@ MediaWindow::MessageReceived(BMessage* message) delete fParamWeb; fParamWeb = NULL; - fTitleView->SetText(item->GetLabel()); + fTitleView->SetLabel(item->GetLabel()); if (item->OutlineLevel() == 0) { if (item->IsVideo()) @@ -641,13 +635,6 @@ MediaWindow::MessageReceived(BMessage* message) (bounds.Height()-stringView->Bounds().Height())/2); } } - - bool barChanged = (item->OutlineLevel() == 0 - || fParamWeb == NULL || fParamWeb->CountGroups()<2); - if (barChanged != fBar->fDisplay) { - fBar->fDisplay = barChanged; - fBar->Invalidate(); - } } break; case B_SOME_APP_LAUNCHED: diff --git a/src/preferences/media/MediaWindow.h b/src/preferences/media/MediaWindow.h index 71bdecb2a9..d6c49ba314 100644 --- a/src/preferences/media/MediaWindow.h +++ b/src/preferences/media/MediaWindow.h @@ -31,6 +31,9 @@ #define SETTINGS_FILE "MediaPrefs Settings" +class BSeparatorView; + + class MediaWindow : public BWindow { public: @@ -57,11 +60,10 @@ private: BBox* fBox; BListView* fListView; - BStringView* fTitleView; + BSeparatorView* fTitleView; BView* fContentView; SettingsView* fAudioView; SettingsView* fVideoView; - BarView* fBar; media_node* fCurrentNode; BParameterWeb* fParamWeb;