summaryrefslogtreecommitdiff
Unidiff
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,11 +1,23 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on release 2CONFIG += qte warn_on release
3HEADERS = ofontmenu.h \ 3HEADERS = ofontmenu.h \
4 ocolorbutton.h \ 4 ocolorbutton.h \
5 ofiledialog.h ofileselector.h tododb.h \ 5 ofileselector/odefaultfactories.h \
6 ofileselector/ofiledialog.h \
7 ofileselector/ofilelistview.h \
8 ofileselector/ofileiconview.h \
9 ofileselector/ofileselector.h \
10 ofileselector/ofileselectoritem.h \
11 ofileselector/ofileselectoriconitem.h \
12 ofileselector/ofileselectormain.h \
13 ofileselector/ofileview.h \
14 ofileselector/olister.h \
15 ofileselector/olocallister.h \
16 ofileselector/opixmapprovider.h \
17 tododb.h \
6 ocheckitem.h todoevent.h todoresource.h \ 18 ocheckitem.h todoevent.h todoresource.h \
7 todovcalresource.h xmltree.h \ 19 todovcalresource.h xmltree.h \
8 colordialog.h colorpopupmenu.h \ 20 colordialog.h colorpopupmenu.h \
9 oclickablelabel.h oprocctrl.h \ 21 oclickablelabel.h oprocctrl.h \
10 oprocess.h odevice.h \ 22 oprocess.h odevice.h \
11 otimepicker.h otabwidget.h \ 23 otimepicker.h otabwidget.h \
@@ -28,14 +40,26 @@ HEADERS = ofontmenu.h \
28 pim/orecur.h \ 40 pim/orecur.h \
29 orecurrancewidget.h 41 orecurrancewidget.h
30# pim/otodoaccesssql.h \ 42# pim/otodoaccesssql.h \
31 43
32SOURCES = ofontmenu.cc \ 44SOURCES = ofontmenu.cc \
33 ocolorbutton.cpp \ 45 ocolorbutton.cpp \
46 ofileselector/odefaultfactories.cpp \
47 ofileselector/ofiledialog.cpp \
48 ofileselector/ofilefactory.cpp \
49 ofileselector/ofilelistview.cpp \
50 ofileselector/ofileiconview.cpp \
51 ofileselector/ofileselector.cpp \
52 ofileselector/ofileselectoritem.cpp \
53 ofileselector/ofileselectoriconitem.cpp \
54 ofileselector/ofileselectormain.cpp \
55 ofileselector/ofileview.cpp \
56 ofileselector/olister.cpp \
57 ofileselector/olocallister.cpp \
58 ofileselector/opixmapprovider.cpp \
34 xmltree.cc \ 59 xmltree.cc \
35 ofiledialog.cc ofileselector.cc \
36 ocheckitem.cpp tododb.cpp todoevent.cpp \ 60 ocheckitem.cpp tododb.cpp todoevent.cpp \
37 todovcalresource.cpp colordialog.cpp \ 61 todovcalresource.cpp colordialog.cpp \
38 colorpopupmenu.cpp oclickablelabel.cpp \ 62 colorpopupmenu.cpp oclickablelabel.cpp \
39 oprocctrl.cpp oprocess.cpp \ 63 oprocctrl.cpp oprocess.cpp \
40 odevice.cpp otimepicker.cpp \ 64 odevice.cpp otimepicker.cpp \
41 otabwidget.cpp otabbar.cpp \ 65 otabwidget.cpp otabbar.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 @@
1#include "ofilelistview.h" 1#include "ofilelistview.h"
2#include "ofileiconview.h"
2#include "olocallister.h" 3#include "olocallister.h"
3 4
5
4#include "odefaultfactories.h" 6#include "odefaultfactories.h"
5 7
6extern "C" { 8extern "C" {
7 9
10
11 OFileView* newFileIconView( OFileSelector* sel, QWidget* parent ) {
12 return new OFileIconView( parent, sel );
13 }
14
8 OFileView* newFileListView( OFileSelector* sel, QWidget* par ) { 15 OFileView* newFileListView( OFileSelector* sel, QWidget* par ) {
9 return new OFileListView(par, sel ); 16 return new OFileListView(par, sel );
10 } 17 }
18
11 OLister* newLocalLister( OFileSelector* sel) { 19 OLister* newLocalLister( OFileSelector* sel) {
12 return new OLocalLister( sel ); 20 return new OLocalLister( sel );
13 } 21 }
14 22
15}; 23};
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
@@ -2,13 +2,16 @@
2#define OPIE_DEFAULT_FACTORIES_H 2#define OPIE_DEFAULT_FACTORIES_H
3 3
4#include "ofilefactory.h" 4#include "ofilefactory.h"
5 5
6extern "C" { 6extern "C" {
7 7
8 OFileView* newFileIconView( OFileSelector*, QWidget* parent );
8 OFileView* newFileListView( OFileSelector*, QWidget* parent ); 9 OFileView* newFileListView( OFileSelector*, QWidget* parent );
10
9 OLister* newLocalLister(OFileSelector* ); 11 OLister* newLocalLister(OFileSelector* );
10 12
13
11}; 14};
12 15
13 16
14#endif 17#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
@@ -81,13 +81,13 @@ QString OFileDialog::getOpenFileName(int selector,
81{ 81{
82 QString ret; 82 QString ret;
83 OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption, 83 OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
84 wid, OFileSelector::Open, selector, startDir, file, mimes); 84 wid, OFileSelector::Open, selector, startDir, file, mimes);
85 dlg.showMaximized(); 85 dlg.showMaximized();
86 if( dlg.exec() ) 86 if( dlg.exec() )
87 ret = dlg.fileName(); 87 ret = dlg.fileName();
88 88
89 return ret; 89 return ret;
90} 90}
91QString OFileDialog::getSaveFileName(int selector, 91QString OFileDialog::getSaveFileName(int selector,
92 const QString &startDir, 92 const QString &startDir,
93 const QString &file, 93 const QString &file,
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
@@ -29,13 +29,14 @@
29 29
30#ifndef OpieFileDialog_h 30#ifndef OpieFileDialog_h
31#define OpieFileDialog_h 31#define OpieFileDialog_h
32 32
33#include <qdialog.h> 33#include <qdialog.h>
34 34
35#include <opie/ofileselector.h> 35//#include <opie/ofileselector.h>
36#include "ofileselector.h"
36 37
37class OFileDialog : public QDialog { 38class OFileDialog : public QDialog {
38 Q_OBJECT 39 Q_OBJECT
39 public: 40 public:
40 OFileDialog(const QString &caption, 41 OFileDialog(const QString &caption,
41 QWidget *, int mode, int selector, 42 QWidget *, int mode, int selector,
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
@@ -482,12 +482,14 @@ void OFileSelector::init()
482 482
483 if( m_shYesNo ) // the Yes No button row 483 if( m_shYesNo ) // the Yes No button row
484 initializeYes( ); 484 initializeYes( );
485 485
486 if (m_selector != Normal ) 486 if (m_selector != Normal )
487 reparse(); 487 reparse();
488
489 showMaximized();
488} 490}
489void OFileSelector::updateMimes() 491void OFileSelector::updateMimes()
490{ 492{
491 if( m_autoMime ){ 493 if( m_autoMime ){
492 m_mimetypes.clear(); 494 m_mimetypes.clear();
493 m_mimetypes.insert( tr("All"), QString::null ); 495 m_mimetypes.insert( tr("All"), QString::null );
@@ -648,13 +650,13 @@ void OFileSelector::initToolbar() {
648 m_pseudoLayout = new QVBoxLayout( m_pseudo ); 650 m_pseudoLayout = new QVBoxLayout( m_pseudo );
649 651
650 m_boxToolbar = new QHBox( m_pseudo ); 652 m_boxToolbar = new QHBox( m_pseudo );
651 m_boxToolbar->setSpacing( 0 ); 653 m_boxToolbar->setSpacing( 0 );
652 654
653 // tool bar members now 655 // tool bar members now
654 m_location = new QComboBox( m_boxToolbar ); 656 m_location = new QComboBox( m_boxToolbar );
655 m_location->setEditable( TRUE ); 657 m_location->setEditable( TRUE );
656 m_location->setDuplicatesEnabled( FALSE ); 658 m_location->setDuplicatesEnabled( FALSE );
657 connect( m_location, SIGNAL(activated(const QString& ) ), 659 connect( m_location, SIGNAL(activated(const QString& ) ),
658 this, SLOT(slotLocationActivated(const QString& )) ); 660 this, SLOT(slotLocationActivated(const QString& )) );
659 connect( m_location->lineEdit(), SIGNAL(returnPressed() ) , 661 connect( m_location->lineEdit(), SIGNAL(returnPressed() ) ,
660 this, SLOT(locationComboChanged() ) ); 662 this, SLOT(locationComboChanged() ) );
@@ -971,15 +973,15 @@ void OFileSelector::setView( const QString& lis ) {
971 * the factory 973 * the factory
972 */ 974 */
973void OFileSelector::initFactory() { 975void OFileSelector::initFactory() {
974 m_fileFactory = new OFileFactory(); 976 m_fileFactory = new OFileFactory();
975 m_fileFactory->addLister(tr("Files"), newLocalLister ); 977 m_fileFactory->addLister(tr("Files"), newLocalLister );
976 m_fileFactory->addView(tr("List View"), newFileListView ); 978 m_fileFactory->addView(tr("List View"), newFileListView );
977 /* the factory is just a dummy */ 979 m_fileFactory->addView(tr("Documents"), newFileIconView );
978 m_fileFactory->addView(tr("Documents"), newFileListView );
979} 980}
981
980void OFileSelector::fillList() { 982void OFileSelector::fillList() {
981 qWarning("fill list"); 983 qWarning("fill list");
982 if (!m_viewCheck ) 984 if (!m_viewCheck )
983 return; 985 return;
984 986
985 m_viewCheck->clear(); 987 m_viewCheck->clear();
diff --git a/libopie/todayplugininterface.h b/libopie/todayplugininterface.h
index becb79c..b37a3ab 100644
--- a/libopie/todayplugininterface.h
+++ b/libopie/todayplugininterface.h
@@ -56,12 +56,18 @@ public:
56 56
57 /** 57 /**
58 * The application that should be assigned to the button (pixmap) 58 * The application that should be assigned to the button (pixmap)
59 */ 59 */
60 virtual QString appName() const = 0; 60 virtual QString appName() const = 0;
61 61
62
63 /**
64 * If the plugin should take part in the periodic refresh
65 */
66 virtual bool excludeFromRefresh() const = 0;
67
62 /** 68 /**
63 * minimum height the plugin at least should have 69 * minimum height the plugin at least should have
64 */ 70 */
65 // virtual int minHeight() const = 0; 71 // virtual int minHeight() const = 0;
66 72
67 /** 73 /**