From 6095b1f70bcac407208e7473598f2bbf53339810 Mon Sep 17 00:00:00 2001 From: alwin Date: Wed, 07 Apr 2004 11:10:21 +0000 Subject: the ImageScrollView wrapped with another class where just the opie-eye specifics are implemented. So we can move that into the MM lib and use it in other programs. --- (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') 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 @@ -7,7 +7,7 @@ #include "iconview.h" #include "filesystem.h" #include "imageinfoui.h" -#include "imagescrollview.h" +#include "imageview.h" #include #include @@ -162,10 +162,17 @@ void PMainWindow::slotConfig() { Opie::Ui::OKeyConfigWidget* keyWid = new Opie::Ui::OKeyConfigWidget( wid, "key config" ); keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue ); keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() ); + if ( !m_info ) { initInfo(); } keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() ); + + if ( !m_disp ) { + initDisp(); + } + keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() ); + keyWid->load(); wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") ); @@ -215,12 +222,12 @@ void PMainWindow::initInfo() { connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&))); } void PMainWindow::initDisp() { - initT( "Image ScrollView", &m_disp, ImageDisplay ); + initT( "Image ScrollView", &m_disp, ImageDisplay ); if (m_disp) { m_disp->setAutoScale(autoScale); m_disp->setAutoRotate(autoRotate); + connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); } - } /** -- cgit v0.9.0.2