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

Revert "Properly hide all auto-tune panels when showing details panel" 

This reverts commit 144901a768.
master
Ansariel 2021-11-10 20:11:47 +01:00 committed by Beq
parent 144901a768
commit 8f8fc99f06
9 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsfloaterperformance.cpp
View File

@ -116,7 +116,7 @@ BOOL FSFloaterPerformance::postBuild()
getChild<LLPanel>("settings_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mSettingsPanel));
getChild<LLPanel>("huds_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mHUDsPanel));
auto tgt_panel = findChild<LLPanel>("target_subpanel");
auto tgt_panel = getChild<LLPanel>("target_subpanel");
if (tgt_panel)
{
tgt_panel->getChild<LLButton>("target_btn")->setCommitCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel));

102
indra/newview/skins/default/xui/de/floater_performance.xml
View File

@ -36,63 +36,63 @@
Frame-Aufschlüsselung erfolgt hier.
</text>
</panel>
<panel name="panel_performance_main">
<panel name="target_subpanel">
<text name="settings_lbl">
Auto-Anpassung Ziel-FPS
</text>
<check_box label="Auto-Anpassung" name="AutoTuneFPS" tool_tip="Der Viewer wird automatisch versuchen, die Ziel-FPS zu erreichen." />
<text name="settings_desc">
Einstellungen automatisch für FPS anpassen.
</text>
<combo_box name="FSTuningFPSStrategy">
<combo_box.item label="Nur Avatar-Einstellungen" name="av_only" />
<combo_box.item label="Avatar und Szenerie" name="av_and_scene" />
</combo_box>
<spinner name="target_fps" tooltip="Ziel-FPS - Der Viewer wird automatisch versuchen, die gewünschte FPS durch Anpassung der Einstellungen zu erreichen." />
</panel>
<panel name="settings_subpanel">
<text name="settings_lbl">
Grafik-Einstellungen
</text>
<text name="settings_desc">
Einstellungen für Distanz, Wasser, Beleuchtung uvm.
</text>
</panel>
<panel name="nearby_subpanel">
<text name="avatars_nearby_lbl">
Avatar in der Nähe
</text>
<text name="avatars_nearby_desc">
Einstellen, welche Avatare vollständig dargestellt werden.
</text>
<text name="avatars_frme_pct_lbl">
<panel name="target_subpanel">
<text name="settings_lbl">
Auto-Anpassung Ziel-FPS
</text>
<check_box label="Auto-Anpassung" name="AutoTuneFPS" tool_tip="Der Viewer wird automatisch versuchen, die Ziel-FPS zu erreichen." />
<text name="settings_desc">
Einstellungen automatisch für FPS anpassen.
</text>
<combo_box name="FSTuningFPSStrategy">
<combo_box.item label="Nur Avatar-Einstellungen" name="av_only" />
<combo_box.item label="Avatar und Szenerie" name="av_and_scene" />
</combo_box>
<spinner name="target_fps" tooltip="Ziel-FPS - Der Viewer wird automatisch versuchen, die gewünschte FPS durch Anpassung der Einstellungen zu erreichen." />
</panel>
</panel>
<panel name="panel_performance_main">
<panel name="settings_subpanel">
<text name="settings_lbl">
Grafik-Einstellungen
</text>
<text name="settings_desc">
Einstellungen für Distanz, Wasser, Beleuchtung uvm.
</text>
</panel>
<panel name="nearby_subpanel">
<text name="avatars_nearby_lbl">
Avatar in der Nähe
</text>
<text name="avatars_nearby_desc">
Einstellen, welche Avatare vollständig dargestellt werden.
</text>
<text name="avatars_frme_pct_lbl">
Benötigte
Renderzeit
für Avatare
</text>
</panel>
<panel name="complexity_subpanel">
<text name="complexity_lbl">
Eigene Avatar-Komplexität
</text>
<text name="complexity_info">
Sei ein guter Einwohner - verwalte den Einfluss des eigenen Avatars.
</text>
</panel>
<panel name="huds_subpanel">
<text name="huds_lbl">
Aktive HUDs
</text>
<text name="huds_desc">
Entfernen von HUDs kann Geschwindigkeit verbessern.
</text>
<text name="huds_frme_pct_lbl">
</text>
</panel>
<panel name="complexity_subpanel">
<text name="complexity_lbl">
Eigene Avatar-Komplexität
</text>
<text name="complexity_info">
Sei ein guter Einwohner - verwalte den Einfluss des eigenen Avatars.
</text>
</panel>
<panel name="huds_subpanel">
<text name="huds_lbl">
Aktive HUDs
</text>
<text name="huds_desc">
Entfernen von HUDs kann Geschwindigkeit verbessern.
</text>
<text name="huds_frme_pct_lbl">
Benötigte
Renderzeit
für HUDs
</text>
</panel>
</text>
</panel>
</panel>
</floater>

32
indra/newview/skins/default/xui/en/floater_performance.xml
View File

@ -115,16 +115,6 @@ Frame breakdown will appear here.
</text>
</panel>
<panel
bevel_style="none"
follows="left|top"
height="540"
width="580"
name="panel_performance_main"
visible="true"
layout="topleft"
left="0"
top="60">
<panel
bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
@ -226,6 +216,17 @@ Frame breakdown will appear here.
is_toggle="true">
</button>
</panel>
</panel>
<panel
bevel_style="none"
follows="left|top"
height="540"
width="580"
name="panel_performance_main"
visible="true"
layout="topleft"
left="0"
top="115">
<panel
bg_alpha_color="PanelGray"
background_visible="true"
@ -464,7 +465,6 @@ HUDs
right="-20"/>
</panel>
</panel>
</panel>
<panel
filename="panel_performance_nearby.xml"
follows="all"
@ -472,7 +472,7 @@ HUDs
left="0"
name="panel_performance_nearby"
visible="false"
top="60" />
top="115" />
<panel
filename="panel_performance_complexity.xml"
follows="all"
@ -480,7 +480,7 @@ HUDs
left="0"
name="panel_performance_complexity"
visible="false"
top="60" />
top="115" />
<panel
filename="panel_performance_preferences.xml"
follows="all"
@ -488,7 +488,7 @@ HUDs
left="0"
name="panel_performance_preferences"
visible="false"
top="60" />
top="115" />
<panel
filename="panel_performance_huds.xml"
follows="all"
@ -496,7 +496,7 @@ HUDs
left="0"
name="panel_performance_huds"
visible="false"
top="60" />
top="115" />
<panel
filename="panel_performance_autotune.xml"
follows="all"
@ -504,5 +504,5 @@ HUDs
left="0"
name="panel_performance_autotune"
visible="false"
top="60" />
top="115" />
</floater>

2
indra/newview/skins/default/xui/en/panel_performance_autotune.xml
View File

@ -2,7 +2,7 @@
<panel
bevel_style="none"
follows="left|top"
height="585"
height="530"
width="580"
name="panel_performance_autotune"
layout="topleft"

4
indra/newview/skins/default/xui/en/panel_performance_complexity.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bevel_style="none"
follows="left|top"
height="585"
height="530"
width="580"
name="panel_performance_complexity"
layout="topleft"
@ -89,7 +89,7 @@ You may remove your own attachments quickly and easily by hitting the 'X'.
column_padding="1"
draw_stripes="true"
draw_heading="true"
height="435"
height="379"
follows="left|top"
sort_column="1"
sort_ascending="false"

4
indra/newview/skins/default/xui/en/panel_performance_huds.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bevel_style="none"
follows="left|top"
height="585"
height="530"
width="580"
name="panel_performance_huds"
layout="topleft"
@ -77,7 +77,7 @@
column_padding="1"
draw_stripes="true"
draw_heading="true"
height="435"
height="380"
follows="left|top"
layout="topleft"
name="hud_list"

4
indra/newview/skins/default/xui/en/panel_performance_nearby.xml
View File

@ -2,7 +2,7 @@
<panel
bevel_style="none"
follows="left|top"
height="585"
height="530"
width="580"
name="panel_performance_nearby"
layout="topleft"
@ -137,7 +137,7 @@ top="0">
column_padding="1"
draw_stripes="true"
draw_heading="true"
height="335"
height="280"
left="20"
follows="left|top"
layout="topleft"

2
indra/newview/skins/default/xui/en/panel_performance_preferences.xml
View File

@ -2,7 +2,7 @@
<panel
bevel_style="none"
follows="left|top"
height="585"
height="530"
width="580"
name="panel_performance_preferences"
layout="topleft"

102
indra/newview/skins/default/xui/pl/floater_performance.xml
View File

@ -30,63 +30,63 @@
Tutaj pojawi się analiza klatek.
</text>
</panel>
<panel name="panel_performance_main">
<panel name="target_subpanel">
<text name="settings_lbl">
Autostrojenie klatek
</text>
<check_box label="Autostrojenie" name="AutoTuneFPS" tool_tip="Przeglądarka spróbuje dostosowywać ustawienia, aby osiągnąć docelową liczbę klatek na sekundę." />
<text name="settings_desc">
Autostrojenie ustawień, by utrzymać FPS.
</text>
<combo_box name="FSTuningFPSStrategy">
<combo_box.item label="Dostrój tylko awatary" name="av_only" />
<combo_box.item label="Awatary i scena" name="av_and_scene" />
</combo_box>
<spinner name="target_fps" tooltip="Docelowa liczba FPS — żądany poziom klatek na sekundę. Przeglądarka spróbuje go osiągnąć dostosowując ustawienia grafiki." />
</panel>
<panel name="settings_subpanel">
<text name="settings_lbl">
Ustawienia grafiki
</text>
<text name="settings_desc">
Wybierz ustawienia odległości, wody, oświetlenia itd.
</text>
</panel>
<panel name="nearby_subpanel">
<text name="avatars_nearby_lbl">
Awatary w pobliżu
</text>
<text name="avatars_nearby_desc">
Ustaw, które awatary są w pełni wyświetlane.
</text>
<text name="avatars_frme_pct_lbl">
<panel name="target_subpanel">
<text name="settings_lbl">
Autostrojenie klatek
</text>
<check_box label="Autostrojenie" name="AutoTuneFPS" tool_tip="Przeglądarka spróbuje dostosowywać ustawienia, aby osiągnąć docelową liczbę klatek na sekundę." />
<text name="settings_desc">
Autostrojenie ustawień, by utrzymać FPS.
</text>
<combo_box name="FSTuningFPSStrategy">
<combo_box.item label="Dostrój tylko awatary" name="av_only" />
<combo_box.item label="Awatary i scena" name="av_and_scene" />
</combo_box>
<spinner name="target_fps" tooltip="Docelowa liczba FPS — żądany poziom klatek na sekundę. Przeglądarka spróbuje go osiągnąć dostosowując ustawienia grafiki." />
</panel>
</panel>
<panel name="panel_performance_main">
<panel name="settings_subpanel">
<text name="settings_lbl">
Ustawienia grafiki
</text>
<text name="settings_desc">
Wybierz ustawienia odległości, wody, oświetlenia itd.
</text>
</panel>
<panel name="nearby_subpanel">
<text name="avatars_nearby_lbl">
Awatary w pobliżu
</text>
<text name="avatars_nearby_desc">
Ustaw, które awatary są w pełni wyświetlane.
</text>
<text name="avatars_frme_pct_lbl">
Czas
rysowania
awatarów
</text>
</panel>
<panel name="complexity_subpanel">
<text name="complexity_lbl">
Złożoność awatara
</text>
<text name="complexity_info">
Bądź dobrą osobą. Zajmij się złożonością swojego awatara.
</text>
</panel>
<panel name="huds_subpanel">
<text name="huds_lbl">
Aktywne HUDy
</text>
<text name="huds_desc">
Usunięcie zbędnych HUDów poprawi szybkość.
</text>
<text name="huds_frme_pct_lbl">
</text>
</panel>
<panel name="complexity_subpanel">
<text name="complexity_lbl">
Złożoność awatara
</text>
<text name="complexity_info">
Bądź dobrą osobą. Zajmij się złożonością swojego awatara.
</text>
</panel>
<panel name="huds_subpanel">
<text name="huds_lbl">
Aktywne HUDy
</text>
<text name="huds_desc">
Usunięcie zbędnych HUDów poprawi szybkość.
</text>
<text name="huds_frme_pct_lbl">
Czas
rysowania
HUDów
</text>
</panel>
</text>
</panel>
</panel>
</floater>