From 2d5e990cf0278c6ee9dd9f5c3193e82487753712 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Sat, 8 Jun 2019 22:14:38 -0400 Subject: [PATCH] tycho: reorganize sources and fix some jank --- CMakeLists.txt | 38 +++++----- source/tycho-qt/headers/mapprops.h | 23 ++++++ source/tycho-qt/{winmenu.h => headers/menu.h} | 13 ++-- source/tycho-qt/{ => headers}/tycho.h | 0 source/tycho-qt/resources.qrc | 14 ---- .../{data => resources}/color/lines.png | Bin .../{data => resources}/color/map.png | Bin .../{data => resources}/color/points.png | Bin .../{data => resources}/color/polygons.png | Bin .../tycho-qt/{data => resources}/hc/lines.png | Bin .../tycho-qt/{data => resources}/hc/map.png | Bin .../{data => resources}/hc/points.png | Bin .../{data => resources}/hc/polygons.png | Bin .../{data => resources}/misc/tycho1.png | Bin .../{data => resources}/misc/tycho2.png | Bin source/tycho-qt/resources/resources.qrc | 14 ++++ .../{data => resources}/sources/icons.psd | Bin .../{data => resources}/sources/tycho1.psd | Bin .../{data => resources}/sources/tycho2.psd | Bin source/tycho-qt/{ => source}/main.cc | 4 +- source/tycho-qt/source/mapprops.cc | 17 +++++ .../tycho-qt/{winmenu.cc => source/menu.cc} | 30 ++++---- source/tycho-qt/{winabout.ui => ui/about.ui} | 18 +++-- .../{winmapprops.ui => ui/mapprops.ui} | 71 +++++++++--------- source/tycho-qt/{viewmap.ui => ui/mapview.ui} | 6 +- source/tycho-qt/{winmenu.ui => ui/menu.ui} | 14 ++-- source/tycho-qt/ui/points.ui | 47 ++++++++++++ source/tycho-qt/winmapprops.cc | 17 ----- source/tycho-qt/winmapprops.h | 23 ------ 29 files changed, 202 insertions(+), 147 deletions(-) create mode 100644 source/tycho-qt/headers/mapprops.h rename source/tycho-qt/{winmenu.h => headers/menu.h} (52%) rename source/tycho-qt/{ => headers}/tycho.h (100%) delete mode 100644 source/tycho-qt/resources.qrc rename source/tycho-qt/{data => resources}/color/lines.png (100%) rename source/tycho-qt/{data => resources}/color/map.png (100%) rename source/tycho-qt/{data => resources}/color/points.png (100%) rename source/tycho-qt/{data => resources}/color/polygons.png (100%) rename source/tycho-qt/{data => resources}/hc/lines.png (100%) rename source/tycho-qt/{data => resources}/hc/map.png (100%) rename source/tycho-qt/{data => resources}/hc/points.png (100%) rename source/tycho-qt/{data => resources}/hc/polygons.png (100%) rename source/tycho-qt/{data => resources}/misc/tycho1.png (100%) rename source/tycho-qt/{data => resources}/misc/tycho2.png (100%) create mode 100644 source/tycho-qt/resources/resources.qrc rename source/tycho-qt/{data => resources}/sources/icons.psd (100%) rename source/tycho-qt/{data => resources}/sources/tycho1.psd (100%) rename source/tycho-qt/{data => resources}/sources/tycho2.psd (100%) rename source/tycho-qt/{ => source}/main.cc (81%) create mode 100644 source/tycho-qt/source/mapprops.cc rename source/tycho-qt/{winmenu.cc => source/menu.cc} (56%) rename source/tycho-qt/{winabout.ui => ui/about.ui} (84%) rename source/tycho-qt/{winmapprops.ui => ui/mapprops.ui} (97%) rename source/tycho-qt/{viewmap.ui => ui/mapview.ui} (82%) rename source/tycho-qt/{winmenu.ui => ui/menu.ui} (95%) create mode 100644 source/tycho-qt/ui/points.ui delete mode 100644 source/tycho-qt/winmapprops.cc delete mode 100644 source/tycho-qt/winmapprops.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b4d3cb..738e03a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,25 +16,6 @@ set(CMAKE_CXX_FLAGS_DEBUGOPT "-O2 -g") find_package(Threads REQUIRED) find_package(Qt5Widgets CONFIG REQUIRED) -add_executable( - maraiah-tycho - WIN32 - source/tycho-qt/resources.qrc - - source/tycho-qt/viewmap.ui - source/tycho-qt/winabout.ui - source/tycho-qt/winmapprops.ui - source/tycho-qt/winmenu.ui - - source/tycho-qt/tycho.h - source/tycho-qt/winmapprops.h - source/tycho-qt/winmenu.h - - source/tycho-qt/winmapprops.cc - source/tycho-qt/winmenu.cc - source/tycho-qt/main.cc -) - add_custom_target( maraiah-tycho-lib ALL BYPRODUCTS "${RS_LIB}" @@ -43,6 +24,23 @@ add_custom_target( COMMENT "Building Rust library" ) +add_executable( + maraiah-tycho + WIN32 + source/tycho-qt/headers/mapprops.h + source/tycho-qt/headers/menu.h + source/tycho-qt/headers/tycho.h + source/tycho-qt/resources/resources.qrc + source/tycho-qt/source/main.cc + source/tycho-qt/source/mapprops.cc + source/tycho-qt/source/menu.cc + source/tycho-qt/ui/about.ui + source/tycho-qt/ui/mapprops.ui + source/tycho-qt/ui/mapview.ui + source/tycho-qt/ui/menu.ui + source/tycho-qt/ui/points.ui +) + set_target_properties( maraiah-tycho PROPERTIES @@ -50,6 +48,8 @@ set_target_properties( CXX_STANDARD_REQUIRED ON ) +target_include_directories(maraiah-tycho PUBLIC source/tycho-qt/headers) + target_link_libraries( maraiah-tycho "${RS_LIB}" diff --git a/source/tycho-qt/headers/mapprops.h b/source/tycho-qt/headers/mapprops.h new file mode 100644 index 0000000..1d36eb0 --- /dev/null +++ b/source/tycho-qt/headers/mapprops.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include + +namespace Ui +{ + class MapProps; +} + +class MapProps : public QDialog +{ + Q_OBJECT + +public: + explicit MapProps(QWidget *parent = nullptr); + ~MapProps(); + +private: + std::unique_ptr ui; +}; + +// EOF diff --git a/source/tycho-qt/winmenu.h b/source/tycho-qt/headers/menu.h similarity index 52% rename from source/tycho-qt/winmenu.h rename to source/tycho-qt/headers/menu.h index ba8f26f..a6227cf 100644 --- a/source/tycho-qt/winmenu.h +++ b/source/tycho-qt/headers/menu.h @@ -1,22 +1,20 @@ #pragma once -#include "winmapprops.h" - #include #include namespace Ui { - class WinMenu; + class Menu; } -class WinMenu : public QMainWindow +class Menu : public QMainWindow { Q_OBJECT public: - explicit WinMenu(QWidget *parent = nullptr); - ~WinMenu(); + explicit Menu(QWidget *parent = nullptr); + ~Menu(); public slots: void mapNew(); @@ -25,8 +23,7 @@ public slots: void openMapProperties(); private: - std::unique_ptr ui; - WinMapProps *props; + std::unique_ptr ui; }; // EOF diff --git a/source/tycho-qt/tycho.h b/source/tycho-qt/headers/tycho.h similarity index 100% rename from source/tycho-qt/tycho.h rename to source/tycho-qt/headers/tycho.h diff --git a/source/tycho-qt/resources.qrc b/source/tycho-qt/resources.qrc deleted file mode 100644 index 9a584a3..0000000 --- a/source/tycho-qt/resources.qrc +++ /dev/null @@ -1,14 +0,0 @@ - - - data/color/lines.png - data/color/map.png - data/color/points.png - data/color/polygons.png - data/hc/lines.png - data/hc/map.png - data/hc/points.png - data/hc/polygons.png - data/misc/tycho1.png - data/misc/tycho2.png - - diff --git a/source/tycho-qt/data/color/lines.png b/source/tycho-qt/resources/color/lines.png similarity index 100% rename from source/tycho-qt/data/color/lines.png rename to source/tycho-qt/resources/color/lines.png diff --git a/source/tycho-qt/data/color/map.png b/source/tycho-qt/resources/color/map.png similarity index 100% rename from source/tycho-qt/data/color/map.png rename to source/tycho-qt/resources/color/map.png diff --git a/source/tycho-qt/data/color/points.png b/source/tycho-qt/resources/color/points.png similarity index 100% rename from source/tycho-qt/data/color/points.png rename to source/tycho-qt/resources/color/points.png diff --git a/source/tycho-qt/data/color/polygons.png b/source/tycho-qt/resources/color/polygons.png similarity index 100% rename from source/tycho-qt/data/color/polygons.png rename to source/tycho-qt/resources/color/polygons.png diff --git a/source/tycho-qt/data/hc/lines.png b/source/tycho-qt/resources/hc/lines.png similarity index 100% rename from source/tycho-qt/data/hc/lines.png rename to source/tycho-qt/resources/hc/lines.png diff --git a/source/tycho-qt/data/hc/map.png b/source/tycho-qt/resources/hc/map.png similarity index 100% rename from source/tycho-qt/data/hc/map.png rename to source/tycho-qt/resources/hc/map.png diff --git a/source/tycho-qt/data/hc/points.png b/source/tycho-qt/resources/hc/points.png similarity index 100% rename from source/tycho-qt/data/hc/points.png rename to source/tycho-qt/resources/hc/points.png diff --git a/source/tycho-qt/data/hc/polygons.png b/source/tycho-qt/resources/hc/polygons.png similarity index 100% rename from source/tycho-qt/data/hc/polygons.png rename to source/tycho-qt/resources/hc/polygons.png diff --git a/source/tycho-qt/data/misc/tycho1.png b/source/tycho-qt/resources/misc/tycho1.png similarity index 100% rename from source/tycho-qt/data/misc/tycho1.png rename to source/tycho-qt/resources/misc/tycho1.png diff --git a/source/tycho-qt/data/misc/tycho2.png b/source/tycho-qt/resources/misc/tycho2.png similarity index 100% rename from source/tycho-qt/data/misc/tycho2.png rename to source/tycho-qt/resources/misc/tycho2.png diff --git a/source/tycho-qt/resources/resources.qrc b/source/tycho-qt/resources/resources.qrc new file mode 100644 index 0000000..90dbeec --- /dev/null +++ b/source/tycho-qt/resources/resources.qrc @@ -0,0 +1,14 @@ + + + color/lines.png + color/map.png + color/points.png + color/polygons.png + hc/lines.png + hc/map.png + hc/points.png + hc/polygons.png + misc/tycho1.png + misc/tycho2.png + + diff --git a/source/tycho-qt/data/sources/icons.psd b/source/tycho-qt/resources/sources/icons.psd similarity index 100% rename from source/tycho-qt/data/sources/icons.psd rename to source/tycho-qt/resources/sources/icons.psd diff --git a/source/tycho-qt/data/sources/tycho1.psd b/source/tycho-qt/resources/sources/tycho1.psd similarity index 100% rename from source/tycho-qt/data/sources/tycho1.psd rename to source/tycho-qt/resources/sources/tycho1.psd diff --git a/source/tycho-qt/data/sources/tycho2.psd b/source/tycho-qt/resources/sources/tycho2.psd similarity index 100% rename from source/tycho-qt/data/sources/tycho2.psd rename to source/tycho-qt/resources/sources/tycho2.psd diff --git a/source/tycho-qt/main.cc b/source/tycho-qt/source/main.cc similarity index 81% rename from source/tycho-qt/main.cc rename to source/tycho-qt/source/main.cc index 84b7d41..2e12703 100644 --- a/source/tycho-qt/main.cc +++ b/source/tycho-qt/source/main.cc @@ -1,11 +1,11 @@ -#include "winmenu.h" +#include "menu.h" #include #include int main(int argc, char *argv[]) { QApplication a(argc, argv); - WinMenu w; + Menu w; w.show(); return a.exec(); } diff --git a/source/tycho-qt/source/mapprops.cc b/source/tycho-qt/source/mapprops.cc new file mode 100644 index 0000000..fe6441c --- /dev/null +++ b/source/tycho-qt/source/mapprops.cc @@ -0,0 +1,17 @@ +#include "tycho.h" +#include "mapprops.h" +#include "../ui/ui_mapprops.h" + +MapProps::MapProps(QWidget *parent) : + QDialog(parent), + ui(new Ui::MapProps) +{ + ui->setupUi(this); +} + +MapProps::~MapProps() +{ + dbgPrintFunc(); +} + +// EOF diff --git a/source/tycho-qt/winmenu.cc b/source/tycho-qt/source/menu.cc similarity index 56% rename from source/tycho-qt/winmenu.cc rename to source/tycho-qt/source/menu.cc index 1b7e5f9..10ac914 100644 --- a/source/tycho-qt/winmenu.cc +++ b/source/tycho-qt/source/menu.cc @@ -1,32 +1,32 @@ #include "tycho.h" -#include "winmenu.h" -#include "ui_winmenu.h" -#include "ui_winabout.h" +#include "mapprops.h" +#include "menu.h" +#include "../ui/ui_menu.h" +#include "../ui/ui_about.h" #include #include extern "C" void test_fn(char const *fname); -WinMenu::WinMenu(QWidget *parent) : +Menu::Menu(QWidget *parent) : QMainWindow(parent), - ui(new Ui::WinMenu), - props(new WinMapProps(this)) + ui(new Ui::Menu) { ui->setupUi(this); } -WinMenu::~WinMenu() +Menu::~Menu() { dbgPrintFunc(); } -void WinMenu::mapNew() +void Menu::mapNew() { // TODO } -void WinMenu::mapOpen() +void Menu::mapOpen() { auto fname = QFileDialog::getOpenFileName( @@ -38,19 +38,21 @@ void WinMenu::mapOpen() test_fn(qUtf8Printable(fname)); } -void WinMenu::openAbout() +void Menu::openAbout() { - QDialog dlg{this}; - Ui::WinAbout about{}; + QDialog dlg{this}; + Ui::About about{}; about.setupUi(&dlg); dlg.exec(); } -void WinMenu::openMapProperties() +void Menu::openMapProperties() { - props->show(); + MapProps props{this}; + + props.exec(); } // EOF diff --git a/source/tycho-qt/winabout.ui b/source/tycho-qt/ui/about.ui similarity index 84% rename from source/tycho-qt/winabout.ui rename to source/tycho-qt/ui/about.ui index 9ef1715..e062008 100644 --- a/source/tycho-qt/winabout.ui +++ b/source/tycho-qt/ui/about.ui @@ -1,7 +1,10 @@ - WinAbout - + About + + + Qt::WindowModal + 0 @@ -13,11 +16,14 @@ About Tycho + + true + - <img src="qrc:///data/misc/tycho2.png"/> + <img src="qrc:///misc/tycho2.png"/> @@ -71,14 +77,14 @@ Tycho is public domain software under the CC0 license. - + buttonBox rejected() - WinAbout - close() + About + reject() 479 diff --git a/source/tycho-qt/winmapprops.ui b/source/tycho-qt/ui/mapprops.ui similarity index 97% rename from source/tycho-qt/winmapprops.ui rename to source/tycho-qt/ui/mapprops.ui index 11830e7..51a7f7d 100644 --- a/source/tycho-qt/winmapprops.ui +++ b/source/tycho-qt/ui/mapprops.ui @@ -1,7 +1,7 @@ - WinMapProps - + MapProps + Qt::WindowModal @@ -16,6 +16,9 @@ Map Properties + + true + @@ -346,38 +349,6 @@ - - buttonBox - accepted() - WinMapProps - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - WinMapProps - reject() - - - 316 - 260 - - - 286 - 274 - - - checkBox_24 toggled(bool) @@ -394,5 +365,37 @@ + + buttonBox + accepted() + MapProps + accept() + + + 345 + 645 + + + 287 + -12 + + + + + buttonBox + rejected() + MapProps + reject() + + + 315 + 648 + + + 324 + -6 + + + diff --git a/source/tycho-qt/viewmap.ui b/source/tycho-qt/ui/mapview.ui similarity index 82% rename from source/tycho-qt/viewmap.ui rename to source/tycho-qt/ui/mapview.ui index e54a3f3..8108af0 100644 --- a/source/tycho-qt/viewmap.ui +++ b/source/tycho-qt/ui/mapview.ui @@ -1,7 +1,7 @@ - ViewMap - + MapView + 0 @@ -11,7 +11,7 @@ - Form + Map View diff --git a/source/tycho-qt/winmenu.ui b/source/tycho-qt/ui/menu.ui similarity index 95% rename from source/tycho-qt/winmenu.ui rename to source/tycho-qt/ui/menu.ui index 231551e..705a686 100644 --- a/source/tycho-qt/winmenu.ui +++ b/source/tycho-qt/ui/menu.ui @@ -1,7 +1,7 @@ - WinMenu - + Menu + 0 @@ -120,7 +120,7 @@ actionMapProps triggered() - WinMenu + Menu openMapProperties() @@ -136,7 +136,7 @@ actionQuit triggered() - WinMenu + Menu close() @@ -152,7 +152,7 @@ actionOpen triggered() - WinMenu + Menu mapOpen() @@ -168,7 +168,7 @@ actionNew triggered() - WinMenu + Menu mapNew() @@ -184,7 +184,7 @@ actionAbout triggered() - WinMenu + Menu openAbout() diff --git a/source/tycho-qt/ui/points.ui b/source/tycho-qt/ui/points.ui new file mode 100644 index 0000000..2c2dc31 --- /dev/null +++ b/source/tycho-qt/ui/points.ui @@ -0,0 +1,47 @@ + + + Points + + + + 0 + 0 + 150 + 82 + + + + Point Editor + + + + + + The horizontal position. Lower numbers represent positions further to the left. + + + X Position + + + + + + + + + + The vertical position. Lower numbers represent positions further upwards. + + + Y Position + + + + + + + + + + + diff --git a/source/tycho-qt/winmapprops.cc b/source/tycho-qt/winmapprops.cc deleted file mode 100644 index e2a9252..0000000 --- a/source/tycho-qt/winmapprops.cc +++ /dev/null @@ -1,17 +0,0 @@ -#include "tycho.h" -#include "winmapprops.h" -#include "ui_winmapprops.h" - -WinMapProps::WinMapProps(QWidget *parent) : - QDialog(parent, Qt::Window), - ui(new Ui::WinMapProps) -{ - ui->setupUi(this); -} - -WinMapProps::~WinMapProps() -{ - dbgPrintFunc(); -} - -// EOF diff --git a/source/tycho-qt/winmapprops.h b/source/tycho-qt/winmapprops.h deleted file mode 100644 index 7753621..0000000 --- a/source/tycho-qt/winmapprops.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include -#include - -namespace Ui -{ - class WinMapProps; -} - -class WinMapProps : public QDialog -{ - Q_OBJECT - -public: - explicit WinMapProps(QWidget *parent = nullptr); - ~WinMapProps(); - -private: - std::unique_ptr ui; -}; - -// EOF