summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp22
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.h2
-rw-r--r--noncore/graphics/opie-eye/iface/dirlister.h1
-rw-r--r--noncore/graphics/opie-eye/iface/dirview.h2
-rw-r--r--noncore/graphics/opie-eye/impl/dcim/dcim_dirview.cpp5
-rw-r--r--noncore/graphics/opie-eye/impl/dcim/dcim_dirview.h2
-rw-r--r--noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp5
-rw-r--r--noncore/graphics/opie-eye/impl/dir/dir_dirview.h1
-rw-r--r--noncore/graphics/opie-eye/impl/doc/doc_dirview.cpp7
-rw-r--r--noncore/graphics/opie-eye/impl/doc/doc_dirview.h4
-rw-r--r--noncore/graphics/opie-eye/impl/doc/doc_lister.cpp41
-rw-r--r--noncore/graphics/opie-eye/impl/doc/doc_lister.h7
12 files changed, 91 insertions, 8 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 5472ead..948477c 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -196,10 +196,11 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
m_iconsize = 32;
m_internalReset = false;
+ m_customWidget = 0;
- QHBox *hbox = new QHBox( this );
- QLabel* lbl = new QLabel( hbox );
+ m_hbox = new QHBox( this );
+ QLabel* lbl = new QLabel( m_hbox );
lbl->setText( tr("View as" ) );
- m_views = new QComboBox( hbox, "View As" );
+ m_views = new QComboBox( m_hbox, "View As" );
m_view= new QIconView( this );
@@ -450,6 +451,12 @@ void PIconView::slotViewChanged( int i) {
}
+ if (m_customWidget) {
+ delete m_customWidget;
+ m_customWidget = 0;
+ }
PDirView* cur = currentView();
- if (cur) delete cur;
+ if (cur) {
+ delete cur;
+ }
QString str = m_views->text(i);
ViewMap* map = viewMap();
@@ -469,4 +476,9 @@ void PIconView::slotViewChanged( int i) {
cur = (*(*map)[str])(*m_cfg);
setCurrentView( cur );
+ m_customWidget = cur->widget(m_hbox);
+ if (m_customWidget) {
+ odebug << "Got a widget" << oendl;
+ m_customWidget->show();
+ }
/* connect to the signals of the lister */
@@ -480,5 +492,5 @@ void PIconView::slotViewChanged( int i) {
connect(lis, SIGNAL(sig_end()) ,
this, SLOT(slotEnd()) );
-
+ connect(lis,SIGNAL(sig_reloadDir()),this,SLOT(slotReloadDir()));
/* reload now with default Path
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index b018c51..78dda58 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -98,4 +98,6 @@ private:
bool m_internalReset:1;
int m_iconsize;
+ QHBox*m_hbox;
+ QWidget*m_customWidget;
};
diff --git a/noncore/graphics/opie-eye/iface/dirlister.h b/noncore/graphics/opie-eye/iface/dirlister.h
index 68e8495..6997f52 100644
--- a/noncore/graphics/opie-eye/iface/dirlister.h
+++ b/noncore/graphics/opie-eye/iface/dirlister.h
@@ -45,4 +45,5 @@ signals:
void sig_fullInfo( const QString&, const QString& );
void sig_thumbNail( const QString&, const QPixmap& );
+ void sig_reloadDir();
protected:
diff --git a/noncore/graphics/opie-eye/iface/dirview.h b/noncore/graphics/opie-eye/iface/dirview.h
index 20d9062..3c05b60 100644
--- a/noncore/graphics/opie-eye/iface/dirview.h
+++ b/noncore/graphics/opie-eye/iface/dirview.h
@@ -13,4 +13,5 @@
class PInterfaceInfo;
class PDirLister;
+class QWidget;
struct PDirView {
@@ -19,4 +20,5 @@ struct PDirView {
virtual PInterfaceInfo* interfaceInfo()const = 0;
virtual PDirLister* dirLister()const = 0;
+ virtual QWidget* widget(QWidget*)=0;
};
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.cpp
index e55c27a..3f6044f 100644
--- a/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.cpp
+++ b/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.cpp
@@ -27,2 +27,7 @@ PDirLister* DCIM_DirView::dirLister()const {
return m_lister;
}
+
+QWidget* DCIM_DirView::widget(QWidget*)
+{
+ return 0L;
+}
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.h b/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.h
index 7fc38ec..8394b34 100644
--- a/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.h
+++ b/noncore/graphics/opie-eye/impl/dcim/dcim_dirview.h
@@ -18,5 +18,5 @@ struct DCIM_DirView : public PDirView {
PInterfaceInfo* interfaceInfo()const;
PDirLister * dirLister ()const;
-
+ virtual QWidget* widget(QWidget*);
private:
mutable PDirLister *m_lister;
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp b/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
index fc502d4..9c2c840 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
@@ -32,2 +32,7 @@ PDirLister* Dir_DirView::dirLister()const{
return m_lister;
}
+
+QWidget* Dir_DirView::widget(QWidget*)
+{
+ return 0L;
+} \ No newline at end of file
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_dirview.h b/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
index 89cf6c9..ae53a5c 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
+++ b/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
@@ -15,4 +15,5 @@ struct Dir_DirView : public PDirView {
PInterfaceInfo* interfaceInfo()const;
PDirLister* dirLister()const;
+ virtual QWidget* widget(QWidget*);
private:
bool m_cfg : 1;
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_dirview.cpp b/noncore/graphics/opie-eye/impl/doc/doc_dirview.cpp
index 0d6e25f..2cc897b 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_dirview.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_dirview.cpp
@@ -27,2 +27,9 @@ PDirLister* Doc_DirView::dirLister()const{
return m_lister;
}
+
+QWidget* Doc_DirView::widget(QWidget*parent)
+{
+ if (!m_lister)
+ dirLister();
+ return m_lister->widget(parent);
+}
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_dirview.h b/noncore/graphics/opie-eye/impl/doc/doc_dirview.h
index 3a2fd71..55ba6f2 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_dirview.h
+++ b/noncore/graphics/opie-eye/impl/doc/doc_dirview.h
@@ -8,4 +8,5 @@
#include <iface/dirview.h>
+class Doc_DirLister;
struct Doc_DirView : public PDirView {
@@ -15,7 +16,8 @@ struct Doc_DirView : public PDirView {
PInterfaceInfo* interfaceInfo()const;
PDirLister* dirLister()const;
+ QWidget* widget(QWidget*parent);
private:
bool m_cfg : 1;
- mutable PDirLister* m_lister;
+ mutable Doc_DirLister* m_lister;
mutable PInterfaceInfo *m_info;
};
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
index 722fb95..d60149f 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
@@ -13,4 +13,7 @@
#include <qpe/applnk.h>
+#include <qtopia/private/categories.h>
+#include <qtopia/categoryselect.h>
+
using namespace Opie::Core;
@@ -23,4 +26,5 @@ Doc_DirLister::Doc_DirLister()
{
/* connect the signals */
+ m_catFilter = 0;
SlaveMaster* master = SlaveMaster::self();
connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) );
@@ -41,4 +45,13 @@ QString Doc_DirLister::defaultPath()const {
}
+bool Doc_DirLister::matchCat(const AppLnk* app)
+{
+ if (!app) return false;
+ if (m_catFilter==0 || app->categories().contains(m_catFilter) || m_catFilter == -1 && app->categories().count() == 0 ) {
+ return true;
+ }
+ return false;
+}
+
QString Doc_DirLister::setStartPath(const QString&) {
static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png");
@@ -48,5 +61,6 @@ QString Doc_DirLister::setStartPath(const QString&) {
QListIterator<DocLnk> dit(ds.children());
for( ; dit.current(); ++dit) {
-// if (! (*dit)->isValid()) continue;
+ if (! (*dit)->isValid()) continue;
+ if (!matchCat((*dit))) continue;
m_namemap[(*dit)->name()]=(*dit)->file();
m_filemap[(*dit)->file()]=(*dit)->name();
@@ -148,2 +162,27 @@ QString Doc_DirLister::dirUp( const QString& p ) const{
return p;
}
+
+QWidget* Doc_DirLister::widget(QWidget*parent)
+{
+ CategorySelect * catmb = new CategorySelect(parent);
+ Categories cats( 0 );
+ cats.load( categoryFileName() );
+ QArray<int> vl( 0 );
+ catmb->setCategories( vl, "Document View", // No tr
+ "Document View" );
+ catmb->setRemoveCategoryEdit( TRUE );
+ catmb->setAllCategories( TRUE );
+ connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
+ catmb->setCurrentCategory(-2);
+ return catmb;
+}
+
+void Doc_DirLister::showCategory(int which)
+{
+ Categories cat;
+ cat.load( categoryFileName() );
+ m_catFilter = which==-2?0:which;
+ m_namemap.clear();
+ 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 5884a35..e148ac0 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h
@@ -12,4 +12,6 @@
class Config;
+class AppLnk;
+
class Doc_DirLister : public PDirLister {
Q_OBJECT
@@ -31,11 +33,16 @@ public:
virtual QString nameToFname(const QString&name)const;
QString dirUp( const QString& )const;
+ QWidget* widget(QWidget*parent);
private:
QMap<QString,QString> m_namemap,m_filemap;
+ int m_catFilter;
+ bool matchCat(const AppLnk* app);
+
protected slots:
virtual void slotFullInfo(const QString&, const QString&);
virtual void slotThumbInfo(const QString&, const QString&);
virtual void slotThumbNail(const QString&, const QPixmap&);
+ virtual void showCategory(int);
};