summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
AgeCommit message (Collapse)Author
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-06-25STORM-1879: Inventory gear menu remains on screen after floater is closedMartinRJ Fayray
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
don't auto position other floater when it is hosted
2012-03-30merge changes for vmrg-233Oz Linden
2012-03-23CHUI-70 FIX Build floater and other floaters opened in default position ↵Richard Linden
become centered in viewer when object is built or viewer resized always initialize mPosition
2012-03-23Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-03-21CHUI-61 FIX Relative floater positions not written to settings file if ↵Richard Linden
previous settings exist from old viewer
2012-03-21CHUI-61 FIX Relative floater positions not written to settings file if ↵Richard Linden
previous settings exist from old viewer
2012-03-20CHUI-61 FIX Relative floater positions not written to settings file if ↵Richard Linden
previous settings exist from old viewer only write back floater positioning information generated from legacy saved rect after reading any new floater positioning info
2012-03-16CHUI-61 FIX Relative floater positions not written to settings file if ↵Richard Linden
previous settings exist from old viewer apply relative positioning to floaters that are loaded with rects specified from earlier viewer
2012-03-05CHUI-55 FIX Floaters that have set positions from old viewer versions can ↵Richard Linden
appear off screen until user repositions the floaters manually
2012-03-01CHUI-55 FIX Floaters that have set positions from old viewer versions can ↵Richard Linden
appear off screen until user repositions the floaters manually
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-24potential fix for linux buildRichard Linden
2012-02-23Linux build fix.Seth ProductEngine
Moved type casts from protected base classes to derived LLCoord.
2012-02-07EXP-1181 WIP as a designer I would like to specify default floater positions ↵Richard Linden
using realtive coordinates fixed build moved conversion funcs to llwindow.cpp as they work on all platforms refactored translateintorect to take overlap as parameter
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-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2012-01-17EXP-1806 FIXED CTRL-W no longer closes floaters.Vadim ProductEngine
Restoring accidentally removed code.
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-14Removed unused variable to fix the mac buildLeslie Linden
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-24EXP-1456 FIX NEARBY CHAT window sometimes opens at the top of the screen.Richard Linden
2011-10-24EXP-1454 FIX People floater 'cascades' as if opening a new window while ↵Richard Linden
looking at group profiles
2011-10-20EXP-1431 FIX Default positions for floaters follows additional open ↵Richard Linden
Inventory windows
2011-10-20EXP-1440 FIX Floaters can offset from call dialog and show offscreen for ↵Richard Linden
default positions
2011-10-19EXP-1364 FIX Debug console output covered by left toolbar buttons if presentRichard Nelson
EXP-1427 FIX Voice Settings dialog closes when selecting minimize option
2011-10-19EXP-1428 FIX Snapshot button does not toggle floater closedRichard Nelson
2011-10-19EXP-1424 FIX Floaters open on top of one another in default position with no ↵Richard Nelson
offset floaters only stack on floaters that haven't moved
2011-10-19EXP-1411 FIX "Speak" button enabled in regions with disabled voiceRichard Nelson
EXP-1424 FIX Floaters open on top of one another in default position with no offset floaters now stack with their own kind preferentially
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-19floaters only save rect when explicitly moved by userRichard Nelson
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-14EXP-1272 FIX Move "How To" to a separate web floaterRichard Nelson
added missing file and updated size of floater
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-10mergeLeyla Farazha
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