summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro28
-rw-r--r--libopie/ofileselector/odefaultfactories.cpp8
-rw-r--r--libopie/ofileselector/odefaultfactories.h3
-rw-r--r--libopie/ofileselector/ofiledialog.cpp2
-rw-r--r--libopie/ofileselector/ofiledialog.h3
-rw-r--r--libopie/ofileselector/ofileselector.cpp8
-rw-r--r--libopie/todayplugininterface.h6
7 files changed, 51 insertions, 7 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index df9c40a..a216cca 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,13 +1,25 @@
TEMPLATE = lib
CONFIG += qte warn_on release
HEADERS = ofontmenu.h \
ocolorbutton.h \
- ofiledialog.h ofileselector.h tododb.h \
+ ofileselector/odefaultfactories.h \
+ ofileselector/ofiledialog.h \
+ ofileselector/ofilelistview.h \
+ ofileselector/ofileiconview.h \
+ ofileselector/ofileselector.h \
+ ofileselector/ofileselectoritem.h \
+ ofileselector/ofileselectoriconitem.h \
+ ofileselector/ofileselectormain.h \
+ ofileselector/ofileview.h \
+ ofileselector/olister.h \
+ ofileselector/olocallister.h \
+ ofileselector/opixmapprovider.h \
+ tododb.h \
ocheckitem.h todoevent.h todoresource.h \
todovcalresource.h xmltree.h \
colordialog.h colorpopupmenu.h \
oclickablelabel.h oprocctrl.h \
oprocess.h odevice.h \
otimepicker.h otabwidget.h \
otabbar.h otabinfo.h \
ofontselector.h \
@@ -26,18 +38,30 @@ HEADERS = ofontmenu.h \
pim/opimcache.h \
pim/otodoaccessvcal.h \
pim/orecur.h \
orecurrancewidget.h
# pim/otodoaccesssql.h \
SOURCES = ofontmenu.cc \
ocolorbutton.cpp \
+ ofileselector/odefaultfactories.cpp \
+ ofileselector/ofiledialog.cpp \
+ ofileselector/ofilefactory.cpp \
+ ofileselector/ofilelistview.cpp \
+ ofileselector/ofileiconview.cpp \
+ ofileselector/ofileselector.cpp \
+ ofileselector/ofileselectoritem.cpp \
+ ofileselector/ofileselectoriconitem.cpp \
+ ofileselector/ofileselectormain.cpp \
+ ofileselector/ofileview.cpp \
+ ofileselector/olister.cpp \
+ ofileselector/olocallister.cpp \
+ ofileselector/opixmapprovider.cpp \
xmltree.cc \
- ofiledialog.cc ofileselector.cc \
ocheckitem.cpp tododb.cpp todoevent.cpp \
todovcalresource.cpp colordialog.cpp \
colorpopupmenu.cpp oclickablelabel.cpp \
oprocctrl.cpp oprocess.cpp \
odevice.cpp otimepicker.cpp \
otabwidget.cpp otabbar.cpp \
ofontselector.cpp \
pim/otodo.cpp \
diff --git a/libopie/ofileselector/odefaultfactories.cpp b/libopie/ofileselector/odefaultfactories.cpp
index c41fbca..c8efffb 100644
--- a/libopie/ofileselector/odefaultfactories.cpp
+++ b/libopie/ofileselector/odefaultfactories.cpp
@@ -1,15 +1,23 @@
#include "ofilelistview.h"
+#include "ofileiconview.h"
#include "olocallister.h"
+
#include "odefaultfactories.h"
extern "C" {
+
+ OFileView* newFileIconView( OFileSelector* sel, QWidget* parent ) {
+ return new OFileIconView( parent, sel );
+ }
+
OFileView* newFileListView( OFileSelector* sel, QWidget* par ) {
return new OFileListView(par, sel );
}
+
OLister* newLocalLister( OFileSelector* sel) {
return new OLocalLister( sel );
}
};
diff --git a/libopie/ofileselector/odefaultfactories.h b/libopie/ofileselector/odefaultfactories.h
index eb698d3..b4c35af 100644
--- a/libopie/ofileselector/odefaultfactories.h
+++ b/libopie/ofileselector/odefaultfactories.h
@@ -1,14 +1,17 @@
#ifndef OPIE_DEFAULT_FACTORIES_H
#define OPIE_DEFAULT_FACTORIES_H
#include "ofilefactory.h"
extern "C" {
+ OFileView* newFileIconView( OFileSelector*, QWidget* parent );
OFileView* newFileListView( OFileSelector*, QWidget* parent );
+
OLister* newLocalLister(OFileSelector* );
+
};
#endif
diff --git a/libopie/ofileselector/ofiledialog.cpp b/libopie/ofileselector/ofiledialog.cpp
index 430def2..d137c66 100644
--- a/libopie/ofileselector/ofiledialog.cpp
+++ b/libopie/ofileselector/ofiledialog.cpp
@@ -79,17 +79,17 @@ QString OFileDialog::getOpenFileName(int selector,
QWidget *wid,
const QString &caption )
{
QString ret;
OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
wid, OFileSelector::Open, selector, startDir, file, mimes);
dlg.showMaximized();
if( dlg.exec() )
- ret = dlg.fileName();
+ ret = dlg.fileName();
return ret;
}
QString OFileDialog::getSaveFileName(int selector,
const QString &startDir,
const QString &file,
const MimeTypes &mimes,
QWidget *wid,
diff --git a/libopie/ofileselector/ofiledialog.h b/libopie/ofileselector/ofiledialog.h
index e14253c..e368e96 100644
--- a/libopie/ofileselector/ofiledialog.h
+++ b/libopie/ofileselector/ofiledialog.h
@@ -27,17 +27,18 @@
*/
#ifndef OpieFileDialog_h
#define OpieFileDialog_h
#include <qdialog.h>
-#include <opie/ofileselector.h>
+//#include <opie/ofileselector.h>
+#include "ofileselector.h"
class OFileDialog : public QDialog {
Q_OBJECT
public:
OFileDialog(const QString &caption,
QWidget *, int mode, int selector,
const QString &dirName,
const QString &fileName = QString::null,
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 9ce07dd..c6e923f 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -480,16 +480,18 @@ void OFileSelector::init()
if( m_shPerm ) // the Permission QCheckBox
initializePerm();
if( m_shYesNo ) // the Yes No button row
initializeYes( );
if (m_selector != Normal )
reparse();
+
+ showMaximized();
}
void OFileSelector::updateMimes()
{
if( m_autoMime ){
m_mimetypes.clear();
m_mimetypes.insert( tr("All"), QString::null );
if( m_selector == Normal ){
DocLnkSet set;
@@ -646,17 +648,17 @@ void OFileSelector::initToolbar() {
qWarning( "toolbar" );
m_pseudo = new QWidget( m_mainView, "Pseudo Widget" );
m_pseudoLayout = new QVBoxLayout( m_pseudo );
m_boxToolbar = new QHBox( m_pseudo );
m_boxToolbar->setSpacing( 0 );
// tool bar members now
- m_location = new QComboBox( m_boxToolbar );
+ m_location = new QComboBox( m_boxToolbar );
m_location->setEditable( TRUE );
m_location->setDuplicatesEnabled( FALSE );
connect( m_location, SIGNAL(activated(const QString& ) ),
this, SLOT(slotLocationActivated(const QString& )) );
connect( m_location->lineEdit(), SIGNAL(returnPressed() ) ,
this, SLOT(locationComboChanged() ) );
// UP Button
@@ -969,19 +971,19 @@ void OFileSelector::setView( const QString& lis ) {
}
/*
* the factory
*/
void OFileSelector::initFactory() {
m_fileFactory = new OFileFactory();
m_fileFactory->addLister(tr("Files"), newLocalLister );
m_fileFactory->addView(tr("List View"), newFileListView );
- /* the factory is just a dummy */
- m_fileFactory->addView(tr("Documents"), newFileListView );
+ m_fileFactory->addView(tr("Documents"), newFileIconView );
}
+
void OFileSelector::fillList() {
qWarning("fill list");
if (!m_viewCheck )
return;
m_viewCheck->clear();
QStringList list = factory()->views();
qWarning("views: " + list.join(";") );
diff --git a/libopie/todayplugininterface.h b/libopie/todayplugininterface.h
index becb79c..b37a3ab 100644
--- a/libopie/todayplugininterface.h
+++ b/libopie/todayplugininterface.h
@@ -54,16 +54,22 @@ public:
*/
virtual TodayConfigWidget* configWidget( QWidget * ) = 0;
/**
* The application that should be assigned to the button (pixmap)
*/
virtual QString appName() const = 0;
+
+ /**
+ * If the plugin should take part in the periodic refresh
+ */
+ virtual bool excludeFromRefresh() const = 0;
+
/**
* minimum height the plugin at least should have
*/
// virtual int minHeight() const = 0;
/**
* maximum height that should be used before starting scrolling
*/