diff --git a/.gitignore b/.gitignore index 79ee3fb..861fb08 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Cargo.lock perf.data* *.bat +*.user diff --git a/CMakeLists.txt b/CMakeLists.txt index 6959fc3..867452e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,12 @@ add_executable( maraiah-tycho WIN32 source/tycho-qt/main.cc - source/tycho-qt/mainwindow.cc - source/tycho-qt/mainwindow.h - source/tycho-qt/mainwindow.ui + source/tycho-qt/mapprops.cc + source/tycho-qt/mapprops.h + source/tycho-qt/mapprops.ui + source/tycho-qt/winmenu.cc + source/tycho-qt/winmenu.h + source/tycho-qt/winmenu.ui ) add_custom_target( diff --git a/source/tycho-qt/main.cc b/source/tycho-qt/main.cc index 38a869b..efa7e1f 100644 --- a/source/tycho-qt/main.cc +++ b/source/tycho-qt/main.cc @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "winmenu.h" #include #include @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) test_fn(); QApplication a(argc, argv); - MainWindow w; + WinMenu w; w.show(); return a.exec(); } diff --git a/source/tycho-qt/mainwindow.cc b/source/tycho-qt/mainwindow.cc deleted file mode 100644 index 8b3204a..0000000 --- a/source/tycho-qt/mainwindow.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - -// EOF diff --git a/source/tycho-qt/mainwindow.h b/source/tycho-qt/mainwindow.h deleted file mode 100644 index 8bc3d6a..0000000 --- a/source/tycho-qt/mainwindow.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#ifndef tycho_qt__mainwindow_h -#define tycho_qt__mainwindow_h - -#include - -namespace Ui -{ - class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = nullptr); - ~MainWindow(); - -private: - Ui::MainWindow *ui; -}; - -#endif diff --git a/source/tycho-qt/mainwindow.ui b/source/tycho-qt/mainwindow.ui deleted file mode 100644 index 8e8a033..0000000 --- a/source/tycho-qt/mainwindow.ui +++ /dev/null @@ -1,24 +0,0 @@ - - MainWindow - - - - 0 - 0 - 400 - 300 - - - - MainWindow - - - - - - - - - - - diff --git a/source/tycho-qt/mapprops.cc b/source/tycho-qt/mapprops.cc new file mode 100644 index 0000000..cd05bae --- /dev/null +++ b/source/tycho-qt/mapprops.cc @@ -0,0 +1,15 @@ +#include "mapprops.h" +#include "ui_mapprops.h" + +MapProps::MapProps(QWidget *parent) : + QWidget(parent), + ui(new Ui::MapProps) +{ + ui->setupUi(this); +} + +MapProps::~MapProps() +{ +} + +// EOF diff --git a/source/tycho-qt/mapprops.h b/source/tycho-qt/mapprops.h new file mode 100644 index 0000000..aaac692 --- /dev/null +++ b/source/tycho-qt/mapprops.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include + +namespace Ui +{ + class MapProps; +} + +class MapProps : public QWidget +{ + Q_OBJECT + +public: + explicit MapProps(QWidget *parent = nullptr); + ~MapProps(); + +private: + std::unique_ptr ui; +}; + +// EOF diff --git a/source/tycho-qt/mapprops.ui b/source/tycho-qt/mapprops.ui new file mode 100644 index 0000000..850ea95 --- /dev/null +++ b/source/tycho-qt/mapprops.ui @@ -0,0 +1,333 @@ + + + MapProps + + + + 0 + 0 + 467 + 628 + + + + + + + + 16777215 + 194 + + + + Map Info + + + + + + Map Name + + + + + + + The name of the map. + + + 65 + + + + + + + Texture Set + + + + + + + + 0 + 0 + + + + The texture set used by the map. + + + + + + + Landscape + + + + + + + + 0 + 0 + + + + The landscape/sky background for the map. + + + + + + + Music No. + + + + + + + false + + + + 0 + 0 + + + + The music number used in this map. Only enabled if the "Music" flag is on. + + + + + + + + + + + + Entry Flags + + + + + + Carnage + + + + + + + KTMWTB + + + + + + + Co-operative + + + + + + + Solo + + + + + + + King of the Hill + + + + + + + Defense + + + + + + + Rugby + + + + + + + Capture the Flag + + + + + + + + + + Environment Flags + + + + + + Vacuum + + + + + + + Magnetic + + + + + + + Rebellion + + + + + + + Low Gravity + + + + + + + Marathon 1 Glue + + + + + + + Lava Floor + + + + + + + Rebellion (No Strip) + + + + + + + Music + + + + + + + Terminals Stop Time + + + + + + + M1 Monster Limits + + + + + + + M1 Weapon Differences + + + + + + + + + + Mission Flags + + + + + + Extermination + + + + + + + Exploration + + + + + + + Retrieval + + + + + + + Repair + + + + + + + Rescue + + + + + + + M1 Exploration + + + + + + + M1 Rescue + + + + + + + M1 Repair + + + + + + + + + + + + + diff --git a/source/tycho-qt/winmenu.cc b/source/tycho-qt/winmenu.cc new file mode 100644 index 0000000..185c830 --- /dev/null +++ b/source/tycho-qt/winmenu.cc @@ -0,0 +1,17 @@ +#include "winmenu.h" +#include "ui_winmenu.h" + +WinMenu::WinMenu(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::WinMenu) +{ + ui->setupUi(this); + props = new MapProps(ui->dockScrollArea); + ui->dockScrollArea->setWidget(props); +} + +WinMenu::~WinMenu() +{ +} + +// EOF diff --git a/source/tycho-qt/winmenu.h b/source/tycho-qt/winmenu.h new file mode 100644 index 0000000..f5fb5e6 --- /dev/null +++ b/source/tycho-qt/winmenu.h @@ -0,0 +1,26 @@ +#pragma once + +#include "mapprops.h" + +#include +#include + +namespace Ui +{ + class WinMenu; +} + +class WinMenu : public QMainWindow +{ + Q_OBJECT + +public: + explicit WinMenu(QWidget *parent = nullptr); + ~WinMenu(); + +private: + std::unique_ptr ui; + MapProps *props; +}; + +// EOF diff --git a/source/tycho-qt/winmenu.ui b/source/tycho-qt/winmenu.ui new file mode 100644 index 0000000..10542eb --- /dev/null +++ b/source/tycho-qt/winmenu.ui @@ -0,0 +1,108 @@ + + + WinMenu + + + + 0 + 0 + 500 + 400 + + + + + 500 + 400 + + + + Tycho + + + + + + 0 + 0 + 500 + 30 + + + + + File + + + + + + + + + + TopToolBarArea + + + false + + + + + false + + + QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Property Editor + + + 2 + + + + + + + QFrame::NoFrame + + + Qt::ScrollBarAlwaysOff + + + true + + + + + 0 + 0 + 80 + 289 + + + + + + + + + + + Open Project + + + + + New Project + + + + + + +