| -rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 63 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 26 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 64 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 13 |
4 files changed, 139 insertions, 27 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 74a8d0f..b3f0006 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -11,5 +11,7 @@ #include <iface/dirlister.h> -#include <qpe/config.h> +#include <opie2/oconfig.h> +#include <opie2/okeyconfigwidget.h> + #include <qpe/resource.h> #include <qpe/qpemessagebox.h> @@ -17,4 +19,5 @@ #include <qpe/qcopenvelope_qws.h> + #include <qiconview.h> #include <qlabel.h> @@ -28,4 +31,5 @@ +using Opie::Ui::OKeyConfigItem; namespace { @@ -97,5 +101,5 @@ namespace { -PIconView::PIconView( QWidget* wid, Config* cfg ) +PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) : QVBox( wid ), m_cfg( cfg ) { @@ -125,4 +129,8 @@ PIconView::PIconView( QWidget* wid, Config* cfg ) m_view->setGridX( viewerWidth-2*m_view->spacing() ); m_view->setGridY( fontMetrics().height()*2+40 ); + + + initKeys(); + loadViews(); slotViewChanged( m_views->currentItem() ); @@ -133,4 +141,40 @@ PIconView::~PIconView() { QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" ); } + m_viewManager->save(); + delete m_viewManager; +} + +Opie::Ui::OKeyConfigManager* PIconView::manager() { + return m_viewManager; +} + +void PIconView::initKeys() { + Opie::Ui::OKeyPair::List lst; + lst.append( Opie::Ui::OKeyPair::upArrowKey() ); + lst.append( Opie::Ui::OKeyPair::downArrowKey() ); + lst.append( Opie::Ui::OKeyPair::leftArrowKey() ); + lst.append( Opie::Ui::OKeyPair::rightArrowKey() ); + lst.append( Opie::Ui::OKeyPair::returnKey() ); + + m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "View-KeyBoard-Config", + lst, false,this, "keyconfig name" ); + m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", + QString::fromLatin1("beam"), BeamItem, + Opie::Ui::OKeyPair(Qt::Key_B, Qt::ShiftButton), + this, SLOT(slotBeam())) ); + m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", + QString::fromLatin1("trash"), DeleteItem, + Opie::Ui::OKeyPair(Qt::Key_D, Qt::ShiftButton), + this, SLOT(slotTrash())) ); + m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", + QString::fromLatin1("1to1"), ViewItem, + Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton), + this, SLOT(slotShowImage()))); + m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info", + QString::fromLatin1("DocumentTypeWord"), InfoItem, + Opie::Ui::OKeyPair(Qt::Key_I, Qt::ShiftButton ), + this, SLOT(slotImageInfo()) ) ); + m_viewManager->load(); + m_viewManager->handleWidget( m_view ); } @@ -153,7 +197,9 @@ void PIconView::slotChangeDir(const QString& path) { m_path = lister->currentPath(); + m_view->setUpdatesEnabled( false ); m_view->clear(); addFolders( lister->folders() ); addFiles( lister->files() ); + m_view->setUpdatesEnabled( true ); // Also invalidate the cache. We can't cancel the operations anyway @@ -318,2 +364,15 @@ void PIconView::slotEnd() { m_view->setUpdatesEnabled( true ); } + +void PIconView::slotShowImage() { + +} +void PIconView::slotShowImage( const QString& ) { + +} +void PIconView::slotImageInfo() { + +} +void PIconView::slotImageInfo( const QString& ) { + +} diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index 439833a..0fba327 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h @@ -9,5 +9,4 @@ #include <qvbox.h> -#include <qpe/config.h> class QIconView; @@ -17,13 +16,28 @@ class PIconViewItem; class PDirLister; class Ir; + +namespace Opie { +namespace Core{ + class OConfig; +} +namespace Ui { + class OKeyConfigManager; +} +} + class PIconView : public QVBox { Q_OBJECT friend class PIconViewItem; + enum ActionIds { + BeamItem, DeleteItem, ViewItem, InfoItem + }; public: - PIconView( QWidget* wid, Config *cfg ); + PIconView( QWidget* wid, Opie::Core::OConfig *cfg ); ~PIconView(); void resetView(); + Opie::Ui::OKeyConfigManager* manager(); private: + void initKeys(); QString currentFileName(bool &isDir)const; void loadViews(); @@ -39,4 +53,9 @@ private slots: void slotBeamDone( Ir* ); + void slotShowImage(); + void slotShowImage( const QString& ); + void slotImageInfo(); + void slotImageInfo( const QString& ); + void slotStart(); void slotEnd(); @@ -51,5 +70,6 @@ private slots: void slotThumbNail(const QString&, const QPixmap&); private: - Config *m_cfg; + Opie::Ui::OKeyConfigManager *m_viewManager; + Opie::Core::OConfig *m_cfg; QComboBox* m_views; QIconView* m_view; diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index ea765d1..0314659 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -3,4 +3,20 @@ * No WArranty... */ +#include "mainwindow.h" + +#include "iconview.h" +#include "filesystem.h" + +#include <iface/ifaceinfo.h> +#include <iface/dirview.h> + +#include <opie2/oapplicationfactory.h> +#include <opie2/otabwidget.h> +#include <opie2/okeyconfigwidget.h> + + +#include <qpe/resource.h> +#include <qpe/config.h> +#include <qpe/ir.h> #include <qtoolbar.h> @@ -10,26 +26,18 @@ #include <qmap.h> -#include <qpe/resource.h> -#include <qpe/config.h> -#include <qpe/ir.h> -#include <opie2/oapplicationfactory.h> -#include <opie2/otabwidget.h> -#include <iface/ifaceinfo.h> -#include <iface/dirview.h> -#include "iconview.h" -#include "filesystem.h" - -#include "mainwindow.h" OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> ) PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) - : QMainWindow( wid, name, style ), m_cfg("phunkview") + : QMainWindow( wid, name, style ) { setCaption( QObject::tr("Opie Eye Caramba" ) ); - m_cfg.setGroup("Zecke_view" ); + m_cfg = new Opie::Core::OConfig("phunkview"); + m_cfg->setGroup("Zecke_view" ); + + /* * Initialize ToolBar and IconView @@ -40,5 +48,5 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) setToolBarsMovable( false ); - m_view = new PIconView( this, &m_cfg ); + m_view = new PIconView( this, m_cfg ); setCentralWidget( m_view ); @@ -81,4 +89,9 @@ PMainWindow::~PMainWindow() { void PMainWindow::slotConfig() { +/* + * have a tab with the possible views + * a tab for globals image cache size.. scaled loading + * and one tab for the KeyConfigs + */ QDialog dlg(this, 0, true); dlg.setCaption( tr("Phunk View - Config" ) ); @@ -92,7 +105,7 @@ void PMainWindow::slotConfig() { for( ; _it != vM->end(); ++_it ) { - PDirView *view = (_it.data())(m_cfg); + PDirView *view = (_it.data())(*m_cfg); PInterfaceInfo *inf = view->interfaceInfo(); - QWidget *_wid = inf->configWidget( m_cfg ); + QWidget *_wid = inf->configWidget( *m_cfg ); _wid->reparent(wid, QPoint() ); lst.insert( view, _wid ); @@ -100,15 +113,26 @@ void PMainWindow::slotConfig() { } - dlg.showMaximized(); - bool act = ( dlg.exec() == QDialog::Accepted ); +/* + * Add the KeyConfigWidget + */ + 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() ); + keyWid->load(); + wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") ); + + + bool act = ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ); QMap<PDirView*, QWidget*>::Iterator it; for ( it = lst.begin(); it != lst.end(); ++it ) { if ( act ) - it.key()->interfaceInfo()->writeConfig(it.data(), m_cfg); + it.key()->interfaceInfo()->writeConfig(it.data(), *m_cfg); delete it.key(); } - if ( act ) + if ( act ) { m_view->resetView(); + keyWid->save(); + } } diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 408fe32..317a51e 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h @@ -7,7 +7,15 @@ #define PHUNK_MAIN_WINDOW_H +#include <opie2/oconfig.h> + #include <qmainwindow.h> -#include <qpe/config.h> + + +namespace Opie { +namespace Ui{ + class OKeyConfigManager; +} +} class PIconView; @@ -20,7 +28,8 @@ public: private: - Config m_cfg; + Opie::Core::OConfig *m_cfg; PIconView* m_view; + private slots: void slotConfig(); |