- Reordered headers to match coding guidelines.
- Added use of the new BuildScreenSaverDefaultSettingsView function (this is basically the same code.) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
0007a867cf
commit
db9feb346e
@ -9,11 +9,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "PreviewView.h"
|
|
||||||
#include "ScreenCornerSelector.h"
|
|
||||||
#include "ScreenSaverItem.h"
|
|
||||||
#include "ScreenSaverWindow.h"
|
#include "ScreenSaverWindow.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <Application.h>
|
#include <Application.h>
|
||||||
#include <Box.h>
|
#include <Box.h>
|
||||||
#include <Button.h>
|
#include <Button.h>
|
||||||
@ -32,7 +31,11 @@
|
|||||||
#include <StringView.h>
|
#include <StringView.h>
|
||||||
#include <TabView.h>
|
#include <TabView.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <BuildScreenSaverDefaultSettingsView.h>
|
||||||
|
|
||||||
|
#include "PreviewView.h"
|
||||||
|
#include "ScreenCornerSelector.h"
|
||||||
|
#include "ScreenSaverItem.h"
|
||||||
|
|
||||||
|
|
||||||
const uint32 kPreviewMonitorGap = 16;
|
const uint32 kPreviewMonitorGap = 16;
|
||||||
@ -529,18 +532,10 @@ ModulesView::_OpenSaver()
|
|||||||
if (fSettingsView->ChildAt(0) == NULL) {
|
if (fSettingsView->ChildAt(0) == NULL) {
|
||||||
// There are no settings at all, we add the module name here to
|
// There are no settings at all, we add the module name here to
|
||||||
// let it look a bit better at least.
|
// let it look a bit better at least.
|
||||||
rect = BRect(15, 15, 20, 20);
|
BuildScreenSaverDefaultSettingsView(fSettingsView,
|
||||||
BStringView* stringView = new BStringView(rect, "module", fSettings.ModuleName()[0]
|
fSettings.ModuleName()[0] ? fSettings.ModuleName() : "Blackness",
|
||||||
? fSettings.ModuleName() : "Blackness");
|
saver || !fSettings.ModuleName()[0]
|
||||||
stringView->SetFont(be_bold_font);
|
? "No options available" : "Could not load screen saver");
|
||||||
stringView->ResizeToPreferred();
|
|
||||||
fSettingsView->AddChild(stringView);
|
|
||||||
|
|
||||||
rect.OffsetBy(0, stringView->Bounds().Height() + 4);
|
|
||||||
stringView = new BStringView(rect, "info", saver || !fSettings.ModuleName()[0]
|
|
||||||
? "No options available" : "Could not load screen saver");
|
|
||||||
stringView->ResizeToPreferred();
|
|
||||||
fSettingsView->AddChild(stringView);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenSaverWindow* window = dynamic_cast<ScreenSaverWindow*>(Window());
|
ScreenSaverWindow* window = dynamic_cast<ScreenSaverWindow*>(Window());
|
||||||
|
Loading…
Reference in New Issue
Block a user