Commit Graph

122 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Richard Nelson 86cbb16e27 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-10-12 18:17:18 -07:00
Richard Nelson 9206226a37 tooltips now only show labels for toolbar buttons when label is hidden or truncated
tooltips are no longer instantaneous once a tooltip is visible
2011-10-12 18:16:59 -07:00
Merov Linden 40ebe180a6 Pull from richard/viewer-experience-fui 2011-10-12 18:13:01 -07:00
Merov Linden aa1f0215c7 EXP-1331 : Implement new longer caret and make it work on multi lines or columns of tools. EXP-1304 : handle only tools in DaD on toolbars 2011-10-12 18:01:50 -07:00
Leslie Linden 1181e7c757 Merge 2011-10-12 17:50:03 -07:00
Leslie Linden 20358ea89d * Added mModified flag and isModified() query to check it.
(currently it is not connect to actual data)
2011-10-12 17:45:21 -07:00
Richard Nelson d5d7e264ad don't highlight toolbar buttons during drag and drop (for real) 2011-10-12 16:51:00 -07:00
Richard Nelson 3594853d0e don't highlight toolbar buttons during drag and drop
added mVisibleWhenMinimized to floaters
2011-10-12 16:17:24 -07:00
Merov Linden dacfe7b2bd EXP-1300 : Fix caret position in bottom bar, fix misplacement when moving within same toolbar, suppress visible caret in some situations, no caret if toolbar empty 2011-10-11 16:20:02 -07:00
Merov Linden 682609d254 Pull from richard/viewer-experience-fui 2011-10-11 15:16:45 -07:00
Merov Linden 3596c0f7e1 EXP-1300 : Implemented carets for DaD. Works with small bugs but OK for demo. Still in need of some cleanup 2011-10-11 15:06:16 -07:00
Leslie Linden aec61c579a Added 'execute_stop_function' command parameter to handle mouse down/up actions on toolbar buttons 2011-10-11 10:07:19 -07:00
Merov Linden 8b5a905bdb pull from richard/viewer-experience-fui 2011-10-10 18:22:56 -07:00
Merov Linden 1478f22857 EXP-1300 : Simplify and clean up of the DaD which now doesn't duplicate the dragged tool. 2011-10-10 18:00:24 -07:00
Richard Nelson 6a570a9bdc fixed icons moving when clicking on icon-only toolbars 2011-10-10 17:52:37 -07:00
Merov Linden ec5ea33c81 EXP-1300 : drop tool animation. First shot. Works but still a bit hacky and with some bugs (tools can be duplicated at times). 2011-10-09 15:52:45 -07:00
Merov Linden feabe29f35 EXP-1300 : Completed the drawing of drop zones on toolbars when dragging tools 2011-10-07 18:30:57 -07:00
Merov Linden ea02a6a80d EXP-1301 : Init some members that were not initialized correctly 2011-10-06 17:14:54 -07:00
Richard Nelson 740b3547d6 EXP-1303 FIX Drag and dropping button over viewer area can select objects inworld
fixed close button not working on floaters against right edge of window
fixed drag and drop only working once per toolbar button
reimplemented drag and drop threshold
2011-10-06 16:48:19 -07:00
Richard Nelson adeaf71e33 EXP-1300 WIP Visual feedback for Drag and Drop
removed hover highlighting of buttons when dragging over them
also updated toolbar button art to match spec
2011-10-06 15:19:15 -07:00
Leslie Linden 55d2e0020b Merge! 2011-10-05 17:38:56 -07:00
Merov Linden 64d005bfed EXP-1286 : Add DaD to toybox 2011-10-05 17:04:07 -07:00
Leslie Linden 70495f6f2f Fixing merge mistakes! 2011-10-05 16:56:49 -07:00
Leslie Linden d848916664 Merge with latest 2011-10-05 16:39:32 -07:00
Leslie Linden 93e3c8e4a5 EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should change the state of their parent button
* Toolbar buttons now display green when its corresponding floater is open or
  minimized.
* Made changes to buttons so flash time and rate is configurable
* Removed unused "highlight_color" attribute from LLButton
* Implemented "isVisible" function for toolbar button floaters.  It returns true
  when the floater is visible or minimized.
* Toolbar floater unminimize now also puts focus to the floater
* All commands now specify their "is_running_function" for toolbar button state
* ButtonFlashCount and ButtonFlashRate have been moved to button.xml settings
  and are now configurable on the button.  Toolbar buttons are set to never
  flash and this functionality is used to show which buttons have windows open.
