Author: czeidler Date: 2010-11-25 00:58:19 +0100 (Thu, 25 Nov 2010) New Revision: 39621 Changeset: http://dev.haiku-os.org/changeset/39621 Ticket: http://dev.haiku-os.org/ticket/6906 Modified: haiku/trunk/src/preferences/cpufrequency/CPUFrequencyView.cpp Log: Removing duplicate stepping police label as suggested by diver, thanks. Fix #6906. Style fixes. Modified: haiku/trunk/src/preferences/cpufrequency/CPUFrequencyView.cpp =================================================================== --- haiku/trunk/src/preferences/cpufrequency/CPUFrequencyView.cpp 2010-11-24 23:42:17 UTC (rev 39620) +++ haiku/trunk/src/preferences/cpufrequency/CPUFrequencyView.cpp 2010-11-24 23:58:19 UTC (rev 39621) @@ -1,11 +1,12 @@ /* - * Copyright 2009, Haiku, Inc. All Rights Reserved. + * Copyright 2009-2010, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: * Clemens Zeidler, haiku@xxxxxxxxxxxxxxxxxx */ + #include "CPUFrequencyView.h" #include "StatusView.h" @@ -34,8 +35,9 @@ CPUFrequencyView::CPUFrequencyView(BRect frame, - PreferencesStorage<freq_preferences>* storage) - : BView(frame, "CPUFrequencyView", B_FOLLOW_NONE, B_WILL_DRAW), + PreferencesStorage<freq_preferences>* storage) + : + BView(frame, "CPUFrequencyView", B_FOLLOW_NONE, B_WILL_DRAW), fStorage(storage) { BGroupLayout* mainLayout = new BGroupLayout(B_VERTICAL); @@ -55,17 +57,15 @@ mainLayout->AddView(policyBox); fPolicyMenu = new BMenu(B_TRANSLATE("Stepping policy: ")); - BMenuField *menuField = new BMenuField( - B_TRANSLATE("Stepping policy: "), fPolicyMenu); - + BMenuField *menuField = new BMenuField("", fPolicyMenu); policyLayout->AddView(menuField); // dynamic stepping BBox *dynamicBox = new BBox(rect, "dynamicBox"); dynamicBox->SetLabel(B_TRANSLATE("Dynamic stepping")); BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL); - dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10, - 10, 10); + dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10, 10, + 10); dynamicLayout->SetSpacing(10); dynamicBox->SetLayout(dynamicLayout); mainLayout->AddView(dynamicBox); @@ -74,10 +74,8 @@ fColorStepView->SetFrequencys(fDriverInterface.GetCpuFrequencyStates()); fIntegrationTime = new BTextControl(BRect(0,0,Bounds().Width(),10), - "intergal", - B_TRANSLATE("Integration time [ms]: "), - "", - new BMessage(kIntegrationTimeChanged)); + "intergal", B_TRANSLATE("Integration time [ms]: "), "", + new BMessage(kIntegrationTimeChanged)); dynamicLayout->AddView(fColorStepView); dynamicLayout->AddView(fIntegrationTime); @@ -91,13 +89,12 @@ statusBox->SetLayout(statusLayout); mainLayout->AddView(statusBox); - fStatusView = new StatusView(BRect(0, 0, 5, 5), false, - fStorage); + fStatusView = new StatusView(BRect(0, 0, 5, 5), false, fStorage); fStatusView->ShowPopUpMenu(false); fInstallButton = new BButton("installButton", - B_TRANSLATE("Install replicant into Deskbar"), - new BMessage(kInstallIntoDeskbar)); + B_TRANSLATE("Install replicant into Deskbar"), + new BMessage(kInstallIntoDeskbar)); statusLayout->AddView(fStatusView); statusLayout->AddView(fInstallButton); @@ -159,8 +156,8 @@ void CPUFrequencyView::AttachedToWindow() { - fFrequencyMenu = new FrequencyMenu(fPolicyMenu, this, - fStorage, &fDriverInterface); + fFrequencyMenu = new FrequencyMenu(fPolicyMenu, this, fStorage, + &fDriverInterface); AddFilter(fFrequencyMenu); fColorStepView->SetTarget(this);