projects
/
emufront
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cac2a8a
)
SetupModel instance is shared from MainWindow.
author
Mikko Keinänen
<mikko.keinanen@gmail.com>
Sun, 19 Dec 2010 22:58:23 +0000
(
00:58
+0200)
committer
Mikko Keinänen
<mikko.keinanen@gmail.com>
Sun, 19 Dec 2010 22:58:23 +0000
(
00:58
+0200)
src/mainwindow.cpp
patch
|
blob
|
history
src/views/externalexecutableeditview.cpp
patch
|
blob
|
history
src/views/externalexecutableeditview.h
patch
|
blob
|
history
src/views/filepatheditview.cpp
patch
|
blob
|
history
src/views/filepatheditview.h
patch
|
blob
|
history
diff --git
a/src/mainwindow.cpp
b/src/mainwindow.cpp
index
dda730e
..
cbb3a10
100644
(file)
--- a/
src/mainwindow.cpp
+++ b/
src/mainwindow.cpp
@@
-225,7
+225,7
@@
void MainWindow::configureMediaImagePathss()
{
if (!mediaImagePathView)
{
{
if (!mediaImagePathView)
{
- mediaImagePathView = new FilePathEditView(this);
+ mediaImagePathView = new FilePathEditView(supModel, this);
}
activateDialog(mediaImagePathView);
}
}
activateDialog(mediaImagePathView);
}
@@
-264,8
+264,7
@@
void MainWindow::configureSetupss()
void MainWindow::configureEmulatorss()
{
if (!emulatorEditView) {
void MainWindow::configureEmulatorss()
{
if (!emulatorEditView) {
- emulatorEditView = new ExternalExecutableEditView(emuModel, this);
- //connect(emulatorEditView, SIGNAL(finished(int)), this, SLOT(updateData()));
+ emulatorEditView = new ExternalExecutableEditView(supModel, emuModel, this);
}
activateDialog(emulatorEditView);
}
}
activateDialog(emulatorEditView);
}
diff --git
a/src/views/externalexecutableeditview.cpp
b/src/views/externalexecutableeditview.cpp
index
3e023e5
..
66b9e95
100644
(file)
--- a/
src/views/externalexecutableeditview.cpp
+++ b/
src/views/externalexecutableeditview.cpp
@@
-25,15
+25,14
@@
#include "comboboxdelegate.h"
#include <QtGui>
#include "comboboxdelegate.h"
#include <QtGui>
-ExternalExecutableEditView::ExternalExecutableEditView(ExternalExecutableModel *emuModel, QWidget *parent) :
+ExternalExecutableEditView::ExternalExecutableEditView(SetupModel *supModel, ExternalExecutableModel *emuModel, QWidget *parent) :
EmuFrontEditView(parent)
{
setWindowTitle(tr("Set emulators"));
model = emuModel; // new ExternalExecutableModel(this);
objectList->setModel(model);
EmuFrontEditView(parent)
{
setWindowTitle(tr("Set emulators"));
model = emuModel; // new ExternalExecutableModel(this);
objectList->setModel(model);
- SetupModel *stupMdl = new SetupModel(this);
ComboBoxDelegate *setupDelegate = new ComboBoxDelegate(
ComboBoxDelegate *setupDelegate = new ComboBoxDelegate(
- stupMdl,
+ supModel,
SetupModel::Setup_Id,
SetupModel::Setup_Name,
this
SetupModel::Setup_Id,
SetupModel::Setup_Name,
this
diff --git
a/src/views/externalexecutableeditview.h
b/src/views/externalexecutableeditview.h
index
b332b4a
..
00d26eb
100644
(file)
--- a/
src/views/externalexecutableeditview.h
+++ b/
src/views/externalexecutableeditview.h
@@
-25,11
+25,13
@@
#include "emufronteditview.h"
class ExternalExecutableModel;
#include "emufronteditview.h"
class ExternalExecutableModel;
+class SetupModel;
+
class ExternalExecutableEditView : public EmuFrontEditView
{
Q_OBJECT
public:
class ExternalExecutableEditView : public EmuFrontEditView
{
Q_OBJECT
public:
- ExternalExecutableEditView(ExternalExecutableModel *emuModel, QWidget *parent = 0);
+ ExternalExecutableEditView(SetupModel *supModel, ExternalExecutableModel *emuModel, QWidget *parent = 0);
};
#endif // EXTERNALEXECUTABLEEDITVIEW_H
};
#endif // EXTERNALEXECUTABLEEDITVIEW_H
diff --git
a/src/views/filepatheditview.cpp
b/src/views/filepatheditview.cpp
index
988160f
..
b502eac
100644
(file)
--- a/
src/views/filepatheditview.cpp
+++ b/
src/views/filepatheditview.cpp
@@
-27,7
+27,7
@@
#include "filesystembrowsedelegate.h"
#include <QtGui>
#include "filesystembrowsedelegate.h"
#include <QtGui>
-FilePathEditView::FilePathEditView(QWidget *parent) :
+FilePathEditView::FilePathEditView(SetupModel *supModel, QWidget *parent) :
EmuFrontEditView(parent)
{
setWindowTitle(tr("Set media image paths"));
EmuFrontEditView(parent)
{
setWindowTitle(tr("Set media image paths"));
@@
-38,9
+38,8
@@
FilePathEditView::FilePathEditView(QWidget *parent) :
model = new FilePathModel(this);
objectList->setModel(model);
model = new FilePathModel(this);
objectList->setModel(model);
- SetupModel *stupMdl = new SetupModel(this);
ComboBoxDelegate *setupDelegate = new ComboBoxDelegate(
ComboBoxDelegate *setupDelegate = new ComboBoxDelegate(
- stupMdl,
+ supModel,
SetupModel::Setup_Id,
SetupModel::Setup_Name,
this
SetupModel::Setup_Id,
SetupModel::Setup_Name,
this
diff --git
a/src/views/filepatheditview.h
b/src/views/filepatheditview.h
index
695f0c0
..
439848d
100644
(file)
--- a/
src/views/filepatheditview.h
+++ b/
src/views/filepatheditview.h
@@
-26,12
+26,13
@@
class FileUtil;
class QProgressDialog;
class FileUtil;
class QProgressDialog;
+class SetupModel;
class FilePathEditView : public EmuFrontEditView
{
Q_OBJECT
public:
class FilePathEditView : public EmuFrontEditView
{
Q_OBJECT
public:
- FilePathEditView(QWidget *parent = 0);
+ FilePathEditView(SetupModel *supModel, QWidget *parent = 0);
protected:
virtual void connectSignals();
protected:
virtual void connectSignals();