diff options
author | McCabe Maxsted | 2010-03-04 15:42:11 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-03-11 19:13:49 -0600 |
commit | 1e0089c27a40a138bee5b33f4ec9cff63d388119 (patch) | |
tree | 4498718d79f31f25b88339a4aeab81e6684a788b /linden/indra/newview/skins/default/xui/en-us | |
parent | Updated .gitignore to exclude some 1.3 files and folders on Windows. (diff) | |
download | meta-impy-1e0089c27a40a138bee5b33f4ec9cff63d388119.zip meta-impy-1e0089c27a40a138bee5b33f4ec9cff63d388119.tar.gz meta-impy-1e0089c27a40a138bee5b33f4ec9cff63d388119.tar.bz2 meta-impy-1e0089c27a40a138bee5b33f4ec9cff63d388119.tar.xz |
Added menus from BetterNotecardFloater Cool Viewer patch.
Patch by Henri Beauchamp.
(slviewer-0-v12350-BetterNotecardFloater.patch)
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml | 43 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml | 80 |
2 files changed, 94 insertions, 29 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml index 03fc7f6..ed26e11 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml | |||
@@ -1,11 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="true" enabled="true" follows="left|top" height="361" left="273" | 3 | can_resize="true" enabled="true" follows="left|top" height="377" left="273" |
4 | min_height="243" min_width="234" mouse_opaque="true" | 4 | min_height="259" min_width="234" mouse_opaque="true" |
5 | name="preview notecard" title="Note:" width="400"> | 5 | name="preview notecard" title="Note:" width="400"> |
6 | <button bottom="-352" enabled="false" follows="left|bottom" font="SansSerif" | ||
7 | halign="center" height="20" label="Save" label_selected="Save" left="9" | ||
8 | mouse_opaque="false" name="Save" scale_image="true" width="100" /> | ||
9 | <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16" | 6 | <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16" |
10 | image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock" | 7 | image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock" |
11 | width="16" /> | 8 | width="16" /> |
@@ -20,12 +17,44 @@ | |||
20 | handle_edit_keys_directly="false" height="19" left="93" max_length="127" | 17 | handle_edit_keys_directly="false" height="19" left="93" max_length="127" |
21 | mouse_opaque="true" name="desc" select_all_on_focus_received="false" | 18 | mouse_opaque="true" name="desc" select_all_on_focus_received="false" |
22 | select_on_focus="false" width="294" /> | 19 | select_on_focus="false" width="294" /> |
23 | <text_editor type="string" length="1" bottom="-327" embedded_items="true" enabled="true" | 20 | <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right" |
24 | follows="left|top|right|bottom" font="SansSerif" height="281" | 21 | height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false" |
22 | tear_off="false" width="220"> | ||
23 | <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150" | ||
24 | mouse_opaque="false" name="Edit" opaque="true" tear_off="false"> | ||
25 | <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0" | ||
26 | mouse_opaque="true" name="Undo" width="139" /> | ||
27 | <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0" | ||
28 | mouse_opaque="true" name="Redo" width="139" /> | ||
29 | <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0" | ||
30 | mouse_opaque="true" name="separator1" width="139" /> | ||
31 | <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0" | ||
32 | mouse_opaque="true" name="Cut" width="139" /> | ||
33 | <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0" | ||
34 | mouse_opaque="true" name="Copy" width="139" /> | ||
35 | <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0" | ||
36 | mouse_opaque="true" name="Paste" width="139" /> | ||
37 | <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0" | ||
38 | mouse_opaque="true" name="separator2" width="139" /> | ||
39 | <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0" | ||
40 | mouse_opaque="true" name="Select All" width="139" /> | ||
41 | <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0" | ||
42 | mouse_opaque="true" name="Deselect" width="139" /> | ||
43 | <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0" | ||
44 | mouse_opaque="true" name="separator3" width="139" /> | ||
45 | <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..." | ||
46 | left="0" mouse_opaque="true" name="Search / Replace..." width="139" /> | ||
47 | </menu> | ||
48 | </menu_bar> | ||
49 | <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true" | ||
50 | follows="left|top|right|bottom" font="SansSerif" height="285" | ||
25 | ignore_tab="false" left="4" max_length="65536" mouse_opaque="true" | 51 | ignore_tab="false" left="4" max_length="65536" mouse_opaque="true" |
26 | name="Notecard Editor" width="392" word_wrap="true"> | 52 | name="Notecard Editor" width="392" word_wrap="true"> |
27 | Loading... | 53 | Loading... |
28 | </text_editor> | 54 | </text_editor> |
55 | <button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif" | ||
56 | halign="center" height="20" label="Save" label_selected="Save" left="9" | ||
57 | mouse_opaque="false" name="Save" scale_image="true" width="100" /> | ||
29 | <string name="no_object"> | 58 | <string name="no_object"> |
30 | Unable to find object containing this note. | 59 | Unable to find object containing this note. |
31 | </string> | 60 | </string> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml index 32af593..cd651dd 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml | |||
@@ -1,35 +1,71 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="-484" can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="true" enabled="true" height="400" left="138" min_height="243" | 3 | can_resize="true" enabled="true" follows="left|top" height="377" left="273" |
4 | min_width="234" mouse_opaque="true" name="preview_notecard" width="400"> | 4 | min_height="259" min_width="350" mouse_opaque="true" |
5 | <text_editor type="string" length="1" bottom="-366" | 5 | name="preview notecard" title="Note:" width="400"> |
6 | embedded_items="true" enabled="true" follows="left|top|right|bottom" | 6 | <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16" |
7 | font="SansSerif" height="320" ignore_tab="false" left="4" | 7 | image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock" |
8 | max_length="65536" mouse_opaque="true" name="Notecard Editor" width="392" | 8 | width="16" /> |
9 | word_wrap="true"> | ||
10 | Loading... | ||
11 | </text_editor> | ||
12 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 9 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
13 | bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top" | 10 | bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top" |
14 | font="SansSerif" h_pad="0" halign="left" height="19" left="13" | 11 | font="SansSerif" h_pad="0" halign="left" height="19" left="13" |
15 | mouse_opaque="true" name="desc txt" v_pad="0" width="80"> | 12 | mouse_opaque="true" name="desc txt" v_pad="0" width="80"> |
16 | Description: | 13 | Description: |
17 | </text> | 14 | </text> |
18 | <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16" | ||
19 | image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock" | ||
20 | width="16" /> | ||
21 | <button bottom="-391" enabled="true" follows="left|bottom" font="SansSerif" | ||
22 | halign="center" height="20" label="Keep" label_selected="Keep" left="9" | ||
23 | mouse_opaque="true" name="Keep" scale_image="true" width="100" /> | ||
24 | <button bottom="-391" enabled="true" follows="left|bottom" font="SansSerif" | ||
25 | halign="center" height="20" label="Discard" label_selected="Discard" | ||
26 | left="114" mouse_opaque="true" name="Discard" scale_image="true" | ||
27 | width="100" /> | ||
28 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38" | 15 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38" |
29 | enabled="true" follows="left|top|right" font="SansSerif" | 16 | enabled="true" follows="left|top|right" font="SansSerif" |
30 | handle_edit_keys_directly="false" height="19" left="93" max_length="127" | 17 | handle_edit_keys_directly="false" height="19" left="93" max_length="127" |
31 | mouse_opaque="true" name="desc" select_all_on_focus_received="false" | 18 | mouse_opaque="true" name="desc" select_all_on_focus_received="false" |
32 | select_on_focus="false" width="294" /> | 19 | select_on_focus="false" width="294" /> |
33 | <string name="no_object">Unable to find object containing this note.:</string> | 20 | <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right" |
34 | <string name="not_allowed">You are not allowed to view this note.</string> | 21 | height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false" |
22 | tear_off="false" width="220"> | ||
23 | <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150" | ||
24 | mouse_opaque="false" name="Edit" opaque="true" tear_off="false"> | ||
25 | <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0" | ||
26 | mouse_opaque="true" name="Undo" width="139" /> | ||
27 | <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0" | ||
28 | mouse_opaque="true" name="Redo" width="139" /> | ||
29 | <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0" | ||
30 | mouse_opaque="true" name="separator1" width="139" /> | ||
31 | <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0" | ||
32 | mouse_opaque="true" name="Cut" width="139" /> | ||
33 | <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0" | ||
34 | mouse_opaque="true" name="Copy" width="139" /> | ||
35 | <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0" | ||
36 | mouse_opaque="true" name="Paste" width="139" /> | ||
37 | <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0" | ||
38 | mouse_opaque="true" name="separator2" width="139" /> | ||
39 | <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0" | ||
40 | mouse_opaque="true" name="Select All" width="139" /> | ||
41 | <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0" | ||
42 | mouse_opaque="true" name="Deselect" width="139" /> | ||
43 | <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0" | ||
44 | mouse_opaque="true" name="separator3" width="139" /> | ||
45 | <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..." | ||
46 | left="0" mouse_opaque="true" name="Search / Replace..." width="139" /> | ||
47 | </menu> | ||
48 | </menu_bar> | ||
49 | <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true" | ||
50 | follows="left|top|right|bottom" font="SansSerif" height="285" | ||
51 | ignore_tab="false" left="4" max_length="65536" mouse_opaque="true" | ||
52 | name="Notecard Editor" width="392" word_wrap="true"> | ||
53 | Loading... | ||
54 | </text_editor> | ||
55 | <button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif" | ||
56 | halign="center" height="20" label="Keep" label_selected="Keep" left="9" | ||
57 | mouse_opaque="true" name="Keep" scale_image="true" width="100" /> | ||
58 | <button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif" | ||
59 | halign="center" height="20" label="Save" label_selected="Save" left="114" | ||
60 | mouse_opaque="false" name="Save" scale_image="true" width="100" /> | ||
61 | <button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif" | ||
62 | halign="center" height="20" label="Discard" label_selected="Discard" | ||
63 | left="219" mouse_opaque="true" name="Discard" scale_image="true" | ||
64 | width="100" /> | ||
65 | <string name="no_object"> | ||
66 | Unable to find object containing this note. | ||
67 | </string> | ||
68 | <string name="not_allowed"> | ||
69 | You are not allowed to view this note. | ||
70 | </string> | ||
35 | </floater> | 71 | </floater> |