Commit Graph

1174 Commits

Author SHA1 Message Date
Latif Khalifa
a7a2b0c227 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-11-07 01:07:21 +01:00
Latif Khalifa
2234e95d5c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-07 01:06:53 +01:00
Inusaito Sayori
511b0cfb9c ContextMenu Support!
LLContextMenu functionality pulled out of LLPieMenu, PieMenu is now derived from LLContextMenu
- The more attribute boolean of pie_menu element determines whether or not to have an actual submenu if it's not a pie, defaults to false which means actual submenu..
-- in the future we may want to have more more="true" depending on feedback
- Pie menu labels now dynamically get " >" appended to them (avoids stupid looking context menus)
- Positioning logic combined in part, mostly conditional still, in the future we could probably combine it more.
- handleHoverOver function combines common functionality between context and pies given an item and hover mouse coords.

LiruUseContextMenus debug setting determines which to use, default is pie, of course
- Context(/Pie) Menus are rebuilt when the setting changes value
-- this is safe at any point because all startup states have been accounted for
- "Use context menus instead of pie menus" added to System->General preferences (it's close to the bottom)
2013-11-06 18:47:02 -05:00
Inusaito Sayori
cb0cc571ee Mats UI.
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter()
Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding)
Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors.
Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream.

Translators:
panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed.
strings.xml now has "use_texture" string.
notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
2013-11-06 17:39:04 -05:00
Aleric Inglewood
254396596c Merge remote-tracking branch 'singu/master' 2013-11-05 22:40:08 +01:00
Aleric Inglewood
c516a71804 Move AIAlert* into namespace AIAlert and rename classes.
Instead of having several AI* classes, it turned out to be easier to
have a namespace: this allows me to define the classes in llcommon but
add (new) 'add' and 'add_modal' functions to 'AIAlert' in llui.
This is needed to avoid a collision with the 'add' functions in
LLNotificationsUtil.

The new add/add_modal makes it a lot easier to just show a caught
alert, prepending or appending new text: it turns out that that is
way more common then a re-throw.

Adjusted code as appropriate.
2013-11-05 22:30:02 +01:00
Aleric Inglewood
8ab9039ff6 Use " and ' instead of " and ' for new msgs in strings.xml.
Since it works... this might actually be better readable and therefore
easier to work with for the translators.
2013-11-05 18:10:05 +01:00
Inusaito Sayori
5a2ec28ddf Refactor panel_tools_texture.xml file in preparation to merge (nothing changed yet)
Pulled out defaulted/dead attributes, switched to v3 markup stylings.  Merged in some norspec comments.
2013-11-04 23:00:15 -05:00
Aleric Inglewood
2453c13e11 Add AIXMLLindenGenepool - redo of archetype export/import using AIXML*.
In order to remove code duplication, and as prove of concept,
I redid the linden_genepool archetype export and import (from the Edit
Appearance Floater), using AIXML and AIAlert.

The import/export code did shrink significantly, and became a lot
simpler. Although a new file pair (aixmllindengenepool.{cpp,h}) is
added to define the (de)serialization of the linden_genepool XML format,
that code is now centralized in one place, and still a lot simpler.

As a bonus however, every possible error is now semi-automatically
reported to the user with all details that might help to overcome
the problem, like file names and system errors.
2013-11-05 03:01:49 +01:00
Aleric Inglewood
d174b7fcf8 Add AIXMLRootElement, AIXMLElement, AIXMLParser and AIXMLElementParser
The AIXML* classes provide an Object Oriented way to serialize objects
to and from an XML file. Documentation is added at the top of aixml.cpp

These classes will be used by AIMultiGrid.
2013-11-05 03:01:48 +01:00
Aleric Inglewood
78673e4a94 Add AIFile - LLFile but throws AIAlertCode exceptions on error.
The code is the current errno.
2013-11-05 03:01:47 +01:00
Aleric Inglewood
193010e947 Add THROW_[MF]ALERT[EC] (AIArgs, AIAlert, AIAlertCode, AIAlertPrefix, AIAlertLine)
A system to throw errors that allow for easy error reporting to the user
by showing a translated pop-up alert box with the error message.

The messages use strings.xml for translation and allow the usual
replacement args (ie [FILE] is replaced with a filename).

