dfighter1985
|
63f7fa81e9
|
CHANGED: #1471 it's a good idea to register GUI widget classes with the reflection system if we want to use them!
--HG--
branch : gui-refactoring
|
2012-07-14 05:16:09 +02:00 |
|
dfighter1985
|
b8030b966a
|
CHANGED: #1471 Apparently it's a bad idea for NLMISC to depend on a global in Ryzom client, since then it cannot be linked with other binaries.
--HG--
branch : gui-refactoring
|
2012-07-14 01:46:22 +02:00 |
|
dfighter1985
|
e2abe1e33e
|
CHANGED: #1471 CInterfaceParser is now a component of CWidgetManager, and is instantiated by an abstract factory method. (IParser::createParser())
--HG--
branch : gui-refactoring
|
2012-07-13 05:37:09 +02:00 |
|
dfighter1985
|
bab0ca184a
|
CHANGED: #1471 no need to go thru CInterfaceManager, when CViewRenderer has it's own Singleton.
--HG--
branch : gui-refactoring
|
2012-07-12 23:04:36 +02:00 |
|
dfighter1985
|
ba6fd68efc
|
CHANGED: #1474 CInterfaceManager is no longer a subclass of CInterfaceParser, instead CInterfaceParser is a component of CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-07-12 21:39:51 +02:00 |
|
dfighter1985
|
f9cda42c8d
|
CHANGED: #1471 Moved some Lua related code from CInterfaceManager to CLuaManager and CInterfaceParser.
--HG--
branch : gui-refactoring
|
2012-07-12 09:01:35 +02:00 |
|
dfighter1985
|
11d2efb96f
|
CHANGED: #1471 Moved CProcedure code to it's own files, and also moved the procedure handling code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
|
2012-07-12 05:29:33 +02:00 |
|
dfighter1985
|
530b542e4a
|
CHANGED: #1471 Moved some more GUI code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
|
2012-07-11 22:27:22 +02:00 |
|
dfighter1985
|
b8f3aff5b1
|
CHANGED: #1471 Moved the input event handling code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
|
2012-07-11 06:44:34 +02:00 |
|
dfighter1985
|
ad764e7bf0
|
CHANGED: #1471 Moved the widget drawing code from CInterfaceManager to CWidgetManager, so the GUI library can now draw the widgets!
--HG--
branch : gui-refactoring
|
2012-07-10 23:01:09 +02:00 |
|
dfighter1985
|
42a282de48
|
CHANGED: #1471 Moved the contexthelp drawing/controlling code to the GUI library.
--HG--
branch : gui-refactoring
|
2012-07-10 06:25:15 +02:00 |
|
dfighter1985
|
dcadeb9095
|
CHANGED: #1471 CInterfaceParser is now part of the Nel GUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-07-09 03:45:00 +02:00 |
|
dfighter1985
|
e11d65bedc
|
CHANGED: #1471 CInterfaceParser no longer depends on CLuaIHMRyzom.
--HG--
branch : gui-refactoring
|
2012-07-09 03:07:19 +02:00 |
|
dfighter1985
|
d78ed9eac3
|
CHANGED: #1471 Modularized CInterfaceParser. It is now extendable with parser modules, so it can parse Ryzom game related stuff without the parser code having to be in the class itself.
--HG--
branch : gui-refactoring
|
2012-07-09 02:36:17 +02:00 |
|
dfighter1985
|
5e68fa3e75
|
CHANGED: #1471 Classes derived from CInterfaceOptions are now instantiated using a factory.
--HG--
branch : gui-refactoring
|
2012-07-08 01:56:49 +02:00 |
|
dfighter1985
|
18b83ad1fc
|
CHANGED: #1471 Some more cleanup in CInterfaceParser, removed some unused code, which also means less coupling and less refactoring to do :P
--HG--
branch : gui-refactoring
|
2012-07-07 21:17:15 +02:00 |
|
dfighter1985
|
750b069ff7
|
CHANGED: #1471 Moved CSheetSelectionGroup and CSheetSelection to the GUI library.
--HG--
branch : gui-refactoring
|
2012-07-07 20:38:45 +02:00 |
|
dfighter1985
|
b689c57052
|
CHANGED: #1471 Little cleanup in CInterfaceParser.
--HG--
branch : gui-refactoring
|
2012-07-07 19:49:13 +02:00 |
|
dfighter1985
|
d301c46c27
|
Merged default branch into gui-refactoring.
--HG--
branch : gui-refactoring
|
2012-07-02 22:46:08 +02:00 |
|
dfighter1985
|
ec51a4f340
|
CHANGED: #1471 Moved the basic interface expression user functions into the NELGUI library under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-07-02 05:07:13 +02:00 |
|
dfighter1985
|
65f038bf4e
|
CHANGED: #1471 CViewPointer is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-07-02 03:21:42 +02:00 |
|
dfighter1985
|
803bdc6272
|
CHANGED: #1471 Broke up CViewPointer into a generic and a Ryzom game related class.
--HG--
branch : gui-refactoring
|
2012-07-02 02:50:47 +02:00 |
|
dfighter1985
|
31482e873b
|
CHANGED: #1471 CInterfaceTrack and CInterfaceAnim are now part of the NELGUI library and are under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-07-01 04:13:24 +02:00 |
|
dfighter1985
|
cb4bc53ecd
|
CHANGED: #1471 CInterfaceAnim no longer depends on Ryzom game related code.
--HG--
branch : gui-refactoring
|
2012-07-01 03:45:38 +02:00 |
|
dfighter1985
|
cbb55e5133
|
CHANGED: #1471 CGroupHTML, CGroupParagraph, CViewLink are now part of the NELGUI library and are under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-07-01 03:11:24 +02:00 |
|
dfighter1985
|
bb698212bf
|
CHANGED: #1471 Decoupled CGroupHTML, CGroupParagraph, CViewLink from Ryzom game related code.
--HG--
branch : gui-refactoring
|
2012-06-30 05:58:02 +02:00 |
|
dfighter1985
|
b65e0ca0c5
|
CHANGED: #1471 CGroupTable and CGroupCell are now part of the NELGUI library and are under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-29 06:58:14 +02:00 |
|
dfighter1985
|
baee35347b
|
CHANGED: #1471 CGroupTable and CGroupCell no longer depend on CInterfaceManager, and a Ryzom game global.
--HG--
branch : gui-refactoring
|
2012-06-29 06:15:56 +02:00 |
|
dfighter1985
|
4ba859dc7c
|
CHANGED: #1471 CDBGroupComboBox is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-29 02:57:29 +02:00 |
|
dfighter1985
|
d82891c719
|
CHANGED: #1471 CDBGroupComboBox no longer depends on the isLoggedin global Ryzom game variable.
--HG--
branch : gui-refactoring
|
2012-06-29 00:30:27 +02:00 |
|
kaetemi
|
e9f75e639d
|
Fixed: Valgrind warnings
|
2012-06-28 11:08:36 +02:00 |
|
dfighter1985
|
9cb78fe4f5
|
CHANGED: #1471 CDBGroupSelectNumber is now part of the NELGUI library and is under the NLGUI namespace. Also had to add a workaround so that the linker doesn't drop the seemingly unused code from the library. Thanks goes to Kaetami for that!
--HG--
branch : gui-refactoring
|
2012-06-28 11:06:36 +02:00 |
|
dfighter1985
|
cabff5c8e5
|
CHANGED: #1471 CDBViewQuantity is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-28 07:35:11 +02:00 |
|
dfighter1985
|
c1148532b9
|
CHANGED: #1471 CDBViewNumber is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-28 07:16:15 +02:00 |
|
dfighter1985
|
5e6cada535
|
CHANGED: CDBViewDigit is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-28 07:07:44 +02:00 |
|
dfighter1985
|
00ab7b9fa4
|
CHANGED: #1471 CDBViewBar3 is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-24 04:51:30 +02:00 |
|
dfighter1985
|
786cc61057
|
CHANGED: #1471 CDBViewBar3 no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-24 04:33:55 +02:00 |
|
dfighter1985
|
6ac90d848c
|
CHANGED: #1471 CDBViewBar is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-24 04:30:12 +02:00 |
|
dfighter1985
|
f049b68079
|
CHANGED: CDBViewBar no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-24 04:14:36 +02:00 |
|
dfighter1985
|
14247e9659
|
CHANGED: CGroupHeader is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-24 04:08:15 +02:00 |
|
dfighter1985
|
5893f791d4
|
CHANGED: CGroupHeader no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-24 04:00:45 +02:00 |
|
dfighter1985
|
862c846e43
|
CHANGED: CGroupTab and CCtrlTabButton are now part of the NELGUI library and are under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-24 03:53:15 +02:00 |
|
dfighter1985
|
ebe5417e3e
|
CHANGED: #1471 CGroupTab no longer depends on CInterfaceManager and the Ryzom game client time data.
--HG--
branch : gui-refactoring
|
2012-06-24 03:29:20 +02:00 |
|
dfighter1985
|
3f3b8a35b0
|
CHANGED: #1471 CViewTextMenu, CGroupSubMenu, CGroupMenu are now part of the NELGUI library and are under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-23 22:38:10 +02:00 |
|
dfighter1985
|
3786e362df
|
CHANGED: #1471 CViewTextMenu, CGroupSubMenu, CGroupMenu no longer depend on CInterfaceManager and CInterfaceParser.
--HG--
branch : gui-refactoring
|
2012-06-23 22:04:33 +02:00 |
|
dfighter1985
|
d4d4041895
|
CHANGED: #1471 CGroupScrollText is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-23 21:24:48 +02:00 |
|
dfighter1985
|
b1f9abd903
|
CHANGED: #1471 CGroupScrollText no longer depends on the Ryzom client time data.
--HG--
branch : gui-refactoring
|
2012-06-23 21:03:23 +02:00 |
|
dfighter1985
|
b9ac80f41a
|
CHANGED: #1471 CGroupContainer is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-23 07:21:32 +02:00 |
|
dfighter1985
|
aa5562b166
|
CHANGED: #1471 CGroupContainer no longer depends on CInterfaceManager, CViewPointer and the Ryzom game client time values.
--HG--
branch : gui-refactoring
|
2012-06-23 06:24:09 +02:00 |
|
dfighter1985
|
30ddbcd0b9
|
CHANGED: #1471 Moved some code from interface_options_ryzom to interface_options ( needed for CGroupContainer )
--HG--
branch : gui-refactoring
|
2012-06-23 04:23:52 +02:00 |
|
dfighter1985
|
595999580b
|
CHANGED: #1471 CGroupEditBox is now in the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-23 03:27:49 +02:00 |
|
dfighter1985
|
3213e52b60
|
CHANGED: #1471 CGroupEditBox no longer depends on CGroupContainer, and CInputHandlerManager.
--HG--
branch : gui-refactoring
|
2012-06-22 23:17:55 +02:00 |
|
dfighter1985
|
c746f81499
|
CHANGED: #1471 CGroupList is now part of NELGUI library, and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-22 06:48:19 +02:00 |
|
dfighter1985
|
1b9911af85
|
CHANGED: #1471 CGroupList no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-22 05:44:01 +02:00 |
|
dfighter1985
|
3f7d55c443
|
CHANGED: #1471 CGroupTree is now part of NELGUI library, and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-22 05:37:55 +02:00 |
|
dfighter1985
|
278ecff08b
|
CHANGED: #1471 CGroupTree no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-22 05:13:05 +02:00 |
|
dfighter1985
|
1d0a1e8f7f
|
CHANGED: #1471 CViewBitmapCombo is now part of NELGUI library, and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-22 04:40:34 +02:00 |
|
dfighter1985
|
8193f484bf
|
CHANGED: #1471 CViewBitmapCombo no longer depends on CViewPointer.
--HG--
branch : gui-refactoring
|
2012-06-22 04:27:53 +02:00 |
|
dfighter1985
|
8b84170dec
|
CHANGED: #1471 CViewBitmap is now part of NELGUI library, and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-22 03:49:43 +02:00 |
|
dfighter1985
|
5dd0ce01f6
|
CHANGED: #1471 CViewBitmap no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-21 23:05:12 +02:00 |
|
dfighter1985
|
47a1769dea
|
CHANGED: #1471 CCtrlTextButton is now part of NELGUI library, and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-21 22:20:02 +02:00 |
|
dfighter1985
|
040eaad94c
|
CHANGED: #1471 CCtrlTextButton no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-21 21:28:13 +02:00 |
|
dfighter1985
|
90a1049934
|
CHANGED: #1471 CViewTextIDFormated is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-21 20:31:10 +02:00 |
|
dfighter1985
|
ec5214ecdb
|
CHANGED: #1471 CViewTextIDFormated no longer depends on Ryzom game related code.
--HG--
branch : gui-refactoring
|
2012-06-21 20:21:01 +02:00 |
|
dfighter1985
|
a1b52bd8a5
|
CHANGED: #1471 CViewTextFormated is now part of NELGUI library, and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-21 10:32:46 +02:00 |
|
dfighter1985
|
4013d3173e
|
CHANGED: #1471 CViewTextFormated no longer depends on Ryzom game related code.
--HG--
branch : gui-refactoring
|
2012-06-21 10:20:43 +02:00 |
|
dfighter1985
|
d257a3e896
|
CHANGED: #1471 CViewTextID is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-21 07:18:25 +02:00 |
|
dfighter1985
|
1d3ff3c948
|
CHANGED: #1471 CViewTextID no longer depends on the client string manager.
--HG--
branch : gui-refactoring
|
2012-06-21 06:57:39 +02:00 |
|
dfighter1985
|
84d826462d
|
CHANGED: #1471 CGroupWheel is now in NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-17 21:21:20 +02:00 |
|
dfighter1985
|
1ddba090b6
|
CHANGED: #1471 CViewText is now part of NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-17 02:49:00 +02:00 |
|
dfighter1985
|
7acd93ff7c
|
CHANGED: #1471 CViewText no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-17 02:08:21 +02:00 |
|
dfighter1985
|
f4823200fc
|
CHANGED: #1471 decoupled CViewText from CGroupContainer and CCtrlResizer.
--HG--
branch : gui-refactoring
|
2012-06-16 23:03:29 +02:00 |
|
dfighter1985
|
1222e35012
|
CHANGED: #1471 moved some ucstring handling code to the NELGUI library ( required for CViewText )
--HG--
branch : gui-refactoring
|
2012-06-16 22:21:14 +02:00 |
|
dfighter1985
|
b51dea4654
|
CHANGED: #1471 CViewPolygon is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 21:05:16 +02:00 |
|
dfighter1985
|
c480f9804f
|
CHANGED: #1471 CViewQuad is now part of the NELGUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 20:53:58 +02:00 |
|
dfighter1985
|
0bdb8f7149
|
CHANGED: #1471 CCtrlTooltip is now in the NELGUI library and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 04:16:12 +02:00 |
|
dfighter1985
|
cd8b37eca5
|
CHANGED: #1471 CCtrlColPick is now in the NELGUI library and is under NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 03:39:23 +02:00 |
|
dfighter1985
|
beb9fa96dc
|
CHANGED: #1471 CCtrlPolygon is now in the NELGUI library and is under NLGUI.
--HG--
branch : gui-refactoring
|
2012-06-16 02:55:19 +02:00 |
|
dfighter1985
|
dbec432a19
|
CHANGED: #1471 CCtrlQuad is now in the NELGUI library under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 02:34:07 +02:00 |
|
dfighter1985
|
a062e563bf
|
CHANGED: #1471 CCtrlScroll is now part of NELGUI, and is under the NLGUI namespace. Also added a new class CGroupSubMenuBase.
--HG--
branch : gui-refactoring
|
2012-06-16 02:06:53 +02:00 |
|
dfighter1985
|
a90445fa03
|
CHANGED: #1471 CCtrlButton is now under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-16 00:49:40 +02:00 |
|
dfighter1985
|
aca24ff510
|
CHANGED: #1471 CCtrlButton is now part of the NEL GUI library.
--HG--
branch : gui-refactoring
|
2012-06-16 00:23:20 +02:00 |
|
dfighter1985
|
bf7d3afd38
|
CHANGED: #1471 CCtrlBaseButton is now part of the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-15 23:30:27 +02:00 |
|
dfighter1985
|
dfb1f0ed37
|
CHANGED: #1471 CCtrlBaseButton is now part of the NELGUI Library.
--HG--
branch : gui-refactoring
|
2012-06-15 22:40:08 +02:00 |
|
dfighter1985
|
a05fe020c3
|
CHANGED: #1471 Moved back some more static methods from CLuaIHMRyzom to CLuaIHM, as CLuaIHM can now handle these too.
--HG--
branch : gui-refactoring
|
2012-06-09 22:18:29 +02:00 |
|
dfighter1985
|
c792abe091
|
CHANGED: #1471 The classes moved in the previous commit are now under the NLGUI namespace.
--HG--
branch : gui-refactoring
|
2012-06-09 03:57:40 +02:00 |
|
dfighter1985
|
56a75a90ab
|
CHANGED: #1471 Finally moved some of the basic widget classes and the widget manager, action handler manager to the GUI lib. Also moved some GUI related methods back to CLuaIHM.
--HG--
branch : gui-refactoring
|
2012-06-09 01:37:43 +02:00 |
|
dfighter1985
|
50ec12947f
|
CHANGED: #1471 Moved some code from CGroupContainer to CGroupContainerBase. CAHManager now depends on CGroupContainerBase instead of CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-08 04:41:33 +02:00 |
|
dfighter1985
|
423ce45141
|
CHANGED: #1471 CWidgetManager no longer depends on CGroupContainer, instead of depends on a new class CGroupContainerBase.
--HG--
branch : gui-refactoring
|
2012-06-08 03:45:43 +02:00 |
|
dfighter1985
|
2fd850b0eb
|
CHANGED: #1471 Broke up CInterfaceOptions to two files, moved the options from CInterfaceParser to CWidgetManager, CGroupFrame no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-08 02:43:20 +02:00 |
|
dfighter1985
|
388cabed97
|
CHANGED: #1471 CWidgetManager no longer depends on CGroupInScene.
--HG--
branch : gui-refactoring
|
2012-06-08 00:28:47 +02:00 |
|
dfighter1985
|
fbd1d5533c
|
CHANGED: #1471 CWidgetManager no longer depends on CViewPointer. Instead it depends on the new class CViewPointerBase.
--HG--
branch : gui-refactoring
|
2012-06-07 23:57:02 +02:00 |
|
dfighter1985
|
3c74576ba9
|
CHANGED: #1471 CWidgetManager no longer depends on CGroupEditBox, it depends on a new class CGroupEditBoxBase instead.
--HG--
branch : gui-refactoring
|
2012-06-07 05:11:14 +02:00 |
|
dfighter1985
|
6f591808b0
|
CHANGED: #1471 CInterfaceGroup no longer depends on CGroupScrollText.
--HG--
branch : gui-refactoring
|
2012-06-07 03:30:27 +02:00 |
|
dfighter1985
|
2e9779a591
|
CHANGED: #1471 CInterfaceGroup no longer depends on CCtrlScroll. Instead if depends on a new CCtrlScrollBase class.
--HG--
branch : gui-refactoring
|
2012-06-07 02:54:14 +02:00 |
|
dfighter1985
|
3c73de81a3
|
CHANGED: #1471 CInterfaceElement no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-06 22:31:47 +02:00 |
|
dfighter1985
|
8437a0319d
|
CHANGED: #1471 CInterfaceGroup no longer depends on CGroupContainer.
--HG--
branch : gui-refactoring
|
2012-06-06 05:48:51 +02:00 |
|
dfighter1985
|
a27305e295
|
CHANGED: #1471 CInterfaceGroup::InvalidateTexts is now implemented with a visitor, method removed. Also added CInterfaceGroup::visitGroupAndChildren, that only visits the group and it's sub-groups.
--HG--
branch : gui-refactoring
|
2012-06-06 04:10:34 +02:00 |
|
dfighter1985
|
d02a5f3d31
|
CHANGED: #1471 moved makeWindow and unMakeWindow methods to CWidgetManager from CInterfaceManager. So CInterfaceGroup no longer depends on CInterfaceManager.
--HG--
branch : gui-refactoring
|
2012-06-06 01:56:25 +02:00 |
|
dfighter1985
|
8b54f34045
|
CHANGED: #1471 extracted some dragging related code from CDBCtrlSheet and created a new class CCtrlDraggable, so that CWidgetManager doesn't have to be coupled with CDBCtrlSheet.
--HG--
branch : gui-refactoring
|
2012-06-05 05:25:49 +02:00 |
|