Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 5e94f93..529bee4 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -8,5 +8,5 @@ | |||
8 | #include "filesystem.h" | 8 | #include "filesystem.h" |
9 | #include "imageinfoui.h" | 9 | #include "imageinfoui.h" |
10 | #include "imagescrollview.h" | 10 | #include "imageview.h" |
11 | 11 | ||
12 | #include <iface/ifaceinfo.h> | 12 | #include <iface/ifaceinfo.h> |
@@ -163,8 +163,15 @@ void PMainWindow::slotConfig() { | |||
163 | keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue ); | 163 | keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue ); |
164 | keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() ); | 164 | keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() ); |
165 | |||
165 | if ( !m_info ) { | 166 | if ( !m_info ) { |
166 | initInfo(); | 167 | initInfo(); |
167 | } | 168 | } |
168 | keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() ); | 169 | keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() ); |
170 | |||
171 | if ( !m_disp ) { | ||
172 | initDisp(); | ||
173 | } | ||
174 | keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() ); | ||
175 | |||
169 | keyWid->load(); | 176 | keyWid->load(); |
170 | wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") ); | 177 | wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") ); |
@@ -216,10 +223,10 @@ void PMainWindow::initInfo() { | |||
216 | } | 223 | } |
217 | void PMainWindow::initDisp() { | 224 | void PMainWindow::initDisp() { |
218 | initT<ImageScrollView>( "Image ScrollView", &m_disp, ImageDisplay ); | 225 | initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay ); |
219 | if (m_disp) { | 226 | if (m_disp) { |
220 | m_disp->setAutoScale(autoScale); | 227 | m_disp->setAutoScale(autoScale); |
221 | m_disp->setAutoRotate(autoRotate); | 228 | m_disp->setAutoRotate(autoRotate); |
229 | connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); | ||
222 | } | 230 | } |
223 | |||
224 | } | 231 | } |
225 | 232 | ||