livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-260 - I18N: the term 'Geek' is hard to translate 

EXT-404 - Make Debug and Develop menus based on QAMode
Test:
* Advanced menu should be toggled based on ctrl-alt-D (as before)
* 'Advanced > Debug (QA) Mode' (ctrl-alt-Q) should now toggle the Advanced and Debug menus
* God Mode (ctrl-alt-G to enable, ctrl-shift-G to disable) should toggle the 'Admin' menu, but *only* when the 'Advanced' menu is visible
meow-7.2.2
Steven Bennetts 2009-08-11 01:34:57 +00:00
parent ad04dcc19d
commit 7caae9f3e7
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewercontrol.cpp
View File

@ -49,6 +49,7 @@
#include "llsky.h"
#include "llvieweraudio.h"
#include "llviewermenu.h"
#include "llviewertexturelist.h"
#include "llviewerthrottle.h"
#include "llviewerwindow.h"
@ -599,6 +600,8 @@ void settings_setup_listeners()
gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
gSavedSettings.getControl("QAMode")->getSignal()->connect(boost::bind(&show_debug_menus));
gSavedSettings.getControl("UseDebugMenus")->getSignal()->connect(boost::bind(&show_debug_menus));
}
#if TEST_CACHED_CONTROL

9
indra/newview/llviewermenu.cpp
View File

@ -5110,15 +5110,16 @@ void show_debug_menus()
if ( gMenuBarView )
{
BOOL debug = gSavedSettings.getBOOL("UseDebugMenus");
BOOL qamode = gSavedSettings.getBOOL("QAMode");
gMenuBarView->setItemVisible("Advanced", debug);
// gMenuBarView->setItemEnabled("Advanced", debug); // Don't disable Advanced keyboard shortcuts when hidden
gMenuBarView->setItemVisible("Debug", debug);
gMenuBarView->setItemEnabled("Debug", debug);
gMenuBarView->setItemVisible("Debug", qamode);
gMenuBarView->setItemEnabled("Debug", qamode);
gMenuBarView->setItemVisible("Develop", debug);
gMenuBarView->setItemEnabled("Develop", debug);
gMenuBarView->setItemVisible("Develop", qamode);
gMenuBarView->setItemEnabled("Develop", qamode);
// Server ('Admin') menu hidden when not in godmode.
const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT);

1
indra/newview/llviewermenu.h
View File

@ -49,6 +49,7 @@ void init_menus();
void cleanup_menus();
void show_debug_menus(); // checks for if menus should be shown first.
void toggle_debug_menus(void*);
void show_context_menu( S32 x, S32 y, MASK mask );
void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
BOOL enable_save_into_inventory(void*);

3
indra/newview/llviewerwindow.cpp
View File

@ -41,6 +41,7 @@
#include "llfloaterreg.h"
#include "llpanellogin.h"
#include "llviewerkeyboard.h"
#include "llviewermenu.h"
#include "llviewerwindow.h"
#include "llviewquery.h"
@ -251,8 +252,6 @@ std::string LLViewerWindow::sSnapshotDir;
std::string LLViewerWindow::sMovieBaseName;
extern void toggle_debug_menus(void*);
class RecordToChatConsole : public LLError::Recorder, public LLSingleton<RecordToChatConsole>
{
public:

14
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -930,7 +930,7 @@
</menu>
</menu>
<menu
label="Geek"
label="Advanced"
layout="topleft"
name="Advanced"
tear_off="true"
@ -1824,6 +1824,18 @@
function="Advanced.ShowDebugSettings"
parameter="all" />
</menu_item_call>
<menu_item_check
label="Debug (QA) Mode"
layout="topleft"
name="Debug Mode"
shortcut="control|alt|Q">
<menu_item_check.on_check
function="CheckControl"
parameter="QAMode" />
<menu_item_check.on_click
function="ToggleControl"
parameter="QAMode" />
</menu_item_check>
</menu>
<menu
create_jump_keys="true"