* more style cleanup
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24116 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
49499c1707
commit
877c1bc7fb
|
@ -31,20 +31,20 @@
|
||||||
#include "KeymapListItem.h"
|
#include "KeymapListItem.h"
|
||||||
#include "KeymapApplication.h"
|
#include "KeymapApplication.h"
|
||||||
|
|
||||||
#define MENU_FILE_OPEN 'mMFO'
|
static const uint32 kMsgMenuFileOpen = 'mMFO';
|
||||||
#define MENU_FILE_SAVE 'mMFS'
|
static const uint32 kMsgMenuFileSave = 'mMFS';
|
||||||
#define MENU_FILE_SAVE_AS 'mMFA'
|
static const uint32 kMsgMenuFileSaveAs = 'mMFA';
|
||||||
#define MENU_EDIT_UNDO 'mMEU'
|
static const uint32 kMsgMenuEditUndo = 'mMEU';
|
||||||
#define MENU_EDIT_CUT 'mMEX'
|
static const uint32 kMsgMenuEditCut = 'mMEX';
|
||||||
#define MENU_EDIT_COPY 'mMEC'
|
static const uint32 kMsgMenuEditCopy = 'mMEC';
|
||||||
#define MENU_EDIT_PASTE 'mMEV'
|
static const uint32 kMsgMenuEditPaste = 'mMEV';
|
||||||
#define MENU_EDIT_CLEAR 'mMEL'
|
static const uint32 kMsgMenuEditClear = 'mMEL';
|
||||||
#define MENU_EDIT_SELECT_ALL 'mMEA'
|
static const uint32 kMsgMenuEditSelectAll = 'mMEA';
|
||||||
#define MENU_FONT_CHANGED 'mMFC'
|
static const uint32 kMsgMenuFontChanged = 'mMFC';
|
||||||
#define SYSTEM_MAP_SELECTED 'SmST'
|
static const uint32 kMsgSystemMapSelected = 'SmST';
|
||||||
#define USER_MAP_SELECTED 'UmST'
|
static const uint32 kMsgUserMapSelected = 'UmST';
|
||||||
#define USE_KEYMAP 'UkyM'
|
static const uint32 kMsgUseKeymap = 'UkyM';
|
||||||
#define REVERT 'Rvrt'
|
static const uint32 kMsgRevertKeymap = 'Rvrt';
|
||||||
|
|
||||||
KeymapWindow::KeymapWindow()
|
KeymapWindow::KeymapWindow()
|
||||||
: BWindow(BRect(80, 25, 692, 281), "Keymap", B_TITLED_WINDOW,
|
: BWindow(BRect(80, 25, 692, 281), "Keymap", B_TITLED_WINDOW,
|
||||||
|
@ -75,12 +75,12 @@ KeymapWindow::KeymapWindow()
|
||||||
|
|
||||||
// The 'Use' button
|
// The 'Use' button
|
||||||
fUseButton = new BButton(BRect(527, 200, 600, 220), "useButton", "Use",
|
fUseButton = new BButton(BRect(527, 200, 600, 220), "useButton", "Use",
|
||||||
new BMessage(USE_KEYMAP));
|
new BMessage(kMsgUseKeymap));
|
||||||
placeholderView->AddChild(fUseButton);
|
placeholderView->AddChild(fUseButton);
|
||||||
|
|
||||||
// The 'Revert' button
|
// The 'Revert' button
|
||||||
fRevertButton = new BButton(BRect(442, 200, 515, 220), "revertButton",
|
fRevertButton = new BButton(BRect(442, 200, 515, 220), "revertButton",
|
||||||
"Revert", new BMessage(REVERT));
|
"Revert", new BMessage(kMsgRevertKeymap));
|
||||||
placeholderView->AddChild(fRevertButton);
|
placeholderView->AddChild(fRevertButton);
|
||||||
|
|
||||||
BPath path;
|
BPath path;
|
||||||
|
@ -124,14 +124,14 @@ KeymapWindow::AddMenuBar()
|
||||||
// Create the File menu
|
// Create the File menu
|
||||||
menu = new BMenu("File");
|
menu = new BMenu("File");
|
||||||
menu->AddItem(new BMenuItem("Open" B_UTF8_ELLIPSIS,
|
menu->AddItem(new BMenuItem("Open" B_UTF8_ELLIPSIS,
|
||||||
new BMessage(MENU_FILE_OPEN), 'O'));
|
new BMessage(kMsgMenuFileOpen), 'O'));
|
||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
currentItem = new BMenuItem("Save",
|
currentItem = new BMenuItem("Save",
|
||||||
new BMessage(MENU_FILE_SAVE), 'S');
|
new BMessage(kMsgMenuFileSave), 'S');
|
||||||
currentItem->SetEnabled(false);
|
currentItem->SetEnabled(false);
|
||||||
menu->AddItem(currentItem);
|
menu->AddItem(currentItem);
|
||||||
menu->AddItem(new BMenuItem("Save As" B_UTF8_ELLIPSIS,
|
menu->AddItem(new BMenuItem("Save As" B_UTF8_ELLIPSIS,
|
||||||
new BMessage(MENU_FILE_SAVE_AS)));
|
new BMessage(kMsgMenuFileSaveAs)));
|
||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
menu->AddItem(new BMenuItem("Quit",
|
menu->AddItem(new BMenuItem("Quit",
|
||||||
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
||||||
|
@ -140,21 +140,21 @@ KeymapWindow::AddMenuBar()
|
||||||
// Create the Edit menu
|
// Create the Edit menu
|
||||||
menu = new BMenu("Edit");
|
menu = new BMenu("Edit");
|
||||||
currentItem = new BMenuItem("Undo",
|
currentItem = new BMenuItem("Undo",
|
||||||
new BMessage(MENU_EDIT_UNDO), 'Z');
|
new BMessage(kMsgMenuEditUndo), 'Z');
|
||||||
currentItem->SetEnabled(false);
|
currentItem->SetEnabled(false);
|
||||||
menu->AddItem(currentItem);
|
menu->AddItem(currentItem);
|
||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
menu->AddItem(new BMenuItem( "Cut",
|
menu->AddItem(new BMenuItem( "Cut",
|
||||||
new BMessage(MENU_EDIT_CUT), 'X'));
|
new BMessage(kMsgMenuEditCut), 'X'));
|
||||||
menu->AddItem(new BMenuItem( "Copy",
|
menu->AddItem(new BMenuItem( "Copy",
|
||||||
new BMessage(MENU_EDIT_COPY), 'C'));
|
new BMessage(kMsgMenuEditCopy), 'C'));
|
||||||
menu->AddItem(new BMenuItem( "Paste",
|
menu->AddItem(new BMenuItem( "Paste",
|
||||||
new BMessage(MENU_EDIT_PASTE), 'V'));
|
new BMessage(kMsgMenuEditPaste), 'V'));
|
||||||
menu->AddItem(new BMenuItem( "Clear",
|
menu->AddItem(new BMenuItem( "Clear",
|
||||||
new BMessage(MENU_EDIT_CLEAR)));
|
new BMessage(kMsgMenuEditClear)));
|
||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
menu->AddItem(new BMenuItem( "Select All",
|
menu->AddItem(new BMenuItem( "Select All",
|
||||||
new BMessage(MENU_EDIT_SELECT_ALL), 'A'));
|
new BMessage(kMsgMenuEditSelectAll), 'A'));
|
||||||
menubar->AddItem(menu);
|
menubar->AddItem(menu);
|
||||||
|
|
||||||
// Create the Font menu
|
// Create the Font menu
|
||||||
|
@ -170,7 +170,7 @@ KeymapWindow::AddMenuBar()
|
||||||
for (int32 i = 0; i < numFamilies; i++ )
|
for (int32 i = 0; i < numFamilies; i++ )
|
||||||
if (get_font_family(i, &family, &flags) == B_OK) {
|
if (get_font_family(i, &family, &flags) == B_OK) {
|
||||||
BMenuItem *item =
|
BMenuItem *item =
|
||||||
new BMenuItem(family, new BMessage(MENU_FONT_CHANGED));
|
new BMenuItem(family, new BMessage(kMsgMenuFontChanged));
|
||||||
fFontMenu->AddItem(item);
|
fFontMenu->AddItem(item);
|
||||||
if (strcmp(family, current_family) == 0)
|
if (strcmp(family, current_family) == 0)
|
||||||
item->SetMarked(true);
|
item->SetMarked(true);
|
||||||
|
@ -199,7 +199,7 @@ KeymapWindow::AddMaps(BView *placeholderView)
|
||||||
|
|
||||||
mapsBox->AddChild(new BScrollView("systemScrollList", fSystemListView,
|
mapsBox->AddChild(new BScrollView("systemScrollList", fSystemListView,
|
||||||
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true));
|
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true));
|
||||||
fSystemListView->SetSelectionMessage(new BMessage(SYSTEM_MAP_SELECTED));
|
fSystemListView->SetSelectionMessage(new BMessage(kMsgSystemMapSelected));
|
||||||
|
|
||||||
// The User list
|
// The User list
|
||||||
BStringView *userLabel = new BStringView(BRect(13, 110, 113, 128), "user", "User");
|
BStringView *userLabel = new BStringView(BRect(13, 110, 113, 128), "user", "User");
|
||||||
|
@ -214,7 +214,7 @@ KeymapWindow::AddMaps(BView *placeholderView)
|
||||||
// Saved keymaps
|
// Saved keymaps
|
||||||
mapsBox->AddChild(new BScrollView("userScrollList", fUserListView,
|
mapsBox->AddChild(new BScrollView("userScrollList", fUserListView,
|
||||||
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true));
|
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true));
|
||||||
fUserListView->SetSelectionMessage(new BMessage(USER_MAP_SELECTED));
|
fUserListView->SetSelectionMessage(new BMessage(kMsgUserMapSelected));
|
||||||
|
|
||||||
FillSystemMaps();
|
FillSystemMaps();
|
||||||
|
|
||||||
|
@ -265,23 +265,23 @@ KeymapWindow::MessageReceived(BMessage* message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MENU_FILE_OPEN:
|
case kMsgMenuFileOpen:
|
||||||
fOpenPanel->Show();
|
fOpenPanel->Show();
|
||||||
break;
|
break;
|
||||||
case MENU_FILE_SAVE:
|
case kMsgMenuFileSave:
|
||||||
break;
|
break;
|
||||||
case MENU_FILE_SAVE_AS:
|
case kMsgMenuFileSaveAs:
|
||||||
fSavePanel->Show();
|
fSavePanel->Show();
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_UNDO:
|
case kMsgMenuEditUndo:
|
||||||
case MENU_EDIT_CUT:
|
case kMsgMenuEditCut:
|
||||||
case MENU_EDIT_COPY:
|
case kMsgMenuEditCopy:
|
||||||
case MENU_EDIT_PASTE:
|
case kMsgMenuEditPaste:
|
||||||
case MENU_EDIT_CLEAR:
|
case kMsgMenuEditClear:
|
||||||
case MENU_EDIT_SELECT_ALL:
|
case kMsgMenuEditSelectAll:
|
||||||
fMapView->MessageReceived(message);
|
fMapView->MessageReceived(message);
|
||||||
break;
|
break;
|
||||||
case MENU_FONT_CHANGED:
|
case kMsgMenuFontChanged:
|
||||||
{
|
{
|
||||||
BMenuItem *item = fFontMenu->FindMarked();
|
BMenuItem *item = fFontMenu->FindMarked();
|
||||||
if (item) {
|
if (item) {
|
||||||
|
@ -290,7 +290,7 @@ KeymapWindow::MessageReceived(BMessage* message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SYSTEM_MAP_SELECTED:
|
case kMsgSystemMapSelected:
|
||||||
{
|
{
|
||||||
KeymapListItem *keymapListItem =
|
KeymapListItem *keymapListItem =
|
||||||
static_cast<KeymapListItem*>(fSystemListView->ItemAt(fSystemListView->CurrentSelection()));
|
static_cast<KeymapListItem*>(fSystemListView->ItemAt(fSystemListView->CurrentSelection()));
|
||||||
|
@ -303,7 +303,7 @@ KeymapWindow::MessageReceived(BMessage* message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case USER_MAP_SELECTED:
|
case kMsgUserMapSelected:
|
||||||
{
|
{
|
||||||
KeymapListItem *keymapListItem =
|
KeymapListItem *keymapListItem =
|
||||||
static_cast<KeymapListItem*>(fUserListView->ItemAt(fUserListView->CurrentSelection()));
|
static_cast<KeymapListItem*>(fUserListView->ItemAt(fUserListView->CurrentSelection()));
|
||||||
|
@ -316,10 +316,10 @@ KeymapWindow::MessageReceived(BMessage* message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case USE_KEYMAP:
|
case kMsgUseKeymap:
|
||||||
UseKeymap();
|
UseKeymap();
|
||||||
break;
|
break;
|
||||||
case REVERT: // do nothing, just like the original
|
case kMsgRevertKeymap: // do nothing, just like the original
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
BWindow::MessageReceived(message);
|
BWindow::MessageReceived(message);
|
||||||
|
@ -1410,22 +1410,22 @@ void
|
||||||
MapView::MessageReceived(BMessage *msg)
|
MapView::MessageReceived(BMessage *msg)
|
||||||
{
|
{
|
||||||
switch (msg->what) {
|
switch (msg->what) {
|
||||||
case MENU_EDIT_UNDO:
|
case kMsgMenuEditUndo:
|
||||||
fTextView->Undo(be_clipboard);
|
fTextView->Undo(be_clipboard);
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_CUT:
|
case kMsgMenuEditCut:
|
||||||
fTextView->Cut(be_clipboard);
|
fTextView->Cut(be_clipboard);
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_COPY:
|
case kMsgMenuEditCopy:
|
||||||
fTextView->Copy(be_clipboard);
|
fTextView->Copy(be_clipboard);
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_PASTE:
|
case kMsgMenuEditPaste:
|
||||||
fTextView->Paste(be_clipboard);
|
fTextView->Paste(be_clipboard);
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_CLEAR:
|
case kMsgMenuEditClear:
|
||||||
fTextView->Clear();
|
fTextView->Clear();
|
||||||
break;
|
break;
|
||||||
case MENU_EDIT_SELECT_ALL:
|
case kMsgMenuEditSelectAll:
|
||||||
fTextView->SelectAll();
|
fTextView->SelectAll();
|
||||||
break;
|
break;
|
||||||
case B_KEY_DOWN:
|
case B_KEY_DOWN:
|
||||||
|
|
Loading…
Reference in New Issue