diff --git a/CMakeLists.txt b/CMakeLists.txt index c0056bb..f5e6807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,14 +21,14 @@ qt_add_executable(llink main.cpp src/MainWindow.cpp src/MainWindow.h - src/VerticalLabel.cpp - src/VerticalLabel.h + src/widgets/VerticalLabel.cpp + src/widgets/VerticalLabel.h src/authmanager.cpp src/networkmanager.cpp - src/authdialog.ui - src/authdialog.cpp - src/settingsdialog.h - src/settingsdialog.cpp + src/dialogs/authdialog.ui + src/dialogs/authdialog.cpp + src/dialogs/settingsdialog.h + src/dialogs/settingsdialog.cpp src/models.h src/store.h src/store.cpp @@ -36,14 +36,14 @@ qt_add_executable(llink src/networkstreammodel.cpp src/particlelistmodel.h src/particlelistmodel.cpp - src/textinputdialog.h - src/textinputdialog.cpp - src/createstreamdialog.h - src/createstreamdialog.cpp - src/memberpickerdialog.h - src/memberpickerdialog.cpp - src/networkdetailwidget.h - src/networkdetailwidget.cpp + src/dialogs/textinputdialog.h + src/dialogs/textinputdialog.cpp + src/dialogs/createstreamdialog.h + src/dialogs/createstreamdialog.cpp + src/dialogs/memberpickerdialog.h + src/dialogs/memberpickerdialog.cpp + src/widgets/networkdetailwidget.h + src/widgets/networkdetailwidget.cpp ) qt_add_resources(llink diff --git a/run.sh b/run.sh index 572a23d..3cd7e98 100755 --- a/run.sh +++ b/run.sh @@ -3,10 +3,11 @@ BUILD_DIR=build if [ ! -d "$BUILD_DIR" ]; then + mkdir -p build cmake -B$BUILD_DIR -S. -GNinja \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_CXX_FLAGS="-Wall -Wextra" \ - -DCMAKE_PREFIX_PATH="$HOME/Qt/6.8.2/macos" \ + -DCMAKE_PREFIX_PATH="$HOME/Qt/6.8.6/macos" \ -DCMAKE_COLOR_DIAGNOSTICS=ON \ -DCMAKE_CXX_FLAGS_INIT="-DQT_QML_DEBUG" fi diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 29396a9..2b49f01 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -3,14 +3,14 @@ // #include "MainWindow.h" -#include "authdialog.h" +#include "dialogs/authdialog.h" #include "authmanager.h" -#include "createstreamdialog.h" -#include "memberpickerdialog.h" -#include "networkdetailwidget.h" +#include "dialogs/createstreamdialog.h" +#include "dialogs/memberpickerdialog.h" +#include "widgets/networkdetailwidget.h" #include "networkmanager.h" -#include "settingsdialog.h" -#include "textinputdialog.h" +#include "dialogs/settingsdialog.h" +#include "dialogs/textinputdialog.h" #include #include #include @@ -404,6 +404,7 @@ void MainWindow::buildUi() hSeparator->setStyleSheet("color: rgba(128, 128, 128, 0.3);"); hSeparator->setFixedHeight(1); mainLayout->addWidget(hSeparator); + // ── Network detail widget (hidden by default) ── m_statusBar = new QStatusBar(); diff --git a/src/authdialog.cpp b/src/dialogs/authdialog.cpp similarity index 98% rename from src/authdialog.cpp rename to src/dialogs/authdialog.cpp index 8283bd8..f29b994 100644 --- a/src/authdialog.cpp +++ b/src/dialogs/authdialog.cpp @@ -1,6 +1,6 @@ #include "authdialog.h" #include "ui_authdialog.h" -#include "authmanager.h" +#include "../authmanager.h" AuthDialog::AuthDialog(QWidget *parent) : QDialog{parent}, ui(new Ui::Dialog) diff --git a/src/authdialog.h b/src/dialogs/authdialog.h similarity index 100% rename from src/authdialog.h rename to src/dialogs/authdialog.h diff --git a/src/authdialog.ui b/src/dialogs/authdialog.ui similarity index 100% rename from src/authdialog.ui rename to src/dialogs/authdialog.ui diff --git a/src/createstreamdialog.cpp b/src/dialogs/createstreamdialog.cpp similarity index 100% rename from src/createstreamdialog.cpp rename to src/dialogs/createstreamdialog.cpp diff --git a/src/createstreamdialog.h b/src/dialogs/createstreamdialog.h similarity index 96% rename from src/createstreamdialog.h rename to src/dialogs/createstreamdialog.h index 2dd34c5..75f5405 100644 --- a/src/createstreamdialog.h +++ b/src/dialogs/createstreamdialog.h @@ -1,7 +1,7 @@ #ifndef CREATESTREAMDIALOG_H #define CREATESTREAMDIALOG_H -#include "models.h" +#include "../models.h" #include QT_BEGIN_NAMESPACE diff --git a/src/memberpickerdialog.cpp b/src/dialogs/memberpickerdialog.cpp similarity index 100% rename from src/memberpickerdialog.cpp rename to src/dialogs/memberpickerdialog.cpp diff --git a/src/memberpickerdialog.h b/src/dialogs/memberpickerdialog.h similarity index 96% rename from src/memberpickerdialog.h rename to src/dialogs/memberpickerdialog.h index ee06bcb..d399880 100644 --- a/src/memberpickerdialog.h +++ b/src/dialogs/memberpickerdialog.h @@ -1,7 +1,7 @@ #ifndef MEMBERPICKERDIALOG_H #define MEMBERPICKERDIALOG_H -#include "models.h" +#include "../models.h" #include QT_BEGIN_NAMESPACE diff --git a/src/settingsdialog.cpp b/src/dialogs/settingsdialog.cpp similarity index 100% rename from src/settingsdialog.cpp rename to src/dialogs/settingsdialog.cpp diff --git a/src/settingsdialog.h b/src/dialogs/settingsdialog.h similarity index 100% rename from src/settingsdialog.h rename to src/dialogs/settingsdialog.h diff --git a/src/textinputdialog.cpp b/src/dialogs/textinputdialog.cpp similarity index 100% rename from src/textinputdialog.cpp rename to src/dialogs/textinputdialog.cpp diff --git a/src/textinputdialog.h b/src/dialogs/textinputdialog.h similarity index 100% rename from src/textinputdialog.h rename to src/dialogs/textinputdialog.h diff --git a/src/VerticalLabel.cpp b/src/widgets/VerticalLabel.cpp similarity index 100% rename from src/VerticalLabel.cpp rename to src/widgets/VerticalLabel.cpp diff --git a/src/VerticalLabel.h b/src/widgets/VerticalLabel.h similarity index 100% rename from src/VerticalLabel.h rename to src/widgets/VerticalLabel.h diff --git a/src/networkdetailwidget.cpp b/src/widgets/networkdetailwidget.cpp similarity index 100% rename from src/networkdetailwidget.cpp rename to src/widgets/networkdetailwidget.cpp diff --git a/src/networkdetailwidget.h b/src/widgets/networkdetailwidget.h similarity index 96% rename from src/networkdetailwidget.h rename to src/widgets/networkdetailwidget.h index c282d4b..cfd69f1 100644 --- a/src/networkdetailwidget.h +++ b/src/widgets/networkdetailwidget.h @@ -1,7 +1,7 @@ #ifndef NETWORKDETAILWIDGET_H #define NETWORKDETAILWIDGET_H -#include "models.h" +#include "../models.h" #include QT_BEGIN_NAMESPACE