From 6e3f797995c3dc54abd92ed8bfb707cd7730c6c1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 25 Aug 2010 19:56:50 -0700
Subject: Cleaned up UI of the local texture properties window (todo: fix the
 texture_picker inside it being clickable)

---
 linden/indra/newview/floaterlocalassetbrowse.H     |   3 -
 linden/indra/newview/floaterlocalassetbrowse.cpp   |  63 ++-------
 .../xui/en-us/floater_local_asset_browse.xml       | 152 +++++++++------------
 .../default/xui/en-us/floater_texture_ctrl.xml     |   4 +-
 4 files changed, 77 insertions(+), 145 deletions(-)

diff --git a/linden/indra/newview/floaterlocalassetbrowse.H b/linden/indra/newview/floaterlocalassetbrowse.H
index 6ee1c75..4827daa 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.H
+++ b/linden/indra/newview/floaterlocalassetbrowse.H
@@ -244,8 +244,6 @@ private:
 	// Widgets
 	LLButton* mAddBtn;
 	LLButton* mDelBtn;
-	LLButton* mMoreBtn;
-	LLButton* mLessBtn;
 	LLButton* mUploadBtn;
 
 	LLScrollListCtrl* mBitmapList;
@@ -271,7 +269,6 @@ private:
     static FloaterLocalAssetBrowser* sLFInstance;
 
 	// non-widget functions
-	static void FloaterResize(bool expand);
 	static void UpdateRightSide(void);
 
 public:
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index bf1bcad..dba4e85 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -59,6 +59,7 @@ this feature is still a work in progress.
 /* misc headers */
 #include <time.h>
 #include <ctime>
+#include "hippoGridManager.h"
 #include "llviewerimagelist.h"
 #include "llviewerobjectlist.h"
 #include "llfilepicker.h"
@@ -748,8 +749,6 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
 	// setting element/xui children:
 	mAddBtn         = getChild<LLButton>("add_btn");
 	mDelBtn         = getChild<LLButton>("del_btn");
-	mMoreBtn        = getChild<LLButton>("more_btn");
-	mLessBtn        = getChild<LLButton>("less_btn");
 	mUploadBtn      = getChild<LLButton>("upload_btn");
 
 	mBitmapList     = getChild<LLScrollListCtrl>("bitmap_list");
@@ -781,8 +780,6 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
 	// setting button callbacks:
 	mAddBtn->setClickedCallback(         onClickAdd,         this);
 	mDelBtn->setClickedCallback(         onClickDel,         this);
-	mMoreBtn->setClickedCallback(        onClickMore,        this);
-	mLessBtn->setClickedCallback(        onClickLess,        this);
 	mUploadBtn->setClickedCallback(      onClickUpload,      this);
 	
 	// combo callback
@@ -794,13 +791,18 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
 	// checkbox callbacks
 	mUpdateChkBox->setCommitCallback(onClickUpdateChkbox);
 
+	mUpdateChkBox->set(true);
+	mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 }
 
 void FloaterLocalAssetBrowser::show(void*)
 {
     if (!sLFInstance)
-	sLFInstance = new FloaterLocalAssetBrowser();
+	{
+		sLFInstance = new FloaterLocalAssetBrowser();
+	}
     sLFInstance->open();
+	sLFInstance->center();
 	sLFInstance->UpdateBitmapScrollList();
 }
 
@@ -819,18 +821,6 @@ void FloaterLocalAssetBrowser::onClickDel(void* userdata)
 	gLocalBrowser->DelBitmap( sLFInstance->mBitmapList->getAllSelected() );
 }
 
-/* what stopped me from using a single button and simply changing it's label
-   is the fact that i'd need to hardcode the button labels here, and that is griff. */
-void FloaterLocalAssetBrowser::onClickMore(void* userdata)
-{
-	FloaterResize(true);
-}
-
-void FloaterLocalAssetBrowser::onClickLess(void* userdata)
-{
-	FloaterResize(false);
-}
-
 void FloaterLocalAssetBrowser::onClickUpload(void* userdata)
 {
 	std::string filename = gLocalBrowser->GetBitmapUnit( 
@@ -874,39 +864,6 @@ void FloaterLocalAssetBrowser::onCommitTypeCombo(LLUICtrl* ctrl, void *userdata)
 	}
 }
 
