Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLViewerWindow::handleKey(): Code cleanup, bit of harmless sync

Browse Source 
Moved Notifications Console into the advanced menu for login, so it's not shoved in as a hack, also a bit easier to access
This commit is contained in:
Inusaito Sayori
2013-10-22 08:16:12 -04:00
parent 9ec10cf246
commit 45cd0157ef
2 changed files with 11 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermenu.cpp
View File

@@ -748,6 +748,8 @@ void init_menus()
menu = new LLMenuGL(CLIENT_MENU_NAME); menu = new LLMenuGL(CLIENT_MENU_NAME);
menu->setCanTearOff(FALSE); menu->setCanTearOff(FALSE);
menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL)); menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL));
// Debugging view for unified notifications: CTRL-SHIFT-5
menu->addChild(new LLMenuItemCallGL("Notifications Console...", handle_show_notifications_console, NULL, NULL, '5', MASK_CONTROL|MASK_SHIFT));
gLoginMenuBarView->addChild(menu); gLoginMenuBarView->addChild(menu);
menu->updateParent(LLMenuGL::sMenuContainer); menu->updateParent(LLMenuGL::sMenuContainer);

64
indra/newview/llviewerwindow.cpp
View File

@@ -2693,12 +2693,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
} }
// HACK look for UI editing keys // HACK look for UI editing keys
if (LLView::sEditingUI) if (LLView::sEditingUI && LLFloaterEditUI::processKeystroke(key, mask))
{ {
if (LLFloaterEditUI::processKeystroke(key, mask)) return TRUE;
{
return TRUE;
}
} }
// Explicit hack for debug menu. // Explicit hack for debug menu.
@@ -2709,31 +2706,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
toggle_debug_menus(NULL); toggle_debug_menus(NULL);
} }
// Explicit hack for debug menu.
//Singu note: We do not use the ForceShowGrid setting. Grid selection should always be visible.
/*if ((mask == (MASK_SHIFT | MASK_CONTROL)) &&
('G' == key || 'g' == key))
{
if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP) //on splash page
{
BOOL visible = ! gSavedSettings.getBOOL("ForceShowGrid");
gSavedSettings.setBOOL("ForceShowGrid", visible);
// Initialize visibility (and don't force visibility - use prefs)
LLPanelLogin::updateLocationSelectorsVisibility();
}
}*/
// Debugging view for unified notifications: CTRL-SHIFT-5
// *FIXME: Having this special-cased right here (just so this can be invoked from the login screen) sucks.
if ((MASK_SHIFT & mask)
&& (!(MASK_ALT & mask))
&& (MASK_CONTROL & mask)
&& ('5' == key))
{
LLFloaterNotificationConsole::showInstance();
return TRUE;
}
// handle shift-escape key (reset camera view) // handle shift-escape key (reset camera view)
if (key == KEY_ESCAPE && mask == MASK_SHIFT) if (key == KEY_ESCAPE && mask == MASK_SHIFT)
@@ -2742,18 +2714,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
return TRUE; return TRUE;
} }
// handle escape key
//if (key == KEY_ESCAPE && mask == MASK_NONE)
//{
// *TODO: get this to play well with mouselook and hidden
// cursor modes, etc, and re-enable.
//if (gFocusMgr.getMouseCapture())
//{
// gFocusMgr.setMouseCapture(NULL);
// return TRUE;
//}
//}
// let menus handle navigation keys // let menus handle navigation keys
if (gMenuBarView && gMenuBarView->handleKey(key, mask, TRUE)) if (gMenuBarView && gMenuBarView->handleKey(key, mask, TRUE))
@@ -2778,10 +2739,13 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
if (gChatBar->getCurrentChat().empty() if (gChatBar->getCurrentChat().empty()
|| gSavedSettings.getBOOL("ArrowKeysMoveAvatar")) || gSavedSettings.getBOOL("ArrowKeysMoveAvatar"))
{ {
// Singu Note: We do this differently from LL to preserve the Ctrl-<Any ArrowKey> behavior in the chatbar /* Singu Note: We do this differently from LL to preserve the Ctrl-<Any ArrowKey> behavior in the chatbar, and we don't need alt because we're not CHUI
// let Control-Up and Control-Down through for chat line history, // let Control-Up and Control-Down through for chat line history,
//if (!(key == KEY_UP && mask == MASK_CONTROL) if (!(key == KEY_UP && mask == MASK_CONTROL)
// && !(key == KEY_DOWN && mask == MASK_CONTROL)) && !(key == KEY_DOWN && mask == MASK_CONTROL)
&& !(key == KEY_UP && mask == MASK_ALT)
&& !(key == KEY_DOWN && mask == MASK_ALT))
*/
{ {
switch(key) switch(key)
{ {
@@ -2803,6 +2767,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
} }
} }
} }
if (keyboard_focus->handleKey(key, mask, FALSE)) if (keyboard_focus->handleKey(key, mask, FALSE))
{ {
return TRUE; return TRUE;
@@ -2827,17 +2792,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
return TRUE; return TRUE;
} }
// Topmost view gets a chance before the hierarchy
// *FIX: get rid of this?
//LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
//if (top_ctrl)
//{
// if( top_ctrl->handleKey( key, mask, TRUE ) )
// {
// return TRUE;
// }
//}
// give floaters first chance to handle TAB key // give floaters first chance to handle TAB key
// so frontmost floater gets focus // so frontmost floater gets focus
if (key == KEY_TAB) if (key == KEY_TAB)