1 | *** haiku/trunk/src/preferences/screensaver/ScreenSaverwindow.cpp 2011-03-05 12:30:34.000000000 +0000
|
---|
2 | --- haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp 2011-03-05 12:27:32.000000000 +0000
|
---|
3 | ***************
|
---|
4 | *** 634,640 ****
|
---|
5 | // Create the controls inside the tabs
|
---|
6 | rect = fTabView->ContainerView()->Bounds();
|
---|
7 | _SetupFadeTab(rect);
|
---|
8 | ! fModulesView = new ModulesView(rect, B_TRANSLATE("Modules"), fSettings);
|
---|
9 |
|
---|
10 | fTabView->AddTab(fFadeView);
|
---|
11 | fTabView->AddTab(fModulesView);
|
---|
12 | --- 634,640 ----
|
---|
13 | // Create the controls inside the tabs
|
---|
14 | rect = fTabView->ContainerView()->Bounds();
|
---|
15 | _SetupFadeTab(rect);
|
---|
16 | ! fModulesView = new ModulesView(rect, B_TRANSLATE("Run Screensaver"), fSettings);
|
---|
17 |
|
---|
18 | fTabView->AddTab(fFadeView);
|
---|
19 | fTabView->AddTab(fModulesView);
|
---|
20 | ***************
|
---|
21 | *** 677,687 ****
|
---|
22 | }
|
---|
23 |
|
---|
24 |
|
---|
25 | ! //! Create the controls for the fade tab
|
---|
26 | void
|
---|
27 | ScreenSaverWindow::_SetupFadeTab(BRect rect)
|
---|
28 | {
|
---|
29 | ! fFadeView = new FadeView(rect, B_TRANSLATE("Fade"), fSettings);
|
---|
30 |
|
---|
31 | float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off "
|
---|
32 | "screen")) + 20.0f;
|
---|
33 | --- 677,687 ----
|
---|
34 | }
|
---|
35 |
|
---|
36 |
|
---|
37 | ! //! Create the controls for the settings tab
|
---|
38 | void
|
---|
39 | ScreenSaverWindow::_SetupFadeTab(BRect rect)
|
---|
40 | {
|
---|
41 | ! fFadeView = new FadeView(rect, B_TRANSLATE("Settings"), fSettings);
|
---|
42 |
|
---|
43 | float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off "
|
---|
44 | "screen")) + 20.0f;
|
---|
45 | ***************
|
---|
46 | *** 913,919 ****
|
---|
47 | void
|
---|
48 | ScreenSaverWindow::MessageReceived(BMessage *msg)
|
---|
49 | {
|
---|
50 | ! // "Fade" tab, slider updates
|
---|
51 |
|
---|
52 | switch (msg->what) {
|
---|
53 | case kMsgRunSliderChanged:
|
---|
54 | --- 913,919 ----
|
---|
55 | void
|
---|
56 | ScreenSaverWindow::MessageReceived(BMessage *msg)
|
---|
57 | {
|
---|
58 | ! // "Settings" tab, slider updates
|
---|
59 |
|
---|
60 | switch (msg->what) {
|
---|
61 | case kMsgRunSliderChanged:
|
---|
62 | ***************
|
---|
63 | *** 939,945 ****
|
---|
64 | }
|
---|
65 |
|
---|
66 | switch (msg->what) {
|
---|
67 | ! // "Fade" tab
|
---|
68 |
|
---|
69 | case kMsgTurnOffCheckBox:
|
---|
70 | fTurnOffSlider->SetEnabled(
|
---|
71 | --- 939,945 ----
|
---|
72 | }
|
---|
73 |
|
---|
74 | switch (msg->what) {
|
---|
75 | ! // "Settings" tab
|
---|
76 |
|
---|
77 | case kMsgTurnOffCheckBox:
|
---|
78 | fTurnOffSlider->SetEnabled(
|
---|
79 | ***************
|
---|
80 | *** 961,967 ****
|
---|
81 | fPasswordWindow->Show();
|
---|
82 | break;
|
---|
83 |
|
---|
84 | ! // "Modules" tab
|
---|
85 |
|
---|
86 | case kMsgUpdateList:
|
---|
87 | fModulesView->PopulateScreenSaverList();
|
---|
88 | --- 961,967 ----
|
---|
89 | fPasswordWindow->Show();
|
---|
90 | break;
|
---|
91 |
|
---|
92 | ! // "Run Screensaver" tab
|
---|
93 |
|
---|
94 | case kMsgUpdateList:
|
---|
95 | fModulesView->PopulateScreenSaverList();
|
---|