KDDockWidgets: Initial integration

REDasmOrg · Feb 4, 2021 · 9b956da · 9b956da
1 parent 456513b
commit 9b956da
Show file tree

Hide file tree

Showing 77 changed files with 716 additions and 1,212 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "libs/qhexview"]
 	path = libs/qhexview
 	url = https://github.com/Dax89/QHexView.git
+[submodule "libs/KDDockWidgets"]
+	path = libs/KDDockWidgets
+	url = https://github.com/KDAB/KDDockWidgets.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(${CMAKE_SOURCE_DIR}/LibREDasm/cmake/sanitizers.cmake)
 
 string(TIMESTAMP REDASM_BUILD_TIMESTAMP "%Y%m%d")
 set(REDASM_GIT_VERSION "unknown")
-set(REDASM_VERSION_BASE "3.0-BETA3")
+set(REDASM_VERSION_BASE "3.0-BETA4")
 
 find_package(Qt5 5.11 REQUIRED COMPONENTS Widgets)
 find_package(Git)
@@ -29,7 +29,11 @@ endif()
 set(REDASM_BUILD_VERSION "${REDASM_BUILD_TIMESTAMP}.${REDASM_GIT_VERSION}")
 add_definitions(-DREDASM_VERSION="${REDASM_VERSION_BASE} \(${REDASM_BUILD_VERSION}\)")
 
-add_subdirectory(libs/qhexview)
+set(KDDockWidgets_STATIC ON CACHE BOOL "" FORCE)
+set(KDDockWidgets_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(KDDockWidgets_UNITY_BUILD OFF CACHE BOOL "" FORCE)
+add_subdirectory(libs/KDDockWidgets EXCLUDE_FROM_ALL)
+add_subdirectory(libs/qhexview EXCLUDE_FROM_ALL)
 add_subdirectory(LibREDasm)
 
 # FindREDasm.config
@@ -109,7 +113,6 @@ set(FORMS
     ${WIDGETS_UIS}
     ${DIALOGS_UIS}
     ${UI_UIS}
-    mainwindow.ui
 )
 
 set(RESOURCES
@@ -143,6 +146,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
+    KDAB::kddockwidgets
     qhexview-lib
     LibREDasm
 )

diff --git a/dialogs/analyzerdialog/analyzerdialog.h b/dialogs/analyzerdialog/analyzerdialog.h
@@ -21,7 +21,7 @@ class AnalyzerDialog : public QDialog
         void selectAnalyzers(bool select);
         void setOrderColumnVisible(bool v);
 
-    private slots:
+    private Q_SLOTS:
         void onAnalyzerItemChanged(QStandardItem* item);
         void getAnalyzers();
 

diff --git a/dialogs/databasedialog/databasedialog.h b/dialogs/databasedialog/databasedialog.h
@@ -30,7 +30,7 @@ class DatabaseDialog: public QDialog
         void checkDatabase(const QString& filepath);
         void addDatabase(RDDatabase* db);
 
-    private slots:
+    private Q_SLOTS:
         void onDatabaseDataDoubleClicked(const QModelIndex& index);
         void selectDatabase(const QModelIndex& index);
         void updateQuery(const QString& query);

diff --git a/dialogs/devdialog/tabs/blockstab.h b/dialogs/devdialog/tabs/blockstab.h
@@ -17,7 +17,7 @@ class BlocksTab : public QWidget
         ~BlocksTab();
         void setContext(const RDContextPtr& ctx);
 
-    private slots:
+    private Q_SLOTS:
         void showBlocks(const QModelIndex& current, const QModelIndex&);
 
     private:

diff --git a/dialogs/devdialog/tabs/functiongraphtab.h b/dialogs/devdialog/tabs/functiongraphtab.h
@@ -19,7 +19,7 @@ class FunctionGraphTab : public QWidget
         ~FunctionGraphTab();
         void setContext(const RDContextPtr& ctx);
 
-    private slots:
+    private Q_SLOTS:
         void showGraph(const QModelIndex& current, const QModelIndex&);
         void copyUnitTests() const;
         void copyGraph() const;

diff --git a/dialogs/gotodialog/gotodialog.h b/dialogs/gotodialog/gotodialog.h
@@ -20,7 +20,7 @@ class GotoDialog : public QDialog
         bool hasValidAddress() const;
         void validateEntry();
 
-    private slots:
+    private Q_SLOTS:
         void onGotoClicked();
         void onItemSelected(const QModelIndex& index);
 

diff --git a/dialogs/referencesdialog/referencesdialog.h b/dialogs/referencesdialog/referencesdialog.h
@@ -15,7 +15,7 @@ class ReferencesDialog : public QDialog
         explicit ReferencesDialog(const RDContextPtr& ctx, ISurface* surface, const RDSymbol *symbol, QWidget *parent = nullptr);
         ~ReferencesDialog();
 
-    private slots:
+    private Q_SLOTS:
         void on_tvReferences_doubleClicked(const QModelIndex &index);
 
     private:

diff --git a/dialogs/settingsdialog/settingsdialog.h b/dialogs/settingsdialog/settingsdialog.h
@@ -23,7 +23,7 @@ class SettingsDialog : public QDialog
         void selectCurrentSize();
         void updatePreview();
 
-    private slots:
+    private Q_SLOTS:
         void selectDefaultFont();
         void onAccepted();
 

diff --git a/dialogs/signaturesdialog/signaturesdialog.h b/dialogs/signaturesdialog/signaturesdialog.h
@@ -19,7 +19,7 @@ class SignaturesDialog : public QDialog
         explicit SignaturesDialog(const RDContextPtr& ctx, QWidget *parent = nullptr);
         ~SignaturesDialog();
 
-    private slots:
+    private Q_SLOTS:
         void loadSignature(bool);
         void readSignature(const QModelIndex& index);
         void browseSignatures();