FIRE-15218: Add refresh screenshot button to abuse report floater

Thu, 18 Dec 2014 09:51:11 +0100

author
Ansariel
date
Thu, 18 Dec 2014 09:51:11 +0100
changeset 43086
8376ca2b5fc6
parent 43085
e1540eb088d6
child 43087
6fdeb99b7cb3

FIRE-15218: Add refresh screenshot button to abuse report floater

indra/newview/llfloaterreporter.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/floater_report_abuse.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_report_abuse.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llfloaterreporter.cpp	Tue Dec 16 23:54:47 2014 +0100
     1.2 +++ b/indra/newview/llfloaterreporter.cpp	Thu Dec 18 09:51:11 2014 +0100
     1.3 @@ -178,6 +178,9 @@
     1.4  	std::string reporter = LLSLURL("agent", gAgent.getID(), "inspect").getSLURLString();
     1.5  	getChild<LLUICtrl>("reporter_field")->setValue(reporter);
     1.6  	
     1.7 +	// <FS:Ansariel> FIRE-15218: Refresh screenshot button
     1.8 +	getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::takeScreenshot, this));
     1.9 +
    1.10  	center();
    1.11  
    1.12  	return TRUE;
     2.1 --- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml	Tue Dec 16 23:54:47 2014 +0100
     2.2 +++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml	Thu Dec 18 09:51:11 2014 +0100
     2.3 @@ -3,6 +3,7 @@
     2.4  	<floater.string name="Screenshot">
     2.5  		Foto
     2.6  	</floater.string>
     2.7 +	<button name="refresh_screenshot" tool_tip="Foto aktualisieren"/>
     2.8  	<check_box bottom_delta="-20" label="Dieses Foto verwenden" name="screen_check"/>
     2.9  	<text name="reporter_title">
    2.10  		Melder:
     3.1 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml	Tue Dec 16 23:54:47 2014 +0100
     3.2 +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml	Thu Dec 18 09:51:11 2014 +0100
     3.3 @@ -21,13 +21,24 @@
     3.4       name="screenshot"
     3.5       top="15"
     3.6       width="220" />
     3.7 +     <button
     3.8 +     follows="top|left"
     3.9 +     halign="center"
    3.10 +     height="23"
    3.11 +     image_overlay="Refresh_Off"
    3.12 +     layout="topleft"
    3.13 +     tool_tip="Refresh Screenshot"
    3.14 +     name="refresh_screenshot"
    3.15 +     left_pad="5"
    3.16 +     top="121"
    3.17 +     width="25"/>
    3.18      <check_box
    3.19       height="15"
    3.20       label="Use this screenshot"
    3.21       layout="topleft"
    3.22       left="8"
    3.23       name="screen_check"
    3.24 -     top_pad="-12"
    3.25 +     top_pad="5"
    3.26       width="116" />
    3.27      <text
    3.28       type="string"

mercurial