From e1ed329d0b8be10ac6e019d37b82afcf21990691 Mon Sep 17 00:00:00 2001 From: alwin Date: Fri, 12 Nov 2004 15:57:59 +0000 Subject: - fixed a bug in docview-lister: different files may have same docview name. So mapping filenames to docname isn't usefull. - when opie-eye is started from doctab closing the imagewindow closes the application - when a doc-link is changed while opie-eye is running it get the changes, too. --- (limited to 'noncore/graphics') diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 948477c..138e661 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -196,6 +196,7 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) m_iconsize = 32; m_internalReset = false; m_customWidget = 0; + m_setDocCalled = false; m_hbox = new QHBox( this ); QLabel* lbl = new QLabel( m_hbox ); @@ -212,10 +213,7 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) m_view->setArrangement( QIconView::LeftToRight ); m_mode = m_cfg->readNumEntry("ListViewMode", 1); - QString lastView = m_cfg->readEntry("LastView",""); - if (m_mode < 1 || m_mode>3) m_mode = 1; - m_view->setItemTextPos( QIconView::Right ); if (m_mode >1) { m_view->setResizeMode(QIconView::Adjust); @@ -227,24 +225,13 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) if (m_iconsize>64)m_iconsize = 64; calculateGrid(); - initKeys(); - loadViews(); - int cc=0; - for (; cccount();++cc) { - if (m_views->text(cc)==lastView) { - break; - } - } - if (cccount()) { - m_views->setCurrentItem(cc); - slotViewChanged(cc); - } else { - slotViewChanged(m_views->currentItem()); - } - connect( m_views, SIGNAL(activated(int)), - this, SLOT(slotViewChanged(int)) ); +} + +void PIconView::setDoccalled(bool how) +{ + m_setDocCalled = how; } /* @@ -441,6 +428,30 @@ void PIconView::resetView() { m_internalReset = false; } +void PIconView::polish() +{ + odebug << "===\n" + << "PIconView::polish()\n" + << "====" << oendl; + QVBox::polish(); + + QString lastView = m_cfg->readEntry("LastView",""); + int cc=0; + for (; cccount();++cc) { + if (m_views->text(cc)==lastView) { + break; + } + } + if (cccount()) { + m_views->setCurrentItem(cc); + slotViewChanged(cc); + } else { + slotViewChanged(m_views->currentItem()); + } + connect( m_views, SIGNAL(activated(int)), + this, SLOT(slotViewChanged(int)) ); +} + /* *swicth view reloadDir and connect signals */ @@ -529,15 +540,20 @@ void PIconView::addFiles( const QStringList& lst) { if (!m_path.isEmpty()) { pre = m_path+"/"; } + QString s = ""; + int pos; for (it=lst.begin(); it!= lst.end(); ++it ) { - m_pix = PPixmapCache::self()->cachedImage( pre+(*it), m_iconsize, m_iconsize ); - _iv = new IconViewItem( m_view, pre+(*it), (*it),m_iconsize ); + s = (*it); + pos = s.find(char(0)); + m_pix = PPixmapCache::self()->cachedImage( pre+(*it), m_iconsize, m_iconsize ); + if (pos>-1) { + _iv = new IconViewItem( m_view, s.mid(pos+1), s.left(pos),m_iconsize ); + } else { + _iv = new IconViewItem( m_view, pre+(*it), (*it),m_iconsize ); + } if (m_mode==3) { _iv->setTextOnly(true); _iv->setPixmap(QPixmap()); - - - } else { if (m_pix) _iv->setPixmap(*m_pix); } diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index 78dda58..6e08fd8 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h @@ -35,6 +35,8 @@ public: void resetView(); Opie::Core::OKeyConfigManager* manager(); + void setDoccalled(bool); + signals: void sig_showInfo( const QString& ); void sig_display(const QString&); @@ -45,6 +47,7 @@ public slots: virtual void slotShowPrev(); virtual void slotShowLast(); virtual bool slotShowFirst(); + virtual void polish(); protected: void resizeEvent( QResizeEvent* ); @@ -56,6 +59,7 @@ private: QString prevFileName(bool &isDir)const; void loadViews(); void calculateGrid(QResizeEvent*e = 0); + bool m_setDocCalled:1; private slots: void slotDirUp(); diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index ebdfc60..ac6474c 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp @@ -27,6 +27,7 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name m_gDisplayType = 0; m_gPrevNext = 0; m_hGroup = 0; + closeIfHide = false; } void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup) @@ -152,7 +153,19 @@ void ImageView::keyReleaseEvent(QKeyEvent * e) if (!e || e->state()!=0) { return; } - if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe(); + if (e->key()==Qt::Key_Escape) { + if (fullScreen()) { + emit hideMe(); + } + if (closeIfHide) { + QTimer::singleShot(0, qApp, SLOT(closeAllWindows())); + } + } +} + +void ImageView::setCloseIfHide(bool how) +{ + closeIfHide = how; } void ImageView::slotShowImageInfo() diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h index 2408211..f1067bb 100644 --- a/noncore/graphics/opie-eye/gui/imageview.h +++ b/noncore/graphics/opie-eye/gui/imageview.h @@ -39,6 +39,7 @@ public: virtual void enableFullscreen(); void stopSlide(); void setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup); + void setCloseIfHide(bool); signals: void dispImageInfo(const QString&); @@ -61,6 +62,7 @@ protected: int m_slideValue; virtual void focusInEvent ( QFocusEvent * ); QActionGroup *m_gDisplayType,*m_gPrevNext,*m_hGroup; + bool closeIfHide:1; public slots: virtual void hide(); diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index f443ccb..295f93f 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -46,6 +46,8 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) m_cfg = new Opie::Core::OConfig("opie-eye"); m_cfg->setGroup("main" ); readConfig(); + m_setDocCalled = false; + m_polishDone = false; m_storage = new StorageInfo(); connect(m_storage, SIGNAL(disksChanged() ), @@ -419,11 +421,13 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { * return from view * or properly quit */ - if ( m_stack->visibleWidget() == m_info || - m_stack->visibleWidget() == m_disp ) { - ev->ignore(); - raiseIconView(); - return; + if (!m_setDocCalled) { + if ( m_stack->visibleWidget() == m_info || + m_stack->visibleWidget() == m_disp ) { + ev->ignore(); + raiseIconView(); + return; + } } if (m_disp && m_disp->fullScreen()) { /* otherwise opie-eye crashes in bigscreen mode! */ @@ -436,16 +440,16 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { void PMainWindow::setDocument( const QString& showImg ) { - bool first_start = m_disp==0; - QString file = showImg; DocLnk lnk(showImg); if (lnk.isValid() ) file = lnk.file(); slotDisplay( file ); - if (first_start && m_aFullScreen->isOn()) { +#if 0 + if (!m_polishDone) { QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); } +#endif } void PMainWindow::check_view_fullscreen() @@ -689,17 +693,13 @@ void PMainWindow::listviewselected(QAction*which) { if (!which || which->isOn()==false) return; int val = 1; -// QString name; if (which==m_aDirName) { val = 3; -// name = "opie-eye/opie-eye-textview"; } else if (which==m_aDirShort) { val = 2; -// name = "opie-eye/opie-eye-thumbonly"; } else if (which==m_aDirLong) { val = 1; -// name = "opie-eye/opie-eye-thumb"; } emit changeListMode(val); } @@ -708,3 +708,26 @@ void PMainWindow::readConfig() { autoSave =m_cfg->readBoolEntry("savestatus",true); } + +void PMainWindow::polish() +{ + if (m_disp) { + odebug << "======================\n" + << "Called via setdocument\n" + << "======================" << oendl; + m_setDocCalled = true; + m_view->setDoccalled(true); + m_disp->setCloseIfHide(true); + } else { + m_setDocCalled = false; + m_view->setDoccalled(false); + } + m_polishDone = true; + QMainWindow::polish(); + if (m_setDocCalled) { + if (m_aFullScreen->isOn()) { + QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); + } else if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + } + } +} diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 465e352..2f54090 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h @@ -58,6 +58,7 @@ public slots: void setDocument( const QString& ); virtual void slotToggleFullScreen(); virtual void slotFullScreenToggled(bool); + virtual void polish(); protected slots: void raiseIconView(); @@ -80,6 +81,8 @@ private: imageinfo *m_info; ImageView *m_disp; bool autoSave; + bool m_setDocCalled:1; + bool m_polishDone:1; QToolButton*fsButton; QToolBar *toolBar; QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu; diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index f5c711a..8bcf01d 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -20,6 +21,7 @@ using namespace Opie::Core; /* QT */ #include #include +#include Doc_DirLister::Doc_DirLister() : PDirLister( "doc_dir_lister" ) @@ -35,17 +37,21 @@ Doc_DirLister::Doc_DirLister() this, SLOT(slotFullInfo(const QString&, const QString&)) ); connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), this, SLOT(slotThumbNail(const QString&, const QPixmap&)) ); - - m_namemap.clear(); - m_filemap.clear(); m_docreads = false; + syschannel = new QCopChannel("QPE/System", this); + connect(syschannel, SIGNAL(received(const QCString&,const QByteArray&)), + this, SLOT(systemMsg(const QCString&,const QByteArray&)) ); +} + +Doc_DirLister::~Doc_DirLister() +{ } QString Doc_DirLister::defaultPath()const { return QString::null; } -bool Doc_DirLister::matchCat(const AppLnk* app) +bool Doc_DirLister::matchCat(const AppLnk* app)const { if (!app) return false; if (m_catFilter==0 || app->categories().contains(m_catFilter) || m_catFilter == -1 && app->categories().count() == 0 ) { @@ -56,23 +62,16 @@ bool Doc_DirLister::matchCat(const AppLnk* app) QString Doc_DirLister::setStartPath(const QString&) { static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); - if (m_namemap.isEmpty()) { - if (!m_docreads) { - Global::findDocuments(&m_ds,Mtype_str); - m_docreads = true; - } - QListIterator dit(m_ds.children()); - for( ; dit.current(); ++dit) { - if (!matchCat((*dit))) continue; - m_namemap[(*dit)->name()]=(*dit)->file(); - m_filemap[(*dit)->file()]=(*dit)->name(); - } + if (!m_docreads) { + Global::findDocuments(&m_ds,Mtype_str); + m_docreads = true; } return QString::null; } -QString Doc_DirLister::currentPath()const { - return QString::null; +QString Doc_DirLister::currentPath()const +{ + return QString::null; } @@ -82,9 +81,13 @@ QStringList Doc_DirLister::folders()const { QStringList Doc_DirLister::files()const { QStringList out; - QMap::ConstIterator it; - for (it = m_namemap.begin();it != m_namemap.end();++it) { - out.append(it.key()); + QListIterator dit(m_ds.children()); + for( ; dit.current(); ++dit) { + if (!matchCat((*dit))) continue; + QString s = (*dit)->name(); + s+=char(0); + s+=(*dit)->file(); + out.append(s); } return out; } @@ -93,71 +96,42 @@ void Doc_DirLister::deleteImage( const QString& ) { } -void Doc_DirLister::thumbNail( const QString& str, int w, int h) { - if (m_namemap.find(str)==m_namemap.end()) { - return; - } - QString fname = m_namemap[str]; - SlaveMaster::self()->thumbNail( fname, w, h ); +void Doc_DirLister::thumbNail( const QString& str, int w, int h) +{ + SlaveMaster::self()->thumbNail( str, w, h ); } -QImage Doc_DirLister::image( const QString& str, Factor f, int m) { - if (m_namemap.find(str)==m_namemap.end()) { - return QImage(); - } - QString fname = m_namemap[str]; - return SlaveMaster::self()->image( fname, f, m ); +QImage Doc_DirLister::image( const QString& str, Factor f, int m) +{ + return SlaveMaster::self()->image(str, f, m ); } void Doc_DirLister::imageInfo( const QString& str) { - if (m_namemap.find(str)==m_namemap.end()) { - return; - } - QString fname = m_namemap[str]; - SlaveMaster::self()->thumbInfo( fname ); + SlaveMaster::self()->thumbInfo( str ); } void Doc_DirLister::fullImageInfo( const QString& str) { - if (m_namemap.find(str)==m_namemap.end()) { - return; - } - QString fname = m_namemap[str]; - SlaveMaster::self()->imageInfo( fname ); + SlaveMaster::self()->imageInfo(str); } void Doc_DirLister::slotFullInfo(const QString&f, const QString&t) { - if (m_filemap.find(f)==m_filemap.end()) { - return; - } - QString name = m_filemap[f]; - emit sig_fullInfo(name, t); + emit sig_fullInfo(f, t); } void Doc_DirLister::slotThumbInfo(const QString&f, const QString&t) { - if (m_filemap.find(f)==m_filemap.end()) { - return; - } - QString name = m_filemap[f]; - emit sig_thumbInfo(name, t); + emit sig_thumbInfo(f, t); } void Doc_DirLister::slotThumbNail(const QString&f, const QPixmap&p) { - if (m_filemap.find(f)==m_filemap.end()) { - return; - } - QString name = m_filemap[f]; - emit sig_thumbNail(name, p); + emit sig_thumbNail(f, p); } QString Doc_DirLister::nameToFname(const QString&name)const { - if (m_namemap.find(name)==m_namemap.end()) { - return QString::null; - } - return m_namemap[name]; + return name; } QString Doc_DirLister::dirUp( const QString& p ) const{ @@ -182,7 +156,46 @@ QWidget* Doc_DirLister::widget(QWidget*parent) void Doc_DirLister::showCategory(int which) { m_catFilter = which==-2?0:which; - m_namemap.clear(); setStartPath(""); emit sig_reloadDir(); } + +void Doc_DirLister::systemMsg(const QCString &msg, const QByteArray &data) +{ + if ( msg != "linkChanged(QString)"||!m_docreads) { + return; + } + QString link; + QDataStream stream( data, IO_ReadOnly ); + stream >> link; + odebug << "Doc_DirLister systemMsg -> linkchanged( " << link << " )" << oendl; + if ( link.isNull() || OGlobal::isAppLnkFileName(link) ) { + return; + } + QListIterator dit(m_ds.children()); + bool must_reload = false; + bool found = false; + while ( dit.current() ) { + DocLnk *doc = dit.current(); + ++dit; + if (doc->linkFile() == link) { + found = true; + DocLnk* dl = new DocLnk(link); + if (dl->fileKnown()) { + // changing + m_ds.add(dl); + } else { + delete dl; + } + if (matchCat(doc) || matchCat(dl)) { + must_reload = true; + } + m_ds.remove( doc ); // remove old link from docLnkSet + delete doc; + } + } + if (must_reload) { + setStartPath(""); + emit sig_reloadDir(); + } +} diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.h b/noncore/graphics/opie-eye/impl/doc/doc_lister.h index 403241c..3f8825f 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h @@ -14,12 +14,13 @@ class Config; class AppLnk; +class QCopChannel; class Doc_DirLister : public PDirLister { Q_OBJECT public: Doc_DirLister(); - virtual ~Doc_DirLister(){} + virtual ~Doc_DirLister(); QString defaultPath()const; QString setStartPath( const QString& ); @@ -37,9 +38,8 @@ public: QWidget* widget(QWidget*parent); private: - QMap m_namemap,m_filemap; int m_catFilter; - bool matchCat(const AppLnk* app); + bool matchCat(const AppLnk* app)const; bool m_docreads; DocLnkSet m_ds; @@ -48,6 +48,8 @@ protected slots: virtual void slotThumbInfo(const QString&, const QString&); virtual void slotThumbNail(const QString&, const QPixmap&); virtual void showCategory(int); + void systemMsg(const QCString &, const QByteArray &); + QCopChannel *syschannel; }; #endif -- cgit v0.9.0.2