Commit Graph

49 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Nat Goodspeed d2386652f8 CHOP-962: Make LLControlVariable::setPersist() accept only enum.
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Gilbert Gonzales 24e650b403 CHUI-835 (ctrl-h does not select nearby chat conversation in list): Modified 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-03-08 18:34:40 -08:00
Merov Linden 7f51bd7897 CHUI-568 : Fixed! Implemented Ctrl-H for Nearby Chat, taking into account the existence of other conversations and docked/torn off state 2013-02-23 11:22:09 -08:00
Merov Linden 86150b4019 CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chat 2013-02-21 19:15:48 -08:00
Nat Goodspeed 3653727e7f Introduce new LLDir::findSkinnedFilenames() method. Use as needed.
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-10-10 14:57:43 -04:00
Richard Linden 5f90875a9e EXP-1181 FIX as a designer I would like to specify default floater positions using realtive coordinates
changed settings naming scheme for floater positioning so that related settings appear together in file
2012-03-16 17:52:28 -07:00
Richard Linden b9521a38f1 CHUI-59 FIX Floater stacking offset only occurs first time a floater is opened
changed stacking logic to attempt to stack against any floater that is cascade head
*or* in a cascade group
2012-03-14 15:00:48 -07:00
Richard Linden fbfad41587 EXP-1181 FIX As a designer, I would like to specify default floater positions using relative coordinates
store and load floater relative positions
2012-02-27 13:06:10 -08:00
Richard Linden 0c7e91205f EXP-1181 FIX As a designer, I would like to specify default floater 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-24 16:57:12 -08:00
Richard Nelson 03b836d94f EXP-1424 FIX Floaters open on top of one another in default position with no 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-19 17:25:18 -07:00
Richard Linden 30527b2206 EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
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-18 14:09:52 -07:00
Richard Nelson 63e4fdfc64 cleaned up floater reg, removed extraneous functions 2011-10-13 10:49:53 -07:00
Leslie Linden 309ebb84a8 * Floater positioning now based on position of other cascading windows currently
open.
2011-10-12 17:43:47 -07:00
Leslie Linden f9e900f5ac * New floater positioning code. Better than what's checked in but not great.
* Floater updates for positioning and to revert some earlier string changes.
2011-10-11 17:36:23 -07:00
Richard Nelson ec23ec68ea EXP-1310 FIX Profile button should open Web Profile floater
removed unused LLWeb functions for opening non-web media
moved logic inside floaters and away from auxiliary functions
2011-10-10 19:17:38 -07:00
Leslie Linden 93e3c8e4a5 EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should change the state of their parent button
* Toolbar buttons now display green when its corresponding floater is open or
  minimized.
* Made changes to buttons so flash time and rate is configurable
* Removed unused "highlight_color" attribute from LLButton
* Implemented "isVisible" function for toolbar button floaters.  It returns true
  when the floater is visible or minimized.
* Toolbar floater unminimize now also puts focus to the floater
* All commands now specify their "is_running_function" for toolbar button state
* ButtonFlashCount and ButtonFlashRate have been moved to button.xml settings
  and are now configurable on the button.  Toolbar buttons are set to never
  flash and this functionality is used to show which buttons have windows open.
* All toybox buttons show hover glow even when disabled

Reviewed by Richard.
2011-10-05 16:28:40 -07:00
Leslie Linden 6fe4815217 Updated FUI floater toggle function to handle closing windows that are
initialized with chrome.
2011-09-30 15:26:48 -07:00
Leslie Linden 896ea6f81e EXP-1278 FIX -- Implement 3-way toolbar button functionality
Toolbar buttons now affect their floaters as indicated in the FUI_Button_states
wiki page -- https://wiki.lindenlab.com/wiki/FUI_Button_states
2011-09-29 14:42:30 -07:00
Leslie Linden 412e29ed9d EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions

* Added basic commands.xml file to define FUI-related toolbar actions.  For now
  a basic "avatar" and "places" button are defined.
* Added basic command manager to parse and hold strings that define potential
  toolbar command actions.
* Broke out a separate floater function as a placeholder for the 3-state toolbar
  floater toggling.
* LLUI::initClass now parses the new commands.xml file

