Diffstat (limited to 'noncore/apps/opie-console/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 31f1138..647a331 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -1,23 +1,25 @@ | |||
1 | 1 | ||
2 | #include <qaction.h> | 2 | #include <qaction.h> |
3 | #include <qmenubar.h> | 3 | #include <qmenubar.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | #include <qtoolbar.h> | 6 | #include <qtoolbar.h> |
7 | 7 | ||
8 | #include "configdialog.h" | 8 | #include "configdialog.h" |
9 | #include "default.h" | ||
9 | #include "metafactory.h" | 10 | #include "metafactory.h" |
10 | #include "profilemanager.h" | 11 | #include "profilemanager.h" |
11 | #include "mainwindow.h" | 12 | #include "mainwindow.h" |
12 | #include "tabwidget.h" | 13 | #include "tabwidget.h" |
13 | 14 | ||
14 | MainWindow::MainWindow() { | 15 | MainWindow::MainWindow() { |
15 | m_factory = new MetaFactory(); | 16 | m_factory = new MetaFactory(); |
17 | Default def(m_factory); | ||
16 | m_sessions.setAutoDelete( TRUE ); | 18 | m_sessions.setAutoDelete( TRUE ); |
17 | m_curSession = 0; | 19 | m_curSession = 0; |
18 | m_manager = new ProfileManager( m_factory ); | 20 | m_manager = new ProfileManager( m_factory ); |
19 | m_manager->load(); | 21 | m_manager->load(); |
20 | 22 | ||
21 | initUI(); | 23 | initUI(); |
22 | populateProfiles(); | 24 | populateProfiles(); |
23 | } | 25 | } |
@@ -151,17 +153,17 @@ void MainWindow::slotTerminate() { | |||
151 | currentSession()->layer()->close(); | 153 | currentSession()->layer()->close(); |
152 | delete m_curSession; | 154 | delete m_curSession; |
153 | m_curSession = 0l; | 155 | m_curSession = 0l; |
154 | /* FIXME move to the next session */ | 156 | /* FIXME move to the next session */ |
155 | } | 157 | } |
156 | 158 | ||
157 | void MainWindow::slotConfigure() { | 159 | void MainWindow::slotConfigure() { |
158 | qWarning("configure"); | 160 | qWarning("configure"); |
159 | ConfigDialog conf( manager()->all() ); | 161 | ConfigDialog conf( manager()->all(), factory() ); |
160 | conf.showMaximized(); | 162 | conf.showMaximized(); |
161 | 163 | ||
162 | int ret = conf.exec(); | 164 | int ret = conf.exec(); |
163 | 165 | ||
164 | if ( QDialog::Accepted == ret ) { | 166 | if ( QDialog::Accepted == ret ) { |
165 | manager()->setProfiles( conf.list() ); | 167 | manager()->setProfiles( conf.list() ); |
166 | populateProfiles(); | 168 | populateProfiles(); |
167 | } | 169 | } |