Client: Added convenience headers for the client-side UI framework

Excluding widget/dialog classes for now.
skyjake · Aug 29, 2013 · 4a27ab8 · 4a27ab8
1 parent aa26339
commit 4a27ab8
Show file tree

Hide file tree

Showing 80 changed files with 146 additions and 105 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -108,36 +108,33 @@ DENG_API_HEADERS = \
     $$DENG_API_DIR/doomsday.h
 
 # Convenience headers.
-DENG_HEADERS += \
+DENG_CONVENIENCE_HEADERS += \
+    include/AtlasProceduralImage \
     include/BiasDigest \
     include/BiasIllum \
     include/BiasSource \
     include/BiasSurface \
     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
@@ -0,0 +1 @@
+#include "ui/framework/atlasproceduralimage.h"
diff --git a/doomsday/client/include/CommandAction 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
@@ -0,0 +1 @@
+#include "ui/framework/contextwidgetorganizer.h"
diff --git a/doomsday/client/include/FontLineWrapping 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
@@ -0,0 +1 @@
+#include "ui/framework/gltextcomposer.h"
diff --git a/doomsday/client/include/GridLayout 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
@@ -0,0 +1 @@
+#include "ui/framework/guirootwidget.h"
diff --git a/doomsday/client/include/GuiWidget 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
@@ -0,0 +1 @@
+#include "ui/framework/proceduralimage.h"
diff --git a/doomsday/client/include/SequentialLayout 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
@@ -0,0 +1 @@
+#include "ui/framework/signalaction.h"
diff --git a/doomsday/client/include/TextDrawable 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
@@ -0,0 +1 @@
+#include "ui/framework/widgetactions.h"
diff --git 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
@@ -0,0 +1,2 @@
+#include "ui/framework/actionitem.h"
+
diff --git a/doomsday/client/include/ui/Data 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
@@ -0,0 +1 @@
+#include "ui/framework/item.h"
diff --git a/doomsday/client/include/ui/ListData 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
@@ -0,0 +1 @@
+#include "ui/framework/margins.h"
diff --git a/doomsday/client/include/ui/SubmenuItem 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
@@ -0,0 +1 @@
+#include "ui/framework/variabletoggleitem.h"
diff --git a/doomsday/client/include/ui/clientwindow.h b/doomsday/client/include/ui/clientwindow.h
@@ -23,7 +23,7 @@
 
 #include <de/PersistentCanvasWindow>
 
-#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
@@ -20,7 +20,7 @@
 #define DENG_CLIENT_UI_DATA_H
 
 #include <de/Observers>
-#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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
 #ifndef CLIENT_BUSYWIDGET_H
 #define CLIENT_BUSYWIDGET_H
 
-#include "ui/framework/guiwidget.h"
+#include "GuiWidget"
 #include "progresswidget.h"
 
 #include <de/GLTexture>

diff --git 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
@@ -21,7 +21,7 @@
 
 #include <QObject>
 
-#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
@@ -24,9 +24,9 @@
 #include <de/GLUniform>
 
 #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
@@ -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
@@ -19,7 +19,7 @@
 #ifndef DENG_CLIENT_LINEEDITWIDGET_H
 #define DENG_CLIENT_LINEEDITWIDGET_H
 
-#include "ui/framework/guiwidget.h"
+#include "GuiWidget"
 #include <de/shell/AbstractLineEditor>
 #include <de/KeyEvent>
 

diff --git 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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
 #ifndef DENG_CLIENT_SLIDERWIDGET_H
 #define DENG_CLIENT_SLIDERWIDGET_H
 
-#include "ui/framework/guiwidget.h"
+#include "GuiWidget"
 
 #include <de/Range>
 

diff --git a/doomsday/client/include/ui/widgets/taskbarwidget.h b/doomsday/client/include/ui/widgets/taskbarwidget.h
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <de/Action>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,9 +16,9 @@
  * http://www.gnu.org/licenses</small> 
  */
 
-#include "ui/framework/contextwidgetorganizer.h"
-#include "ui/framework/item.h"
+#include "ContextWidgetOrganizer"
 #include "ui/widgets/labelwidget.h"
+#include "ui/Item"
 
 #include <QMap>
 

diff --git 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</small> 
  */
 
-#include "ui/framework/data.h"
-#include "ui/framework/item.h"
+#include "ui/Data"
+#include "ui/Item"
 #include "ui/widgets/labelwidget.h"
 
 #include <QtAlgorithms>

diff --git 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</small> 
  */
 
-#include "ui/framework/fontlinewrapping.h"
+#include "FontLineWrapping"
 
 #include <QMap>
 

diff --git 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</small> 
  */
 
-#include "ui/framework/gltextcomposer.h"
+#include "GLTextComposer"
 
 #include <QList>
 

diff --git 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</small> 
  */
 
-#include "ui/framework/gridlayout.h"
-#include "ui/framework/sequentiallayout.h"
+#include "GridLayout"
+#include "SequentialLayout"
 
 using namespace de;