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

Adjust opening of UI scaling preferences for Firestorm

master
Ansariel 2016-07-26 20:51:47 +02:00
parent c3d4ba3e32
commit 28f0ce1506
14 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewerwindow.cpp
View File

@ -1970,7 +1970,13 @@ bool LLViewerWindow::onSystemUIScaleFactorChanged(const LLSD& notification, cons
LLFloaterReg::toggleInstanceOrBringToFront("preferences");
LLFloater* pref_floater = LLFloaterReg::getInstance("preferences");
LLTabContainer* tab_container = pref_floater->getChild<LLTabContainer>("pref core");
tab_container->selectTabByName("advanced1");
// <FS:Ansariel> Adjusted for Firestorm
//tab_container->selectTabByName("advanced1");
tab_container->selectTabByName("ui");
LLPanel* ui_panel = tab_container->getCurrentPanel();
LLTabContainer* ui_tab_container = ui_panel->getChild<LLTabContainer>("tabs");
ui_tab_container->selectTabByName("ui-2d-overlay");
// </FS:Ansariel>
}
return false;

2
indra/newview/skins/default/xui/de/floater_preferences.xml
View File

@ -19,7 +19,7 @@
<panel label="Meldungen" name="msgs"/>
<panel label="Privatsphäre" name="im"/>
<panel label="Erweitert" name="advanced1"/>
<panel label="Benutzerinterface" name="starlightUI1"/>
<panel label="Benutzerinterface" name="ui"/>
<panel label="Oberflächendesign" name="skins"/>
<panel label="Absturzmeldungen" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

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

@ -168,7 +168,7 @@
label="User Interface"
layout="topleft"
help_topic="preferences_ui_extras_tab"
name="starlightUI1" />
name="ui" />
<panel
class="panel_preference_skins"
filename="panel_preferences_skins.xml"

2
indra/newview/skins/default/xui/es/floater_preferences.xml
View File

@ -15,7 +15,7 @@
<panel label="Privacidad" name="im"/>
<panel label="Avanzado" name="advanced1"/>
<panel label="Ortografía" name="spell_check"/>
<panel label="Interfaz" name="starlightUI1"/>
<panel label="Interfaz" name="ui"/>
<panel label="Skins" name="skins"/>
<panel label="Reporte de fallos" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/default/xui/fr/floater_preferences.xml
View File

@ -16,7 +16,7 @@
<panel label="Notifications" name="msgs"/>
<panel label="Confidentialité" name="im"/>
<panel label="Avancés" name="advanced1"/>
<panel label="Interface" name="starlightUI1"/>
<panel label="Interface" name="ui"/>
<panel label="Thèmes" name="skins"/>
<panel label="Rapports d'erreurs" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/default/xui/it/floater_preferences.xml
View File

@ -14,7 +14,7 @@
<panel label="Riservatezza" name="im"/>
<panel label="Impostazione" name="input"/>
<panel label="Avanzate" name="advanced1"/>
<panel label="Interfaccia" name="starlightUI1"/>
<panel label="Interfaccia" name="ui"/>
<panel label="Segnala Crash" name="crashreports" />
</tab_container>
</floater>

2
indra/newview/skins/default/xui/ja/floater_preferences.xml
View File

@ -17,7 +17,7 @@
<panel label="通知" name="msgs"/>
<panel label="プライバシー" name="im"/>
<panel label="アドバンス" name="advanced1"/>
<panel label="UI" name="starlightUI1"/>
<panel label="UI" name="ui"/>
<panel label="スキン" name="skins"/>
<panel label="レポート" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/default/xui/pl/floater_preferences.xml
View File

@ -18,7 +18,7 @@
<panel label="Powiadomienia" name="msgs"/>
<panel label="Prywatność" name="im"/>
<panel label="Zaawansowane" name="advanced1"/>
<panel label="Interfejs" name="starlightUI1"/>
<panel label="Interfejs" name="ui"/>
<panel label="Skórki" name="skins"/>
<panel label="Błędy" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/default/xui/ru/floater_preferences.xml
View File

@ -19,7 +19,7 @@
<panel label="Уведомления" name="msgs"/>
<panel label="Приватность" name="im"/>
<panel label="Расширеное" name="advanced1"/>
<panel label="Интерфейс" name="starlightUI1"/>
<panel label="Интерфейс" name="ui"/>
<panel label="Темы" name="skins"/>
<panel label="Ошибки" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
View File

@ -20,7 +20,7 @@
<panel label="Meldungen" name="msgs"/>
<panel label="Privatsphäre" name="im"/>
<panel label="Erweitert" name="advanced1"/>
<panel label="Benutzerinterface" name="starlightUI1"/>
<panel label="Benutzerinterface" name="ui"/>
<panel label="Oberflächendesign" name="skins"/>
<panel label="Firestorm" name="firestorm"/>
<panel label="OpenSim" name="opensim"/>

2
indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
View File

@ -175,7 +175,7 @@
label="User Interface"
layout="topleft"
help_topic="preferences_ui_extras_tab"
name="starlightUI1" />
name="ui" />
<panel
class="panel_preference_skins"
filename="panel_preferences_skins.xml"

2
indra/newview/skins/starlightcui/xui/es/floater_preferences.xml
View File

@ -18,7 +18,7 @@
<panel label="Notificaciones" name="msgs"/>
<panel label="Privacidad" name="im"/>
<panel label="Avanzado" name="advanced1"/>
<panel label="Interfaz" name="starlightUI1"/>
<panel label="Interfaz" name="ui"/>
<panel label="Skins" name="skins"/>
<panel label="Reporte de fallos" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
View File

@ -20,7 +20,7 @@
<panel label="Powiadomienia" name="msgs"/>
<panel label="Prywatność" name="im"/>
<panel label="Zaawansowane" name="advanced1"/>
<panel label="Interfejs" name="starlightUI1"/>
<panel label="Interfejs" name="ui"/>
<panel label="Skórki" name="skins"/>
<panel label="Błędy" name="crashreports"/>
<panel label="Firestorm" name="firestorm"/>

2
indra/newview/skins/vintage/xui/en/floater_preferences.xml
View File

@ -157,7 +157,7 @@
label="User Interface"
layout="topleft"
help_topic="preferences_ui_extras_tab"
name="starlightUI1" />
name="ui" />
<panel
class="panel_preference_skins"
filename="panel_preferences_skins.xml"