drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Start on import wizard and move JSON wrappers into NostalgiaStudio library

Browse Source
This commit is contained in:
Gary Talent
2017-05-13 00:18:27 -05:00
parent 03d7b5fd26
commit e79e3756c5
15 changed files with 101 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/studio/mainwindow.hpp
+7 -2
View File
@@ -57,6 +57,7 @@ class MainWindow: public QMainWindow {
static const QString AppTitle;
private:
QAction *m_importAction = nullptr;
QSharedPointer<Project> m_project;
QPointer<QMenu> m_viewMenu;
QVector<std::function<void()>> m_cleanupTasks;
@@ -79,10 +80,12 @@ class MainWindow: public QMainWindow {
void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget);
void addAction(QMenu *menu, QString text, QString toolTip,
QAction *addAction(QMenu *menu, QString text, QString toolTip, const QObject *tgt, const char *cb);
QAction *addAction(QMenu *menu, QString text, QString toolTip,
QKeySequence::StandardKey key, const QObject *tgt, const char *cb);
void addAction(QMenu *menu, QString text, QString toolTip,
QAction *addAction(QMenu *menu, QString text, QString toolTip,
QKeySequence::StandardKey key, void (*cb)());
int readSettings(QString path);
@@ -93,6 +96,8 @@ class MainWindow: public QMainWindow {
void openProject();
void showNewWizard();
void showImportWizard();
};
}