From bb4c1384ac4113775cf69e2de521ad150733fa67 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 1 Apr 2010 12:05:17 -0700 Subject: EXT-3531 - Ctrl-P does not work reliably on login forgot menu_edit.xml --- indra/newview/skins/default/xui/en/menu_edit.xml | 89 ++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/menu_edit.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml new file mode 100644 index 0000000000..68f3cb532c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_edit.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From e254aa6dc6dcd3ba7369de5231dec16a570701a8 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 1 Apr 2010 12:06:16 -0700 Subject: EXT-3531 - Ctrl-P does not work reliably on login deprecated handle_edit_keys_directly and moved edit menu out of menu_viewer and menu_login --- .../skins/default/xui/en/alert_line_editor.xml | 1 - .../skins/default/xui/en/floater_about_land.xml | 1 - .../skins/default/xui/en/floater_buy_land.xml | 1 - .../default/xui/en/floater_outfit_save_as.xml | 1 - .../default/xui/en/floater_preview_notecard.xml | 1 - .../skins/default/xui/en/floater_ui_preview.xml | 3 - .../default/xui/en/floater_wearable_save_as.xml | 1 - indra/newview/skins/default/xui/en/menu_login.xml | 135 ++--- indra/newview/skins/default/xui/en/menu_viewer.xml | 582 ++------------------- indra/newview/skins/default/xui/en/panel_login.xml | 3 - .../skins/default/xui/en/panel_place_profile.xml | 1 - .../default/xui/en/panel_preferences_setup.xml | 1 - .../skins/default/xui/en/panel_region_covenant.xml | 1 - .../skins/default/xui/en/panel_script_ed.xml | 1 - .../skins/default/xui/en/widgets/line_editor.xml | 1 - 15 files changed, 87 insertions(+), 647 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml index 97991153d8..82bf5fc8da 100644 --- a/indra/newview/skins/default/xui/en/alert_line_editor.xml +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml @@ -1,7 +1,6 @@ length="1" enabled="false" follows="all" - handle_edit_keys_directly="true" height="200" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 125b080519..df44b61632 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -356,7 +356,6 @@ supports [AMOUNT2] objects length="1" enabled="false" follows="top|right" - handle_edit_keys_directly="false" height="237" layout="topleft" left="444" diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index a2938e8574..1d73d516d0 100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -45,7 +45,6 @@ as a new Outfit: border_style="line" border_thickness="1" follows="left|top" - handle_edit_keys_directly="true" height="23" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index e9099211a3..14c0081c0d 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -72,7 +72,6 @@ max_length="65536" name="Notecard Editor" allow_html="false" - handle_edit_keys_directly="true" tab_group="1" top="46" width="392" diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 3a981adfdf..3b10a57c50 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -238,7 +238,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="100" @@ -278,7 +277,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="100" @@ -320,7 +318,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="65" diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml index b4b57f2dbc..71812bd1a6 100644 --- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml @@ -44,7 +44,6 @@ border_style="line" border_thickness="1" follows="left|top" - handle_edit_keys_directly="true" height="23" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index ba74104594..4655fa8c46 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -29,14 +29,6 @@ function="File.Quit" /> - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -270,5 +181,27 @@ function="Advanced.WebBrowserTest" parameter="http://join.secondlife.com/"/> + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index a08bc16066..43f594ca5a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2,16 +2,13 @@ - + @@ -56,7 +48,6 @@ - + @@ -115,7 +100,6 @@ @@ -124,18 +108,15 @@ - + - + @@ -188,7 +163,6 @@ @@ -228,7 +199,6 @@ @@ -247,12 +216,10 @@ - + @@ -280,7 +244,6 @@ @@ -324,7 +283,6 @@ @@ -374,11 +330,9 @@ control="NavBarShowParcelProperties" /> - + @@ -397,7 +350,6 @@ - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -687,11 +514,9 @@ - + - + @@ -732,7 +553,6 @@ @@ -743,7 +563,6 @@ @@ -752,7 +571,6 @@ @@ -761,7 +579,6 @@ @@ -772,12 +589,10 @@ - + - + @@ -867,7 +672,6 @@ @@ -877,18 +681,15 @@ - + @@ -897,7 +698,6 @@ @@ -906,7 +706,6 @@ @@ -914,11 +713,9 @@ function="ToggleControl" parameter="ShowSelectionBeam" /> - + - - + - + + + + + @@ -1101,7 +889,6 @@ - + - + - --> + @@ -1297,9 +1063,8 @@ - @@ -1850,11 +1557,9 @@ function="View.Fullscreen" /> - + + @@ -1901,7 +1603,6 @@ @@ -1914,7 +1615,6 @@ @@ -1960,7 +1657,6 @@ @@ -1971,11 +1667,9 @@ function="Advanced.ToggleConsole" parameter="memory view" /> - + - + - + - + - + - + - + @@ -2755,12 +2381,10 @@ @@ -2799,14 +2420,12 @@ @@ -2874,7 +2487,6 @@ @@ -2969,18 +2572,15 @@ @@ -3058,28 +2651,24 @@ - + - + @@ -3331,7 +2893,6 @@ @@ -3340,7 +2901,6 @@ @@ -3386,7 +2942,6 @@ @@ -3407,12 +2961,10 @@ @@ -3421,7 +2973,6 @@ @@ -3431,7 +2982,6 @@ - + There is no Covenant provided for this Estate. diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index d444420550..c5c66c04d5 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -143,7 +143,6 @@ name="Script Editor" width="487" show_line_numbers="true" - handle_edit_keys_directly="true" word_wrap="true"> Loading... diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index a21e3f2645..a054960bf8 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -3,7 +3,6 @@ background_image_disabled="TextField_Disabled" background_image_focused="TextField_Active" select_on_focus="false" - handle_edit_keys_directly="false" commit_on_focus_lost="true" ignore_tab="true" cursor_color="TextCursorColor" -- cgit v1.2.3 From df45c16169bd2be38c53fd39fd87aa7b00bb64c2 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 1 Apr 2010 12:49:23 -0700 Subject: removed unused textures reviewed by Erica --- .../default/textures/icons/Generic_Group_Large.png | Bin 2282 -> 0 bytes .../skins/default/textures/icons/Progress_1.png | Bin 464 -> 0 bytes .../skins/default/textures/icons/Progress_10.png | Bin 461 -> 0 bytes .../skins/default/textures/icons/Progress_11.png | Bin 471 -> 0 bytes .../skins/default/textures/icons/Progress_12.png | Bin 457 -> 0 bytes .../skins/default/textures/icons/Progress_2.png | Bin 461 -> 0 bytes .../skins/default/textures/icons/Progress_3.png | Bin 487 -> 0 bytes .../skins/default/textures/icons/Progress_4.png | Bin 466 -> 0 bytes .../skins/default/textures/icons/Progress_5.png | Bin 477 -> 0 bytes .../skins/default/textures/icons/Progress_6.png | Bin 460 -> 0 bytes .../skins/default/textures/icons/Progress_7.png | Bin 483 -> 0 bytes .../skins/default/textures/icons/Progress_8.png | Bin 467 -> 0 bytes .../skins/default/textures/icons/Progress_9.png | Bin 483 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 183 +-------------------- 14 files changed, 1 insertion(+), 182 deletions(-) delete mode 100644 indra/newview/skins/default/textures/icons/Generic_Group_Large.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_1.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_10.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_11.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_12.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_2.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_3.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_4.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_5.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_6.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_7.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_8.png delete mode 100644 indra/newview/skins/default/textures/icons/Progress_9.png (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png deleted file mode 100644 index 4d4f1e1bee..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png deleted file mode 100644 index 58b56003c4..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_1.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png deleted file mode 100644 index 07fe0be8a3..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_10.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png deleted file mode 100644 index 215d68cc46..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_11.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png deleted file mode 100644 index d755588621..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_12.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png deleted file mode 100644 index 6640ee227b..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_2.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png deleted file mode 100644 index 5decbe977e..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_3.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png deleted file mode 100644 index 56e81c17aa..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_4.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png deleted file mode 100644 index a89bf2ac62..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_5.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png deleted file mode 100644 index 233c479540..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_6.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png deleted file mode 100644 index 631d7a6819..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_7.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png deleted file mode 100644 index ac0e3f13f7..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_8.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png deleted file mode 100644 index 17fb4a0335..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Progress_9.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index fed326c25e..41bcc62220 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,4 +1,4 @@ - @@ -64,49 +60,28 @@ with the same filename but different name - - - - - - - - - - - - - - - - - - - - - @@ -116,8 +91,6 @@ with the same filename but different name - - @@ -127,8 +100,6 @@ with the same filename but different name - - @@ -136,25 +107,18 @@ with the same filename but different name - - - - - - - @@ -162,8 +126,6 @@ with the same filename but different name - - @@ -174,22 +136,16 @@ with the same filename but different name - - - - - - @@ -206,7 +162,6 @@ with the same filename but different name - @@ -225,13 +180,11 @@ with the same filename but different name - - @@ -239,7 +192,6 @@ with the same filename but different name - @@ -259,7 +211,6 @@ with the same filename but different name - @@ -272,9 +223,7 @@ with the same filename but different name - - @@ -283,18 +232,9 @@ with the same filename but different name - - - - - - - - - @@ -311,10 +251,6 @@ with the same filename but different name - - - - @@ -356,27 +292,15 @@ with the same filename but different name - - - - - - - - - - - - @@ -388,22 +312,13 @@ with the same filename but different name - - - - - - - - - @@ -415,18 +330,6 @@ with the same filename but different name - - - - - - - - - - - - @@ -435,7 +338,6 @@ with the same filename but different name - @@ -448,12 +350,8 @@ with the same filename but different name - - - - @@ -470,11 +368,6 @@ with the same filename but different name - - - - - @@ -487,8 +380,6 @@ with the same filename but different name - - @@ -503,11 +394,7 @@ with the same filename but different name - - - - @@ -520,63 +407,35 @@ with the same filename but different name - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -585,8 +444,6 @@ with the same filename but different name - - @@ -595,7 +452,6 @@ with the same filename but different name - - - - - - - - - - @@ -635,7 +482,6 @@ with the same filename but different name - - - - @@ -667,17 +510,7 @@ with the same filename but different name - - - - - - - - - - @@ -687,7 +520,6 @@ with the same filename but different name - @@ -717,8 +549,6 @@ with the same filename but different name - - @@ -728,15 +558,11 @@ with the same filename but different name - - - - @@ -747,7 +573,6 @@ with the same filename but different name - @@ -756,15 +581,10 @@ with the same filename but different name - - - - - @@ -780,5 +600,4 @@ with the same filename but different name - -- cgit v1.2.3