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

Satisfy radar issues: 51(Avatar Age), 382(Time duration), 245(Hide columns on command)

Browse Source 
Overall:
Extras tab added to radar.
Activities given tool_tip strings, TODO: Get icon entries to have tool_tips.
Added tab_min_width="0" to tab container so tabs take up only as much space as necessary.

Issue 51:
RadarAlertAge, AvatarAgeAlertDays debugs added.
RadarTextYoung color added to colors_base and gemini.
UI bits added to radar.
ALERT_TYPE_AGE, LIST_AGE, and boost::lexical_cast added.
LLAvatarListEntry is now derived from LLAvatarPropertiesObserver for processProperties and all that fun stuff. Also has mAgeAlert and mAge.
processProperties is basically copied directly from LLAvatarPanel, it can probably be bettered.

Issue 382:
mTime, getTime(), LIST_TIME
Time column.

Issue 245:
Hide columns text and checkboxes added to UI.
assessColumns() now used to determine which columns to show. Also once used during postBuild()
col_helper() function added to help decide to hide or resize a column based on given params.
checkboxes all use assessColumns as callback.
RadarColumn* debug settings added.

If you read this all, that's a sign the 'pocalypse is coming.
This commit is contained in:
Lirusaito
2012-12-20 08:58:18 -05:00
parent c35f762826
commit 245eaa1fd9
6 changed files with 395 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/colors_base.xml
View File

@@ -153,6 +153,7 @@
<RadarTextChatRange value="255, 0, 0, 255"/>
<RadarTextShoutRange value="255, 255, 0, 128"/>
<RadarTextDrawDist value="0, 153, 0, 255"/>
<RadarTextYoung value="255, 0, 0, 255"/>
<!-- SPEAKERS -->
<SpeakersInactive value="76, 76, 76, 255"/>

30
indra/newview/skins/default/xui/en-us/floater_radar.xml
View File

@@ -14,11 +14,13 @@
<column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
<column name="activity" label="Act." width="24" tool_tip="Activity"/>
<column name="age" label="Age" width="45" tool_tip="Age"/>
<column name="time" label="Time" width="52" tool_tip="Time since arrival in the sim."/>
<column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/>
</scroll_list>
<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
name="actions_tab_container" tab_position="top" follows="left|right|bottom">
name="actions_tab_container" tab_position="top" tab_min_width="0" follows="left|right|bottom">
<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
label="Avatar" left="1" mouse_opaque="true"
name="actions_tab" width="398">
@@ -337,7 +339,33 @@
follows="bottom|left"
/>
</panel>
<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
label="Extras" left="1" mouse_opaque="true" name="extras_tab" width="398">
<check_box label="Avatar Age Alert" left_delta="5" bottom="80" name="agealert"
width="200" follows="bottom|left" control_name="RadarAlertAge" tool_tip="Enable Avatar Age Alert" />
<spinner bottom_delta="-1" decimal_digits="0" follows="bottom|left" height="16"
left_delta="120" increment="1" initial_val="3" min_val="0" max_val="9999"
name="AgeAlertDays" label="Age Threshold" label_width="80"
tool_tip="The minimum amount of days an avatar can have spent on the grid without triggering an alert" width="130" control_name="AvatarAgeAlertDays" />
<text follows="bottom|left" left="2" name="hide_columns">Hide columns:</text>
<check_box follows="bottom|left" bottom_delta="-25" left="5" control_name="RadarColumnMarkHidden" name="hide_mark" label="Mark"/>
<check_box follows="bottom|left" bottom_delta="0" left_delta="70" control_name="RadarColumnPositionHidden" name="hide_pos" label="Pos." tool_tip="Position"/>
<check_box follows="bottom|left" bottom_delta="0" left_delta="70" control_name="RadarColumnAltitudeHidden" name="hide_alt" label="Alt." tool_tip="Altitude"/>
<check_box follows="bottom|left" bottom_delta="-20" left="5" control_name="RadarColumnActivityHidden" name="hide_act" label="Act." tool_tip="Activity"/>
<check_box follows="bottom|left" bottom_delta="0" left_delta="70" control_name="RadarColumnAgeHidden" name="hide_age" label="Age"/>
<check_box follows="bottom|left" bottom_delta="0" left_delta="70" control_name="RadarColumnTimeHidden" name="hide_time" label="Time"/>
<check_box follows="bottom|left" bottom_delta="0" left_delta="70" control_name="RadarColumnClientHidden" name="hide_client" label="Client"/>
</panel>
</tab_container>
<string name="Moving">Moving</string>
<string name="Playing a gesture">Playing a gesture</string>
<string name="Playing a sound">Playing a sound</string>
<string name="Rezzing objects">Rezzing objects</string>
<string name="Creating particles">Creating particles</string>
<string name="Just arrived">Just arrived</string>
<string name="Typing">Typing</string>
<string name="has_triggered_your_avatar_age_alert">has triggered your avatar age alert</string>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">has entered</string>

1
indra/newview/skins/gemini/colors.xml
View File

@@ -151,6 +151,7 @@
<RadarTextChatRange value="255, 66, 66, 128"/>
<RadarTextShoutRange value="255, 255, 66, 128"/>
<RadarTextDrawDist value="66, 153, 66, 128"/>
<RadarTextYoung value="255, 0, 0, 255"/>
<!-- SPEAKERS -->
<SpeakersInactive value="76, 76, 76, 255"/>