livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made media lists floater localizable plus minor overhaul and German translation

Ansariel 2011-11-25 21:51:37 +01:00
parent 9b6c18a73b
commit 8b0b7c9e89
3 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/floatermedialists.cpp
View File

@ -107,7 +107,7 @@ void FloaterMediaLists::onWhitelistAdd( void* data )
self->getChildView("input_domain")->setVisible(true);
self->getChildView("commit_domain")->setVisible(true);
self->getChild<LLUICtrl>("add_text")->
setValue(std::string("Enter domain or URL to always allow:"));
setValue(self->getString("EnterUrlAllow"));
self->getChildView("add_text")->setVisible(true);
sIsWhitelist = true;
}
@ -152,7 +152,7 @@ void FloaterMediaLists::onBlacklistAdd( void* data )
self->getChildView("input_domain")->setVisible(true);
self->getChildView("commit_domain")->setVisible(true);
self->getChild<LLUICtrl>("add_text")->
setValue(std::string("Enter domain or URL to never allow:"));
setValue(self->getString("EnterUrlDeny"));
self->getChildView("add_text")->setVisible(true);
self->sIsWhitelist = false;
}

42
indra/newview/skins/default/xui/de/floater_media_lists.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floatermedialists" title="Medienlisten">
<floater.string name="EnterUrlAllow">
Domäne oder URL eingeben, die immer erlaubt wird:
</floater.string>
<floater.string name="EnterUrlDeny">
Domäne oder URL eingeben, die niemals erlaubt wird:
</floater.string>
<layout_stack name="lists_layout_stack">
<layout_panel name="whitelist_layout_panel">
<text name="whitelist_text">
Erlaubte Domänen:
</text>
<layout_stack name="whitelist_buttons_layout_stack">
<layout_panel name="whitelist_buttons_panel_add">
<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_whitelist"/>
</layout_panel>
<layout_panel name="whitelist_buttons_panel_remove">
<button label="Entfernen" label_selected="Entfernen" name="remove_whitelist"/>
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="blacklist_layout_panel">
<text name="blacklist_text">
Blockierte Domänen:
</text>
<layout_stack name="blacklist_buttons_layout_stack">
<layout_panel name="blacklist_buttons_panel_add">
<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_blacklist"/>
</layout_panel>
<layout_panel name="blacklist_buttons_panel_remove">
<button label="Entfernen" label_selected="Entfernen" name="remove_blacklist"/>
</layout_panel>
</layout_stack>
</layout_panel>
</layout_stack>
<!-- This text will be replaced accordingly to ast for a URL/Domain to add to white-/blacklist -->
<text initial_value="URL eingeben:" name="add_text"/>
<button label="Hinzufügen" label_selected="Hinzufügen" name="commit_domain"/>
</floater>

38
indra/newview/skins/default/xui/en/floater_media_lists.xml
View File

@ -9,14 +9,22 @@
name="floatermedialists"
title="Media Lists"
width="460"
min_height="300"
min_width="460"
rect_control="MediaListRect">
<floater.string name="EnterUrlAllow">
Enter domain or URL to always allow:
</floater.string>
<floater.string name="EnterUrlDeny">
Enter domain or URL to never allow:
</floater.string>
<layout_stack
name="lists_layout_stack"
left="10"
top="10"
right="-10"
height="230"
height="234"
follows="all"
orientation="horizontal"
layout="topleft">
@ -24,7 +32,7 @@
<layout_panel
name="whitelist_layout_panel"
width="220"
height="200"
height="204"
auto_resize="true"
follows="all"
layout="topleft">
@ -62,7 +70,7 @@
name="whitelist_buttons_layout_stack"
left="0"
top_pad="4"
height="16"
height="20"
follows="left|right|bottom"
orientation="horizontal"
layout="topleft">
@ -70,7 +78,7 @@
<layout_panel
name="whitelist_buttons_panel_add"
width="110"
height="16"
height="20"
user_resize="false"
auto_resize="true"
follows="all"
@ -79,7 +87,7 @@
<button
top="0"
left="0"
height="16"
height="20"
right="-2"
enabled="true"
follows="all"
@ -94,7 +102,7 @@
<layout_panel
name="whitelist_buttons_panel_remove"
width="110"
height="16"
height="20"
auto_resize="true"
follows="all"
layout="topleft">
@ -102,7 +110,7 @@
<button
top="0"
left="2"
height="16"
height="20"
right="-1"
enabled="true"
follows="all"
@ -121,7 +129,7 @@
<layout_panel
name="blacklist_layout_panel"
width="220"
height="200"
height="204"
auto_resize="true"
follows="all"
layout="topleft">
@ -159,7 +167,7 @@
name="blacklist_buttons_layout_stack"
left="5"
top_pad="4"
height="16"
height="20"
follows="left|right|bottom"
orientation="horizontal"
layout="topleft">
@ -167,7 +175,7 @@
<layout_panel
name="blacklist_buttons_panel_add"
width="110"
height="16"
height="20"
user_resize="false"
auto_resize="true"
follows="all"
@ -176,7 +184,7 @@
<button
top="0"
left="0"
height="16"
height="20"
right="-2"
enabled="true"
follows="all"
@ -191,7 +199,7 @@
<layout_panel
name="blacklist_buttons_panel_remove"
width="110"
height="16"
height="20"
auto_resize="true"
follows="all"
layout="topleft">
@ -199,7 +207,7 @@
<button
top="0"
left="2"
height="16"
height="20"
right="-1"
enabled="true"
follows="all"
@ -237,7 +245,7 @@
top_pad="4"
follows="left|bottom|right"
font="SansSerifSmall"
height="16"
height="20"
name="input_domain"
right="-94"
select_all_on_focus_received="true"
@ -249,7 +257,7 @@
follows="bottom|right"
font="SansSerifSmall"
halign="center"
height="16"
height="20"
left_pad="4"
label="Add"
label_selected="Add"