The exceptions can be cascaded, by adding more (translated) text
when caught and then re-throwing the result.

Macros are being used to support adding a function name prefix
to a message of the current function that the exception is thrown
from.

The syntax is:

  <macro>(<line>);		to show 'line'
  <macro>(<alert>, <line>);	to append 'line' to a caught alert.
  <macro>(<line>, <alert>);	to prepend 'line' to a caught alert.

  where <macro> is one of:
  THROW_ALERT, THROW_MALERT, THROW_FALERT, THROW_FMALERT,
  THROW_ALERTE, THROW_MALERTE, THROW_FALERTE, THROW_FMALERTE, where
  M = modal, F = Function name.
  and where <line> is one of:

  <xmldesc>
  <xmldesc>, AIArgs<args>

  where <xmldesc> is a string literal that will be looked up
  in strings.xml, and <args> is:

  (<key>, <replacement>)[<args>]

  There are more variations of the macros to throw an arbitrary
  class (append _CLASS), include an int code (append C) or
  to store the current errno as code (append E).

  For example, THROW_MALERTC(code, ...), or THROW_FALERT_CLASS(Foobar, ...),
  where the ... is the same as for the macros above.

Documentation and example usage has been added to aialert.h.
2013-11-05 03:01:47 +01:00
Latif Khalifa
7ffb751ead In preparation to release, change defalt for crash reporting to 'Ask' 2013-11-05 02:35:08 +01:00
Inusaito Sayori
7129d97ee5 panel_tools_texture.xml splits off from floater_tools.xml (No real changes here, but this change will make life so nice for me) 2013-11-04 17:49:29 -05:00
Inusaito Sayori
ec55c53b62 French menu gets Motion Resets Camera courtesy of Nomade (more translation on the way) 2013-11-04 17:10:42 -05:00
Inusaito Sayori
083aaffec7 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-11-03 15:28:01 -05:00
Inusaito Sayori
23e9eabedb These new icons need tooltips 2013-11-01 17:57:52 -04:00
Latif Khalifa
b9c487a0c7 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-11-01 22:50:22 +01:00
Inusaito Sayori
96e8f37c81 The rest of some touchups to wlf xml for nicer alignment of elements 2013-11-01 17:43:32 -04:00
Inusaito Sayori
0fc9d540bf Feature Request: Add Camera preset switching functionality (part of quicksettings)
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
2013-11-01 17:35:12 -04:00
Latif Khalifa
1f587d1ad1 Don't crash when trying to export linked parts
Fixes issue #1176
2013-11-01 22:34:55 +01:00
Inusaito Sayori
ba1a29aae2 French Translation updates! Provided by Nomade Zhao 2013-11-01 02:56:21 -04:00
Damian Zhaoying
9be72ffb47 add spanish translation for prefs editor open log in windows option 2013-10-30 05:01:12 -03:00
Inusaito Sayori
41303d0c9c Added "Log button opens external text editor (Windows only)" to Adv. Chat UI 2013-10-23 17:44:27 -04:00
Inusaito Sayori
fd42029a61 LLViewerWindow::handleKey(): Partial Fix for Issue 704: Keyboard shortcuts that should be passed to focused text fields are instead passed to selected prims when building
All edit keys now work, but Ctrl-A still doesn't work right, it must be grabbed by something else...
Adds LLFocusMgr::keyboardFocusHasAccelerators()
Adds virtual bool LLView::hasAccelerators() which returns false by default, overrides returning true placed in LLPreviewScript and LLPreviewNotecard
Shortcut keys added to notecard and script menu xmls