* All toybox buttons show hover glow even when disabled

Reviewed by Richard.
2011-10-05 16:28:40 -07:00
Merov Linden 00dc8b3982 EXP-1286 : DaD works between all toolbars, button drops in correct place, removal of button works too 2011-10-05 14:47:50 -07:00
Merov Linden fb7af4d001 EXP-1202 : pull from richard/viewer-experience-fui 2011-10-05 11:49:12 -07:00
Merov Linden 3b3a137073 EXP-1286 : DaD is functional though has bugs... Working on it... 2011-10-05 11:18:17 -07:00
Leslie Linden db2e763ff0 * Modified commands to add functions for is_enabled, is_running and is_starting,
currently not hooked to any functionality.
2011-10-04 14:09:03 -07:00
Richard Nelson 3689995fcf fixed build 2011-10-03 18:58:30 -07:00
Richard Nelson ca8bac2394 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-10-03 18:52:55 -07:00
Richard Nelson edacb7b336 implemented Range and ClampedValue classes to standardize min/max settings
fixed not serializing named values when values provided from code
2011-10-03 18:52:22 -07:00
Merov Linden daae211fe3 EXP-1202 : pull from richard/viewer-experience-fui 2011-10-03 17:29:00 -07:00
Merov Linden 99ada9b047 EXP-1202 : pull from richard/viewer-experience-fui 2011-10-03 17:13:14 -07:00
Leslie Linden 2d0dfbca99 * Added tooltips to the toolbar buttons.
Reviewed by Richard.
2011-10-03 16:37:07 -07:00
Merov Linden cd467cc34f EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks into the LLToolDragAndDrop system in to support the new AT_WIDGET and SOURCE_VIEWER 2011-10-03 16:27:24 -07:00
Richard Nelson 63a8fce12b made toolbars conform to visual specs
added ability to specify clip rects in textures.xml
2011-09-30 18:51:17 -07:00
Richard Nelson 0991a8a870 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-30 16:58:09 -07:00
Richard Nelson 09e179b238 param block cleanup
added Flag as value type
moved Batch to BatchBlock
renamed Choice to ChoiceBlock
made merging of parameters for ValueParams consistent (fillFrom and overwriteFrom are inverses of each other now)
made iteration over Multiple<T> type params easier
initial schema param blocks
2011-09-30 16:57:08 -07:00
Merov Linden b07e7c7198 EXP-1211, EXP-1257 : Save and load the button type along with the toolbars, add a force default load option, enforce consistency between menus and toolbars 2011-09-29 15:01:15 -07:00
Richard Nelson 788c5cdf97 Merge 2011-09-29 08:26:54 -07:00
Leslie Linden fdf042bdb9 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 FIX -- Populate the toybox floater window with all FUI toolbar buttons indicated as such in the "commands.xml" definition.
EXP-1267 FIX -- Enable/disable buttons in the toybox

* Hooked up button callbacks to the toolbar buttons
* Fixed toybox button enable/disable to function properly and live update as
  buttons change states.
* Removed the toybox toolbar background image

Reviewed by Leyla
2011-09-28 16:54:34 -07:00
Richard Nelson 6a49f2947f EXP-1234 WIP experimental drag and drop 2011-09-28 16:25:32 -07:00
Richard Linden 78eb989e50 EXP-1258 FIX toggle buttons between icons and icons+text modes
fixed button layout for icon only buttons
2011-09-27 19:22:09 -07:00
Richard Linden 68d5141fb3 EXP-1258 WIP toggle buttons between icons and icons+text modes
fixed button layout for icon+text
layout stack now uses floating point precision to avoid clamping panels to 0
2011-09-27 19:06:02 -07:00
Richard Linden 9eef4b6c56 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-27 15:54:18 -07:00
Richard Linden 8912a9bef6 EXP-1258 WIP toggle buttons between icons and icons+text modes
better button sizing
also disabled context menu for non-toolbar region
2011-09-27 15:53:38 -07:00
Merov Linden 442350a6a5 EXP-1202 : pull from viewer-experience-fui 2011-09-27 15:05:22 -07:00
Merov Linden 0e4f226b56 EXP-1211 : Read toolbar default settings from toolbars.xml, no saving of settings done yet. 2011-09-27 14:58:20 -07:00
Leslie Linden a686aeabff * Modified toolbar context menus to bind to the specific instance of the toolbar 2011-09-27 12:40:47 -07:00
Richard Linden f0095ddd23 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-27 09:41:09 -07:00
Richard Nelson f56bf69dfe initial support for switching between icons only and icons + text 2011-09-26 19:48:17 -07:00
Richard Nelson 7fd0e8c69e fixed toolbar context menu
deprecated pointless LLView::deleteViewByHandle
2011-09-26 18:51:43 -07:00
Richard Nelson 756532ba8a Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-26 17:42:25 -07:00
Leslie Linden 53a4866493 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
* Command buttons are now enabled/disabled in toybox based on whether or not the
  LLToolBarView has them anywhere.