Reviewed by Richard.
2011-09-21 17:25:38 -07:00
Richard Linden 63a857f0c7 EXP-1054 FIX Entering search term in search box in Viewer UI does not produce search results if search window is already open
use new parameters when opening existing floater
2011-07-28 19:09:48 -07:00
Richard Nelson fd9f3b9fe9 EXP-1021 FIX Position of web content browser dictates position of profile panel - profile panel position changes do not persist
EXP-1030 FIX Search button toggle can get out of synch in bottom bar
made llinstancetracker::iterator do own nested level management (removing need for separate guard)
added support for filename= to floaters
can pass in arbitrary window_class to floaters
2011-07-26 14:26:27 -07:00
Richard Linden 38ba526cc5 EXP-1009 WIP Teleport links from Search floater and destination guide in viewer fail with intrusted browser error in viewer 2011-07-13 17:59:53 -07:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Vadim Savchuk baeded61a7 STORM-101 FIXED Moved floater settings (rect, visibility, docked state) to account-specific XML file.
The settings are now stored to settings_per_account.xml.
This change affects all floaters having save_rect/save_visibility/save_dock_state params set to "true",
not just detached sidebar tabs as the ticket requests.
2010-09-13 20:06:48 +03:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Alexei Arabadji c63233106b EXT-7090 FIXED Made snapshot preview and minimap(like in 1.23) floaters showable in mouselook mode.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/449/

--HG--
branch : product-engine
2010-05-27 14:47:27 +03:00
angela 0fe35e068f EXT-4684 Beacons are not shown when beacons floater is minimized 2010-03-09 15:59:27 +08:00
Ychebotarev ProductEngine 371885c373 fix for normal EXT-4810 Block hot-keys in mouse-look mode
--HG--
branch : product-engine
2010-02-02 14:35:37 +02:00
Nat Goodspeed 062d0a13db Add LLEventAPI class, formalizing the mechanism by which we wrap a C++ API
with an event API. In addition to the LLEventPump name on which to listen,
LLEventAPI accepts a documentation string for event API introspection.
Give every LLEventDispatcher::add() overload a new documentation string
parameter for event API introspection.
Convert every existing event API to new conventions, introducing suitable
documentation strings for the API and each of its operations.
2009-11-11 07:41:50 -05:00
Yuri Chebotarev f8d1644a41 fix for major bug ext-2209 Nearby Chat log is broken
--HG--
branch : product-engine
2009-11-05 13:17:12 +02:00
Yuri Chebotarev f1d834c50d fix for normal task EXT-239 Save chat window state and position between sessions
--HG--
branch : product-engine
2009-11-03 17:31:26 +02:00
Vadim Savchuk 28c0bcf7e6 Merge from default branch
--HG--
branch : product-engine
2009-11-02 17:16:03 +02:00
Yuri Chebotarev 2e12c9a53a fix Normal Task EXT-239 Save chat window state and position between sessions
--HG--
branch : product-engine
2009-11-02 14:35:57 +02:00
Rick Pasetto c54faf2823 Fix crash in LLMultiFloater::setCanResize()
Reviewed (conceptually) by Richard and James
2009-10-30 16:01:58 -07:00
Yuri Chebotarev ff97c31995 fix task EXT-1960 Region messages, should they be displayed in the local chat?
and working on
EXT-239 Save chat window state and position between sessions (not finished)

--HG--
branch : product-engine
2009-10-30 17:00:23 +02:00
Nat Goodspeed 4ea9361aa8 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-17 12:23:38 -04:00
Nat Goodspeed 2a5c25cb3a New LLFloater methods capture LLFloaterReg visibility tests.
The logic was redundantly expressed in LLFloaterReg -- and would be
useful elsewhere -- so was introduced as LLFloater::isShown(). Thanks to
Richard and James for suggesting the terminology.
2009-10-17 11:56:26 -04:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
Steven Bennetts 4c89e73893 Fixed a problem where floaters that failed to load their XML would still be opened. This was particularly a problem with Modal Dialogs since the UI would loose focus with no floater to respond to.
Reviewed by Leyla
2009-10-08 22:39:17 +00:00
Nat Goodspeed 2da8eb43d5 Wrap a subset of the LLFloaterReg API with an event API 2009-08-14 14:40:43 -04:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
Steven Bennetts e4dc104e32 EXT-70 Camera and Movement controls don't save their positions
DEV-35250 Quitting from the login screen forgets window placement and visibility (e.g. movement and camera floaters)
reviewed by Leyla
2009-07-10 21:18:42 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00