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

Added setting to turn on/off location info in the menu bar

meow-7.2.2
Kadah 2011-01-09 20:57:05 -08:00
parent 4286b90bf5
commit 5fd14f653b
5 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FIRESTORM-FEATURETABLE.txt
View File

@ -35,3 +35,4 @@ Persist_Minimized LGPL
FirestormGrey_skin LGPL
TopMenu_Navbar LGPL
Cmd_chatbar LGPL
Menubar_location LGPL

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

@ -12831,5 +12831,16 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>ShowMenuBarLocation</key>
<map>
<key>Comment</key>
<string>Show/Hide location info in the menu bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

11
indra/newview/llviewercontrol.cpp
View File

@ -71,6 +71,7 @@
#include "llpanellogin.h"
#include "llpaneltopinfobar.h"
#include "llcombobox.h"
#include "llstatusbar.h"
#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
BOOL gHackGodmode = FALSE;
@ -492,6 +493,15 @@ bool toggle_show_search_topbar(const LLSD& newvalue)
return true;
}
bool toggle_show_menubar_location_panel(const LLSD& newvalue)
{
bool value = newvalue.asBoolean();
gStatusBar->childSetVisible("parcel_info_panel",value);
return true;
}
bool toggle_show_object_render_cost(const LLSD& newvalue)
{
LLFloaterTools::sShowObjectCost = newvalue.asBoolean();
@ -646,6 +656,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2));
gSavedSettings.getControl("ShowMiniLocationPanel")->getSignal()->connect(boost::bind(&toggle_show_mini_location_panel, _2));
gSavedSettings.getControl("ShowSearchTopBar")->getSignal()->connect(boost::bind(&toggle_show_search_topbar, _2));
gSavedSettings.getControl("ShowMenuBarLocation")->getSignal()->connect(boost::bind(&toggle_show_menubar_location_panel, _2));
gSavedSettings.getControl("ShowObjectRenderingCost")->getSignal()->connect(boost::bind(&toggle_show_object_render_cost, _2));
gSavedSettings.getControl("ForceShowGrid")->getSignal()->connect(boost::bind(&handleForceShowGrid, _2));
}

11
indra/newview/skins/default/xui/en/menu_hide_navbar.xml
View File

@ -54,4 +54,15 @@
parameter="ShowMiniLocationPanel" />
</menu_item_check>
-->
<menu_item_check
label="Show Menu Bar Location"
layout="topleft"
name="ShowMenuBarLocation">
<on_click
function="ToggleControl"
parameter="ShowMenuBarLocation" />
<on_check
function="CheckControl"
parameter="ShowMenuBarLocation" />
</menu_item_check>
</menu>

13
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -22,6 +22,16 @@
left="0"
width="1000" / -->
<panel
height="18"
left="500"
width="95"
top="1"
follows="left|top"
name="parcel_info_panel"
bg_visible="true"
background_opaque="true"
bg_opaque_image="bevel_background">
<button
follows="left|top"
height="16"
@ -30,7 +40,7 @@
image_disabled_selected="Info_Off"
image_selected="Info_Off"
image_unselected="Info_Off"
left="500"
left="0"
name="place_info_btn"
top="2"
width="16"/>
@ -111,6 +121,7 @@
visible="false"
width="35"
/>
</panel>
<panel.string
name="packet_loss_tooltip">