DD-19 : Cleaned up Marketplace Audit UI, make the floater non modal

meow-7.2.2
Merov Linden 2014-04-23 18:00:34 -07:00
parent d22944da00
commit 59f512b375
3 changed files with 51 additions and 43 deletions

View File

@ -581,8 +581,8 @@ void LLFloaterAssociateListing::cancel()
// LLFloaterMarketplaceValidation
//-----------------------------------------------------------------------------
LLFloaterMarketplaceValidation::LLFloaterMarketplaceValidation(const LLSD& data)
: LLModalDialog( data["message"].asString() ),
LLFloaterMarketplaceValidation::LLFloaterMarketplaceValidation(const LLSD& key)
: LLFloater(key),
mEditor(NULL)
{
}
@ -614,7 +614,7 @@ LLFloaterMarketplaceValidation::~LLFloaterMarketplaceValidation()
void LLFloaterMarketplaceValidation::draw()
{
// draw children
LLModalDialog::draw();
LLFloater::draw();
}
// static

View File

@ -154,14 +154,13 @@ private:
// get the validation triggered on the server and display the html report.
// *TODO : morph into an html/text window using the pattern in llfloatertos
class LLFloaterMarketplaceValidation : public LLModalDialog
class LLFloaterMarketplaceValidation : public LLFloater
{
public:
LLFloaterMarketplaceValidation(const LLSD& data);
LLFloaterMarketplaceValidation(const LLSD& key);
virtual ~LLFloaterMarketplaceValidation();
BOOL postBuild();
virtual BOOL postBuild();
virtual void draw();
void appendMessage(std::string& message);

View File

@ -1,49 +1,58 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
can_close="false"
can_minimize="false"
height="500"
layout="topleft"
title="MARKETPLACE VALIDATION LOG"
positioning="centered"
width="600">
title="MARKETPLACE VALIDATION LOG"
name="floater_marketplace_validation"
help_topic="floater_marketplace_validation"
layout="topleft"
positioning="cascading"
legacy_header_height="18"
width="600"
height="500"
min_width="400"
min_height="200"
can_close="true"
can_resize="true"
can_minimize="true"
save_rect="true"
reuse_instance="true"
save_visibility="false">
<button
height="20"
label="OK"
label_selected="OK"
layout="topleft"
left="484"
name="OK"
top="465"
width="100" />
name="OK"
label="OK"
label_selected="OK"
layout="topleft"
follows="right|bottom"
top="465"
width="100"
height="20"
left="484"/>
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left="20"
name="tos_heading"
top="20"
width="552">
type="string"
font="SansSerif"
length="1"
layout="topleft"
follows="left|top"
width="552"
height="20"
left="20"
top="20">
The Marketplace Validation reported the following:
</text>
<text_editor
type="string"
length="1"
bg_readonly_color="1 1 1 1"
bottom="455"
follows="left|top"
font="SansSerif"
layout="topleft"
left="20"
max_length="65536"
name="validation_text"
right="-20"
text_readonly_color="0 0 0 1"
type="string"
font="SansSerif"
length="1"
max_length="65536"
layout="topleft"
follows="all"
bg_readonly_color="TextBgReadOnlyColor"
text_readonly_color="TextFgReadOnlyColor"
top="45"
bottom="455"
left="20"
right="-20"
word_wrap="true">
MARKETPLACE_VALIDATION_TEXT
</text_editor>