I'm thinking Qarl's Align tool handling may be receiving the Ctrl-A, we do seem to handle it differently than Exodus and Firestorm something modern could have broken the old way..
Come to think of it, those two features(Align and Select all prims) have a longstanding shortcut conflict in shortcuts... that's pretty nasty
2013-10-22 23:35:53 -04:00
Inusaito Sayori
80bb529220 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-10-10 22:16:39 -04:00
Damian Zhaoying
7cc99ebf72 update spanish messages in IM floaters 2013-10-10 23:15:33 -03:00
Inusaito Sayori
be5727548b Fix a warning typo and a minor bug I thought I'd fixed long ago indicated by some getString warning spam 2013-10-10 20:25:15 -04:00
Inusaito Sayori
54c08b3ea0 Localize the new Silent Accept/Decline messages 2013-10-10 18:28:06 -04:00
Latif Khalifa
2a830c3184 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-10-10 21:58:25 +02:00
Inusaito Sayori
390c097c6a Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-10-10 15:53:32 -04:00
Salvatore La Bua
ebc839d540 Rearrange silent keep/discard inventory offer buttons 2013-10-10 21:49:49 +02:00
Salvatore La Bua
20ee6cdb72 Add silent keep/discard inventory offer buttons
Adapted from Phoenix code
2013-10-10 20:21:46 +02:00
Inusaito Sayori
402f4f7068 [LLIMMgr/LLIMPanel Revision] Feature Request: Friendship operations from IM
Also adds the toggle mute option, but this was deemed too risky and has been left commented out for future projects to decide for themselves on
2013-10-10 04:03:41 -04:00
Inusaito Sayori
9e312a3808 [LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls 2013-10-10 02:27:26 -04:00
Damian Zhaoying
24463b7d04 update panel_login.xml and menu_minimap.xml files and fix labels in master language file menu-minimap.xml to make translations works 2013-10-08 17:49:52 -03:00
Inusaito Sayori
8f5337cc67 Tooltip for grids combo box to clarify its new uses for unfamiliar users 2013-10-04 21:01:02 -04:00
Salvatore La Bua
6abffb2ce4 Merge branch 'master' of github.com:DamianZhaoying/SingularityViewer 2013-10-03 11:47:01 +02:00
Damian Zhaoying
4f863689a9 update floater_tools.xml and other minor fixes 2013-09-30 21:40:37 -03:00
Latif Khalifa
b90512fea0 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-09-30 23:24:11 +02:00
Inusaito Sayori
2333a684a3 Feature Request: Allow typing login uris into the grids combo box on the login screen
Furthermore, users may now type in grid name, grid nick, or grid login uri into the box and it will resolve to an existing grid they've used before, or (for uris only) try to add the new grid with the data it provides.
Input will have trailing and leading spaces trimmed.

Thanks to Diva Canto for this brilliant request!
2013-09-30 17:18:41 -04:00
Salvatore La Bua
bed0ed73d9 Remove unused userdata fields from the MiniMap menu 2013-09-30 22:45:50 +02:00
Salvatore La Bua
c0961e9760 Remove unnecessary listeners for the MiniMap
New class ToggleControl is used in place of the removed listeners.
Much cleaner code for the MiniMap chat rings.
Remove redundant debug setting: MiniMapChatRings.

-Thanks Liru for the advices.
2013-09-30 22:21:11 +02:00
Inusaito Sayori
705de655a9 Enable grids button portuguese translation 2013-09-30 14:42:02 -04:00
Aleric Inglewood
227c621dad Merge remote-tracking branch 'slb/master'
Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml
2013-09-29 16:56:55 +02:00
Sean Devin
ffc44a7010 Implemented right click option on MiniMap to hide or show objects 2013-09-29 15:56:38 +02:00
Salvatore La Bua
af1480615f Add optional chat ranges rings on MiniMap
Ability to show Whisper, Chat and Shout range circles on the MiniMap.
Range values are at the moment hardcoded as [10, 20, 100].

Each ring is binded to the following Debug Settings:
Whisper ring:	MiniMapWhisperRing
Chat Ring:	MiniMapChatRing
Shout Ring:	MiniMapShoutRing

Each ring colour can be customised through the following Debug Settings:
Whisper ring:	MiniMapWhisperRingColor
Chat Ring:	MiniMapChatRingColor
Shout Ring:	MiniMapShoutRingColor

The following Debug Setting is used to enable/disable all the rings at once:
MiniMapChatRings
2013-09-29 14:53:51 +02:00
Salvatore La Bua
df7c60de35 Add option to show Client tags on a new line
The checkbox is available in Preferences > Vanity > Tags/Colors.
Debug Setting: SLBDisplayClientTagOnNewLine
2013-09-28 05:32:54 +02:00
Latif Khalifa
d08c34cc2e Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-09-27 03:22:26 +02:00
Latif Khalifa
ad8ea07a7a Aurora var region support
Firestorm patch by Cinders
Adopted from Angstrom viewer with assistance of nhede Core
and Revolution Smythe.
2013-09-27 03:14:51 +02:00