Age | Commit message (Collapse) | Author |
|
|
|
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.
|
|
|
|
don't auto position other floater when it is hosted
|
|
|
|
become centered in viewer when object is built or viewer resized
always initialize mPosition
|
|
|
|
previous settings exist from old viewer
|
|
previous settings exist from old viewer
|
|
previous settings exist from old viewer
only write back floater positioning information generated from legacy saved rect after reading any new
floater positioning info
|
|
previous settings exist from old viewer
apply relative positioning to floaters that are loaded with rects specified from earlier viewer
|
|
appear off screen until user repositions the floaters manually
|
|
appear off screen until user repositions the floaters manually
|
|
EXP-1919 FIX Resizing viewer window with minimized floaters can result in floaters appearing off screen when un-minimized
|
|
positions using relative coordinates
store and load floater relative positions
|
|
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
|
|
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
|
|
|
|
Moved type casts from protected base classes to derived LLCoord.
|
|
using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
|
|
using realtive coordinates
changed over to new convert() method
added LLCoordFloater
|
|
|
|
Restoring accidentally removed code.
|
|
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
|
|
|
|
made non-movable floaters not use auto-follow logic
toasts will now use own layout logic
|
|
|
|
|
|
LLHandle<Base>
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
|
|
|
|
looking at group profiles
|
|
Inventory windows
|
|
default positions
|
|
EXP-1427 FIX Voice Settings dialog closes when selecting minimize option
|
|
|
|
offset
floaters only stack on floaters that haven't moved
|
|
EXP-1424 FIX Floaters open on top of one another in default position with no offset
floaters now stack with their own kind preferentially
|
|
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
|
|
|
|
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
|
|
added missing file and updated size of floater
|
|
|
|
|
|
open.
|
|
added mVisibleWhenMinimized to floaters
|
|
added confirmation dialog before hiding UI
|
|
restores hidden floaters now
|
|
* Floater updates for positioning and to revert some earlier string changes.
|
|
|
|
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
|