summaryrefslogtreecommitdiff
path: root/indra/newview/llhints.cpp
AgeCommit message (Collapse)Author
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.
2011-04-01SOCIAL-822 FIX UI and Sizing issues with hints in Basic and Advanced modesRichard Linden
fixed crash for advanced mode
2011-04-01SOCIAL-822 FIX UI and Sizing issues with hints in Basic and Advanced modesRichard Linden
fixed crash for advanced mode
2011-04-01SOCIAL-822 FIX UI and Sizing issues with hints in Basic and Advanced modesRichard Linden
2011-03-25SOCIAL-717 FIX Artwork for click to move hintRichard Linden
updated resize logic for hint popups to accomodate image size
2010-11-15mergeRichard Linden
2010-10-29VWR-23444 FIXED Double clicking x on UI hint crashes Skylight ViewerRichard Linden
2010-10-15EXP-229 FIXED Double clicking x on UI hint crashes Skylight ViewerRichard Linden
2010-10-06EXP-156 WIP Implement custom Skylight hintsRichard Nelson
2010-10-08Fixed issue where non-visible hint wasn't allowing mouse events to pass throughLeyla Farazha
2010-10-08Created a floater for setting display nameLeyla Farazha
2010-09-22Fix "no newline at end of file".Monroe Linden
2010-09-20EXP-60 FIX not showing after Re-enabling Hints in same sessionRichard Nelson
2010-09-17EXP-60 Hints not showing after Re-enabling Hints in same sessionRichard Linden
2010-09-16EXP-63 FIX Hint marked as acted upon if hints are disabled while specific ↵Richard Linden
UI hint is open
2010-09-10EXP-24 FIX Menu disable all viewer hintsRichard Nelson
2010-09-10EXP-23 FIX Tail for chat box hint should be slantways instead of horizontalRichard Nelson
2010-08-27Update license block for new files.Monroe Linden
2010-08-24mergeRichard Nelson
2010-08-23mergeRichard Linden
2010-08-23made Params parsers not act as singletonsRichard Nelson
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-19eliminated spam when parsing hints llsdRichard Linden
2010-08-16made hints only expire when explicitly responded to, not implicitly after ↵Richard Nelson
first seeing them added hint_popup.xml for hint styling
2010-08-13stopped hints from appearing temporarily when retriggeredRichard Nelson
2010-08-12added remaining hints and fade in/fade out behaviorRichard Linden
2010-08-12remaining hints definedRichard Linden
2010-08-12forgot some filesRichard Nelson