summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-07 12:46:26 (UTC)
committer alwin <alwin>2004-04-07 12:46:26 (UTC)
commit9e1ecade17a77c3d50aecc4c92091d852e99e8d9 (patch) (side-by-side diff)
treebef7f25d64890aab64f5dc0e0fcb40c64497464a
parentd581038dd7875aa65a750f099333a94f43c37ef2 (diff)
downloadopie-9e1ecade17a77c3d50aecc4c92091d852e99e8d9.zip
opie-9e1ecade17a77c3d50aecc4c92091d852e99e8d9.tar.gz
opie-9e1ecade17a77c3d50aecc4c92091d852e99e8d9.tar.bz2
keys will now be written to config file
all view use the same config object otherwise there will be problems writing a new config
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageinfoui.cpp19
-rw-r--r--noncore/graphics/opie-eye/gui/imageinfoui.h2
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp20
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp6
5 files changed, 31 insertions, 18 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
index 822fd88..0b3250c 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
@@ -18,64 +18,70 @@
#include <opie2/oconfig.h>
#include <opie2/okeyconfigwidget.h>
#include <opie2/odebug.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
static const int THUMBSIZE = 128;
using namespace Opie::Core;
-imageinfo::imageinfo(QWidget* parent, const char* name, WFlags fl )
+imageinfo::imageinfo(Opie::Core::OConfig *cfg,QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
m_viewManager = 0;
+ m_cfg = cfg;
init(name);
initKeys();
}
imageinfo::imageinfo(const QString&_path, QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl ),currentFile(_path)
{
m_viewManager = 0;
+ m_cfg = 0;
init(name);
initKeys();
slotChangeName(_path);
}
Opie::Ui::OKeyConfigManager* imageinfo::manager()
{
if (!m_viewManager) {
initKeys();
}
return m_viewManager;
}
void imageinfo::initKeys()
{
odebug << "init imageinfo keys" << oendl;
- m_cfg = new Opie::Core::OConfig("phunkview");
- m_cfg->setGroup("Zecke_view" );
+#if 0
+ if (!m_cfg) {
+ m_cfg = new Opie::Core::OConfig("phunkview");
+ m_cfg->setGroup("imageinfo_keys" );
+ }
+#endif
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, "Imageinfo-KeyBoard-Config",
+ m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "imageinfo_keys",
lst, false,this, "keyconfig name" );
- m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "view",
+ m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "infoview",
Resource::loadPixmap("1to1"), ViewItem,
Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton),
this, SLOT(slotShowImage())));
m_viewManager->load();
m_viewManager->handleWidget( this );
m_viewManager->handleWidget( TextView1 );
}
void imageinfo::slotShowImage()
{
emit dispImage(currentFile);
}
@@ -134,37 +140,34 @@ void imageinfo::slotChangeName(const QString&_path)
SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE);
} else {
PixmapLabel1->setPixmap(*m_pix);
}
}
imageinfo::~imageinfo()
{
{
QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" );
}
if (m_viewManager) {
- m_viewManager->save();
delete m_viewManager;
}
}
void imageinfo::slot_fullInfo(const QString&_path, const QString&_t)
{
if (_path == currentFile) {
qDebug(_t);
QString t = _t;
t.replace(QRegExp("\n"),"<br>");
-/* t.replace(QRegeExp("<qt>","");
- t.replace(QRegeExp("</qt>","");*/
TextView1->setText(t);
}
}
void imageinfo::slotThumbNail(const QString&_path, const QPixmap&_pix)
{
if (_path == currentFile) {
if (_pix.width()>0) {
PPixmapCache::self()->insertImage( _path, _pix, THUMBSIZE, THUMBSIZE );
PixmapLabel1->setPixmap( _pix );
PixmapLabel1->resize(QSize(_pix.width(),_pix.height()));
}
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.h b/noncore/graphics/opie-eye/gui/imageinfoui.h
index 0ffa423..c9b83a1 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.h
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.h
@@ -20,25 +20,25 @@ namespace Opie {
class OKeyConfigManager;
}
}
class imageinfo : public QWidget
{
Q_OBJECT
enum ActionIds {
ViewItem
};
public:
- imageinfo( QWidget* parent = 0, const char* name = 0, WFlags fl =0);
+ imageinfo(Opie::Core::OConfig *cfg, QWidget* parent = 0, const char* name = 0, WFlags fl =0);
imageinfo(const QString&_path, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
virtual ~imageinfo();
void setDestructiveClose();
Opie::Ui::OKeyConfigManager* manager();
signals:
void dispImage(const QString&);
void sig_return();
public slots:
virtual void setPath( const QString& path );
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 8fc258e..e43bbff 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -1,55 +1,61 @@
#include "imageview.h"
#include <opie2/odebug.h>
#include <opie2/oconfig.h>
#include <opie2/okeyconfigwidget.h>
#include <qpe/resource.h>
using namespace Opie::Core;
-ImageView::ImageView( QWidget* parent, const char* name, WFlags fl )
+ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
: ImageScrollView(parent,name,fl)
{
m_viewManager = 0;
+ m_cfg = cfg;
initKeys();
}
ImageView::~ImageView()
{
+ if (m_viewManager) {
+ delete m_viewManager;
+ }
}
Opie::Ui::OKeyConfigManager* ImageView::manager()
{
if (!m_viewManager) {
initKeys();
}
return m_viewManager;
}
void ImageView::initKeys()
{
odebug << "init imageview keys" << oendl;
- m_cfg = new Opie::Core::OConfig("phunkview");
- m_cfg->setGroup("Zecke_view" );
+ if (!m_cfg) {
+ m_cfg = new Opie::Core::OConfig("phunkview");
+ m_cfg->setGroup("image_view_keys" );
+ }
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, "Imageview-KeyBoard-Config",
- lst, false,this, "keyconfig name" );
- m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Image Info"), "view",
+ m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "image_view_keys",
+ lst, false,this, "image_view_keys" );
+ m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
Resource::loadPixmap("1to1"), ViewInfo,
Opie::Ui::OKeyPair(Qt::Key_I,Qt::ShiftButton),
this, SLOT(slotShowImageInfo())));
- m_viewManager->load();
m_viewManager->handleWidget( this );
+ m_viewManager->load();
}
void ImageView::slotShowImageInfo()
{
emit dispImageInfo(m_lastName);
}
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 5ee0d7d..f61c93f 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -13,25 +13,25 @@ namespace Opie {
}
}
class ImageView:public ImageScrollView
{
Q_OBJECT
enum ActionIds {
ViewInfo
};
public:
- ImageView( QWidget* parent, const char* name = 0, WFlags fl = 0 );
+ ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 );
virtual ~ImageView();
Opie::Ui::OKeyConfigManager* manager();
signals:
void dispImageInfo(const QString&);
void sig_return();
protected:
Opie::Core::OConfig * m_cfg;
Opie::Ui::OKeyConfigManager*m_viewManager;
void initKeys();
protected slots:
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 529bee4..21a668a 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -186,40 +186,44 @@ void PMainWindow::slotConfig() {
QMap<PDirView*, QWidget*>::Iterator it;
for ( it = lst.begin(); it != lst.end(); ++it ) {
if ( act )
it.key()->interfaceInfo()->writeConfig(it.data(), *m_cfg);
delete it.key();
}
if ( act ) {
m_view->resetView();
keyWid->save();
+ m_disp->manager()->save();
+ m_info->manager()->save();
+ m_view->manager()->save();
}
+ delete keyWid;
}
/*
* create a new image info component
* and detach the current one
* we will make the other delete on exit
*/
template<class T>
void PMainWindow::initT( const char* name, T** ptr, int id) {
if ( *ptr ) {
(*ptr)->disconnect(this, SLOT(slotReturn()));
(*ptr)->setDestructiveClose();
m_stack->removeWidget( *ptr );
}
- *ptr = new T( m_stack, name );
+ *ptr = new T(m_cfg, m_stack, name );
m_stack->addWidget( *ptr, id );
connect(*ptr, SIGNAL(sig_return()),
this,SLOT(slotReturn()));
}
void PMainWindow::initInfo() {
initT<imageinfo>( "Image Info", &m_info, ImageInfo );
connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&)));
}
void PMainWindow::initDisp() {
initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay );