[nostalgia/studio] Move OxFSTreeView out of Studio lib

This commit is contained in:
Gary Talent 2020-01-01 19:26:41 -06:00
parent 3afaa0fc85
commit 038f0ee493
8 changed files with 18 additions and 10 deletions

View File

@ -4,6 +4,7 @@ add_executable(
nostalgia-studio MACOSX_BUNDLE nostalgia-studio MACOSX_BUNDLE
main.cpp main.cpp
mainwindow.cpp mainwindow.cpp
oxfstreeview.cpp
) )
target_link_libraries( target_link_libraries(

View File

@ -7,7 +7,6 @@ add_library(
json_read.cpp json_read.cpp
json_write.cpp json_write.cpp
wizard.cpp wizard.cpp
oxfstreeview.cpp
plugin.cpp plugin.cpp
project.cpp project.cpp
) )
@ -30,7 +29,6 @@ install(
json_read.hpp json_read.hpp
json_write.hpp json_write.hpp
wizard.hpp wizard.hpp
oxfstreeview.hpp
plugin.hpp plugin.hpp
project.hpp project.hpp
DESTINATION DESTINATION

View File

@ -10,6 +10,7 @@
#include <functional> #include <functional>
#include <QToolBar>
#include <QVector> #include <QVector>
#include <QWizardPage> #include <QWizardPage>
@ -19,11 +20,20 @@
namespace nostalgia::studio { namespace nostalgia::studio {
struct Context { struct Context: public QObject {
QString appName; Q_OBJECT
QString orgName;
QWidget *tabParent = nullptr; public:
const Project *project = nullptr; QString appName;
QString orgName;
QWidget *tabParent = nullptr;
const Project *project = nullptr;
signals:
void addToolBar(QToolBar *tb);
void removeToolBar(QToolBar *tb);
}; };
struct EditorMaker { struct EditorMaker {

View File

@ -24,7 +24,6 @@
#include "lib/editor.hpp" #include "lib/editor.hpp"
#include "lib/json.hpp" #include "lib/json.hpp"
#include "lib/oxfstreeview.hpp"
#include "lib/project.hpp" #include "lib/project.hpp"
#include "lib/wizard.hpp" #include "lib/wizard.hpp"

View File

@ -24,10 +24,11 @@
#include <ox/std/types.hpp> #include <ox/std/types.hpp>
#include "lib/oxfstreeview.hpp"
#include "lib/plugin.hpp" #include "lib/plugin.hpp"
#include "lib/project.hpp" #include "lib/project.hpp"
#include "oxfstreeview.hpp"
namespace nostalgia::studio { namespace nostalgia::studio {
struct NostalgiaStudioState { struct NostalgiaStudioState {

View File

@ -12,5 +12,4 @@
#include "lib/json.hpp" #include "lib/json.hpp"
#include "lib/plugin.hpp" #include "lib/plugin.hpp"
#include "lib/project.hpp" #include "lib/project.hpp"
#include "lib/oxfstreeview.hpp"
#include "lib/wizard.hpp" #include "lib/wizard.hpp"