diff --git a/README.md b/README.md index 64d74be5..4f5745e5 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Now build and run the example: $ cd path/to/kddockwidgets/examples/dockwidgets/ $ cmake -G Ninja -DCMAKE_PREFIX_PATH=/path/where/to/install $ cmake --build . -$ ./kddockwidgets_example +$ ./bin/examples/qtwidgets_dockwidgets ``` The installation directory defaults to `c:\KDAB\KDDockWidgets-` on Windows @@ -166,7 +166,7 @@ Styling Almost all private widgets used by KDDW can be derived by the user to give them a custom look. That's done by providing your own ViewFactory. Run -"kddockwidgets_example -p" to see that in action. +"examples/qtwidgets_dockwidgets -p" to see that in action. Qt StyleSheets are not, and will not, be supported. See the comments in `examples/dockwidgets/MyTitleBar_CSS.h` for why. You can however use some minimal diff --git a/code.dev.code-workspace b/code.dev.code-workspace index 161a42a9..5f80fa3d 100644 --- a/code.dev.code-workspace +++ b/code.dev.code-workspace @@ -34,128 +34,72 @@ "version": "0.2.0", "configurations": [ { - "name": "gdb-kddockwidgets_example", + "name": "qtwidgets_dockwidgets", "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_dockwidgets", "args": [], "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_minimal_example", - "type": "cppdbg", + "name": "qtwidgets_minimal", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_minimal", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_minimal_mdi_example", - "type": "cppdbg", + "name": "qtwidgets_minimal_mdi", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_mdi_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_minimal_mdi", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_mdi_with_docking_example", - "type": "cppdbg", + "name": "qtwidgets_mdi_with_docking", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_mdi_with_docking_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_mdi_with_docking", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-tst_docks", + "name": "tst_docks", "type": "lldb", "request": "launch", "program": "${workspaceFolder}/build-dev/bin/tst_docks", "args": [ "tst_addMDIDockWidget" ], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "lldb-kddockwidgets_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-kddockwidgets_minimal_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-kddockwidgets_minimal_mdi_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_mdi_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-tst_docks", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/tst_docks", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "msvc-kddockwidgets_example", + "name": "msvc-qtwidgets_dockwidgets", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_dockwidgets, "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, "externalConsole": false }, { - "name": "msvc-kddockwidgets_minimal_example", + "name": "msvc-qtwidgets_minimal", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_minimal", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, "externalConsole": false }, { - "name": "msvc-kddockwidgets_minimal_mdi_example", + "name": "msvc-qtwidgets_minimal_mdi", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev/bin/kddockwidgets_minimal_mdi_example", + "program": "${workspaceFolder}/build-dev/bin/examples/qtwidgets_minimal_mdi", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, @@ -173,4 +117,4 @@ } ] } -} \ No newline at end of file +} diff --git a/code.dev6.code-workspace b/code.dev6.code-workspace index 68f80039..9aa77355 100644 --- a/code.dev6.code-workspace +++ b/code.dev6.code-workspace @@ -34,128 +34,72 @@ "version": "0.2.0", "configurations": [ { - "name": "gdb-kddockwidgets_example", + "name": "qtwidgets_dockwidgets", "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_dockwidgets", "args": [], "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_minimal_example", - "type": "cppdbg", + "name": "qtwidgets_minimal", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_minimal", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_minimal_mdi_example", - "type": "cppdbg", + "name": "qtwidgets_minimal_mdi", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_mdi_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_minimal_mdi", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-kddockwidgets_mdi_with_docking_example", - "type": "cppdbg", + "name": "qtwidgets_mdi_with_docking", + "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_mdi_with_docking_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_mdi_with_docking", "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "gdb-tst_docks", + "name": "tst_docks", "type": "lldb", "request": "launch", "program": "${workspaceFolder}/build-dev6/bin/tst_docks", "args": [ "tst_addMDIDockWidget" ], - "cwd": "${workspaceFolder}", - "MIMode": "gdb", - "stopAtEntry": false, - "externalConsole": false + "cwd": "${workspaceFolder}" }, { - "name": "lldb-kddockwidgets_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-kddockwidgets_minimal_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-kddockwidgets_minimal_mdi_example", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_mdi_example", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "lldb-tst_docks", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/tst_docks", - "args": [], - "cwd": "${workspaceFolder}", - "MIMode": "lldb", - "stopAtEntry": false, - "externalConsole": false - }, - { - "name": "msvc-kddockwidgets_example", + "name": "msvc-qtwidgets_dockwidgets", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_dockwidgets, "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, "externalConsole": false }, { - "name": "msvc-kddockwidgets_minimal_example", + "name": "msvc-qtwidgets_minimal", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_minimal", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, "externalConsole": false }, { - "name": "msvc-kddockwidgets_minimal_mdi_example", + "name": "msvc-qtwidgets_minimal_mdi", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build-dev6/bin/kddockwidgets_minimal_mdi_example", + "program": "${workspaceFolder}/build-dev6/bin/examples/qtwidgets_minimal_mdi", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, diff --git a/examples/dockwidgets/MyTitleBar_CSS.h b/examples/dockwidgets/MyTitleBar_CSS.h index 3dce1700..22a99267 100644 --- a/examples/dockwidgets/MyTitleBar_CSS.h +++ b/examples/dockwidgets/MyTitleBar_CSS.h @@ -22,7 +22,7 @@ * Derive from KDDockWidgets::DefaultWidgetFactory and override the two createTitleBar() methods. * * To try it out, modify examples/dockwidgets/MyViewFactory.cpp to return a MyTitleBar_CSS instance. - * Run the example with: ./bin/kddockwidgets_example -p + * Run the example with: ./bin/examples/qtwidgets_dockwidgets -p * * WARNINGS: * - Qt StyleSheets are not recommended for new applications. Often you are able to style 90% of diff --git a/src/Config.h b/src/Config.h index d2a0bfb5..b313531d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -271,7 +271,7 @@ public: * * @endcode * - * Run "kddockwidgets_example --hide-certain-docking-indicators" to see this in action. + * Run "examples/qtwidgets_dockwidgets --hide-certain-docking-indicators" to see this in action. */ void setDropIndicatorAllowedFunc(DropIndicatorAllowedFunc func); diff --git a/src/controllers/DockWidget.h b/src/controllers/DockWidget.h index 309b40f6..5205a971 100644 --- a/src/controllers/DockWidget.h +++ b/src/controllers/DockWidget.h @@ -74,7 +74,7 @@ public: Option_DeleteOnClose = 4, ///< Deletes the DockWidget when closed Option_MDINestable = 8 ///< EXPERIMENTAL. When this dock widget is being shown in a MDI area it will also allow other dock widgets to be dropped to its sides and tabbed /// Usually Each MDI "window" corresponds to one DockWidget, with this option each "window" will have a layout with 1 or more dock widgets - /// Run "kddockwidgets_mdi_with_docking_example -n" to see it in action + /// Run "examples/qtwidgets_mdi_with_docking -n" to see it in action }; Q_DECLARE_FLAGS(Options, Option) Q_ENUM(Options); @@ -357,7 +357,7 @@ public: * want to dock a main window into another main window. This is done by putting it into a * dock widget first. * - * See also kddockwidgets_example -j + * See also examples/qtwidgets_dockwidgets -j */ bool isMainWindow() const; diff --git a/src/controllers/MainWindow.h b/src/controllers/MainWindow.h index c147a2e5..481b40ef 100644 --- a/src/controllers/MainWindow.h +++ b/src/controllers/MainWindow.h @@ -97,7 +97,7 @@ public: * @param widget The QWidget (or QQuickItem if built with QtQuick support) that you * want to set. * - * Example: kddockwidgets_example --central-widget + * Example: examples/qtwidgets_dockwidgets --central-widget */ Q_INVOKABLE void setPersistentCentralWidget(std::shared_ptr widget); std::shared_ptr persistentCentralWidget() const;