From 5609f78f456a2919aa6eba76955a2438689c0689 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@gmail.com>
Date: Thu, 3 Jun 2010 18:59:16 +0300
Subject: EXT-5808 FIXED Mini-Location panel was added below Navigation Bar

- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml   |  11 +++
 .../skins/default/xui/en/menu_hide_navbar.xml      |  19 +++-
 .../skins/default/xui/en/panel_topinfo_bar.xml     | 102 +++++++++++++++++++++
 3 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_topinfo_bar.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index b2e4a7ad95..79efb287cd 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -74,6 +74,17 @@
                    mouse_opaque="false"
                 name="hud container"
                    width="500">
+            <panel auto_resize="false"
+                   follows="left|top"
+                   height="19"
+                   left="0"
+                   mouse_opaque="false"
+                   name="topinfo_bar_container"
+                   tab_stop="false"
+                   top="0"
+                   user_resize="false"
+                   visible="false"
+                   width="1024"/>
               <panel follows="right|top|bottom"
                      height="500"
                      mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index a175b3103f..3f38d734b9 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -12,10 +12,10 @@
          label="Show Navigation Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
-           <menu_item_check.on_click
+           <on_click
              function="ToggleControl"
              parameter="ShowNavbarNavigationPanel" /> 
-             <menu_item_check.on_check
+             <on_check
              function="CheckControl"
              parameter="ShowNavbarNavigationPanel" />
     </menu_item_check>
@@ -23,11 +23,22 @@
          label="Show Favorites Bar"
          layout="topleft"
          name="ShowNavbarFavoritesPanel">
-           <menu_item_check.on_click
+           <on_click
              function="ToggleControl"
              parameter="ShowNavbarFavoritesPanel" /> 
-             <menu_item_check.on_check
+             <on_check
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
     </menu_item_check>
+    <menu_item_check
+         label="Show Mini-Location Bar"
+         layout="topleft"
+         name="ShowMiniLocationPanel">
+           <on_click
+             function="ToggleControl"
+             parameter="ShowMiniLocationPanel" />
+             <on_check
+             function="CheckControl"
+             parameter="ShowMiniLocationPanel" />
+    </menu_item_check>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
new file mode 100644
index 0000000000..d3fb77f135
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+ background_visible="true"
+ background_opaque="false"
+ bg_opaque_color="Black_50"
+ bg_alpha_color="Black_50"
+ follows="left|top|right"
+ height="19"
+ layout="topleft"
+ name="topinfo_bar"
+ width="1024">
+  <button
+    border="true"
+    follows="left|top"
+    height="16"
+    hover_glow_amount="0.15"
+    image_disabled="Info_Off"
+    image_disabled_selected="Info_Off"
+    image_selected="Info_Off"
+    image_unselected="Info_Off"
+    left="11"
+    name="place_info_btn"
+    top="1"
+    width="16"/>
+   <text
+     follows="left|top|right"
+     font="DejaVu"
+     height="16"
+     layout="topleft"
+     left_pad="11"
+     length="1"
+     name="parcel_info_text"
+     top="1"
+     type="string"
+     width="1"/>
+  <icon
+    enabled="true"
+    follows="right|top"
+    height="18"
+    image_name="Parcel_VoiceNo_Light"
+    name="voice_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_FlyNo_Light"
+    name="fly_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_PushNo_Light"
+    name="push_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_BuildNo_Light"
+    name="build_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_ScriptsNo_Light"
+    name="scripts_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="13"
+    image_name="Parcel_Health_Dark"
+    left="2"
+    name="damage_icon"
+    top="3"
+    visible="false"
+    width="14"
+    />
+  <text
+    follows="right|top"
+    font="SansSerifSmall"
+    halign="right"
+    height="18"
+    name="damage_text"
+    top="5"
+    visible="false"
+    width="35"
+    />
+</panel>
-- 
cgit v1.2.3