From e770782e990debc5e2997f3f23de68ee8eec6d94 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Tue, 4 Apr 2023 13:49:53 +0200
Subject: [PATCH] Image upload preview now tells you the final upload size and
 alpha status, also some minor XUI cleanup and alignment

---
 indra/newview/llfloaterimagepreview.cpp       | 16 +++-
 .../default/xui/en/floater_image_preview.xml  | 79 +++++++++++++------
 2 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index b3a86d562f..dc57b37973 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -183,9 +183,14 @@ BOOL LLFloaterImagePreview::postBuild()
 	// getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterNameDesc::onBtnOK, this));
 	getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterImagePreview::onBtnUpload, this));
 	
+	getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
+	getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
+
 	if (mRawImagep->getComponents() != 4)
 	{
-		return TRUE;
+		getChild<LLUICtrl>("image_alpha_warning")->setVisible(false);
+		getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString("no_alpha"));
+		return true;
 	}
 
 	U32 imageBytes = mRawImagep->getWidth() * mRawImagep->getHeight() * 4;
@@ -214,6 +219,8 @@ BOOL LLFloaterImagePreview::postBuild()
 		getChild<LLUICtrl>("image_alpha_warning")->setVisible(false);
 		mEmptyAlphaCheck->setValue(false);
 	}
+
+	getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString(mEmptyAlphaCheck->getValue() ? "no_alpha" : "with_alpha"));
 	// </FS:Zi>
 	return TRUE;
 }
@@ -221,7 +228,11 @@ BOOL LLFloaterImagePreview::postBuild()
 // <FS:Zi> detect and strip empty alpha layers from images on upload
 void LLFloaterImagePreview::emptyAlphaCheckboxCallback()
 {
-	if (!mEmptyAlphaCheck->getValue())
+	if (mEmptyAlphaCheck->getValue())
+	{
+		getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString("no_alpha"));
+	}
+	else
 	{
 		LLNotificationsUtil::add("ImageEmptyAlphaLayer", LLSD(), LLSD(), boost::bind(&LLFloaterImagePreview::imageEmptyAlphaCallback, this, _1, _2));
 	}
@@ -237,6 +248,7 @@ bool LLFloaterImagePreview::imageEmptyAlphaCallback(const LLSD& notification, co
 		mEmptyAlphaCheck->setValue(true);
 	}
 
+	getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString(option == 0 ? "no_alpha" : "with_alpha"));
 	return true;
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 35430d6403..b766602994 100644
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -7,6 +7,17 @@
  name="Image Preview"
  help_topic="image_preview"
  width="300">
+
+    <string
+     name="with_alpha"
+     value="with alpha"
+    />
+
+    <string
+     name="no_alpha"
+     value="no alpha"
+    />
+
     <text
      type="string"
      length="1"
@@ -60,7 +71,7 @@
      height="18"
      label="Clothing Type"
      layout="topleft"
-     left_delta="110"
+     right="-10"
      name="clothing_type_combo"
      top_delta="-2"
      width="160">
@@ -108,13 +119,13 @@
 
     <panel
      follows="left|right"
-     height="32"
+     height="24"
      layout="topleft"
      left="10"
      name="image_alpha_warning"
      right="-10"
      top_pad="4"
-     visible="false">
+     visible="true">
 
     <icon
      height="24"
@@ -140,20 +151,21 @@
     <panel
      background_opaque="true"
      background_visible="true"
-     bg_opaque_color="red"
+     bg_opaque_color="0 0 0 0.333"
      follows="top|left"
      height="239"
      layout="topleft"
-     left="9"
+     left="10"
      name="preview_area"
-     top_pad="11"
-     width="282"
+     right="-10"
+     top_pad="4"
     />
 
     <text
      type="string"
      length="1"
      bottom="250"
+     halign="center"
      height="45"
      word_wrap="true"
      follows="top|left"
@@ -164,6 +176,22 @@
 
 Try saving image as 24 bit Targa (.tga).
     </text>
+
+    <text
+     type="string"
+     length="1"
+     height="16"
+     word_wrap="true"
+     follows="top|left"
+     halign="center"
+     layout="topleft"
+     left="10"
+     name="uploaded_size_text"
+     right="-10"
+     top_pad="142">
+Uploaded Size: [X_RES]x[Y_RES], [ALPHA]
+    </text>
+
     <check_box
      enabled="false"
      initial_value="false"
@@ -171,50 +199,53 @@ Try saving image as 24 bit Targa (.tga).
      height="16"
      label="Use lossless compression"
      layout="topleft"
-     left_delta="2"
+     left_delta="-3"
      name="lossless_check"
-     top_pad="162"
+     top_pad="7"
      width="280" />
      <check_box
       control_name="TemporaryUpload"
-      visible="false"
+      visible="true"
       follows="bottom|left"
       height="16"
       initial_value="false"
-      left_delta="155"
+      left_delta="168"
       name="temp_check"
       width="280"
       label="Temporary (Free)"
        tool_tip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
-    <button
-     follows="bottom|right"
-     height="20"
-     label="Cancel"
-     layout="topleft"
-     left="165"
-     name="cancel_btn"
-     top="430"
-     width="125" />
     <button
      follows="bottom|left"
      height="20"
      label="Upload (L$[AMOUNT])"
      layout="topleft"
-     left_delta="-150"
+     left="10"
      name="ok_btn"
+     top_pad="4"
+     width="130" />
+    <button
+     follows="bottom|right"
+     height="20"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     right="-10"
      top_delta="0"
-     width="125" />
+     width="130" />
     <text
      type="string"
      length="1"
      follows="left|top"
+     halign="center"
      height="35"
      layout="topleft"
      left="10"
      mouse_opaque="false"
+     right="-10"
      skip_link_underline="true"
      name="info_text"
      word_wrap="true"
-     top_pad="10"
-     width="270"/>
+     top_pad="5"
+     value="= upload fee information text goes here ="
+    />
 </floater>