summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
AgeCommit message (Collapse)Author
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-09-13Build fix after patch for MAINT-3137dmitrykproductengine
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-17CHUI-959 FIXED Resident picker allowed to open behind fui toolbarsmaksymsproductengine
2013-05-16CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-09Merge downstream code and viewer-betasimon
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-09CHUI-797 FIXED Only one separated conversation window is shown after exiting ↵PavelK ProductEngine
from mouselook view Added all separated conversation floaters to skip list used in gFloaterView->popVisibleAll(skip_list) in llagent.cpp since LLFloaterIMContainer::setVisible() takes control of them by itself.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-08CHUI-835 (ctrl-h does not select nearby chat conversation in list): Modified ↵Gilbert Gonzales
setVisibleAndFrontMost() to now take a arguement for the key that was pressed (if one was pressed). This allows the floater to select the converation line item when becoming visible/frontmost.
2013-02-28Modify LLInstanceTracker to avoid using a map of strings to find a map of ↵Graham Madarasz (Graham)
foo to find some pointers
2013-02-21CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chatMerov Linden
2013-02-18CHUI-729 FIXED Messages pane displays incorrect after changing size and reloginmaksymsproductengine
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-26CHUI-529: Post code review changes. When showing a floater using ↵Gilbert Gonzales
LLFloater::showInstance() instead of setVisibleAndFrontmost(). Also made setVisibleAndFrontmost() public since both setVisible and setFrontmost are public functions.
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-15CHUI-524: The root reason of crash was in the infinity recursion in the ↵maksymsproductengine
chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLFloaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson.
2012-09-24CHUI-355 FIXED Nearby chat entries do not appear in torn off nearby chat ↵AlexanderP ProductEngine
window when opening from a toast: moved setIsSingleInstance() from constructor to postBuild() for prevent of a resetting it in buildFromXML(); implemented correct set of mReuseInstance; changed type of the key of LLIMConversation from LLUUID() to LLSD()
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-31CHUI-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
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-08-02CHUI-230, CHUI-232, CHUI-261 Forced resize of a conversation's floater in ↵AlexanderP ProductEngine
the IM-container; support of the rectControls for IM-conversations; fixed LLFloater and LLMultiFloater for the correct hosting of floaters with mSaveRect
2012-08-01CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): Remove duplication of functionality from LLNearbyChat; transfer mChatHistory, mInputEditor and some its settings and callbacks to the base class.
2012-06-07Merge : pull from lindenlab/viewer-releaseMerov Linden
2012-05-30CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-containerAlexanderP ProductEngine
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