ScreenSaver: Refactor ModulesView
Create controls in initializer list of constructor, delete controls in the (newly-added) destructor. Make fSettings the first private member.
This commit is contained in:
@@ -132,6 +132,7 @@ class ModulesView : public BView {
|
|||||||
public:
|
public:
|
||||||
ModulesView(const char* name,
|
ModulesView(const char* name,
|
||||||
ScreenSaverSettings& settings);
|
ScreenSaverSettings& settings);
|
||||||
|
virtual ~ModulesView();
|
||||||
|
|
||||||
virtual void DetachedFromWindow();
|
virtual void DetachedFromWindow();
|
||||||
virtual void AttachedToWindow();
|
virtual void AttachedToWindow();
|
||||||
@@ -153,10 +154,11 @@ private:
|
|||||||
void _OpenSaver();
|
void _OpenSaver();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
ScreenSaverSettings& fSettings;
|
||||||
|
|
||||||
BListView* fScreenSaversListView;
|
BListView* fScreenSaversListView;
|
||||||
BButton* fTestButton;
|
BButton* fTestButton;
|
||||||
|
|
||||||
ScreenSaverSettings& fSettings;
|
|
||||||
ScreenSaverRunner* fSaverRunner;
|
ScreenSaverRunner* fSaverRunner;
|
||||||
BString fCurrentName;
|
BString fCurrentName;
|
||||||
|
|
||||||
@@ -522,25 +524,22 @@ ModulesView::ModulesView(const char* name, ScreenSaverSettings& settings)
|
|||||||
:
|
:
|
||||||
BView(name, B_WILL_DRAW),
|
BView(name, B_WILL_DRAW),
|
||||||
fSettings(settings),
|
fSettings(settings),
|
||||||
|
fScreenSaversListView(new BListView("SaversListView")),
|
||||||
|
fTestButton(new BButton("TestButton", B_TRANSLATE("Test"),
|
||||||
|
new BMessage(kMsgTestSaver))),
|
||||||
fSaverRunner(NULL),
|
fSaverRunner(NULL),
|
||||||
|
fSettingsBox(new BBox("SettingsBox")),
|
||||||
fSettingsView(NULL),
|
fSettingsView(NULL),
|
||||||
|
fPreviewView(new PreviewView("preview")),
|
||||||
fScreenSaverTestTeam(-1)
|
fScreenSaverTestTeam(-1)
|
||||||
{
|
{
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
||||||
|
|
||||||
fTestButton = new BButton("TestButton", B_TRANSLATE("Test"),
|
|
||||||
new BMessage(kMsgTestSaver));
|
|
||||||
|
|
||||||
fPreviewView = new PreviewView("preview");
|
|
||||||
|
|
||||||
fScreenSaversListView = new BListView("SaversListView",
|
|
||||||
B_SINGLE_SELECTION_LIST);
|
|
||||||
fScreenSaversListView->SetSelectionMessage(
|
fScreenSaversListView->SetSelectionMessage(
|
||||||
new BMessage(kMsgSaverSelected));
|
new BMessage(kMsgSaverSelected));
|
||||||
BScrollView* saversListScrollView = new BScrollView("scroll_list",
|
BScrollView* saversListScrollView = new BScrollView("scroll_list",
|
||||||
fScreenSaversListView, 0, false, true);
|
fScreenSaversListView, 0, false, true);
|
||||||
|
|
||||||
fSettingsBox = new BBox("SettingsBox");
|
|
||||||
fSettingsBox->SetLabel(B_TRANSLATE("Screensaver settings"));
|
fSettingsBox->SetLabel(B_TRANSLATE("Screensaver settings"));
|
||||||
|
|
||||||
BLayoutBuilder::Group<>(this, B_HORIZONTAL)
|
BLayoutBuilder::Group<>(this, B_HORIZONTAL)
|
||||||
@@ -558,6 +557,14 @@ ModulesView::ModulesView(const char* name, ScreenSaverSettings& settings)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ModulesView::~ModulesView()
|
||||||
|
{
|
||||||
|
delete fTestButton;
|
||||||
|
delete fSettingsBox;
|
||||||
|
delete fPreviewView;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ModulesView::DetachedFromWindow()
|
ModulesView::DetachedFromWindow()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user