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

FIRE-7004: Made sound explorer fully localizable

Ansariel 2012-08-26 15:05:48 +02:00
parent 989b23200e
commit fe2cfb96ff
3 changed files with 89 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/NACLfloaterexploresounds.cpp
View File

@ -188,16 +188,22 @@ BOOL NACLFloaterExploreSounds::tick()
LLSD& playing_column = element["columns"][0];
playing_column["column"] = "playing";
if(item.mPlaying)
playing_column["value"] = " Playing";
{
playing_column["value"] = getString("Playing");
}
else
playing_column["value"] = llformat("%.1f min ago", (LLTimer::getElapsedSeconds() - item.mTimeStopped) / 60.f);
{
LLStringUtil::format_map_t format_args;
format_args["TIME"] = llformat("%.1f", (LLTimer::getElapsedSeconds() - item.mTimeStopped) / 60.f);
playing_column["value"] = getString("NotPlaying", format_args);
}
LLSD& type_column = element["columns"][1];
type_column["column"] = "type";
if(item.mType == LLAudioEngine::AUDIO_TYPE_UI)
{
// this shouldn't happen for now, as UI is forbidden in the log
type_column["value"] = "UI";
type_column["value"] = getString("Type_UI");
}
else
{
@ -205,20 +211,24 @@ BOOL NACLFloaterExploreSounds::tick()
if(is_avatar)
{
type = "Avatar";
type = getString("Type_Avatar");
}
else
{
if(item.mIsTrigger)
{
type = "llTriggerSound";
type = getString("Type_llTriggerSound");
}
else
{
if(item.mIsLooped)
type = "llLoopSound";
{
type = getString("Type_llLoopSound");
}
else
type = "llPlaySound";
{
type = getString("Type_llPlaySound");
}
}
}
@ -231,11 +241,18 @@ BOOL NACLFloaterExploreSounds::tick()
BOOL is_group;
if(gCacheName->getIfThere(item.mOwnerID, fullname, is_group))
{
if(is_group) fullname += " (Group)";
if (is_group)
{
LLStringUtil::format_map_t format_args;
format_args["NAME"] = fullname;
fullname = getString("GroupOwned", format_args);
}
owner_column["value"] = fullname;
}
else
{
owner_column["value"] = item.mOwnerID.asString();
}
LLSD& sound_column = element["columns"][3];
sound_column["column"] = "sound";

26
indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml
View File

@ -1,12 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="sound_explorer" title="SOUND-EXPLORER">
<floater.string name="Playing">
Wird abgespielt
</floater.string>
<floater.string name="NotPlaying">
vor [TIME] Min.
</floater.string>
<floater.string name="Type_UI">
UI
</floater.string>
<floater.string name="Type_Avatar">
Avatar
</floater.string>
<floater.string name="Type_llTriggerSound">
llTriggerSound
</floater.string>
<floater.string name="Type_llLoopSound">
llLoopSound
</floater.string>
<floater.string name="Type_llPlaySound">
llPlaySound
</floater.string>
<floater.string name="GroupOwned">
[NAME] (Gruppe)
</floater.string>
<check_box name="avatars_chk" label="Avatare"/>
<check_box name="objects_chk" label="Objekte"/>
<check_box name="collision_chk" label="Standard-Kollisionssounds"/>
<check_box name="repeated_asset_chk" label="Wiederholte Assets" left_delta="165" width="120"/>
<check_box name="pause_chk" label="Log Pausieren" left_delta="125"/>
<scroll_list name="sound_list">
<columns label="Abspielend" name="playing"/>
<columns label="Abspielend" name="playing" width="95"/>
<columns label="Typ" name="type"/>
<columns label="Eigentümer" name="owner"/>
<columns label="Sounds" name="sound"/>

54
indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml
View File

@ -3,20 +3,44 @@
save_visibility="true"
single_instance="true"
help_topic="fs_sound_explorer">
<check_box follows="top|left" bottom_delta="20" left="5" width="64" name="avatars_chk" label="Avatars" control_name="FloaterSoundsLogAvatars" />
<check_box follows="top|left" bottom_delta="0" left_delta="64" width="64" name="objects_chk" label="Objects" initial_value="true" control_name="FloaterSoundsLogObjects" />
<check_box follows="top|left" bottom_delta="0" left_delta="64" width="160" name="collision_chk" label="Default Collision Sounds" control_name="FloaterSoundsLogCollisions" />
<check_box follows="top|left" bottom_delta="0" left_delta="160" width="110" name="repeated_asset_chk" label="Repeated Asset" control_name="FloaterSoundsLogRepeats" />
<check_box follows="top|left" bottom_delta="0" left_delta="110" width="80" name="pause_chk" label="Pause Log" initial_value="false"/>
<scroll_list can_resize="true" column_padding="0" draw_heading="true" follows="all" left="10" multi_select="true" name="sound_list" search_column="0" top="40" right="-10" bottom="-60">
<columns dynamicwidth="false" width="80" label="Playing" name="playing" />
<columns dynamicwidth="false" width="100" label="Type" name="type" />
<columns dynamicwidth="true" label="Owner" name="owner" />
<columns dynamicwidth="false" width="0" label="Sound" name="sound" />
</scroll_list>
<button bottom_delta="25" follows="left|bottom" height="20" label="Play Locally" name="play_locally_btn" left="10" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Look At" name="look_at_btn" left_delta="100" width="95"/>
<floater.string name="Playing">
Playing
</floater.string>
<floater.string name="NotPlaying">
[TIME] min ago
</floater.string>
<floater.string name="Type_UI">
UI
</floater.string>
<floater.string name="Type_Avatar">
Avatar
</floater.string>
<floater.string name="Type_llTriggerSound">
llTriggerSound
</floater.string>
<floater.string name="Type_llLoopSound">
llLoopSound
</floater.string>
<floater.string name="Type_llPlaySound">
llPlaySound
</floater.string>
<floater.string name="GroupOwned">
[NAME] (Group)
</floater.string>
<check_box follows="top|left" bottom_delta="20" left="5" width="64" name="avatars_chk" label="Avatars" control_name="FloaterSoundsLogAvatars" />
<check_box follows="top|left" bottom_delta="0" left_delta="64" width="64" name="objects_chk" label="Objects" initial_value="true" control_name="FloaterSoundsLogObjects" />
<check_box follows="top|left" bottom_delta="0" left_delta="64" width="160" name="collision_chk" label="Default Collision Sounds" control_name="FloaterSoundsLogCollisions" />
<check_box follows="top|left" bottom_delta="0" left_delta="160" width="110" name="repeated_asset_chk" label="Repeated Asset" control_name="FloaterSoundsLogRepeats" />
<check_box follows="top|left" bottom_delta="0" left_delta="110" width="80" name="pause_chk" label="Pause Log" initial_value="false"/>
<scroll_list can_resize="true" column_padding="0" draw_heading="true" follows="all" left="10" multi_select="true" name="sound_list" search_column="0" top="40" right="-10" bottom="-60">
<columns dynamicwidth="false" width="80" label="Playing" name="playing" />
<columns dynamicwidth="false" width="100" label="Type" name="type" />
<columns dynamicwidth="true" label="Owner" name="owner" />
<columns dynamicwidth="false" width="0" label="Sound" name="sound" />
</scroll_list>
<button bottom_delta="25" follows="left|bottom" height="20" label="Play Locally" name="play_locally_btn" left="10" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Look At" name="look_at_btn" left_delta="100" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Stop" name="stop_btn" right="-10" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Blacklist" name="bl_btn" right="-110" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Stop" name="stop_btn" right="-10" width="95"/>
<button bottom_delta="0" follows="left|bottom" height="20" label="Blacklist" name="bl_btn" right="-110" width="95"/>
</floater>