summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2012-10-01CHUI-368 FIXED Lock icon shown when clicking on items in inventorymaksymsproductengine
2012-09-28CHUI-102: Now the participants and one-on-one conversations have ↵Gilbert Gonzales
right-click-menus. These menus are functional as well, but 'chat history' does not yet work.
2012-09-28CHUI-367 : Completed : Show user name tooltip in all situations so to avoid ↵Merov Linden
the conversation name showing up
2012-09-28CHUI-342, CHUI-366 and CHUI-367 : WIP : Allow a NO_TOOLTIP value for ↵Merov Linden
tooltips, update display/user names and sort on display/user names
2012-09-26Pull merge from richard/viewer-chuiMerov Linden
2012-09-26CHUI-347 FIXED drawing selected conversation item background.Seth ProductEngine
Moved some duplicating pieces of code from LLFolderViewFolder::draw() and LLFolderViewItem::draw() to separate methods to reduce code duplication in LLConversationViewSession::draw(). Changed some static variables in LLFolderViewItem to static members for using them in derived LLConversationViewSession.
2012-09-25CHUI-342 : Fixed : Use user name and display name correctly. Sort according ↵Merov Linden
to user names.
2012-09-26MAINT-994 Oskar Linden login issuesKelly Washington
* Set max persistent notifications to 250 * Don't register for notification callbacks until after peristent ones are loaded. reviewed with Simon
2012-09-25Merge pull from richard/viewer-chuiMerov Linden
2012-09-24CHUI-340 : Fix dupe items in the conversation model list. Refresh when ↵Merov Linden
resorting.
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-09-21Pull merge from richard/viewer-chuiMerov Linden
2012-09-21CHUI-340 : WIP : Fix sorting bugs on time for sessions, simplified the ↵Merov Linden
update time mechanism and clean up
2012-09-20CHUI-283: within LLFolderView::scrollToShowItem(), adjusted the calculation ↵Gilbert Gonzales
that scrolls to the selected item. My prior commit changed this calculation and adjusted it in this commit to preserve prior behavior.
2012-09-20CHUI-283: Refactor of how the layout is determined for LLFolderViewItem. ↵Gilbert Gonzales
Changed constant members that defined the layout to non-const member varaibles, which are populated using a .xml file.
2012-09-20CHUI-353: Regress Bug caused by a CHUI 283 commit. Problem: The font was ↵Gilbert Gonzales
rendering differently due to the folderviewitem::draw() method calling llview::draw(). I added llview::draw() initially but it is not longer needed. Resolution: Removing the call to llview::draw().
2012-09-18Regress Fix: After a CHUI 283 commit the inventory items suffix was ↵Gilbert Gonzales
overlapping text. Problem was that a variable storing the width of the text was not passed in as a reference, which always resulted in the suffix overlapping the prior text.
2012-09-18CHUI-283: Now the avatar icon loads in the user's avatar image.Also the ↵Gilbert Gonzales
avatar image is of proper size. The participant of the conversation is offset correctly as well.
2012-09-11MAINT-1534 Fix for calls to find widgets getting out of hand.Dave Parks
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-15Remove LLUICtrlFactory::findSkinnedFilename(): cf. LLDir method.Nat Goodspeed
Richard points out that LLUICtrlFactory::findSkinnedFilename() adds little value. It was called from exactly one place, and that one place could easily obtain the information another way. The concern is that it could confuse a reader of the code with regard to the other findSkinnedFilename[s]() methods in LLDir. Clarifying the code base is a Good Thing. Removing.
2012-10-12Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.Nat Goodspeed
Per code review: Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it would return last-considered pathname, whether or not it exists. Changed to emit LL_WARNS log message and return empty string. Use Boost.Assign to simplify initialization of a couple static containers in lldir.cpp.
2012-10-12LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint.Nat Goodspeed
At this point, LLUICtrlFactory::getLayeredXMLNode() is a pretty thin wrapper around LLDir::findSkinnedFilenames() and LLXMLNode::getLayeredXMLNode(). Until now, LLUICtrlFactory::getLayeredXMLNode() passed (by default) LLDir::CURRENT_SKIN to LLDir::findSkinnedFilenames(). But that meant that a caller such as LLTransUtil::parseStrings() that wants almost the same functionality, but with LLDir::ALL_SKINS instead, had to clone the logic from LLUICtrlFactory::getLayeredXMLNode(). Allowing its caller to pass the desired LLDir::ESkinConstraint enum value eliminates the need to clone its logic. Remove cloned logic from LLTransUtil::parseStrings().
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
Until now, adding a xui/en/strings.xml file in any non-default skin meant you had to clone the entire file, editing only the particular entries you wanted to override. With this change, we load strings.xml file(s) from the default skin before loading the specified skin -- so a non-default skin can now provide a strings.xml file containing only the specific entries it wants to override.
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-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-23Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-23MAINT-1473 FIXED Resizing floater past edge of screen causes opposite side ↵Richard Linden
of floater to move updated resize logic to reset floater extents when resizing past bounds
2012-08-24MAINT-1415 FIXED Empty non-functional 'Take off' menu is presented in inspector:MaksymS ProductEngine
- class LLToggleableMenu had been updated with two methods like: appendContextSubMenu and addChild, which based on similar in LLContextMenu
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-22merge changes for DRTVWR-203Oz Linden
2012-09-14CHUI-119 (Add Nearby chat to Conversations floater): addit. fix: use ↵AlexanderP ProductEngine
LLSD(LLUUID::null) instead LLSD::null as "default" floater's key
2012-09-13merging in latest changesGilbert Gonzales
2012-09-13CHUI-283: Now upon the information icon and speaker icon do not overlap the ↵Gilbert Gonzales
username text. Instead the username text will be truncated with an ellipse to prevent the overlap. Also did a code cleanup.
2012-09-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine
2012-09-13CHUI-283: Now the information icon only appears upon mousehover. Also the ↵Gilbert Gonzales
information/speaker icon are right justified.
2012-09-12merging in latest changesGilbert Gonzales
2012-09-12CHUI-335 FIXED (Alpha text allowed in page spinner in chat history viewer)Paul ProductEngine
- Added XML parameter "allow_digits_only" to spinner control widget, which disables/enables ability to input alpha text. - Disabled ability to enter alpha text in page spinner in chat history viewer
2012-09-11merging in latest changesGilbert Gonzales
2012-09-10CHUI-282 WIP Modified conversation view item and IM floater container so ↵Seth ProductEngine
that the folder view handles the positioning of items in conversations list.
2012-09-10CHUI-283: Basic Implementation, just have hard coded avatar icon appearing ↵Gilbert Gonzales
and profile/info buttons visible. profile/info buttons do not have proper positioning or mouseclick events.
2012-08-31merging in latest changesGilbert Gonzales
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-30CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fullyMerov Linden
2012-08-29merging in latest changesGilbert Gonzales
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ↵Gilbert Gonzales
design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'.
2012-08-28CHUI-280 : WIP : Implement update of LLConversationModel in LLParticipantListMerov Linden