Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Liru/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2014-08-11 18:25:32 -03:00
parent 8e2da87b97 2deba06212
commit e02d074a85
22 changed files with 197 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/skins/default/xui/de/menu_viewer.xml
View File

@@ -95,7 +95,6 @@
<menu_item_check label="Aktive Sprecher" name="Active Speakers"/>
<menu_item_check label="Stummschalten-Liste" name="Mute List"/>
<menu_item_check label="Teleport-Liste" name="Teleport History"/>
<menu_item_check label="Medienfilter" name="Media Filter"/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
<menu_item_check label="Bewegungssteuerung" name="Movement Controls"/>
@@ -259,7 +258,7 @@
</menu>
<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
</menu>
<menu label="[SHORT_APP_NAME]" name="Singularity">
<menu name="Singularity">
<menu_item_call label="Alle Dialoge schließen" name="Close All Dialogs"/>
<menu_item_call label="Täusche Abwesend-Status vor" name="Fake Away Status"/>
@@ -271,6 +270,7 @@
<menu_item_check label="Areal-Objektsuche" name="Object Area Search"/>
<menu_item_check label="Sound Explorer" name="Sound Explorer"/>
<menu_item_check label="Asset-Blacklist" name="Asset Blacklist"/>
<menu_item_check label="Medienfilter" name="Media Filter"/>
<menu_item_check label="Streaming-Audio Anzeige" name="Streaming Audio Display"/>
<menu_item_check label="Pose-Stand" name="Pose Stand"/>
<menu_item_check label="Region Debug Konsole" name="Region Debug Console"/>

26
indra/newview/skins/default/xui/en-us/menu_login.xml
View File

@@ -13,6 +13,32 @@
<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
opaque="true" tear_off="false" width="153">
<menu_item_call label="Undo" name="Undo" shortcut="control|Z">
<on_click function="Edit.Undo"/>
<on_enable function="Edit.EnableUndo"/>
</menu_item_call>
<menu_item_call label="Redo" name="Redo" shortcut="control|Y">
<on_click function="Edit.Redo"/>
<on_enable function="Edit.EnableRedo"/>
</menu_item_call>
<menu_item_separator/>
<menu_item_call label="Cut" name="Cut" shortcut="control|X">
<on_click function="Edit.Cut"/>
<on_enable function="Edit.EnableCut"/>
</menu_item_call>
<menu_item_call label="Copy" name="Copy" shortcut="control|C">
<on_click function="Edit.Copy"/>
<on_enable function="Edit.EnableCopy"/>
</menu_item_call>
<menu_item_call label="Paste" name="Paste" shortcut="control|V">
<on_click function="Edit.Paste"/>
<on_enable function="Edit.EnablePaste"/>
</menu_item_call>
<menu_item_call label="Delete" name="Delete" shortcut="Del">
<on_click function="Edit.Delete"/>
<on_enable function="Edit.EnableDelete"/>
</menu_item_call>
<menu_item_separator/>
<menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
<on_click function="ShowFloater" userdata="preferences" />

9
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -357,11 +357,6 @@
<on_click function="ShowFloater" userdata="teleport history" />
<on_check function="FloaterVisible" userdata="teleport history" />
</menu_item_check>
<menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
mouse_opaque="true" name="Media Filter" width="211">
<on_click function="ShowFloater" userdata="media filter" />
<on_check function="FloaterVisible" userdata="media filter" />
</menu_item_check>
<menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="211" />
<menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
@@ -1040,6 +1035,10 @@
<on_click function="ShowFloater" userdata="asset_blacklist"/>
<on_check function="FloaterVisible" userdata="asset_blacklist"/>
</menu_item_check>
<menu_item_check label="Media Filter" name="Media Filter">
<on_click function="ShowFloater" userdata="media filter" />
<on_check function="FloaterVisible" userdata="media filter" />
</menu_item_check>
<menu_item_check label="Streaming Audio Display" mouse_opaque="true" name="Streaming Audio Display">
<on_click function="ShowFloater" userdata="media ticker"/>
<on_check function="FloaterVisible" userdata="media ticker"/>

2
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -151,7 +151,7 @@
icon="alert.tga"
name="MediaAlert"
type="alert">
The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
The owner of this parcel has requested the following [MEDIA_TYPE] URL to be loaded by your viewer:
[URL]