-void FloaterLocalAssetBrowser::FloaterResize(bool expand)
-{
-	sLFInstance->mMoreBtn->setVisible(!expand);
-	sLFInstance->mLessBtn->setVisible(expand);
-	sLFInstance->mTextureView->setVisible(expand);
-	sLFInstance->mUpdateChkBox->setVisible(expand);
-	sLFInstance->mCaptionPathTxt->setVisible(expand);
-	sLFInstance->mCaptionUUIDTxt->setVisible(expand);
-	sLFInstance->mCaptionLinkTxt->setVisible(expand);
-	sLFInstance->mCaptionNameTxt->setVisible(expand);
-	sLFInstance->mCaptionTimeTxt->setVisible(expand);
-	sLFInstance->mTypeComboBox->setVisible(expand);
-
-	sLFInstance->mTimeTxt->setVisible(expand);
-	sLFInstance->mPathTxt->setVisible(expand);
-	sLFInstance->mUUIDTxt->setVisible(expand);
-	sLFInstance->mLinkTxt->setVisible(expand);
-	sLFInstance->mNameTxt->setVisible(expand);
-
-	if(expand)
-	{ 
-		sLFInstance->reshape(LF_FLOATER_EXPAND_WIDTH, LF_FLOATER_HEIGHT); 
-		sLFInstance->setResizeLimits(LF_FLOATER_EXPAND_WIDTH, LF_FLOATER_HEIGHT);
-		sLFInstance->UpdateRightSide();
-	}
-	else
-	{ 
-		sLFInstance->reshape(LF_FLOATER_CONTRACT_WIDTH, LF_FLOATER_HEIGHT);
-		sLFInstance->setResizeLimits(LF_FLOATER_CONTRACT_WIDTH, LF_FLOATER_HEIGHT);
-	}
-
-}
-
 void FloaterLocalAssetBrowser::UpdateBitmapScrollList()
 {
 	if ( !sLFInstance ) { return; }
@@ -937,10 +894,7 @@ void FloaterLocalAssetBrowser::UpdateBitmapScrollList()
 void FloaterLocalAssetBrowser::UpdateRightSide()
 {
 	/*
-	Since i'm not keeping a bool on if the floater is expanded or not, i'll
-	just check if one of the widgets that shows when the floater is expanded is visible.
-
-	Also obviously before updating - checking if something IS actually selected :o
+	Before updating - checking if something IS actually selected :o
 	*/
 
 	if ( !sLFInstance->mTextureView->getVisible() ) { return; }
@@ -961,6 +915,7 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
 			sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
 
 			sLFInstance->mTextureView->setEnabled(true);
+			sLFInstance->mUpdateChkBox->set(true);
 			sLFInstance->mUpdateChkBox->setEnabled(true);
 			sLFInstance->mTypeComboBox->setEnabled(true);
 		}
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
index c63f989..f9bb3a7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -4,103 +4,83 @@
 
 <floater
 	name="local_bitmap_browser_floater"
-	title="Local Bitmap Browser"
-	can_resize="true"
+	title="Local Texture Properties"
+	can_resize="false"
 	can_minimize="true"
 	can_close="true"
 	can_drag_on_left="false"
 	width="415"
-	height="260"
+	height="460"
 	min_width="415"
-	min_height="260"
+	min_height="460"
   rect_control="FloaterLocalbitmapbrowserRect"
 	>
 
-  <!-- floater definition end, left side begin -->
-
   <button
-		name="add_btn"
-		label="Add"
-		left="12.5"
-		bottom="10"
-		width="90"
-		height="20"
+    name="add_btn"
+    label="Add"
+    left="12.5"
+    bottom="-45"
+    width="90"
+    height="20"
 		/>
   <button
 		name="del_btn"
 		label="Remove"
-		left_delta="100"
+		left_delta="95"
 	  bottom_delta="0"
 		width="90"
 		height="20"
 		/>
   <button
     name="upload_btn"
-    label="Upload"
-    left_delta="100"
+    label="Upload Image ([UPLOADFEE])..."
+    right="-5"
     bottom_delta="0"
-    width="90"
+    width="170"
     height="20"
+    follows="left|top"
 		/>
-  <button
-		name="more_btn"
-		label="More"
-		left_delta="100"
-	  bottom_delta="0"
-    width="90"
-		height="20"
-		/>
-  <button
-		name="less_btn"
-		label="Less"
-    left_delta="0"
-    bottom_delta="0"
-    width="90"
-    height="20"
-    visible="false"
-    />
   
   <scroll_list
     name="bitmap_list"
     left="10"
-    bottom_delta="30"
+    bottom_delta="-205"
     width="395"
     height="200"
     column_padding="0"
     can_resize="false"
     draw_heading="true"
-    multi_select="true"
+    multi_select="false"
     search_column="1"
     follows="bottom|top"
 		>
     <column name="bitmap_name" label="Name" dynamicwidth="true" />
     <column name="bitmap_uuid" label="UUID" width="240" />
   </scroll_list>
-
-  <!-- left side done, right side begin -->
-
-  <line_editor 
-    bevel_style="in" 
-    border_style="line" 
+  
+  <line_editor
+    bevel_style="in"
+    border_style="line"
     border_thickness="1"
     mouse_opaque="true"
-		follows="top" 
-    height="16" 
-    bottom_delta="16"
-    left_delta="405"
+    follows="left|top"
+    height="16"
+    bottom="16"
+    left="10"
     name="path_text"
-	  select_all_on_focus_received="true" 
-    width="305" 
-    visible="false"
+    select_all_on_focus_received="true"
+    width="305"
+    visible="true"
     />
-  
+
   <text name="path_caption_text"
     left_delta="0"
     bottom_delta="20"
-    follows="top"
+    follows="left|top"
     width="100"
     height="16"
-    visible="false"
+    visible="true"
  	  >
     Local path:
   </text>
@@ -110,23 +90,23 @@
     border_style="line"
     border_thickness="1"
     mouse_opaque="true"
-		follows="top"
+		follows="left|top"
     height="16"
     bottom_delta="20"
     left_delta="0"
     name="uuid_text"
 	  select_all_on_focus_received="true"
     width="305"
-    visible="false"
+    visible="true"
     />
 
   <text name="uuid_caption_text"
     left_delta="0"
-    follows="top" 
+    follows="left|top"
     bottom_delta="21"
     width="260"
     height="16"
-    visible="false"
+    visible="true"
  	  >
     Local UUID:
   </text>
@@ -143,13 +123,13 @@
     left_delta="0"
     mouse_opaque="true"
     name="texture_view"
-    visible="false"
+    visible="true"
     />
 
   <check_box
     bottom_delta="15"
     left_delta="100"
-    follows="top"
+    follows="left|top"
     height="16"
     initial_value="true"
     label="Keep updating"
@@ -157,55 +137,55 @@
     name="keep_updating_checkbox"
     tool_tip="Enable or disable periodic checks if the source bitmap on your hard drive has been updated"
     width="166"
-    visible="false"
+    visible="true"
     enabled="true"
     />
 
-  <combo_box 
-    visible="false"
-    allow_text_entry="false" 
-    bottom_delta="0" 
-    follows="top" 
-    height="18"       
-    left_delta="120" 
-    max_chars="20" 
-    mouse_opaque="true" 
+  <combo_box
+    visible="true"
+    allow_text_entry="false"
+    bottom_delta="0"
+    follows="left|top"
+    height="18"
+    left_delta="120"
+    max_chars="20"
+    mouse_opaque="true"
     name="type_combobox"
     width="83"
     >
-    
+
     <combo_item name="type_texture" value="type_texture">
       Texture
     </combo_item>
-    
+
     <combo_item name="type_sculptie" value="type_sculptie">
       Sculptmap
     </combo_item>
-    
+
     <combo_item name="type_layer" value="type_layer">
       Clothing
     </combo_item>
-  
+
   </combo_box>
-  
+
   <text name="time_caption_text"
     left_delta="-115"
     bottom_delta="25"
-    follows="top" 
+    follows="left|top"
     width="260"
     height="16"
-    visible="false"
+    visible="true"
  	  >
     Time:
   </text>
-  
+
   <text name="time_text"
     left_delta="50"
     bottom_delta="0"
-    follows="top"
+    follows="left|top"
     width="260"
     height="16"
-	  visible="false"
+	  visible="true"
     >
     (date here)
   </text>
@@ -213,21 +193,21 @@
   <text name="link_caption_text"
     left_delta="-50"
     bottom_delta="20"
-    follows="top"
+    follows="left|top"
     width="260"
     height="16"
-    visible="false"
+    visible="true"
 	  >
     Link:
   </text>
-  
+
   <text name="link_text"
     left_delta="50"
     bottom_delta="0"
-    follows="top"
+    follows="left|top"
     width="260"
     height="16"
-    visible="false"
+    visible="true"
     >
     (link status)
   </text>
@@ -235,10 +215,10 @@
   <text name="name_caption_text"
     left_delta="-50"
     bottom_delta="20"
-    follows="top"
+    follows="left|top"
     width="260"
     height="16"
-    visible="false"
+    visible="true"
   	>
     Name:
   </text>
@@ -248,14 +228,14 @@
     border_style="line"
     border_thickness="1"
     mouse_opaque="true"
-		follows="top"
+		follows="left|top"
     height="16"
     bottom_delta="0"
     left_delta="50"
     name="name_text"
 	  select_all_on_focus_received="true"
     width="150"
-    visible="false"
+    visible="true"
     />
 
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
index 247e0da..f42ed9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
@@ -63,7 +63,7 @@
 	         follows="left|top|right|bottom" height="245" left="0" mouse_opaque="true"
 	         name="inventory panel" sort_order="TexturePickerSortOrder" width="271" />
     </panel>
-    <panel border="false" bottom_delta="0" follows="left|top" height="300" label="My Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
+    <panel border="false" bottom_delta="0" follows="left|top" height="300" label="Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
   <!-- tag: vaa emerald local_asset_browser [begin] -->
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
            bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -81,7 +81,7 @@
               name="Remove" scale_image="true" width="70" visible="true" />
       <button bottom_delta="0" enabled="true" follows="left|top" 
               font="SansSerifSmall" halign="center" height="20" 
-              label="More Info" left_delta="103" mouse_opaque="true" 
+              label="Properties..." left_delta="103" mouse_opaque="true" 
               name="Browser" scale_image="true" width="90" visible="true" />
       <scroll_list
               name="local_name_list"
-- 
cgit v1.1