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

FIRE-4689: Remove V1 menus proof of concept code - it's highly unlikely it will ever be fully implemented

Ansariel 2014-04-04 13:15:03 +02:00
parent e8ad36d575
commit def46d24c2
5 changed files with 0 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/app_settings/settings.xml
View File

@ -18891,18 +18891,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>3.0</real>
</map>
<key>FSUseV1Menus</key>
<map>
<key>Comment</key>
<string>Toggles the display of V1-like viewer menus</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>_NACL_MLFovValues</key>
<map>

1
indra/newview/llviewercontrol.cpp
View File

@ -934,7 +934,6 @@ void settings_setup_listeners()
gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged));
// <FS:CR> FIRE-9759 - Temporarily remove AvatarZOffset since it's broken
//gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here
gSavedSettings.getControl("FSUseV1Menus")->getSignal()->connect(boost::bind(&show_v1_menus)); // V1 menu system -WoLf
// <FS:Zi> Is done inside XUI now, using visibility_control
// gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2));
// </FS:Zi>

64
indra/newview/llviewermenu.cpp
View File

@ -6597,70 +6597,6 @@ void toggle_debug_menus(void*)
show_debug_menus();
}
void toggle_v1_menus(void*) // V1 menu system -WoLf
{
BOOL visible = ! gSavedSettings.getBOOL("FSUseV1Menus");
gSavedSettings.setBOOL("FSUseV1Menus", visible);
show_v1_menus();
}
// AO This may be called a few seconds after activations, to reset it back to V2-style
void menuTimerV1()
{
gSavedSettings.setBOOL("FSUseV1Menus", FALSE);
show_v1_menus();
}
void show_v1_menus() // V1 menu system -WoLf
{
BOOL V1 = gSavedSettings.getBOOL("FSUseV1Menus");
rlvCallbackTimerOnce(30, boost::bind(&menuTimerV1));
if ( gMenuBarView )
{
// The original menu system
gMenuBarView->setItemVisible("Me", !V1);
gMenuBarView->setItemEnabled("Me", !V1);
gMenuBarView->setItemVisible("Communicate", !V1);
gMenuBarView->setItemEnabled("Communicate", !V1);
gMenuBarView->setItemVisible("World", !V1);
gMenuBarView->setItemEnabled("World", !V1);
gMenuBarView->setItemVisible("BuildTools", !V1);
gMenuBarView->setItemEnabled("BuildTools", !V1);
gMenuBarView->setItemVisible("Content", !V1);
gMenuBarView->setItemEnabled("Content", !V1);
gMenuBarView->setItemVisible("Help", !V1);
gMenuBarView->setItemEnabled("Help", !V1);
gMenuBarView->setItemVisible("Advanced", !V1);
gMenuBarView->setItemEnabled("Advanced", !V1);
gMenuBarView->setItemVisible("Develop", !V1);
gMenuBarView->setItemEnabled("Develop", !V1);
// The V1 menu system
gMenuBarView->setItemVisible("V1-File", V1);
gMenuBarView->setItemEnabled("V1-File", V1);
gMenuBarView->setItemVisible("V1-Edit", V1);
gMenuBarView->setItemEnabled("V1-Edit", V1);
gMenuBarView->setItemVisible("V1-View", V1);
gMenuBarView->setItemEnabled("V1-View", V1);
gMenuBarView->setItemVisible("V1-World", V1);
gMenuBarView->setItemEnabled("V1-World", V1);
gMenuBarView->setItemVisible("V1-Tools", V1);
gMenuBarView->setItemEnabled("V1-Tools", V1);
gMenuBarView->setItemVisible("V1-Help", V1);
gMenuBarView->setItemEnabled("V1-Help", V1);
gMenuBarView->setItemVisible("V1-Firestorm", V1);
gMenuBarView->setItemEnabled("V1-Firestorm", V1);
gMenuBarView->setItemVisible("V1-Advanced", V1);
gMenuBarView->setItemEnabled("V1-Advanced", V1);
if (V1 == false)
{
show_debug_menus();
}
}
}
// LLUUID gExporterRequestID;
// std::string gExportDirectory;

3
indra/newview/llviewermenu.h
View File

@ -65,9 +65,6 @@ void handle_duplicate(void*);
void handle_duplicate_in_place(void*);
BOOL enable_not_have_card(void *userdata);
void process_grant_godlike_powers(LLMessageSystem* msg, void**);
void show_v1_menus(); // V1 menu system -WoLf
void toggle_v1_menus(void*); // V1 menu system -WoLf
void menuTimerV1();
BOOL enable_cut(void*);

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

@ -3020,22 +3020,6 @@
function="ToggleControl"
parameter="QAMode" />
</menu_item_check>
<!-- Proof of concept V1 menu toggle entry, Disabled for release
<menu_item_check
label="Use V1 Menus"
name="V1 Menus">
<menu_item_check.on_check
function="CheckControl"
parameter="FSUseV1Menus" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSUseV1Menus" />
</menu_item_check>
END: V1 menu toggle entry -WoLf -->
</menu>
<menu
@ -5094,82 +5078,4 @@
</menu>
</menu>
</menu>
<!-- BEGIN: V1 Menu System -WoLf -->
<!-- V1 menu: File -->
<menu
create_jump_keys="true"
label="File"
name="V1-File"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: Edit -->
<menu
create_jump_keys="true"
label="Edit"
name="V1-Edit"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: View -->
<menu
create_jump_keys="true"
label="View"
name="V1-View"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: World -->
<menu
create_jump_keys="true"
label="World"
name="V1-World"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: Tools -->
<menu
create_jump_keys="true"
label="Tools"
name="V1-Tools"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: Help -->
<menu
create_jump_keys="true"
label="Help"
name="V1-Help"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: Firestorm -->
<menu
create_jump_keys="true"
label="Firestorm"
name="V1-Firestorm"
tear_off="true"
visible="false">
</menu>
<!-- V1 menu: Advanced -->
<menu
create_jump_keys="true"
label="Advanced"
name="V1-Advanced"
tear_off="true"
visible="false">
<menu_item_check
label="Use V1 Menus"
name="V1 Menus">
<menu_item_check.on_check
function="CheckControl"
parameter="FSUseV1Menus" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSUseV1Menus" />
</menu_item_check>
</menu>
<!-- END: V1 Menu System -WoLf -->
</menu_bar>