diff --git a/src/prefs/mouse/MouseConstants.h b/src/prefs/mouse/MouseConstants.h index 832875f6b5..3c4da24b60 100644 --- a/src/prefs/mouse/MouseConstants.h +++ b/src/prefs/mouse/MouseConstants.h @@ -19,20 +19,16 @@ #define MOUSE_CONSTANTS_H // interface messages -const uint32 BUTTON_DEFAULTS = 'BTde'; -const uint32 BUTTON_REVERT = 'BTre'; +const uint32 kMsgDefaults = 'BTde'; +const uint32 kMsgRevert = 'BTre'; -const uint32 POPUP_MOUSE_TYPE = 'PUmt'; -const uint32 POPUP_MOUSE_FOCUS = 'PUmf'; -const uint32 POPUP_MOUSE_MAP = 'PUmm'; +const uint32 kMsgMouseType = 'PUmt'; +const uint32 kMsgMouseFocusMode = 'PUmf'; +const uint32 kMsgMouseMap = 'PUmm'; -const uint32 DOUBLE_CLICK_TEST_AREA = 'TCte'; - -const uint32 SLIDER_DOUBLE_CLICK_SPEED = 'SLdc'; -const uint32 SLIDER_MOUSE_SPEED = 'SLms'; -const uint32 SLIDER_MOUSE_ACC = 'SLma'; - -const uint32 ERROR_DETECTED = 'ERor'; +const uint32 kMsgDoubleClickSpeed = 'SLdc'; +const uint32 kMsgMouseSpeed = 'SLms'; +const uint32 kMsgAccelerationFactor = 'SLma'; // user interface const uint32 kBorderSpace = 10; diff --git a/src/prefs/mouse/MouseView.cpp b/src/prefs/mouse/MouseView.cpp index 827b72f762..90773dc509 100644 --- a/src/prefs/mouse/MouseView.cpp +++ b/src/prefs/mouse/MouseView.cpp @@ -126,7 +126,7 @@ MouseView::MouseDown(BPoint where) button = ConvertFromVisualOrder(button); BPopUpMenu menu("Mouse Map Menu"); - BMessage message(POPUP_MOUSE_MAP); + BMessage message(kMsgMouseMap); message.AddInt32("button", button); menu.AddItem(new BMenuItem("1", new BMessage(message))); diff --git a/src/prefs/mouse/MouseWindow.cpp b/src/prefs/mouse/MouseWindow.cpp index 90a658415f..50d26b19f7 100644 --- a/src/prefs/mouse/MouseWindow.cpp +++ b/src/prefs/mouse/MouseWindow.cpp @@ -48,13 +48,13 @@ MouseWindow::MouseWindow(BRect rect) // Add the "Default" button BRect rect(kBorderSpace, fSettingsView->Frame().bottom + kItemSpace + 2, kBorderSpace + 75, fSettingsView->Frame().bottom + 20); - BButton *button = new BButton(rect, "defaults", "Defaults", new BMessage(BUTTON_DEFAULTS)); + BButton *button = new BButton(rect, "defaults", "Defaults", new BMessage(kMsgDefaults)); button->ResizeToPreferred(); view->AddChild(button); // Add the "Revert" button rect.OffsetBy(button->Bounds().Width() + kItemSpace, 0); - fRevertButton = new BButton(rect, "revert", "Revert", new BMessage(BUTTON_REVERT)); + fRevertButton = new BButton(rect, "revert", "Revert", new BMessage(kMsgRevert)); fRevertButton->SetEnabled(false); view->AddChild(fRevertButton); @@ -81,7 +81,7 @@ void MouseWindow::MessageReceived(BMessage *message) { switch (message->what) { - case BUTTON_DEFAULTS: { + case kMsgDefaults: { // reverts to default settings fSettings.Defaults(); fSettingsView->UpdateFromSettings(); @@ -90,7 +90,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case BUTTON_REVERT: { + case kMsgRevert: { // revert to last settings fSettings.Revert(); fSettingsView->UpdateFromSettings(); @@ -99,7 +99,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case POPUP_MOUSE_TYPE: + case kMsgMouseType: { int32 type; if (message->FindInt32("index", &type) == B_OK) { @@ -110,7 +110,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case POPUP_MOUSE_FOCUS: + case kMsgMouseFocusMode: { int32 mode; if (message->FindInt32("mode", &mode) == B_OK) { @@ -120,7 +120,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case SLIDER_DOUBLE_CLICK_SPEED: + case kMsgDoubleClickSpeed: { int32 value; if (message->FindInt32("be:value", &value) == B_OK) { @@ -131,7 +131,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case SLIDER_MOUSE_SPEED: + case kMsgMouseSpeed: { int32 value; if (message->FindInt32("be:value", &value) == B_OK) { @@ -142,7 +142,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case SLIDER_MOUSE_ACC: + case kMsgAccelerationFactor: { int32 value; if (message->FindInt32("be:value", &value) == B_OK) { @@ -153,7 +153,7 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case POPUP_MOUSE_MAP: + case kMsgMouseMap: { int32 index; int32 button; @@ -175,13 +175,6 @@ MouseWindow::MessageReceived(BMessage *message) break; } - case ERROR_DETECTED: { - (new BAlert("Error", "Something has gone wrong!", "OK", NULL, NULL, - B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT))->Go(); - be_app->PostMessage(B_QUIT_REQUESTED); - break; - } - default: BWindow::MessageReceived(message); break; diff --git a/src/prefs/mouse/SettingsView.cpp b/src/prefs/mouse/SettingsView.cpp index b816b45a5c..a9da23403a 100644 --- a/src/prefs/mouse/SettingsView.cpp +++ b/src/prefs/mouse/SettingsView.cpp @@ -66,9 +66,9 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings) // Add the "Mouse Type" pop up menu fTypeMenu = new BPopUpMenu("unknown"); - fTypeMenu->AddItem(new BMenuItem("1-Button", new BMessage(POPUP_MOUSE_TYPE))); - fTypeMenu->AddItem(new BMenuItem("2-Button", new BMessage(POPUP_MOUSE_TYPE))); - fTypeMenu->AddItem(new BMenuItem("3-Button", new BMessage(POPUP_MOUSE_TYPE))); + fTypeMenu->AddItem(new BMenuItem("1-Button", new BMessage(kMsgMouseType))); + fTypeMenu->AddItem(new BMenuItem("2-Button", new BMessage(kMsgMouseType))); + fTypeMenu->AddItem(new BMenuItem("3-Button", new BMessage(kMsgMouseType))); BMenuField *field = new BMenuField(BRect(7, 8, 155, 190), "mouse_type", "Mouse type:", fTypeMenu); field->ResizeToPreferred(); @@ -89,7 +89,7 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings) B_WARP_MOUSE, B_INSTANT_WARP_MOUSE}; for (int i = 0; i < 4; i++) { - BMessage *message = new BMessage(POPUP_MOUSE_FOCUS); + BMessage *message = new BMessage(kMsgMouseFocusMode); message->AddInt32("mode", focusModes[i]); fFocusMenu->AddItem(new BMenuItem(focusLabels[i], message)); @@ -104,7 +104,7 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings) // Create the "Double-click speed slider... frame.Set(166, 11, 328, 50); fClickSpeedSlider = new BSlider(frame, "double_click_speed", "Double-click speed", - new BMessage(SLIDER_DOUBLE_CLICK_SPEED), 0, 1000); + new BMessage(kMsgDoubleClickSpeed), 0, 1000); fClickSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fClickSpeedSlider->SetHashMarkCount(5); fClickSpeedSlider->SetLimitLabels("Slow", "Fast"); @@ -113,7 +113,7 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings) // Create the "Mouse Speed" slider... frame.Set(166,76,328,125); fMouseSpeedSlider = new BSlider(frame, "mouse_speed", "Mouse Speed", - new BMessage(SLIDER_MOUSE_SPEED), 0, 1000); + new BMessage(kMsgMouseSpeed), 0, 1000); fMouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fMouseSpeedSlider->SetHashMarkCount(7); fMouseSpeedSlider->SetLimitLabels("Slow", "Fast"); @@ -122,7 +122,7 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings) // Create the "Mouse Acceleration" slider... frame.Set(166, 141, 328, 190); fAccelerationSlider = new BSlider(frame, "mouse_acceleration", "Mouse Acceleration", - new BMessage(SLIDER_MOUSE_ACC), 0, 1000); + new BMessage(kMsgAccelerationFactor), 0, 1000); fAccelerationSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fAccelerationSlider->SetHashMarkCount(5); fAccelerationSlider->SetLimitLabels("Slow", "Fast");