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

Fix the new preferred browser setting

Ansariel 2015-01-14 19:29:16 +01:00
parent bb68ce76ce
commit 5a946eb734
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloaterpreference.cpp
View File

@ -2842,10 +2842,10 @@ BOOL LLPanelPreference::postBuild()
}
// <FS:Ansariel> Fix for visually broken browser choice radiobuttons
if (hasChild("use_external_browser", TRUE))
{
getChild<LLRadioGroup>("use_external_browser")->setValue(gSavedSettings.getBOOL("UseExternalBrowser"));
}
//if (hasChild("use_external_browser", TRUE))
//{
// getChild<LLRadioGroup>("use_external_browser")->setValue(gSavedSettings.getBOOL("UseExternalBrowser"));
//}
// </FS:Ansariel> Fix for visually broken browser choice radiobuttons
////////////////////// PanelAlerts ///////////////////
@ -2879,11 +2879,11 @@ LLPanelPreference::~LLPanelPreference()
void LLPanelPreference::apply()
{
// <FS:Ansariel> Fix for visually broken browser choice radiobuttons
if (hasChild("use_external_browser", TRUE))
{
BOOL useExternalBrowser = (getChild<LLRadioGroup>("use_external_browser")->getValue().asInteger() == 1);
gSavedSettings.setBOOL("UseExternalBrowser", useExternalBrowser);
}
//if (hasChild("use_external_browser", TRUE))
//{
// BOOL useExternalBrowser = (getChild<LLRadioGroup>("use_external_browser")->getValue().asInteger() == 1);
// gSavedSettings.setBOOL("UseExternalBrowser", useExternalBrowser);
//}
// </FS:Ansariel> Fix for visually broken browser choice radiobuttons
}

9
indra/newview/skins/default/xui/de/panel_preferences_setup.xml
View File

@ -54,12 +54,19 @@
<button label="Öffne Ordner mit Einstellungen" label_selected="Öffne Ordner mit Einstellungen" name="browse_settingsdir" width="190"/>
<text name="Web:">
Web:
Web-Browser:
</text>
<!--
<radio_group name="use_external_browser">
<radio_item label="In externem Browser (IE, Firefox, Safari)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen."/>
<radio_item label="In integriertem Browser" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/>
</radio_group>
-->
<radio_group name="preferred_browser_behavior">
<radio_item label="Meinen Browser (IE, Firefox, Safari) für alli Links verwenden" name="new_external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen."/>
<radio_item label="Integrierten Browser nur für Second-Life-Links verwenden" name="new_internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/>
<radio_item label="Integrierten Browser für alle Links verwenden" name="new_internal_all" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/>
</radio_group>
<text name="numberwebfloaters_label">
Maximale Anzahl an Webbrowser-Fenstern:
</text>

25
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
View File

@ -111,7 +111,7 @@
layout="topleft"
left="20"
name="connection_port_enabled"
top="10"
top="5"
width="256">
<!-- check_box.commit_callback
function="Notification.Show"
@ -353,7 +353,7 @@
layout="topleft"
left="15"
name="log_path_desc"
top_pad="10"
top_pad="5"
width="300">
Conversation logs and transcripts location:
</text>
@ -449,8 +449,8 @@
layout="topleft"
left="15"
name="Web:"
top_pad="10"
width="300">
top_pad="5"
width="80">
Web browser:
</text>
<!-- <radio_group
@ -487,18 +487,18 @@
control_name="PreferredBrowserBehavior"
draw_border="false"
follows="left|top"
height="60"
height="50"
layout="topleft"
left_delta="50"
left_pad="10"
name="preferred_browser_behavior"
top_pad="0"
top_delta="0"
width="480">
<radio_item
height="20"
label="Use my browser (Chrome, Firefox, IE) for all links"
layout="topleft"
left="0"
name="internal"
name="new_external"
value="0"
tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
top="0"
@ -508,18 +508,19 @@
label="Use built-in browser for Second Life links only"
layout="topleft"
left_delta="0"
name="external"
name="new_internal"
value="1"
tool_tip="Use the default system web browser for help, web links, etc. Builtin browser will be used only for LindenLab/SecondLife links."
top_delta="20"
top_delta="15"
width="480" />
<radio_item
top_delta="15"
height="20"
label="Use built-in browser for all links"
layout="topleft"
left="0"
name="internal"
value="2"
name="new_internal_all"
value="2"/>
</radio_group>
<text