* Commands now have argument to specify whether or not they should be in the
  toybox.
* LLCommandId is now used a universal reference for commands.

Reviewed by Richard.
2011-09-26 17:38:10 -07:00
Richard Nelson a465f816b8 EXP-1239 FIX make toolbars wrap when there is not enough room
toolbars resize to fit buttons
toolbar view uses layout stacks to organize toolbars
reviewed by Leslie
2011-09-26 17:36:07 -07:00
Merov Linden bb1776de68 EXP-1207 : Introduced an hasCommand() method for toolbars and toolbar view 2011-09-26 16:06:57 -07:00
Leslie Linden 9da5a8d010 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons
EXP-1235 FIX -- Make the toybox available through the context menus associated with the other toolbars
EXP-1248 FIX -- Implement context menu on toolbars

* New commands are listed
* Toolbars can now be made read-only (as in the toybox) or editable (as in the others)
* Toolbars that are not read-only have a context menu that allows button type editing.

Reviewed by Richard.
2011-09-26 14:34:42 -07:00
Richard Linden 2ecf4fb307 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-23 17:20:18 -07:00
Richard Linden c27d6ee5aa EXP-1239 FIX make toolbars wrap when there is not enough room
fixed overeager wrapping
2011-09-23 17:19:38 -07:00
Richard Linden b6d7f99f06 EXP-1239 FIX make toolbars wrap when there is not enough room
spacing between buttons now configurable and correct
background art now wraps buttons correctly
created customizable panel for button background
2011-09-23 17:01:15 -07:00
Merov Linden e42a9ec70c EXP-1207 : pull from viewer-experience-fui 2011-09-23 15:20:25 -07:00
Merov Linden 1bcf6882c5 EXP-1207 : More on lltoolbarview. Still not rendering 2011-09-23 15:09:37 -07:00
Richard Linden 0c5d69b662 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui 2011-09-22 17:36:04 -07:00
Richard Linden c155483fc2 EXP-1239 WIP make toolbars wrap when there is not enough room
toolbar button height configured by button_height attribute
vertical toolbar buttons now share common width
wrap attribute now controls wrapping
2011-09-22 17:34:42 -07:00
Leslie Linden 565483ee1f EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons
EXP-1236 FIX -- The toybox floater should remember its position for the user

* Basic addCommand function to the LLToolBar.  Need proper implementation.
* Added map for faster lookup of commands
* Toybox now adds commands to its toolbar for basic button setup

Reviewed by Richard.
2011-09-22 15:43:08 -07:00
Richard Linden 6c209d0fc8 variable rename 2011-09-22 15:10:30 -07:00
Richard Linden 00f66ccf40 EXP-1239 WIP make toolbars wrap when there is not enough room
added more toolbars to floater_test_toolbar.xml
removed layout stack and got basic wrapping working
reviewed by Leslie
2011-09-22 15:08:59 -07:00
Richard Nelson 7e308b551c EXP-1239 WIP make toolbars wrap when there is not enough room
initial pass at wrapping
2011-09-21 18:48:39 -07:00
Leslie Linden 305b65f6f6 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1210 FIX -- Implement new toybox floater window
EXP-1231 FIX -- Add menu option to toggle the toybox floater on and off

* Basic toybox floater implemented as its own class
* Toybox is available through "Me -> Toolbars..." menu option or ctrl-T shortcut
* Toolbars now have "side" type rather than simple orientation, as well as button
  state for "icons only" or "icons with text".

Reviewed by Richard
2011-09-21 12:11:23 -07:00
Richard Linden 64f30a302d EXP-1228 FIX Create toolbar widget class that displays list of buttons horizontally or vertically
buttons are now centered and sized according to content
created floater_test_toolbar.xml to test
2011-09-20 16:37:21 -07:00
Richard Nelson fef08c439a fix build 2011-09-19 16:59:50 -07:00