26
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -141,10 +141,28 @@ when the Atmospheric Shaders are enabled.
<panel border="true" bottom="-400" height="244" left="50" name="DoF" label="Depth of Field" width="500">
<check_box bottom="-22" left="5" follows="top|left" control_name="RenderDepthOfField" label="Enable Depth of Field" tool_tip="Toggles a camera like Depth of Field effect on or off, often used to blur out distance or things that shouldnt be in focus" name="RenderDepthOfField"/>
<slider bottom_delta="-18" left_delta="6" follows="top|left" height="16" width="298" control_name="CameraFNumber" can_edit_text="true" decimal_digits="1" increment="0.1" label_width="110" max_val="128" min_val="0.50" name="CameraFNum" label="F-Number:" tool_tip="Camera f-number value for Depth of Field effect"/>
<slider bottom_delta="-18" follows="top|left" height="16" width="298" control_name="CameraFocalLength" can_edit_text="true" decimal_digits="1" increment="0.1" label_width="110" max_val="300" min_val="0" name="CameraFocal" label="Focal Length(mm):" tool_tip="Camera focal length for Depth of Field effect (in millimeters)"/>
<slider bottom_delta="-18" follows="top|left" height="16" width="298" control_name="CameraMaxCoF" can_edit_text="true" decimal_digits="1" increment="0.1" label_width="110" max_val="100" min_val="0" name="CameraCoF" label="Circle of Confusion:" tool_tip="Set the Camera circle of confusion"/>
<slider bottom_delta="-18" follows="top|left" height="16" width="298" control_name="CameraFocusTransitionTime" can_edit_text="true" decimal_digits="2" increment="0.01" label_width="110" max_val="20" min_val="0.01" name="CameraFocusTrans" label="Transition Time(secs):" tool_tip="Time taken to alter focus from one place to the next"/>
<slider bottom_delta="-18" follows="top|left" height="16" width="298" control_name="CameraDoFResScale" can_edit_text="true" decimal_digits="2" increment="0.01" label_width="110" val_width="35" max_val="1" min_val="0.25" name="CameraDoFRes" label="Resolution:" tool_tip="Set the Resolution (Quality) of each DoF pixel"/>
<button bottom_delta="-1" left_delta="300" follows="top|left" height="18" width="60" name="reset_f_num" label="Reset">
<button.commit_callback function="Prefs.Reset" parameter="CameraFNumber"/>
</button>
<slider bottom_delta="-17" left_delta="-300" follows="top|left" height="16" width="298" control_name="CameraFocalLength" can_edit_text="true" decimal_digits="1" increment="0.1" label_width="110" max_val="300" min_val="0" name="CameraFocal" label="Focal Length(mm):" tool_tip="Camera focal length for Depth of Field effect (in millimeters)"/>
<button bottom_delta="-1" left_delta="300" follows="top|left" height="18" width="60" name="reset_focal_length" label="Reset">
<button.commit_callback function="Prefs.Reset" parameter="CameraFocalLength"/>
</button>
<slider bottom_delta="-17" left_delta="-300" follows="top|left" height="16" width="298" control_name="CameraMaxCoF" can_edit_text="true" decimal_digits="1" increment="0.1" label_width="110" max_val="100" min_val="0" name="CameraCoF" label="Circle of Confusion:" tool_tip="Set the Camera circle of confusion"/>
<button bottom_delta="-1" left_delta="300" follows="top|left" height="18" width="60" name="reset_max_cof" label="Reset">
<button.commit_callback function="Prefs.Reset" parameter="CameraMaxCoF"/>
</button>
<slider bottom_delta="-17" left_delta="-300" follows="top|left" height="16" width="298" control_name="CameraFocusTransitionTime" can_edit_text="true" decimal_digits="2" increment="0.01" label_width="110" max_val="20" min_val="0.01" name="CameraFocusTrans" label="Transition Time(secs):" tool_tip="Time taken to alter focus from one place to the next"/>
<button bottom_delta="-1" left_delta="300" follows="top|left" height="18" width="60" name="reset_trans_time" label="Reset">
<button.commit_callback function="Prefs.Reset" parameter="CameraFocusTransitionTime"/>
</button>
<slider bottom_delta="-17" left_delta="-300" follows="top|left" height="16" width="298" control_name="CameraDoFResScale" can_edit_text="true" decimal_digits="2" increment="0.01" label_width="110" val_width="35" max_val="1" min_val="0.25" name="CameraDoFRes" label="Resolution:" tool_tip="Set the Resolution (Quality) of each DoF pixel"/>
<button bottom_delta="-1" left_delta="300" follows="top|left" height="18" width="60" name="reset_res_scale" label="Reset">
<button.commit_callback function="Prefs.Reset" parameter="CameraDoFResScale"/>
</button>
<button bottom_delta="-23" left_delta="-300" follows="top|left" height="20" width="298" name="reset_dof" label="Reset All Depth of Field Settings">
<button.commit_callback function="Graphics.ResetTab" parameter="DoF"/>
</button>
</panel>
</tab_container>
<string name="resolution_format">[RES_X] x [RES_Y]</string>

