Merged Ascent progress - title picker
This commit is contained in:
Siana Gearz
@@ -7,7 +7,7 @@
|
||||
follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
|
||||
max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
|
||||
word_wrap="true">
|
||||
Ascent is developed and maintained by Hg Beeks and Charley Levenque, with code contributions from: Hazim Gazov, Zwagoth Klaar, and viewers like you. Ascent is based off the Inertia source base.
|
||||
Ascent is developed and maintained by Hg Beeks and Charley Levenque, with code contributions from Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and viewers like you. Ascent is based off the Inertia source base.
|
||||
|
||||
Ascent includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
|
||||
|
||||
|
||||
@@ -18,4 +18,7 @@
|
||||
<button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
|
||||
label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
|
||||
width="80" />
|
||||
<string name="none">
|
||||
none
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,53 +4,35 @@
|
||||
<!-- Floaters can optionally have their titlebar drag handle on the left.
|
||||
If so, the title is not visible.
|
||||
When a floater is resizable, a min_width and min_height must be specified. -->
|
||||
<floater
|
||||
name="floater_contact_groups"
|
||||
title="Manage Contact Groups"
|
||||
rect_control="FloaterContactRect"
|
||||
can_resize="true"
|
||||
can_minimize="false"
|
||||
can_close="true"
|
||||
can_drag_on_left="false"
|
||||
width="335"
|
||||
height="275"
|
||||
min_width="335"
|
||||
min_height="275"
|
||||
>
|
||||
<tab_container bottom="30" follows="left|right|top|bottom" height="220" left="4"
|
||||
name="ContactTabs" tab_position="top" tab_width="65" width="330">
|
||||
<panel name="AddPanel" label="Add Contact"
|
||||
border="true" bottom_delta="-10" height="150" left="6" width="135"
|
||||
mouse_opaque="true">
|
||||
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom="-24" drop_shadow_visible="true" follows="left|top"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
|
||||
mouse_opaque="true" name="InstructManageContacts" v_pad="0"
|
||||
width="240">
|
||||
Create a new group or select an existing one:
|
||||
</text>
|
||||
<line_editor bevel_style="in" border_style="line"
|
||||
border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top|right"
|
||||
font="SansSerifSmall" height="16" left="10" right="-120"
|
||||
max_length="254" mouse_opaque="true" name="add_group_lineedit"
|
||||
width="112" />
|
||||
<button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
|
||||
height="20" label="Create" label_selected="Create" left_delta="20" right="-10"
|
||||
mouse_opaque="true" name="Create" scale_image="TRUE" width="90" />
|
||||
<button bottom_delta="-25" follows="top|right" font="SansSerif" halign="center"
|
||||
height="20" label="Delete" label_selected="Delete" right="-15"
|
||||
mouse_opaque="true" name="Delete" scale_image="TRUE" width="90" />
|
||||
<scroll_list background_visible="true" bottom_delta="-125" column_padding="5"
|
||||
draw_border="true" draw_heading="false" draw_stripes="true"
|
||||
follows="left|top|right" height="120" left="10" mouse_opaque="true"
|
||||
multi_select="false" name="group_scroll_list" width="115" />
|
||||
</panel>
|
||||
</tab_container>
|
||||
|
||||
<button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"
|
||||
width="95" height="20" label="Save" label_selected="Save" mouse_opaque="true"
|
||||
name="Save" scale_image="TRUE" />
|
||||
<button bottom_delta="0" right="240" follows="left|bottom" font="SansSerif" halign="center"
|
||||
width="95" height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
|
||||
name="Cancel" scale_image="TRUE" />
|
||||
<floater name="floater_contact_groups" title="Manage Contact Groups" rect_control="FloaterContactRect"
|
||||
can_resize="true" can_minimize="false" can_close="true" can_drag_on_left="false" width="335"
|
||||
height="275" min_width="260" min_height="275">
|
||||
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom="-35" drop_shadow_visible="true" follows="left|top"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
|
||||
mouse_opaque="true" name="InstructManageContacts" v_pad="0"
|
||||
width="240">
|
||||
Select a group (Or press New to create one):
|
||||
</text>
|
||||
<combo_box allow_text_entry="true" enabled="true" follows="left|top|right"
|
||||
bottom_delta="-20" height="18" hidden="false" left="10" right="-96" max_chars="20" mouse_opaque="true"
|
||||
tool_tip="Buddy group" name="buddy_group_combobox" width="200">
|
||||
<combo_item type="string" length="20" enabled="true" name="All" value="All">
|
||||
All
|
||||
</combo_item>
|
||||
</combo_box>
|
||||
<button follows="top|right" bottom_delta="-1" height="20" label="+" right="-71" name="combo_group_add" width="21" />
|
||||
<button follows="top|right" bottom_delta="0" height="20" label="-" left_delta="22" name="combo_group_remove" width="21" />
|
||||
<button follows="top|right" bottom_delta="0" height="20" label="New" left_delta="22" name="combo_group_create" width="40" />
|
||||
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
|
||||
mouse_opaque="true" name="contact_list_text" v_pad="0"
|
||||
width="240">
|
||||
Currently in:
|
||||
</text>
|
||||
<scroll_list background_visible="true" bottom="15" column_padding="5"
|
||||
draw_border="true" draw_heading="false" draw_stripes="true"
|
||||
follows="left|top|right|bottom" left="10" right="-10" mouse_opaque="true"
|
||||
multi_select="false" name="group_scroll_list" top="-75" />
|
||||
</floater>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="goup titles" title="Group Titles" rect_control="BeauchampFloaterGroupTitlesRect"
|
||||
can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
|
||||
min_width="300" min_height="150" width="400" height="500">
|
||||
<scroll_list name="titles_list" can_resize="true" multi_select="false"
|
||||
background_visible="true" draw_border="true" draw_stripes="true" draw_heading="true"
|
||||
height="450" width="380" bottom_delta="-470" top="10" left="10" follows="left|top|right|bottom">
|
||||
<column name="title" label="Title" dynamicwidth="true" />
|
||||
<column name="group_name" label="Group" dynamicwidth="true" />
|
||||
<!--Hidden field, used as storage for UUID, please keep at width 0-->
|
||||
<column name="group_id" label="" width="0" />
|
||||
</scroll_list>
|
||||
<button name="activate" label="Activate" tool_tip="Activate the selected group title"
|
||||
enabled="true" mouse_opaque="true" font="SansSerif" halign="center"
|
||||
height="20" width="90" bottom_delta="-24" left="10" follows="left|bottom"
|
||||
/>
|
||||
</floater>
|
||||
@@ -37,46 +37,16 @@
|
||||
<string name="unavailable_text_label">
|
||||
Text chat is not available for this call.
|
||||
</string>
|
||||
<!--[$PLOTR$]-->
|
||||
<string name="otr_empty_string"></string>
|
||||
<string name="otr_gen_key_please_wait">OTR is generating keys. This will happen once for each of your avatars and should take less than 45 seconds.</string>
|
||||
<string name="otr_generic_name">Your buddy</string>
|
||||
<string name="otr_err_send_in_finished">[NAME] has ended the private conversation, so your message was not sent. You should restart the private conversation, or end the private conversation.</string>
|
||||
<string name="otr_err_deacivated">OTR has been deactivated by preferences (edit > preferences > Extras tab > IM tab)</string>
|
||||
<string name="otr_err_failed_sending">Unable to encrypt your message for some reason; it has not been sent.</string>
|
||||
<string name="otr_err_failed_starting">Unable to start private conversation.</string>
|
||||
<string name="otr_err_offline_start">[NAME] appears offline; OTR will not try to start a private conversation.</string>
|
||||
<string name="otr_err_offline_send">[NAME] appears offline; You may "End private conversation" and send your message un-encrypted.</string>
|
||||
<string name="otr_prog_I_start">Attempting to start a private conversation with [NAME].</string>
|
||||
<string name="otr_prog_I_stop_unverified">You have ended the unverified conversation with [NAME].</string>
|
||||
<string name="otr_prog_I_stop_private" >You have ended the private conversation with [NAME].</string>
|
||||
<string name="otr_prog_I_stop" >You have ended the OTR conversation with [NAME].</string>
|
||||
<string name="otr_prog_they_start">[NAME] is attempting to start a private conversation.</string>
|
||||
<string name="otr_prog_they_stop_unverified">[NAME] has ended the unverified conversation.</string>
|
||||
<string name="otr_prog_they_stop_private" >[NAME] has ended the private conversation.</string>
|
||||
<string name="otr_prog_they_stop" >[NAME] has ended the OTR conversation.</string>
|
||||
<string name="otr_log_authenticated" >[NAME] is now authenticated.</string>
|
||||
<string name="otr_log_start_private" >Private conversation with [NAME] started.</string>
|
||||
<string name="otr_log_start_unverified">Unverified conversation started. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
|
||||
<string name="otr_log_gone_insecure">Private conversation ended.</string>
|
||||
<string name="otr_log_still_private" >Private conversation with [NAME] resumed.</string>
|
||||
<string name="otr_log_still_unverified">Unverified conversation resumed. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
|
||||
<string name="otr_not_private">OTR: Not Private</string>
|
||||
<string name="otr_unverified" >OTR: Unverified</string>
|
||||
<string name="otr_private" >OTR: Private</string>
|
||||
<string name="otr_finished" >OTR: Finished</string>
|
||||
<string name="otr_start" >Start private conversation</string>
|
||||
<string name="otr_refresh">Refresh private conversation</string>
|
||||
<string name="otr_restart">Restart private conversation</string>
|
||||
<string name="otr_stop" >End private conversation</string>
|
||||
<string name="otr_auth" >Authenticate buddy</string>
|
||||
<!--[/$PLOTR$]-->
|
||||
<button bottom="-40" follows="left|top" height="20" label="Profile" left="5"
|
||||
name="profile_callee_btn" width="80" />
|
||||
<button bottom="-40" follows="left|top" halign="center" height="20" label="Teleport" left_delta="80"
|
||||
name="profile_tele_btn" width="80" />
|
||||
<button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80"
|
||||
name="history_btn" pad_right="10" visible="true" width="80" />
|
||||
name="history_btn" visible="true" width="80" />
|
||||
<check_box bottom="-40" follows="left|top" halign="center" height="20" left_delta="80"
|
||||
name="rp_mode" pad_right="10" >
|
||||
RP Mode
|
||||
</check_box>
|
||||
<button bottom="-40" follows="left|top" halign="right" height="20"
|
||||
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
|
||||
label="Call" left_delta="80" name="start_call_btn" width="53" />
|
||||
|
||||
@@ -73,12 +73,15 @@
|
||||
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
|
||||
initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
|
||||
name="radio select face" radio_style="true" width="114" />
|
||||
<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
|
||||
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
|
||||
initial_value="false" label="Align (Ctrl-A)" left="4" mouse_opaque="true"
|
||||
name="radio align" radio_style="true" width="114" />
|
||||
<check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
|
||||
font="SansSerifSmall" height="16" initial_value="false"
|
||||
label="Edit linked parts" left="4" mouse_opaque="true"
|
||||
name="checkbox edit linked parts" width="114" />
|
||||
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
|
||||
bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
|
||||
mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
|
||||
Ruler:
|
||||
@@ -1388,6 +1391,9 @@
|
||||
<string name="status_move">
|
||||
Drag to move, shift-drag to copy
|
||||
</string>
|
||||
<string name="status_align">
|
||||
Click an arrow to align objects in that direction
|
||||
</string>
|
||||
<string name="status_modifyland">
|
||||
Click and hold to modify land
|
||||
</string>
|
||||
|
||||
@@ -25,28 +25,31 @@
|
||||
tool_tip="You can edit this friend's objects" width="20" />
|
||||
<column name="friend_last_update_generation" width="0" />
|
||||
</scroll_list>
|
||||
<text bottom_delta="-40" follows="left|top" font="SansSerif" height="16" left_delta="10"
|
||||
<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
|
||||
name="friends" width="110">
|
||||
Contact Group:
|
||||
</text>
|
||||
<text bottom_delta="-20" follows="left|top" font="SansSerif" height="16" left_delta="0"
|
||||
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
|
||||
name="friends" width="110">
|
||||
Contact Search:
|
||||
</text>
|
||||
<combo_box allow_text_entry="false" enabled="true" follows="right|top"
|
||||
bottom_delta="20" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
|
||||
bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" mouse_opaque="true"
|
||||
tool_tip="Buddy group" name="buddy_group_combobox" width="130">
|
||||
<combo_item type="string" length="20" enabled="true" name="All" value="All">
|
||||
All
|
||||
</combo_item>
|
||||
</combo_box>
|
||||
<line_editor bottom_delta="-20" enabled="true" follows="right|top" font="SansSerif"
|
||||
height="18" left="-235" name="buddy_search_lineedit"
|
||||
height="18" left_delta="0" name="buddy_search_lineedit"
|
||||
tool_tip="The friend name you want to search for" width="130" />
|
||||
<button bottom_delta="-3" follows="top|right" height="22" label="0"
|
||||
left_delta="132" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info"
|
||||
width="22" />
|
||||
<pad bottom="-7" height="0" left="-90" width="1" />
|
||||
<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
|
||||
left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
|
||||
width="80" />
|
||||
<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
|
||||
left_delta="0" name="assign_btn" tool_tip="Assign a friend to a Contact Group"
|
||||
width="80" />-->
|
||||
<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
|
||||
left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
|
||||
width="80" />
|
||||
|
||||
@@ -34,7 +34,11 @@
|
||||
label="Create..." name="Create" width="80" />
|
||||
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
|
||||
label="Search..." name="Search..." width="80" />
|
||||
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
|
||||
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
|
||||
label="Invite..." name="Invite..." width="80" />
|
||||
|
||||
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
|
||||
label="Titles..." name="Titles..." width="80" />
|
||||
<string name="none">
|
||||
none
|
||||
</string>
|
||||
</panel>
|
||||
|
||||
Reference in New Issue
Block a user