Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup, no functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43162 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2011-11-03 14:18:20 +00:00
parent 7034a82597
commit 360504239c
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/preferences/mouse/SettingsView.cpp
View File

@ -68,7 +68,7 @@ focus_follows_mouse_mode_to_index(mode_focus_follows_mouse mode)
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "SettingsView" #define B_TRANSLATE_CONTEXT "SettingsView"
SettingsView::SettingsView(MouseSettings &settings) SettingsView::SettingsView(MouseSettings& settings)
: BBox("main_view"), : BBox("main_view"),
fSettings(settings) fSettings(settings)
{ {
@ -81,9 +81,9 @@ SettingsView::SettingsView(MouseSettings &settings)
fTypeMenu->AddItem(new BMenuItem(B_TRANSLATE("3-Button"), fTypeMenu->AddItem(new BMenuItem(B_TRANSLATE("3-Button"),
new BMessage(kMsgMouseType))); new BMessage(kMsgMouseType)));
BMenuField *fTypeField = new BMenuField(B_TRANSLATE("Mouse type:"), BMenuField* typeField = new BMenuField(B_TRANSLATE("Mouse type:"),
fTypeMenu); fTypeMenu);
fTypeField->SetAlignment(B_ALIGN_RIGHT); typeField->SetAlignment(B_ALIGN_RIGHT);
// Create the "Double-click speed slider... // Create the "Double-click speed slider...
fClickSpeedSlider = new BSlider("double_click_speed", fClickSpeedSlider = new BSlider("double_click_speed",
@ -115,9 +115,9 @@ SettingsView::SettingsView(MouseSettings &settings)
fMouseView = new MouseView(fSettings); fMouseView = new MouseView(fSettings);
// Create the "Double-click test area" text box... // Create the "Double-click test area" text box...
BTextControl *fDoubleClick = new BTextControl(NULL, BTextControl* doubleClickTextControl = new BTextControl(NULL,
B_TRANSLATE("Double-click test area"), NULL); B_TRANSLATE("Double-click test area"), NULL);
fDoubleClick->SetAlignment(B_ALIGN_LEFT, B_ALIGN_CENTER); doubleClickTextControl->SetAlignment(B_ALIGN_LEFT, B_ALIGN_CENTER);
// Add the "Mouse focus mode" pop up menu // Add the "Mouse focus mode" pop up menu
fFocusMenu = new BPopUpMenu(B_TRANSLATE("Click to focus and raise")); fFocusMenu = new BPopUpMenu(B_TRANSLATE("Click to focus and raise"));
@ -129,16 +129,16 @@ SettingsView::SettingsView(MouseSettings &settings)
B_FOCUS_FOLLOWS_MOUSE}; B_FOCUS_FOLLOWS_MOUSE};
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
BMessage *message = new BMessage(kMsgMouseFocusMode); BMessage* message = new BMessage(kMsgMouseFocusMode);
message->AddInt32("mode", focusModes[i]); message->AddInt32("mode", focusModes[i]);
fFocusMenu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(focusLabels[i]), fFocusMenu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(focusLabels[i]),
message)); message));
} }
BMenuField *fFocusField = new BMenuField(B_TRANSLATE("Focus mode:"), BMenuField* focusField = new BMenuField(B_TRANSLATE("Focus mode:"),
fFocusMenu); fFocusMenu);
fFocusField->SetAlignment(B_ALIGN_RIGHT); focusField->SetAlignment(B_ALIGN_RIGHT);
// Add the "Focus follows mouse mode" pop up menu // Add the "Focus follows mouse mode" pop up menu
fFocusFollowsMouseMenu = new BPopUpMenu(B_TRANSLATE("Normal")); fFocusFollowsMouseMenu = new BPopUpMenu(B_TRANSLATE("Normal"));
@ -150,7 +150,7 @@ SettingsView::SettingsView(MouseSettings &settings)
B_INSTANT_WARP_FOCUS_FOLLOWS_MOUSE}; B_INSTANT_WARP_FOCUS_FOLLOWS_MOUSE};
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
BMessage *message = new BMessage(kMsgFollowsMouseMode); BMessage* message = new BMessage(kMsgFollowsMouseMode);
message->AddInt32("mode_focus_follows_mouse", message->AddInt32("mode_focus_follows_mouse",
focusFollowsMouseModes[i]); focusFollowsMouseModes[i]);
@ -158,9 +158,9 @@ SettingsView::SettingsView(MouseSettings &settings)
B_TRANSLATE_NOCOLLECT(focusFollowsMouseLabels[i]), message)); B_TRANSLATE_NOCOLLECT(focusFollowsMouseLabels[i]), message));
} }
BMenuField *fFocusFollowsMouseField = new BMenuField( BMenuField* focusFollowsMouseField = new BMenuField(
"Focus follows mouse mode:", fFocusFollowsMouseMenu); "Focus follows mouse mode:", fFocusFollowsMouseMenu);
fFocusFollowsMouseField->SetAlignment(B_ALIGN_RIGHT); focusFollowsMouseField->SetAlignment(B_ALIGN_RIGHT);
// Add the "Click-through" check box // Add the "Click-through" check box
fAcceptFirstClickBox = new BCheckBox(B_TRANSLATE("Accept first click"), fAcceptFirstClickBox = new BCheckBox(B_TRANSLATE("Accept first click"),
@ -185,7 +185,7 @@ SettingsView::SettingsView(MouseSettings &settings)
.AddGroup(B_VERTICAL, 10, 1) .AddGroup(B_VERTICAL, 10, 1)
.AddGroup(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL, 10)
.AddGlue() .AddGlue()
.Add(fTypeField) .Add(typeField)
.AddGlue() .AddGlue()
.End() .End()
.AddGlue() .AddGlue()
@ -195,7 +195,7 @@ SettingsView::SettingsView(MouseSettings &settings)
.AddGlue() .AddGlue()
) )
.AddGlue() .AddGlue()
.Add(fDoubleClick) .Add(doubleClickTextControl)
.End() .End()
.Add(hdivider) .Add(hdivider)
.AddGroup(B_VERTICAL, 5, 3) .AddGroup(B_VERTICAL, 5, 3)
@ -212,11 +212,10 @@ SettingsView::SettingsView(MouseSettings &settings)
.End() .End()
.Add(vdivider) .Add(vdivider)
.AddGroup(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL, 10)
.Add(fFocusField) .Add(focusField)
.AddGlue() .AddGlue()
.AddGroup(B_VERTICAL, 0) .AddGroup(B_VERTICAL, 0)
.Add(fAcceptFirstClickBox) .Add(fAcceptFirstClickBox)
//.Add(fFocusFollowsMouseField)
.End() .End()
.End() .End()
.SetInsets(5, 5, 5, 5) .SetInsets(5, 5, 5, 5)
@ -234,6 +233,8 @@ void
SettingsView::AttachedToWindow() SettingsView::AttachedToWindow()
{ {
UpdateFromSettings(); UpdateFromSettings();
} }
@ -266,7 +267,7 @@ SettingsView::UpdateFromSettings()
// slow = 0, fast = 262144 // slow = 0, fast = 262144
fAccelerationSlider->SetValue(value); fAccelerationSlider->SetValue(value);
BMenuItem *item = fTypeMenu->ItemAt(fSettings.MouseType() - 1); BMenuItem* item = fTypeMenu->ItemAt(fSettings.MouseType() - 1);
if (item != NULL) if (item != NULL)
item->SetMarked(true); item->SetMarked(true);

12
src/preferences/mouse/SettingsView.h
View File

@ -42,10 +42,14 @@ class SettingsView : public BBox {
const MouseSettings &fSettings; const MouseSettings &fSettings;
BPopUpMenu *fTypeMenu, *fFocusMenu, *fFocusFollowsMouseMenu; BPopUpMenu* fTypeMenu;
BCheckBox *fAcceptFirstClickBox; BPopUpMenu* fFocusMenu;
MouseView *fMouseView; BPopUpMenu* fFocusFollowsMouseMenu;
BSlider *fClickSpeedSlider, *fMouseSpeedSlider, *fAccelerationSlider; BCheckBox* fAcceptFirstClickBox;
MouseView* fMouseView;
BSlider* fClickSpeedSlider;
BSlider* fMouseSpeedSlider;
BSlider* fAccelerationSlider;
}; };
#endif /* SETTINGS_VIEW_H */ #endif /* SETTINGS_VIEW_H */