6
indra/newview/skins/default/xui/es/menu_viewer.xml
View File

@@ -74,7 +74,6 @@
<menu_item_check label="Participantes Activos" name="Active Speakers"/>
<menu_item_check label="Lista de Ignorados" name="Mute List"/>
<menu_item_check label="Historial de Teleporte" name="Teleport History"/>
<menu_item_check label="Filtro de Media" name="Media Filter"/>
<menu_item_check label="Controles de Cámara" name="Camera Controls"/>
<menu_item_check label="Controles de Movimiento" name="Movement Controls"/>
<menu_item_check label="Mapa del Mundo" name="World Map"/>
@@ -216,7 +215,7 @@
<menu_item_call label="Acerca de [APP_NAME]..." name="About Second Life..."/>
</menu>
<!-- ============================= -->
<menu label="[SHORT_APP_NAME]" name="Singularity">
<menu name="Singularity">
<menu_item_call label="Cerrar todos los diálogos" name="Close All Dialogs"/>
<menu_item_call label="Falso Estado Ausente" name="Fake Away Status"/>
<menu_item_call label="Forzar Sentarse en el Piso" name="Force Ground Sit"/>
@@ -225,9 +224,10 @@
<menu_item_check label="Búsqueda en Área" name="Object Area Search"/>
<menu_item_check label="Explorador de Sonidos" name="Sound Explorer"/>
<menu_item_check label="Lista Negra de Assets" name="Asset Blacklist"/>
<menu_item_check label="Filtro de Media" name="Media Filter"/>
<menu_item_check label="Mostrar Información de Audio" name="Streaming Audio Display"/>
<menu_item_check label="Pose Stand" name="Pose Stand"/>
<menu_item_check label="Consola de Depuración de Región" name="Region Debug Console"/>
<menu_item_call label="Redibujar" name="Rebake"/>
</menu>
</menu>
</menu_bar>

4
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@@ -83,7 +83,6 @@
<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
<menu_item_check label="Liste des ignorés - Mute" name="Mute List"/>
<menu_item_check label="Historique des TP" name="Teleport History"/>
<menu_item_check label="Filtre Médias" name="Media Filter"/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
<menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
@@ -243,4 +242,7 @@
</menu>
<menu_item_call label="A propos de [APP_NAME]" name="About Second Life..."/>
</menu>
<menu name="Singularity">
<menu_item_check label="Filtre Médias" name="Media Filter"/>
</menu>
</menu_bar>

1
indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
View File

@@ -14,6 +14,7 @@
<check_box label="Garder les menus flottants opaques en arrière plan (Cliquer une fois en 1er plan pour activer)" tool_tip="peux poser des conflits avec certains thèmes (skin viewers)." name="unfocused_floaters_opaque"/>
<check_box label="Montrer les noms complets : display + ancient names dans les profils" tool_tip="Ne fonctionnera pas si les display sont désactivés dans le menu général." name="complete_name_profiles"/>
<check_box label="Garder les scripts en premier plan quand ils ne peuvent pas être compilés suite a une erreur" name="script_errors_steal_focus"/>
<check_box label="Se connecter aux régions voisines" name="connect_to_neighbors"/>
</panel>
<panel label="Tags/Couleurs" name="TagsColors">
<!-- Client tag options -->