summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
AgeCommit message (Collapse)Author
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
In a number of different places, for different reasons, the viewer wants to load a UI-related file that might be overridden by a non-default skin; and within that skin, might further be overridden by a non-default language. Apparently, for each of those use cases, every individual developer approached it as an entirely new problem, solving it idiosyncratically for that one case. Not only is this a maintenance problem, but it rubs one's nose in the fact that most such solutions consider only a subset of the relevant skin directories. Richard and I evolved an API intended to address all such cases: a central LLDir method returning a list of relevant pathnames, from most general to most localized, filtered to present only existing files; plus a couple of convenience methods to specifically obtain the most general and most localized available file. There were several load-skinned-file methods (LLFloater::buildFromFile(), LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently cloned-and-modified from each other) that contained funky bolted-on logic to output the loaded data to an optional passed LLXMLNodePtr param. The trouble is that passing that param forced each of these methods to subvert its normal search: specifically for that case, it needed to find the baseline XML file instead of the localized one. Richard agreed that for the intended usage (reformatting XML files) we should use XML schema instead, and that the hacky functionality should be removed. Remove it. Also remove LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases. Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove that. Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the optional output LLXMLNodePtr param. Make onClickSaveFloater() and onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality. Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(), LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(), LLUI::locateSkin(), LLFontRegistry::parseFontInfo(), LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(), LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(), LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more? Apparently so -- though the linux-updater.bin logic to process the relevant command-line switch has been disabled. Shrug.) (Is LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?) Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths(). The only configuration it contained was the pair of partial paths "xui/en" and "xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically returned the first of these, while getLocalizedSkinPath() specifically returned the second. This knowledge is now embedded in findSkinnedFilenames(). Also remove paths.xml from viewer_manifest.py. Remove injected xui_paths from LLFontGL::initClass() and LLFontRegistry::LLFontRegistry(). These are no longer needed since LLFontRegistry can now directly consult LLDir for its path search. Stop passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's constructor and initFonts() method. Add LLDir::append() and add() methods for the simple task of combining two path components separated by getDirDelimiter() -- but only if they're both non-empty. Amazing how often that logic is replicated. Replace some existing concatenations with add() or append(). New LLDir::findSkinnedFilenames() method must know current language. Allow injecting current language by adding an LLDir::setSkinFolder(language) param, and pass it where LLAppViewer::init() and initConfiguration() currently call setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods. Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths(). Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp. Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin directory -- like getUserSkinDir() but with "default" in place of the current skin name as the last path component. (However, we hope findSkinnedFilenames() obviates most explicit use of such individual skin directory pathnames.) Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the latter exercises append() as well. Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above. Notably, comment out its export_test_floaters() function, since the essential LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been removed. This may mean that llui_libtest.cpp has little remaining value, not sure.
2012-08-22MAINT-1416 FIXED Close Mini-map floater after Ctrl-W if it's opened and ↵Richard Linden
other floaters are not in focus changed fix to always close front most closable floater whether or not it has focus to eliminate special case for mini map
2012-02-28EXP-1918 FIX Floaters that are stacked are not offsetRichard Linden
EXP-1919 FIX Resizing viewer window with minimized floaters can result in floaters appearing off screen when un-minimized
2012-02-27EXP-1181 FIX As a designer, I would like to specify default floater ↵Richard Linden
positions using relative coordinates store and load floater relative positions
2012-02-24EXP-1181 FIX As a designer, I would like to specify default floater ↵Richard Linden
positions using relative coordinates fixed bug where resizing window would cause stacked floaters to move relative to each other renamed positioning enums to reflect the fact that they apply all the time now, not just when opening floaters
2012-02-24EXP-1181 FIX As a designer, I would like to specify default floater ↵Richard Linden
positions using relative coordinates floaters given specified positions will stay in that location floaters that stack will treat that as a specified position moving any floater will switch to relative positioning mode cleaned up some XUI where widgets were relying on a default height of 10 pixels
2012-02-07EXP-1181 WIP as a designer I would like to specify default floater positions ↵Richard Linden
using realtive coordinates changed over to new convert() method added LLCoordFloater
2012-02-07EXP-1181 WIP as a designer I would like to specify default floater positions ↵Richard Linden
using realtive coordinates refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2011-12-07EXP-1652 FIX (Build tool floater size affected by viewer window size)Richard Linden
force all floaters to have follows flags = FOLLOWS_NONE and use llfloaterview::reshape logic instead removed existing follows flags from any floater XUI and deprecated the follows parameter for floaters
2011-11-28Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-11-15EXP-1588 FIX Floaters do not snap to edgeRichard Linden
made non-movable floaters not use auto-follow logic toasts will now use own layout logic
2011-11-14EXP-1588 WIP Floaters do not snap to edgeRichard Linden
2011-11-08LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and ↵Richard Linden
LLHandle<Base> can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
2011-10-20EXP-1431 FIX Default positions for floaters follows additional open ↵Richard Linden
Inventory windows
2011-10-19EXP-1424 FIX Floaters open on top of one another in default position with no ↵Richard Nelson
offset EXP-1412 FIX Additional Inventory windows are opened directly on top of each after opening additional inventory windows and closing the first time also made sidepanel floaters reuse the existing instances, saving state
2011-10-18EXP-1409 FIX WASD controls don't move avatar while Move floater is in focusRichard Linden
moved "chrome" flags to xui separated hiding floater title from setting chrome toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
2011-10-12removed visiblewhenminimized logic pending redesignRichard Nelson
2011-10-12MergeLeslie Linden
2011-10-12* Floater positioning now based on position of other cascading windows currentlyLeslie Linden
open.
2011-10-12don't highlight toolbar buttons during drag and dropRichard Nelson
added mVisibleWhenMinimized to floaters
2011-10-12EXP-1275 WIP A UI element or Keyboard shortcut to clear the viewportRichard Nelson
added confirmation dialog before hiding UI
2011-10-12EXP-1275 WIP A UI element or Keyboard shortcut to clear the viewportRichard Nelson
restores hidden floaters now
2011-10-11* New floater positioning code. Better than what's checked in but not great.Leslie Linden
* Floater updates for positioning and to revert some earlier string changes.
2011-10-10EXP-1274 Create floater for "Avatar Picker" contentLeyla Farazha
EXP-1299 Nearby Voice floater can't be closed by clicking the sidebar button again. EXP-1306 Prompt text to "Change your avatar" and "Destinations" floaters get pushed down one line when the floater dialog gets resized to minimum width
2011-10-05* Added function setOpenCallback to match existing setCloseCallback.Leslie Linden
2011-09-30EXP-1264 Chat log shows as blank if closing viewer with chat log open and ↵leyla_linden
then opening chat floater on next login EXP-1271 Remove UI hints
2011-07-26EXP-1021 FIX Position of web content browser dictates position of profile ↵Richard Nelson
panel - profile panel position changes do not persist EXP-1030 FIX Search button toggle can get out of synch in bottom bar made llinstancetracker::iterator do own nested level management (removing need for separate guard) added support for filename= to floaters can pass in arbitrary window_class to floaters
2011-07-12EXP-880 FIX Enable navigation chrome for Search floaterRichard Linden
search floater derives from floater_web_content all web content now uses floater_web_content instead of media_browser
2011-03-17merge changes for storm-1016Oz Linden
2011-03-04STORM-1016 FIXED Crash after pressing ctrl-shift-w while there is an ↵Vadim ProductEngine
undocked sidepanel. Reason: The shortcut closes all floaters, including those wrapping undocked sidepanels. The sidepanels get destroyed as well, while they are still referenced by the side tray. Fix: Dock (i.e. move to side tray) the sidepanel before its floater gets destroyed.
2011-03-02SOCIAL-593 FIX Profile Window cannot be resized in minimal skinRichard Linden
floater view snapping rectangle is now driven by floater_snap_region view
2010-12-01STORM-677 ADDITIONAL_FIX Force textures inside texture picker to be 100% ↵Vadim ProductEngine
opaque while the control is in a focused floater. Besides, made LLFloater handle opacity more like other controls do.
2010-11-29STORM-688 FIXED Sidebar becomes semitransparent if dock semitransparent side ↵Paul Guslisty
panel back to the Sidebar - Before docking the tab back to the sidetray, set floater's children to non-transparent state - After detaching tab from the sidetray there is no need to set manually floater's children transparency. It happens automatically when floater gets focus.
2010-11-25STORM-676 ADDITIONAL FIX Added transparency support to the color picker floater.Vadim ProductEngine
2010-11-24STORM-593 FIXED Make transparent texteditor and lineeditorPaul Guslisty
Reason: If some child of transparent LLFloater has a visible non-transparent background then this part of floater is non-transparent. As a result floater became partially transparent. Solution: When transparent floater changes focus, iterate through its children and set corresponding (corresponding to whether control in active or in inactive floater see STORM-535) transparency value. - Added method LLUICtrl::getCurrentTransparency. This method calculates transparency level of a control. Calculated value should be used as an alpha chennel value in case we want this control to be transparent. For now this method is used by LLFloater to adjust transparency of its children. - Added calculating of transparecny level for: LLLineEditor, LLTextBase, LLinventoryListItem, LLScrollContainer, LLScrollListCtrl, LLAccrodionCtrlTab. - Added method LLFlaoter::updateChildrenTransparency which updates transparency value of its children
2010-11-09STORM-535 FIXED PLEASE allow adjustable transparency of "Nearby Chat" ↵Paul Guslisty
window, Chat History and Chat "Toasts" in Viewer 2.0! - Added to the settings.xml values of transparency for active and inactive floaters - Added three members to the LLFloater. These members store current transparency of floater, transparency of active and inactive floaters. - Added callbacks that update transparency value of active and inactive floater. Also in these callbacks value of current floater transparency updated. - In panel preferences advanced added two spinners: transparency of active floaters and inactive ones. See screenshot.
2010-10-11pull viewer-beta into viewer-developmentMerov Linden
2010-10-11STORM-301 FIXED Fixed behaviour of camera on undocked 'My Appearance' tab ↵Andrew Productengine
minimizing. - Added signal to LLFloater that is emitted on minimize. - Set minimize callback for appearance tab floater in LLSideTrayTab::undock. Method from LLSidePanelAppearance that handles camera issues is called on minimization of floater.
2010-09-13STORM-101 FIXED Moved floater settings (rect, visibility, docked state) to ↵Vadim Savchuk
account-specific XML file. The settings are now stored to settings_per_account.xml. This change affects all floaters having save_rect/save_visibility/save_dock_state params set to "true", not just detached sidebar tabs as the ticket requests.
2010-09-03VWR-21127 FIXED Implemented restoring sidebar tabs that were detached in ↵Vadim Savchuk
previous session. It is now possible to detach some sidebar tabs, exit the viewer, login again and see those tabs still detached. Also fixed incorrect saving of tabs dimensions implemented in the previous commit (766d6e749836). Reviewed by Sergey Litovchuk
2010-09-16mergeRichard Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12EXT-7951 FIXED (Mini-Location panel appearance design issues)Paul Guslisty
- Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/ --HG-- branch : product-engine