From 4a27ab8ffcadd951ac18dd7705baf3e01be88286 Mon Sep 17 00:00:00 2001 From: skyjake Date: Thu, 29 Aug 2013 19:08:33 +0300 Subject: [PATCH] Client: Added convenience headers for the client-side UI framework Excluding widget/dialog classes for now. --- doomsday/client/client.pro | 46 +++++++++++++------ doomsday/client/include/AtlasProceduralImage | 1 + doomsday/client/include/CommandAction | 1 + .../client/include/ContextWidgetOrganizer | 1 + doomsday/client/include/FontLineWrapping | 1 + doomsday/client/include/GLTextComposer | 1 + doomsday/client/include/GridLayout | 1 + doomsday/client/include/GuiRootWidget | 1 + doomsday/client/include/GuiWidget | 1 + doomsday/client/include/ProceduralImage | 1 + doomsday/client/include/SequentialLayout | 1 + doomsday/client/include/SignalAction | 1 + doomsday/client/include/TextDrawable | 1 + doomsday/client/include/WidgetActions | 1 + doomsday/client/include/clientapp.h | 2 +- doomsday/client/include/ui/ActionItem | 2 + doomsday/client/include/ui/Data | 1 + doomsday/client/include/ui/Item | 1 + doomsday/client/include/ui/ListData | 1 + doomsday/client/include/ui/Margins | 1 + doomsday/client/include/ui/SubmenuItem | 1 + doomsday/client/include/ui/VariableToggleItem | 1 + doomsday/client/include/ui/clientwindow.h | 2 +- doomsday/client/include/ui/framework/data.h | 2 +- .../include/ui/framework/sequentiallayout.h | 2 +- .../client/include/ui/widgets/blurwidget.h | 2 +- .../client/include/ui/widgets/busywidget.h | 2 +- .../client/include/ui/widgets/choicewidget.h | 2 +- .../client/include/ui/widgets/consolewidget.h | 2 +- .../client/include/ui/widgets/labelwidget.h | 6 +-- .../client/include/ui/widgets/legacywidget.h | 2 +- .../include/ui/widgets/lineeditwidget.h | 2 +- .../client/include/ui/widgets/menuwidget.h | 12 ++--- .../include/ui/widgets/notificationwidget.h | 2 +- .../include/ui/widgets/scrollareawidget.h | 2 +- .../client/include/ui/widgets/sliderwidget.h | 2 +- .../client/include/ui/widgets/taskbarwidget.h | 2 +- doomsday/client/src/ui/b_command.cpp | 2 +- doomsday/client/src/ui/clientwindow.cpp | 2 +- .../client/src/ui/dialogs/aboutdialog.cpp | 4 +- .../client/src/ui/dialogs/messagedialog.cpp | 2 +- .../src/ui/dialogs/videosettingsdialog.cpp | 8 ++-- .../client/src/ui/framework/commandaction.cpp | 2 +- .../ui/framework/contextwidgetorganizer.cpp | 4 +- doomsday/client/src/ui/framework/data.cpp | 4 +- .../src/ui/framework/fontlinewrapping.cpp | 2 +- .../src/ui/framework/gltextcomposer.cpp | 2 +- .../client/src/ui/framework/gridlayout.cpp | 4 +- .../client/src/ui/framework/guirootwidget.cpp | 2 +- .../client/src/ui/framework/guiwidget.cpp | 4 +- doomsday/client/src/ui/framework/item.cpp | 2 +- doomsday/client/src/ui/framework/listdata.cpp | 2 +- doomsday/client/src/ui/framework/margins.cpp | 2 +- .../src/ui/framework/proceduralimage.cpp | 2 +- .../src/ui/framework/sequentiallayout.cpp | 2 +- .../client/src/ui/framework/signalaction.cpp | 2 +- .../client/src/ui/framework/textdrawable.cpp | 2 +- .../client/src/ui/framework/widgetactions.cpp | 2 +- doomsday/client/src/ui/widgets/busywidget.cpp | 2 +- .../client/src/ui/widgets/buttonwidget.cpp | 2 +- .../client/src/ui/widgets/choicewidget.cpp | 2 +- .../client/src/ui/widgets/consolewidget.cpp | 8 ++-- .../client/src/ui/widgets/dialogwidget.cpp | 4 +- .../client/src/ui/widgets/documentwidget.cpp | 2 +- .../src/ui/widgets/gameselectionwidget.cpp | 4 +- .../client/src/ui/widgets/labelwidget.cpp | 6 +-- .../client/src/ui/widgets/lineeditwidget.cpp | 6 +-- doomsday/client/src/ui/widgets/logwidget.cpp | 4 +- doomsday/client/src/ui/widgets/menuwidget.cpp | 8 ++-- .../src/ui/widgets/notificationwidget.cpp | 2 +- .../client/src/ui/widgets/popupmenuwidget.cpp | 6 +-- .../client/src/ui/widgets/popupwidget.cpp | 2 +- .../client/src/ui/widgets/progresswidget.cpp | 2 +- .../client/src/ui/widgets/sliderwidget.cpp | 2 +- .../client/src/ui/widgets/taskbarwidget.cpp | 6 +-- .../client/src/ui/widgets/togglewidget.cpp | 4 +- .../client/src/updater/downloaddialog.cpp | 2 +- .../src/updater/updateavailabledialog.cpp | 2 +- doomsday/client/src/updater/updater.cpp | 2 +- .../src/updater/updatersettingsdialog.cpp | 2 +- 80 files changed, 146 insertions(+), 105 deletions(-) create mode 100644 doomsday/client/include/AtlasProceduralImage create mode 100644 doomsday/client/include/CommandAction create mode 100644 doomsday/client/include/ContextWidgetOrganizer create mode 100644 doomsday/client/include/FontLineWrapping create mode 100644 doomsday/client/include/GLTextComposer create mode 100644 doomsday/client/include/GridLayout create mode 100644 doomsday/client/include/GuiRootWidget create mode 100644 doomsday/client/include/GuiWidget create mode 100644 doomsday/client/include/ProceduralImage create mode 100644 doomsday/client/include/SequentialLayout create mode 100644 doomsday/client/include/SignalAction create mode 100644 doomsday/client/include/TextDrawable create mode 100644 doomsday/client/include/WidgetActions create mode 100644 doomsday/client/include/ui/ActionItem create mode 100644 doomsday/client/include/ui/Data create mode 100644 doomsday/client/include/ui/Item create mode 100644 doomsday/client/include/ui/ListData create mode 100644 doomsday/client/include/ui/Margins create mode 100644 doomsday/client/include/ui/SubmenuItem create mode 100644 doomsday/client/include/ui/VariableToggleItem diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index f33ca29538..2e92219ae2 100644 --- a/doomsday/client/client.pro +++ b/doomsday/client/client.pro @@ -108,7 +108,8 @@ DENG_API_HEADERS = \ $$DENG_API_DIR/doomsday.h # Convenience headers. -DENG_HEADERS += \ +DENG_CONVENIENCE_HEADERS += \ + include/AtlasProceduralImage \ include/BiasDigest \ include/BiasIllum \ include/BiasSource \ @@ -116,28 +117,24 @@ DENG_HEADERS += \ include/BiasTracker \ include/BspLeaf \ include/BspNode \ + include/CommandAction \ + include/ContextWidgetOrganizer \ include/EntityDatabase \ include/Face \ + include/FontLineWrapping \ include/Game \ include/Games \ + include/GLTextComposer \ include/Grabbable \ + include/GridLayout \ + include/GuiRootWidget \ + include/GuiWidget \ include/Hand \ include/HEdge \ include/HueCircle \ include/HueCircleVisual \ include/IHPlane \ include/Line \ - include/Mesh \ - include/Plane \ - include/Polyobj \ - include/WallEdge \ - include/WallSpec \ - include/Sector \ - include/Surface \ - include/Vertex - -# Private headers. -DENG_HEADERS += \ include/MapElement \ include/Material \ include/MaterialArchive \ @@ -147,13 +144,36 @@ DENG_HEADERS += \ include/MaterialScheme \ include/MaterialSnapshot \ include/MaterialVariantSpec \ + include/Mesh \ + include/Plane \ + include/Polyobj \ + include/ProceduralImage \ + include/Sector \ + include/SequentialLayout \ + include/SignalAction \ include/SkyFixEdge \ + include/SubmenuAction \ + include/Surface \ + include/TextDrawable \ include/Texture \ include/TextureManifest \ include/Textures \ include/TextureScheme \ include/TextureVariantSpec \ - include/TriangleStripBuilder \ + include/TriangleStripBuilder \ + include/ui/Data \ + include/ui/Item \ + include/ui/ListData \ + include/ui/Margins \ + include/ui/VariableToggleItem \ + include/Vertex \ + include/WallEdge \ + include/WallSpec \ + include/WidgetActions + +# Private headers. +DENG_HEADERS += \ + $$DENG_CONVENIENCE_HEADERS \ include/audio/audiodriver.h \ include/audio/audiodriver_music.h \ include/audio/m_mus2midi.h \ diff --git a/doomsday/client/include/AtlasProceduralImage b/doomsday/client/include/AtlasProceduralImage new file mode 100644 index 0000000000..1dcaf1aba2 --- /dev/null +++ b/doomsday/client/include/AtlasProceduralImage @@ -0,0 +1 @@ +#include "ui/framework/atlasproceduralimage.h" diff --git a/doomsday/client/include/CommandAction b/doomsday/client/include/CommandAction new file mode 100644 index 0000000000..0ad8a1f36c --- /dev/null +++ b/doomsday/client/include/CommandAction @@ -0,0 +1 @@ +#include "ui/framework/commandaction.h" diff --git a/doomsday/client/include/ContextWidgetOrganizer b/doomsday/client/include/ContextWidgetOrganizer new file mode 100644 index 0000000000..9a3c5d2aa8 --- /dev/null +++ b/doomsday/client/include/ContextWidgetOrganizer @@ -0,0 +1 @@ +#include "ui/framework/contextwidgetorganizer.h" diff --git a/doomsday/client/include/FontLineWrapping b/doomsday/client/include/FontLineWrapping new file mode 100644 index 0000000000..5f08e37a5b --- /dev/null +++ b/doomsday/client/include/FontLineWrapping @@ -0,0 +1 @@ +#include "ui/framework/fontlinewrapping.h" diff --git a/doomsday/client/include/GLTextComposer b/doomsday/client/include/GLTextComposer new file mode 100644 index 0000000000..5328ca0a4f --- /dev/null +++ b/doomsday/client/include/GLTextComposer @@ -0,0 +1 @@ +#include "ui/framework/gltextcomposer.h" diff --git a/doomsday/client/include/GridLayout b/doomsday/client/include/GridLayout new file mode 100644 index 0000000000..8ad17af25c --- /dev/null +++ b/doomsday/client/include/GridLayout @@ -0,0 +1 @@ +#include "ui/framework/gridlayout.h" diff --git a/doomsday/client/include/GuiRootWidget b/doomsday/client/include/GuiRootWidget new file mode 100644 index 0000000000..708f4cb6b8 --- /dev/null +++ b/doomsday/client/include/GuiRootWidget @@ -0,0 +1 @@ +#include "ui/framework/guirootwidget.h" diff --git a/doomsday/client/include/GuiWidget b/doomsday/client/include/GuiWidget new file mode 100644 index 0000000000..b059589655 --- /dev/null +++ b/doomsday/client/include/GuiWidget @@ -0,0 +1 @@ +#include "ui/framework/guiwidget.h" diff --git a/doomsday/client/include/ProceduralImage b/doomsday/client/include/ProceduralImage new file mode 100644 index 0000000000..8602959709 --- /dev/null +++ b/doomsday/client/include/ProceduralImage @@ -0,0 +1 @@ +#include "ui/framework/proceduralimage.h" diff --git a/doomsday/client/include/SequentialLayout b/doomsday/client/include/SequentialLayout new file mode 100644 index 0000000000..580ebee628 --- /dev/null +++ b/doomsday/client/include/SequentialLayout @@ -0,0 +1 @@ +#include "ui/framework/sequentiallayout.h" diff --git a/doomsday/client/include/SignalAction b/doomsday/client/include/SignalAction new file mode 100644 index 0000000000..b96838d3cf --- /dev/null +++ b/doomsday/client/include/SignalAction @@ -0,0 +1 @@ +#include "ui/framework/signalaction.h" diff --git a/doomsday/client/include/TextDrawable b/doomsday/client/include/TextDrawable new file mode 100644 index 0000000000..f6b89461ab --- /dev/null +++ b/doomsday/client/include/TextDrawable @@ -0,0 +1 @@ +#include "ui/framework/textdrawable.h" diff --git a/doomsday/client/include/WidgetActions b/doomsday/client/include/WidgetActions new file mode 100644 index 0000000000..c2428e4232 --- /dev/null +++ b/doomsday/client/include/WidgetActions @@ -0,0 +1 @@ +#include "ui/framework/widgetactions.h" diff --git a/doomsday/client/include/clientapp.h b/doomsday/client/include/clientapp.h index 62292688c4..fddc8205c8 100644 --- a/doomsday/client/include/clientapp.h +++ b/doomsday/client/include/clientapp.h @@ -25,7 +25,7 @@ #include "network/serverlink.h" #include "ui/inputsystem.h" #include "ui/windowsystem.h" -#include "ui/framework/widgetactions.h" +#include "WidgetActions" #include "updater.h" #include "Games" #include "world/world.h" diff --git a/doomsday/client/include/ui/ActionItem b/doomsday/client/include/ui/ActionItem new file mode 100644 index 0000000000..8118f44513 --- /dev/null +++ b/doomsday/client/include/ui/ActionItem @@ -0,0 +1,2 @@ +#include "ui/framework/actionitem.h" + diff --git a/doomsday/client/include/ui/Data b/doomsday/client/include/ui/Data new file mode 100644 index 0000000000..0eb6a06b3d --- /dev/null +++ b/doomsday/client/include/ui/Data @@ -0,0 +1 @@ +#include "ui/framework/data.h" diff --git a/doomsday/client/include/ui/Item b/doomsday/client/include/ui/Item new file mode 100644 index 0000000000..87664b22ba --- /dev/null +++ b/doomsday/client/include/ui/Item @@ -0,0 +1 @@ +#include "ui/framework/item.h" diff --git a/doomsday/client/include/ui/ListData b/doomsday/client/include/ui/ListData new file mode 100644 index 0000000000..0c52cb5f30 --- /dev/null +++ b/doomsday/client/include/ui/ListData @@ -0,0 +1 @@ +#include "ui/framework/listdata.h" diff --git a/doomsday/client/include/ui/Margins b/doomsday/client/include/ui/Margins new file mode 100644 index 0000000000..b9b799cf1a --- /dev/null +++ b/doomsday/client/include/ui/Margins @@ -0,0 +1 @@ +#include "ui/framework/margins.h" diff --git a/doomsday/client/include/ui/SubmenuItem b/doomsday/client/include/ui/SubmenuItem new file mode 100644 index 0000000000..321403ee21 --- /dev/null +++ b/doomsday/client/include/ui/SubmenuItem @@ -0,0 +1 @@ +#include "ui/framework/submenuitem.h" diff --git a/doomsday/client/include/ui/VariableToggleItem b/doomsday/client/include/ui/VariableToggleItem new file mode 100644 index 0000000000..e306764356 --- /dev/null +++ b/doomsday/client/include/ui/VariableToggleItem @@ -0,0 +1 @@ +#include "ui/framework/variabletoggleitem.h" diff --git a/doomsday/client/include/ui/clientwindow.h b/doomsday/client/include/ui/clientwindow.h index 0ec3d9ee34..c37a3aafca 100644 --- a/doomsday/client/include/ui/clientwindow.h +++ b/doomsday/client/include/ui/clientwindow.h @@ -23,7 +23,7 @@ #include -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include "resource/image.h" /** diff --git a/doomsday/client/include/ui/framework/data.h b/doomsday/client/include/ui/framework/data.h index 071a8bd135..4aeb1be8ef 100644 --- a/doomsday/client/include/ui/framework/data.h +++ b/doomsday/client/include/ui/framework/data.h @@ -20,7 +20,7 @@ #define DENG_CLIENT_UI_DATA_H #include -#include "ui/framework/guiwidget.h" +#include "GuiWidget" namespace ui { diff --git a/doomsday/client/include/ui/framework/sequentiallayout.h b/doomsday/client/include/ui/framework/sequentiallayout.h index c0332d89f9..4595146352 100644 --- a/doomsday/client/include/ui/framework/sequentiallayout.h +++ b/doomsday/client/include/ui/framework/sequentiallayout.h @@ -20,7 +20,7 @@ #define DENG_CLIENT_SEQUENTIALLAYOUT_H #include "../uidefs.h" -#include "guiwidget.h" +#include "GuiWidget" /** * Widget layout for a sequence of widgets. diff --git a/doomsday/client/include/ui/widgets/blurwidget.h b/doomsday/client/include/ui/widgets/blurwidget.h index 4e893ad8e7..946db85e04 100644 --- a/doomsday/client/include/ui/widgets/blurwidget.h +++ b/doomsday/client/include/ui/widgets/blurwidget.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_BLURWIDGET_H #define DENG_CLIENT_BLURWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" /** * Utility widget for drawing blurred widget backgrounds. Many widgets can diff --git a/doomsday/client/include/ui/widgets/busywidget.h b/doomsday/client/include/ui/widgets/busywidget.h index b0297d04f4..d356d000fa 100644 --- a/doomsday/client/include/ui/widgets/busywidget.h +++ b/doomsday/client/include/ui/widgets/busywidget.h @@ -19,7 +19,7 @@ #ifndef CLIENT_BUSYWIDGET_H #define CLIENT_BUSYWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" #include "progresswidget.h" #include diff --git a/doomsday/client/include/ui/widgets/choicewidget.h b/doomsday/client/include/ui/widgets/choicewidget.h index 15906fce61..6bbb88f631 100644 --- a/doomsday/client/include/ui/widgets/choicewidget.h +++ b/doomsday/client/include/ui/widgets/choicewidget.h @@ -21,7 +21,7 @@ #include "buttonwidget.h" #include "popupmenuwidget.h" -#include "ui/framework/actionitem.h" +#include "ui/ActionItem" /** * Widget for choosing an item from a set of alternatives. diff --git a/doomsday/client/include/ui/widgets/consolewidget.h b/doomsday/client/include/ui/widgets/consolewidget.h index 95369487e9..40c934ba05 100644 --- a/doomsday/client/include/ui/widgets/consolewidget.h +++ b/doomsday/client/include/ui/widgets/consolewidget.h @@ -21,7 +21,7 @@ #include -#include "ui/framework/guiwidget.h" +#include "GuiWidget" #include "buttonwidget.h" #include "consolecommandwidget.h" #include "logwidget.h" diff --git a/doomsday/client/include/ui/widgets/labelwidget.h b/doomsday/client/include/ui/widgets/labelwidget.h index 8832dae016..ae00058420 100644 --- a/doomsday/client/include/ui/widgets/labelwidget.h +++ b/doomsday/client/include/ui/widgets/labelwidget.h @@ -24,9 +24,9 @@ #include #include "../uidefs.h" -#include "ui/framework/guiwidget.h" -#include "ui/framework/data.h" -#include "ui/framework/proceduralimage.h" +#include "GuiWidget" +#include "ProceduralImage" +#include "ui/Data" /** * Widget showing a label text and/or image. diff --git a/doomsday/client/include/ui/widgets/legacywidget.h b/doomsday/client/include/ui/widgets/legacywidget.h index 21ab834559..fb4c303d8e 100644 --- a/doomsday/client/include/ui/widgets/legacywidget.h +++ b/doomsday/client/include/ui/widgets/legacywidget.h @@ -20,7 +20,7 @@ #ifndef CLIENT_LEGACYWIDGET_H #define CLIENT_LEGACYWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" /** * Widget for legacy UI components. diff --git a/doomsday/client/include/ui/widgets/lineeditwidget.h b/doomsday/client/include/ui/widgets/lineeditwidget.h index 390534a08f..5fa24a0103 100644 --- a/doomsday/client/include/ui/widgets/lineeditwidget.h +++ b/doomsday/client/include/ui/widgets/lineeditwidget.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_LINEEDITWIDGET_H #define DENG_CLIENT_LINEEDITWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" #include #include diff --git a/doomsday/client/include/ui/widgets/menuwidget.h b/doomsday/client/include/ui/widgets/menuwidget.h index e71c6f5798..ba157fdee9 100644 --- a/doomsday/client/include/ui/widgets/menuwidget.h +++ b/doomsday/client/include/ui/widgets/menuwidget.h @@ -19,12 +19,12 @@ #ifndef DENG_CLIENT_MENUWIDGET_H #define DENG_CLIENT_MENUWIDGET_H -#include "ui/framework/data.h" -#include "ui/framework/contextwidgetorganizer.h" -#include "ui/framework/actionitem.h" -#include "ui/framework/submenuitem.h" -#include "ui/framework/variabletoggleitem.h" -#include "ui/framework/gridlayout.h" +#include "ui/Data" +#include "ContextWidgetOrganizer" +#include "ui/ActionItem" +#include "ui/SubmenuItem" +#include "ui/VariableToggleItem" +#include "GridLayout" #include "scrollareawidget.h" #include "buttonwidget.h" diff --git a/doomsday/client/include/ui/widgets/notificationwidget.h b/doomsday/client/include/ui/widgets/notificationwidget.h index cf01d03fea..9894646ac8 100644 --- a/doomsday/client/include/ui/widgets/notificationwidget.h +++ b/doomsday/client/include/ui/widgets/notificationwidget.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_NOTIFICATIONWIDGET_H #define DENG_CLIENT_NOTIFICATIONWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" /** * Notification area. diff --git a/doomsday/client/include/ui/widgets/scrollareawidget.h b/doomsday/client/include/ui/widgets/scrollareawidget.h index 0e17b95721..4c54b5163f 100644 --- a/doomsday/client/include/ui/widgets/scrollareawidget.h +++ b/doomsday/client/include/ui/widgets/scrollareawidget.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_SCROLLAREAWIDGET_H #define DENG_CLIENT_SCROLLAREAWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" /** * Scrollable area. diff --git a/doomsday/client/include/ui/widgets/sliderwidget.h b/doomsday/client/include/ui/widgets/sliderwidget.h index e84638d2d4..cce90a6f3c 100644 --- a/doomsday/client/include/ui/widgets/sliderwidget.h +++ b/doomsday/client/include/ui/widgets/sliderwidget.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_SLIDERWIDGET_H #define DENG_CLIENT_SLIDERWIDGET_H -#include "ui/framework/guiwidget.h" +#include "GuiWidget" #include diff --git a/doomsday/client/include/ui/widgets/taskbarwidget.h b/doomsday/client/include/ui/widgets/taskbarwidget.h index c1d08068a0..8a32f6c600 100644 --- a/doomsday/client/include/ui/widgets/taskbarwidget.h +++ b/doomsday/client/include/ui/widgets/taskbarwidget.h @@ -22,7 +22,7 @@ #include #include -#include "ui/framework/guiwidget.h" +#include "GuiWidget" #include "consolewidget.h" #include "buttonwidget.h" diff --git a/doomsday/client/src/ui/b_command.cpp b/doomsday/client/src/ui/b_command.cpp index 6a83c18935..6bdf2b3aaa 100644 --- a/doomsday/client/src/ui/b_command.cpp +++ b/doomsday/client/src/ui/b_command.cpp @@ -25,7 +25,7 @@ #include "world/p_players.h" #include "ui/b_main.h" #include "ui/b_command.h" -#include "ui/framework/commandaction.h" +#include "CommandAction" void B_InitCommandBindingList(evbinding_t* listRoot) { diff --git a/doomsday/client/src/ui/clientwindow.cpp b/doomsday/client/src/ui/clientwindow.cpp index 4d8c676966..b3c346b309 100644 --- a/doomsday/client/src/ui/clientwindow.cpp +++ b/doomsday/client/src/ui/clientwindow.cpp @@ -41,7 +41,7 @@ #include "ui/widgets/notificationwidget.h" #include "ui/widgets/gameselectionwidget.h" #include "ui/widgets/progresswidget.h" -#include "ui/framework/commandaction.h" +#include "CommandAction" #include "ui/mouse_qt.h" #include "dd_main.h" diff --git a/doomsday/client/src/ui/dialogs/aboutdialog.cpp b/doomsday/client/src/ui/dialogs/aboutdialog.cpp index 1c1211d9a6..71df91d934 100644 --- a/doomsday/client/src/ui/dialogs/aboutdialog.cpp +++ b/doomsday/client/src/ui/dialogs/aboutdialog.cpp @@ -17,8 +17,8 @@ */ #include "ui/dialogs/aboutdialog.h" -#include "ui/framework/sequentiallayout.h" -#include "ui/framework/signalaction.h" +#include "SequentialLayout" +#include "SignalAction" #include "ui/widgets/labelwidget.h" #include "ui/widgets/popupwidget.h" #include "ui/widgets/documentwidget.h" diff --git a/doomsday/client/src/ui/dialogs/messagedialog.cpp b/doomsday/client/src/ui/dialogs/messagedialog.cpp index de78715696..aefcee1f35 100644 --- a/doomsday/client/src/ui/dialogs/messagedialog.cpp +++ b/doomsday/client/src/ui/dialogs/messagedialog.cpp @@ -17,7 +17,7 @@ */ #include "ui/dialogs/messagedialog.h" -#include "ui/framework/sequentiallayout.h" +#include "SequentialLayout" using namespace de; using namespace ui; diff --git a/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp b/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp index 8d4fbed943..f7586e411b 100644 --- a/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp +++ b/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp @@ -20,10 +20,10 @@ #include "ui/widgets/variabletogglewidget.h" #include "ui/widgets/choicewidget.h" #include "ui/widgets/taskbarwidget.h" -#include "ui/framework/sequentiallayout.h" -#include "ui/framework/gridlayout.h" -#include "ui/framework/commandaction.h" -#include "ui/framework/signalaction.h" +#include "SequentialLayout" +#include "GridLayout" +#include "CommandAction" +#include "SignalAction" #include "ui/clientwindow.h" #include "con_main.h" diff --git a/doomsday/client/src/ui/framework/commandaction.cpp b/doomsday/client/src/ui/framework/commandaction.cpp index 82b82a4569..d5d1ec0fac 100644 --- a/doomsday/client/src/ui/framework/commandaction.cpp +++ b/doomsday/client/src/ui/framework/commandaction.cpp @@ -17,7 +17,7 @@ */ #include "de_platform.h" -#include "ui/framework/commandaction.h" +#include "CommandAction" #include "con_main.h" using namespace de; diff --git a/doomsday/client/src/ui/framework/contextwidgetorganizer.cpp b/doomsday/client/src/ui/framework/contextwidgetorganizer.cpp index 3af245ad15..efb0e2f346 100644 --- a/doomsday/client/src/ui/framework/contextwidgetorganizer.cpp +++ b/doomsday/client/src/ui/framework/contextwidgetorganizer.cpp @@ -16,9 +16,9 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/contextwidgetorganizer.h" -#include "ui/framework/item.h" +#include "ContextWidgetOrganizer" #include "ui/widgets/labelwidget.h" +#include "ui/Item" #include diff --git a/doomsday/client/src/ui/framework/data.cpp b/doomsday/client/src/ui/framework/data.cpp index d405fa49d1..246a35a41f 100644 --- a/doomsday/client/src/ui/framework/data.cpp +++ b/doomsday/client/src/ui/framework/data.cpp @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/data.h" -#include "ui/framework/item.h" +#include "ui/Data" +#include "ui/Item" #include "ui/widgets/labelwidget.h" #include diff --git a/doomsday/client/src/ui/framework/fontlinewrapping.cpp b/doomsday/client/src/ui/framework/fontlinewrapping.cpp index 16ee7b66b8..17a2f7cafc 100644 --- a/doomsday/client/src/ui/framework/fontlinewrapping.cpp +++ b/doomsday/client/src/ui/framework/fontlinewrapping.cpp @@ -20,7 +20,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/fontlinewrapping.h" +#include "FontLineWrapping" #include diff --git a/doomsday/client/src/ui/framework/gltextcomposer.cpp b/doomsday/client/src/ui/framework/gltextcomposer.cpp index 476c2a04a5..ce74dc3862 100644 --- a/doomsday/client/src/ui/framework/gltextcomposer.cpp +++ b/doomsday/client/src/ui/framework/gltextcomposer.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/gltextcomposer.h" +#include "GLTextComposer" #include diff --git a/doomsday/client/src/ui/framework/gridlayout.cpp b/doomsday/client/src/ui/framework/gridlayout.cpp index af5f3ff440..451d2748f7 100644 --- a/doomsday/client/src/ui/framework/gridlayout.cpp +++ b/doomsday/client/src/ui/framework/gridlayout.cpp @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/gridlayout.h" -#include "ui/framework/sequentiallayout.h" +#include "GridLayout" +#include "SequentialLayout" using namespace de; diff --git a/doomsday/client/src/ui/framework/guirootwidget.cpp b/doomsday/client/src/ui/framework/guirootwidget.cpp index ae06f006ca..09622458d2 100644 --- a/doomsday/client/src/ui/framework/guirootwidget.cpp +++ b/doomsday/client/src/ui/framework/guirootwidget.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include "ui/clientwindow.h" #include "clientapp.h" diff --git a/doomsday/client/src/ui/framework/guiwidget.cpp b/doomsday/client/src/ui/framework/guiwidget.cpp index 2a5444d885..4171a28bff 100644 --- a/doomsday/client/src/ui/framework/guiwidget.cpp +++ b/doomsday/client/src/ui/framework/guiwidget.cpp @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/guiwidget.h" -#include "ui/framework/guirootwidget.h" +#include "GuiWidget" +#include "GuiRootWidget" #include "ui/widgets/blurwidget.h" #include "clientapp.h" #include diff --git a/doomsday/client/src/ui/framework/item.cpp b/doomsday/client/src/ui/framework/item.cpp index 7f848e7d02..f645e6c34f 100644 --- a/doomsday/client/src/ui/framework/item.cpp +++ b/doomsday/client/src/ui/framework/item.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/item.h" +#include "ui/Item" using namespace de; using namespace ui; diff --git a/doomsday/client/src/ui/framework/listdata.cpp b/doomsday/client/src/ui/framework/listdata.cpp index 6627e1d595..d7212c2b52 100644 --- a/doomsday/client/src/ui/framework/listdata.cpp +++ b/doomsday/client/src/ui/framework/listdata.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/listdata.h" +#include "ui/ListData" #include #include diff --git a/doomsday/client/src/ui/framework/margins.cpp b/doomsday/client/src/ui/framework/margins.cpp index 2239a1b39d..0a19b4e4a7 100644 --- a/doomsday/client/src/ui/framework/margins.cpp +++ b/doomsday/client/src/ui/framework/margins.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/margins.h" +#include "ui/Margins" #include "clientapp.h" using namespace de; diff --git a/doomsday/client/src/ui/framework/proceduralimage.cpp b/doomsday/client/src/ui/framework/proceduralimage.cpp index 456999ba05..0786466937 100644 --- a/doomsday/client/src/ui/framework/proceduralimage.cpp +++ b/doomsday/client/src/ui/framework/proceduralimage.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/proceduralimage.h" +#include "ProceduralImage" using namespace de; diff --git a/doomsday/client/src/ui/framework/sequentiallayout.cpp b/doomsday/client/src/ui/framework/sequentiallayout.cpp index e0d3d303b6..b422046421 100644 --- a/doomsday/client/src/ui/framework/sequentiallayout.cpp +++ b/doomsday/client/src/ui/framework/sequentiallayout.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/sequentiallayout.h" +#include "SequentialLayout" using namespace de; diff --git a/doomsday/client/src/ui/framework/signalaction.cpp b/doomsday/client/src/ui/framework/signalaction.cpp index a59442fb0b..88b56a2b4a 100644 --- a/doomsday/client/src/ui/framework/signalaction.cpp +++ b/doomsday/client/src/ui/framework/signalaction.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/signalaction.h" +#include "SignalAction" using namespace de; diff --git a/doomsday/client/src/ui/framework/textdrawable.cpp b/doomsday/client/src/ui/framework/textdrawable.cpp index bdf6ed9f77..303ebfae41 100644 --- a/doomsday/client/src/ui/framework/textdrawable.cpp +++ b/doomsday/client/src/ui/framework/textdrawable.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/textdrawable.h" +#include "TextDrawable" #include #include diff --git a/doomsday/client/src/ui/framework/widgetactions.cpp b/doomsday/client/src/ui/framework/widgetactions.cpp index 5217359c57..2aef7645a0 100644 --- a/doomsday/client/src/ui/framework/widgetactions.cpp +++ b/doomsday/client/src/ui/framework/widgetactions.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include "ui/framework/widgetactions.h" +#include "WidgetActions" #include "ui/b_main.h" #include "ui/b_context.h" diff --git a/doomsday/client/src/ui/widgets/busywidget.cpp b/doomsday/client/src/ui/widgets/busywidget.cpp index 371a854d9d..6b39541ca8 100644 --- a/doomsday/client/src/ui/widgets/busywidget.cpp +++ b/doomsday/client/src/ui/widgets/busywidget.cpp @@ -19,7 +19,7 @@ #include "de_platform.h" #include "ui/widgets/busywidget.h" #include "ui/widgets/progresswidget.h" -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include "ui/busyvisual.h" #include "busymode.h" #include "sys_system.h" diff --git a/doomsday/client/src/ui/widgets/buttonwidget.cpp b/doomsday/client/src/ui/widgets/buttonwidget.cpp index c70ca92cbe..ee605329d7 100644 --- a/doomsday/client/src/ui/widgets/buttonwidget.cpp +++ b/doomsday/client/src/ui/widgets/buttonwidget.cpp @@ -17,7 +17,7 @@ */ #include "ui/widgets/buttonwidget.h" -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include #include diff --git a/doomsday/client/src/ui/widgets/choicewidget.cpp b/doomsday/client/src/ui/widgets/choicewidget.cpp index cd42c715ef..0af8584bc3 100644 --- a/doomsday/client/src/ui/widgets/choicewidget.cpp +++ b/doomsday/client/src/ui/widgets/choicewidget.cpp @@ -18,7 +18,7 @@ #include "ui/widgets/choicewidget.h" #include "ui/widgets/popupmenuwidget.h" -#include "ui/framework/signalaction.h" +#include "SignalAction" using namespace de; using namespace ui; diff --git a/doomsday/client/src/ui/widgets/consolewidget.cpp b/doomsday/client/src/ui/widgets/consolewidget.cpp index a8ab310abc..54207b560c 100644 --- a/doomsday/client/src/ui/widgets/consolewidget.cpp +++ b/doomsday/client/src/ui/widgets/consolewidget.cpp @@ -17,10 +17,10 @@ */ #include "ui/widgets/consolewidget.h" -#include "ui/framework/guirootwidget.h" -#include "ui/framework/variabletoggleitem.h" -#include "ui/framework/commandaction.h" -#include "ui/framework/signalaction.h" +#include "GuiRootWidget" +#include "ui/VariableToggleItem" +#include "CommandAction" +#include "SignalAction" #include "ui/widgets/buttonwidget.h" #include "ui/widgets/consolecommandwidget.h" #include "ui/widgets/popupmenuwidget.h" diff --git a/doomsday/client/src/ui/widgets/dialogwidget.cpp b/doomsday/client/src/ui/widgets/dialogwidget.cpp index 47a950232c..73070031a5 100644 --- a/doomsday/client/src/ui/widgets/dialogwidget.cpp +++ b/doomsday/client/src/ui/widgets/dialogwidget.cpp @@ -19,8 +19,8 @@ #include "ui/widgets/dialogwidget.h" #include "ui/widgets/togglewidget.h" #include "ui/widgets/choicewidget.h" -#include "ui/framework/guirootwidget.h" -#include "ui/framework/signalaction.h" +#include "GuiRootWidget" +#include "SignalAction" #include "dd_main.h" #include diff --git a/doomsday/client/src/ui/widgets/documentwidget.cpp b/doomsday/client/src/ui/widgets/documentwidget.cpp index 7c012bd7a6..8aa0d04e60 100644 --- a/doomsday/client/src/ui/widgets/documentwidget.cpp +++ b/doomsday/client/src/ui/widgets/documentwidget.cpp @@ -18,7 +18,7 @@ #include "ui/widgets/documentwidget.h" #include "ui/widgets/progresswidget.h" -#include "ui/framework/textdrawable.h" +#include "TextDrawable" #include diff --git a/doomsday/client/src/ui/widgets/gameselectionwidget.cpp b/doomsday/client/src/ui/widgets/gameselectionwidget.cpp index bed89a2f49..7f7655a5ed 100644 --- a/doomsday/client/src/ui/widgets/gameselectionwidget.cpp +++ b/doomsday/client/src/ui/widgets/gameselectionwidget.cpp @@ -17,8 +17,8 @@ */ #include "ui/widgets/gameselectionwidget.h" -#include "ui/framework/actionitem.h" -#include "ui/framework/commandaction.h" +#include "ui/ActionItem" +#include "CommandAction" #include "clientapp.h" #include "games.h" #include "dd_main.h" diff --git a/doomsday/client/src/ui/widgets/labelwidget.cpp b/doomsday/client/src/ui/widgets/labelwidget.cpp index 1148170ae2..7a6bb5cdfc 100644 --- a/doomsday/client/src/ui/widgets/labelwidget.cpp +++ b/doomsday/client/src/ui/widgets/labelwidget.cpp @@ -17,9 +17,9 @@ */ #include "ui/widgets/labelwidget.h" -#include "ui/framework/gltextcomposer.h" -#include "ui/framework/fontlinewrapping.h" -#include "ui/framework/atlasproceduralimage.h" +#include "GLTextComposer" +#include "FontLineWrapping" +#include "AtlasProceduralImage" #include #include diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp index 0884d4d2e8..92335cdcc4 100644 --- a/doomsday/client/src/ui/widgets/lineeditwidget.cpp +++ b/doomsday/client/src/ui/widgets/lineeditwidget.cpp @@ -18,9 +18,9 @@ #include "ui/widgets/lineeditwidget.h" #include "ui/widgets/labelwidget.h" -#include "ui/framework/fontlinewrapping.h" -#include "ui/framework/guirootwidget.h" -#include "ui/framework/gltextcomposer.h" +#include "FontLineWrapping" +#include "GuiRootWidget" +#include "GLTextComposer" #include "ui/style.h" #include diff --git a/doomsday/client/src/ui/widgets/logwidget.cpp b/doomsday/client/src/ui/widgets/logwidget.cpp index 1035b274be..3c82939157 100644 --- a/doomsday/client/src/ui/widgets/logwidget.cpp +++ b/doomsday/client/src/ui/widgets/logwidget.cpp @@ -22,8 +22,8 @@ */ #include "ui/widgets/logwidget.h" -#include "ui/framework/fontlinewrapping.h" -#include "ui/framework/gltextcomposer.h" +#include "FontLineWrapping" +#include "GLTextComposer" #include "ui/styledlogsinkformatter.h" #include "ui/style.h" #include "clientapp.h" diff --git a/doomsday/client/src/ui/widgets/menuwidget.cpp b/doomsday/client/src/ui/widgets/menuwidget.cpp index 7d8b1ac38c..b3922a2c07 100644 --- a/doomsday/client/src/ui/widgets/menuwidget.cpp +++ b/doomsday/client/src/ui/widgets/menuwidget.cpp @@ -19,10 +19,10 @@ #include "ui/widgets/menuwidget.h" #include "ui/widgets/popupmenuwidget.h" #include "ui/widgets/variabletogglewidget.h" -#include "ui/framework/contextwidgetorganizer.h" -#include "ui/framework/listdata.h" -#include "ui/framework/actionitem.h" -#include "ui/framework/gridlayout.h" +#include "ContextWidgetOrganizer" +#include "ui/ListData" +#include "ui/ActionItem" +#include "GridLayout" using namespace de; using namespace ui; diff --git a/doomsday/client/src/ui/widgets/notificationwidget.cpp b/doomsday/client/src/ui/widgets/notificationwidget.cpp index 118f750b74..33aa56d0e1 100644 --- a/doomsday/client/src/ui/widgets/notificationwidget.cpp +++ b/doomsday/client/src/ui/widgets/notificationwidget.cpp @@ -17,7 +17,7 @@ */ #include "ui/widgets/notificationwidget.h" -#include "ui/framework/sequentiallayout.h" +#include "SequentialLayout" #include #include diff --git a/doomsday/client/src/ui/widgets/popupmenuwidget.cpp b/doomsday/client/src/ui/widgets/popupmenuwidget.cpp index 065d93246c..75eccbb31f 100644 --- a/doomsday/client/src/ui/widgets/popupmenuwidget.cpp +++ b/doomsday/client/src/ui/widgets/popupmenuwidget.cpp @@ -18,9 +18,9 @@ #include "ui/widgets/popupmenuwidget.h" #include "ui/widgets/menuwidget.h" -#include "ui/framework/guirootwidget.h" -#include "ui/framework/contextwidgetorganizer.h" -#include "ui/framework/item.h" +#include "GuiRootWidget" +#include "ContextWidgetOrganizer" +#include "ui/Item" using namespace de; diff --git a/doomsday/client/src/ui/widgets/popupwidget.cpp b/doomsday/client/src/ui/widgets/popupwidget.cpp index 5b9902a75f..2a64c1c4c7 100644 --- a/doomsday/client/src/ui/widgets/popupwidget.cpp +++ b/doomsday/client/src/ui/widgets/popupwidget.cpp @@ -17,7 +17,7 @@ */ #include "ui/widgets/popupwidget.h" -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include "ui/style.h" #include "ui/clientwindow.h" diff --git a/doomsday/client/src/ui/widgets/progresswidget.cpp b/doomsday/client/src/ui/widgets/progresswidget.cpp index e3a23055e3..b1dccf1fa9 100644 --- a/doomsday/client/src/ui/widgets/progresswidget.cpp +++ b/doomsday/client/src/ui/widgets/progresswidget.cpp @@ -17,7 +17,7 @@ */ #include "ui/widgets/progresswidget.h" -#include "ui/framework/guirootwidget.h" +#include "GuiRootWidget" #include #include diff --git a/doomsday/client/src/ui/widgets/sliderwidget.cpp b/doomsday/client/src/ui/widgets/sliderwidget.cpp index eb7695bf48..985dc30eef 100644 --- a/doomsday/client/src/ui/widgets/sliderwidget.cpp +++ b/doomsday/client/src/ui/widgets/sliderwidget.cpp @@ -17,7 +17,7 @@ */ #include "ui/widgets/sliderwidget.h" -#include "ui/framework/gltextcomposer.h" +#include "GLTextComposer" #include #include diff --git a/doomsday/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/client/src/ui/widgets/taskbarwidget.cpp index 352edcc117..2d6ae20db1 100644 --- a/doomsday/client/src/ui/widgets/taskbarwidget.cpp +++ b/doomsday/client/src/ui/widgets/taskbarwidget.cpp @@ -24,9 +24,9 @@ #include "ui/widgets/blurwidget.h" #include "ui/dialogs/aboutdialog.h" #include "ui/dialogs/videosettingsdialog.h" -#include "ui/framework/guirootwidget.h" -#include "ui/framework/commandaction.h" -#include "ui/framework/signalaction.h" +#include "GuiRootWidget" +#include "CommandAction" +#include "SignalAction" #include "updater/updatersettingsdialog.h" #include "ui/clientwindow.h" #include "client/cl_def.h" // clientPaused diff --git a/doomsday/client/src/ui/widgets/togglewidget.cpp b/doomsday/client/src/ui/widgets/togglewidget.cpp index b54664b514..1c5edb2552 100644 --- a/doomsday/client/src/ui/widgets/togglewidget.cpp +++ b/doomsday/client/src/ui/widgets/togglewidget.cpp @@ -17,8 +17,8 @@ */ #include "ui/widgets/togglewidget.h" -#include "ui/framework/proceduralimage.h" -#include "ui/framework/guirootwidget.h" +#include "ProceduralImage" +#include "GuiRootWidget" #include "ui/style.h" #include "clientapp.h" diff --git a/doomsday/client/src/updater/downloaddialog.cpp b/doomsday/client/src/updater/downloaddialog.cpp index 4826312408..cca9266f81 100644 --- a/doomsday/client/src/updater/downloaddialog.cpp +++ b/doomsday/client/src/updater/downloaddialog.cpp @@ -25,7 +25,7 @@ #include "updater/updatersettings.h" #include "ui/widgets/progresswidget.h" #include "ui/widgets/taskbarwidget.h" -#include "ui/framework/signalaction.h" +#include "SignalAction" #include "ui/clientwindow.h" #include "dd_version.h" diff --git a/doomsday/client/src/updater/updateavailabledialog.cpp b/doomsday/client/src/updater/updateavailabledialog.cpp index 5aa1b91496..f1729816c4 100644 --- a/doomsday/client/src/updater/updateavailabledialog.cpp +++ b/doomsday/client/src/updater/updateavailabledialog.cpp @@ -25,7 +25,7 @@ #include "updater/updatersettingsdialog.h" #include "ui/widgets/progresswidget.h" #include "ui/widgets/togglewidget.h" -#include "ui/framework/signalaction.h" +#include "SignalAction" #include "clientapp.h" #include "versioninfo.h" #include diff --git a/doomsday/client/src/updater/updater.cpp b/doomsday/client/src/updater/updater.cpp index d5eae1c952..f225cb945e 100644 --- a/doomsday/client/src/updater/updater.cpp +++ b/doomsday/client/src/updater/updater.cpp @@ -51,7 +51,7 @@ #include "ui/nativeui.h" #include "ui/windowsystem.h" #include "ui/clientwindow.h" -#include "ui/framework/signalaction.h" +#include "SignalAction" #include "ui/widgets/taskbarwidget.h" #include "ui/widgets/progresswidget.h" #include "ui/widgets/notificationwidget.h" diff --git a/doomsday/client/src/updater/updatersettingsdialog.cpp b/doomsday/client/src/updater/updatersettingsdialog.cpp index 7a6f69039d..68ad35e555 100644 --- a/doomsday/client/src/updater/updatersettingsdialog.cpp +++ b/doomsday/client/src/updater/updatersettingsdialog.cpp @@ -24,7 +24,7 @@ #include "ui/widgets/labelwidget.h" #include "ui/widgets/choicewidget.h" #include "ui/widgets/variabletogglewidget.h" -#include "ui/framework/gridlayout.h" +#include "GridLayout" #include #include