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

Merge prefrences refactoring into main branch.

meow-7.2.2
Liny 2011-03-07 17:22:16 -08:00
parent a961853667 14841b3051
commit b2c4b82a79
7 changed files with 327 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -582,6 +582,7 @@ set(viewer_SOURCE_FILES
llxmlrpclistener.cpp
llxmlrpctransaction.cpp
noise.cpp
panel_prefs_firestorm.cpp
pipeline.cpp
qtoolalign.cpp
rlvhandler.cpp
@ -1128,6 +1129,7 @@ set(viewer_HEADER_FILES
llxmlrpctransaction.h
macmain.h
noise.h
panel_prefs_firestorm.h
pipeline.h
qtoolalign.h
rlvdefines.h

55
indra/newview/panel_prefs_firestorm.cpp Normal file
View File

@ -0,0 +1,55 @@
/*${License blank}*/
#include "llviewerprecompiledheaders.h"
#include "panel_prefs_firestorm.h"
static LLRegisterPanelClassWrapper<PanelPreferenceFirestorm> t_pref_fs("panel_preference_firestorm");
PanelPreferenceFirestorm::PanelPreferenceFirestorm() : LLPanelPreference(), m_calcLineEditor(NULL), m_acLineEditor(NULL), m_tp2LineEditor(NULL), m_clearchatLineEditor(NULL), m_musicLineEditor(NULL)
{
}
BOOL PanelPreferenceFirestorm::postBuild()
{
m_calcLineEditor = getChild<LLLineEditor>("PhoenixCmdLineCalc");
m_acLineEditor = getChild<LLLineEditor>("PhoenixCmdLineAutocorrect");
m_tp2LineEditor = getChild<LLLineEditor>("PhoenixCmdLineTP2");
m_clearchatLineEditor = getChild<LLLineEditor>("PhoenixCmdLineClearChat");
m_musicLineEditor = getChild<LLLineEditor>("PhoenixCmdLineMusic");
m_aoLineEditor = getChild<LLLineEditor>("PhoenixCmdLineAO");
if(m_calcLineEditor)
{
m_calcLineEditor->setEnabled(FALSE);
}
if(m_acLineEditor)
{
m_acLineEditor->setEnabled(FALSE);
}
if(m_tp2LineEditor)
{
m_tp2LineEditor->setEnabled(FALSE);
}
if(m_clearchatLineEditor)
{
m_clearchatLineEditor->setEnabled(FALSE);
}
if(m_musicLineEditor)
{
m_musicLineEditor->setEnabled(FALSE);
}
if(m_aoLineEditor)
{
m_aoLineEditor->setEnabled(FALSE);
}
return LLPanelPreference::postBuild();
}
void PanelPreferenceFirestorm::apply()
{
}
void PanelPreferenceFirestorm::cancel()
{
}

24
indra/newview/panel_prefs_firestorm.h Normal file
View File

@ -0,0 +1,24 @@
/*${License blank}*/
#ifndef panel_prefs_firestorm
#define panel_prefs_firestorm
#include "llfloaterpreference.h"
#include "lllineeditor.h"
class LLLineEditor;
class PanelPreferenceFirestorm : public LLPanelPreference
{
public:
PanelPreferenceFirestorm();
/*virtual*/ BOOL postBuild();
/*virtual*/ void apply();
/*virtual*/ void cancel();
protected:
LLLineEditor* m_calcLineEditor;
LLLineEditor* m_acLineEditor;
LLLineEditor* m_tp2LineEditor;
LLLineEditor* m_clearchatLineEditor;
LLLineEditor* m_musicLineEditor;
LLLineEditor* m_aoLineEditor;
};
#endif

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

@ -3,7 +3,7 @@
legacy_header_height="18"
open_centered="true"
default_tab_group="1"
height="460"
height="500"
layout="topleft"
name="Preferences"
help_topic="preferences"
@ -18,7 +18,7 @@
layout="topleft"
right="-105"
name="OK"
top="433"
top="467"
width="90">
<button.commit_callback
function="Pref.OK" />
@ -39,7 +39,7 @@
<tab_container
follows="all"
halign="left"
height="410"
height="440"
layout="topleft"
left="0"
name="pref core"
@ -134,7 +134,7 @@
help_topic="preferences_skins_tab"
name="skins" />
<panel
class="panel_preference"
class="panel_preference_firestorm"
filename="panel_preferences_firestorm.xml"
label="Firestorm"
layout="topleft"

376
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -2,7 +2,7 @@
<panel
border="true"
follows="left|top|right|bottom"
height="408"
height="500"
label="Firestorm"
layout="topleft"
left="102"
@ -10,147 +10,239 @@
top="1"
width="517">
<check_box
control_name="RestrainedLove"
layout="topleft"
follows="left|top"
top_pad="20"
left_delta="20"
width="175"
height="20"
name="checkMiscRLVa"
label="Allow Remote Scripted Viewer Controls (RLVa)"
>
<check_box.commit_callback
function="RLV.ToggleEnabled" />
<check_box.enabled_callback
function="RLV.CheckEnabled" />
</check_box>
<text
layout="topleft"
follows="left|top"
top_delta="6"
left_pad="100"
height="20"
width="150"
name="textMiscRLVaRestart"
text_color="White_25"
>
(requires restart)
</text>
<text
follows="left|top"
layout="topleft"
left="24"
height="12"
name="tab_direction_label"
width="150"
top_pad="10">
Chat Tab Mode Orientation:
</text>
<text
name="requires_restart_label"
follows="left|top"
layout="topleft"
top_delta="0"
left="180"
height="20"
<tab_container
label="Firestorm Prefs"
top="-70"
height="460"
left="0"
mouse_opaque="false"
name="tabs"
tab_min_width="50"
tab_position="top"
width="517"
bg_opaque_color="0,0,0,0.0">
<tab_container
label="Page 1"
bottom="0"
height="500"
left="0"
mouse_opaque="false"
name="page1"
tab_min_width="50"
tab_position="top"
width="517"
bg_opaque_color="0,0,0,0.0">
<panel
border="true"
bottom="-500"
follows="left|top|right|bottom"
height="500"
label="Tab1-1"
left="1"
mouse_opaque="true"
name="tab1-1"
width="517">
<check_box
control_name="RestrainedLove"
layout="topleft"
follows="left|top"
top_pad="20"
left_delta="20"
width="175"
height="20"
name="checkMiscRLVa"
label="Allow Remote Scripted Viewer Controls (RLVa)"
>
<check_box.commit_callback
function="RLV.ToggleEnabled" />
<check_box.enabled_callback
function="RLV.CheckEnabled" />
</check_box>
<text
layout="topleft"
follows="left|top"
top_delta="6"
left_pad="100"
height="20"
width="150"
name="textMiscRLVaRestart"
text_color="White_25">
(requires restart)
</text>
<text
follows="left|top"
layout="topleft"
left="24"
height="12"
name="tab_direction_label"
width="120"
top_pad="10">
Chat Tab Mode Orientation:
</text>
<text
name="requires_restart_label"
follows="left|top"
layout="topleft"
top_delta="0"
left="150"
height="20"
width="130"
text_color="White_25">
(requires restart)
</text>
<radio_group
height="16"
layout="topleft"
left="40"
control_name="ChatTabDirection"
name="chat_tab_direction"
top_pad="0"
tool_tip="Change flow of the chat/IM tabs between horizontal and vertical when consolidated tab mode is active.
(Requires restart)"
width="331">
<radio_item
height="16"
label="Horizontal"
layout="topleft"
left="0"
name="radio_horizontal"
value="0"
top="0"
width="150" />
<radio_item
height="16"
label="Vertical"
layout="topleft"
left_delta="160"
name="radio_vertical"
value="1"
width="150" />
</radio_group>
<check_box
layout="topleft"
follows="left|top"
bottom_delta="30"
left_delta="-10"
width="50"
height="16"
control_name="PhoenixNearbyChatbar"
label="Add a chatbar in the Nearby Chat window"/>
<text
name="requires_restart_label"
follows="left|bottom"
layout="topleft"
top_delta="0"
left_delta="250"
height="18"
text_color="White_25">
(requires restart)
</text>
<radio_group
height="16"
layout="topleft"
left="40"
control_name="ChatTabDirection"
name="chat_tab_direction"
top_pad="0"
tool_tip="Change flow of the chat/IM tabs between horizontal and vertical when consolidated tab mode is active.
(Requires restart)"
width="331">
<radio_item
height="16"
label="Horizontal"
layout="topleft"
left="0"
name="radio_horizontal"
value="0"
top="0"
width="150" />
<radio_item
height="16"
label="Vertical"
layout="topleft"
left_delta="160"
name="radio_vertical"
value="1"
width="150" />
</radio_group>
</panel>
<panel
border="true"
bottom="-500"
follows="left|top|right|bottom"
height="500"
label="Tab1-2"
left="1"
mouse_opaque="true"
name="tab1-2"
width="517">
<text
name="chat_and_in_enhancements"
follows="left|top"
layout="topleft"
top_delta="30"
left="24"
height="10"
width="180">
Chat and IM enhancements:
</text>
<check_box
control_name="AllowMUpose"
name="AllowMUpose"
label="&quot;:&quot; as a synonym for &quot;/me&quot;"
layout="topleft"
top_delta="18"
left="30"
height="20"
width="400" />
<check_box
control_name="AutoCloseOOC"
name="AutoCloseOOC"
label="Auto-close ((OOC)) parenthesis"
layout="topleft"
top_delta="22"
left="30"
height="20"
width="400" />
<check_box
layout="topleft"
follows="left|top"
bottom_delta="30"
left_delta="-10"
width="50"
height="16"
control_name="PhoenixNearbyChatbar"
label="Add a chatbar in the Nearby Chat window"/>
<text
name="requires_restart_label"
follows="left|bottom"
layout="topleft"
top_delta="0"
left_delta="250"
height="18"
width="130"
text_color="White_25">
(requires restart)
</text>
<check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Teleport Screens" left="15" mouse_opaque="true" name="tp_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableTeleportScreens" tool_tip="Disables the black teleport screen during all teleports."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Login Progress Screen" left_delta="0" mouse_opaque="true" name="login_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableLoginScreens" tool_tip="Disables the black login progress Screen"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Logout Progress Screen" left_delta="0" mouse_opaque="true" name="logout_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableLogoutScreens" tool_tip="Disables the black Logout progress screen."/>
<text
name="chat_and_in_enhancements"
follows="left|top"
layout="topleft"
top_delta="30"
left="24"
height="10"
width="180">
Chat and IM enhancements:
</text>
<check_box
control_name="AllowMUpose"
name="AllowMUpose"
label="&quot;:&quot; as a synonym for &quot;/me&quot;"
layout="topleft"
top_delta="18"
left="30"
height="20"
width="400" />
<check_box
control_name="AutoCloseOOC"
name="AutoCloseOOC"
label="Auto-close ((OOC)) parenthesis"
layout="topleft"
top_delta="18"
left="30"
height="20"
width="400" />
<check_box
control_name="OnlineOfflinetoNearbyChat"
name="OnlineOfflinetoNearbyChat"
label="Friend on/off-line notices to Nearby Chat"
layout="topleft"
top_delta="18"
left="30"
height="20"
width="400" />
text_color="White_25">
(requires restart)
</text>
</panel>
<!--CmdLine-->
<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="CmdLine" left="1" mouse_opaque="true" name="tab1-3" width="517">
<button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?" name="PhoenixHelp_CmdLine" tool_tip="Click here for help regarding the settings in this page." right="490" width="18"/>
<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Enable usage of chat bar as a command line" left="5" mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270" control_name="PhoenixCmdLine"/>
<text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" name="loltxt2" width="512">Teleport within sim (usage: cmd x y z)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLinePos" control_name="PhoenixCmdLinePos" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt3" width="512">Teleport to ground (usage: cmd)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineGround" control_name="PhoenixCmdLineGround" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt4" width="512">Teleport to altitude (usage: cmd z)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineHeight" control_name="PhoenixCmdLineHeight" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt5" width="512">Teleport home (usage: cmd)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineTeleportHome" control_name="PhoenixCmdLineTeleportHome" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt6" width="512">Rez a platform (usage: cmd 0 - 30)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineRezPlatform" control_name="PhoenixCmdLineRezPlatform" width="200"/>
<slider bottom_delta="-20" left="15" name="PhoenixCmdLinePlatformSize" control_name="PhoenixCmdLinePlatformSize" decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5" initial_val="5" label="Width" label_width="30" max_val="30" min_val="5" mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
<text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt7" width="512">Teleport to sim x (usage: cmd simname)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineMapTo" control_name="PhoenixCmdLineMapTo" width="200"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true" name="toggle" radio_style="false" width="270" control_name="PhoenixCmdLineMapToKeepPos"/>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt8" width="512">Calc. expressions (usage: cmd SIN(2+2))</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineCalc" control_name="PhoenixCmdLineCalc" width="200"/>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" width="512">Add autocorrect word(cmd list|bad|good)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineAutocorrect" control_name="PhoenixCmdLineAutocorrect" width="200"/>
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="310" left="240" name="EmDivisor" width="0"/>
<text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" name="loltxt9" width="512">Change Draw Distance (usage: cmd meters)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineDrawDistance" control_name="PhoenixCmdLineDrawDistance" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt10" width="512">Teleport to cam position (usage: cmd)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdTeleportToCam" control_name="PhoenixCmdTeleportToCam" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt11" width="512">Get avatar name from key (usage: cmd key)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineKeyToName" control_name="PhoenixCmdLineKeyToName" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt12" width="512">Offer teleport to avatar (usage: cmd key)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineOfferTp" control_name="PhoenixCmdLineOfferTp" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt13" width="512">Teleport to avatar (usage: cmd name)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open." name="PhoenixCmdLineTP2" control_name="PhoenixCmdLineTP2" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt14" width="512">Turn AO on/off (usage: cmd on/off)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineAO" control_name="PhoenixCmdLineAO" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Clear the chat history (usage: cmd)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="PhoenixCmdLineClearChat" control_name="PhoenixCmdLineClearChat" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Set the media url (usage: cmd url type)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="Sets and plays your media stream to the entered url" name="PhoenixCmdLineMedia" control_name="PhoenixCmdLineMedia" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Set the music stream url (usage: cmd url)</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="sets and plays your music stream to the entered url" name="PhoenixCmdLineMusic" control_name="PhoenixCmdLineMusic" width="200"/>
</panel>
</tab_container>
<tab_container
label="Page 2"
bottom="0"
height="400"
left="0"
mouse_opaque="false"
name="page2"
tab_min_width="50"
tab_position="top"
width="500"
bg_opaque_color="0,0,0,0.0">
<panel
border="true"
bottom="-400"
follows="left|top|right|bottom"
height="400"
label="Tab2-1"
left="1"
mouse_opaque="true"
name="tab2-1"
width="517">
</panel>
</tab_container>
</tab_container>
</panel>

8
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -21,7 +21,7 @@
layout="topleft"
left="30"
name="clear_cache"
top="10"
top="1"
width="145">
<button.commit_callback
function="Pref.WebClearCache" />
@ -35,7 +35,7 @@
left_pad="10"
mouse_opaque="false"
name="cache_size_label"
top_delta="3"
top_delta="35"
text_color="LtGray_50"
width="300">
(Locations, images, web, search history)
@ -158,7 +158,7 @@
layout="topleft"
left_pad="5"
name="open_log_path_button"
top_delta="0"
top_delta="-30"
width="40">
<button.commit_callback
function="Pref.BrowseLogPath" />
@ -200,7 +200,7 @@
left_pad="10"
mouse_opaque="false"
name="block_list_label"
top_delta="3"
top_delta="35"
text_color="LtGray_50"
width="300">
(People and/or Objects you have blocked)

9
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -309,10 +309,10 @@
value="true"
follows="left|bottom|right"
height="15"
bottom_delta="10"
tool_tip="This settings allows / disallows scripted prims from controlling your media connections"
label="Allow resident scripts to play media"
top_pad="1"
width="250"
left="25"/>
<check_box
name="media_filter"
@ -328,12 +328,11 @@
name="media_show_on_others_btn"
control_name="MediaShowOnOthers"
value="true"
layout="topleft"
follows="left|bottom|right"
height="15"
tool_tip="Uncheck this to hide media attached to other avatars nearby"
label="Play media attached to other avatars"
top_pad="1"
width="250"
width="230"
left="25"/>
<button
layout="topleft"
@ -357,7 +356,7 @@
left="25"
name="voice_chat_settings"
width="180"
top_pad="7">
top_pad="40">
Voice Chat Settings
</text>
<text