-rw-r--r-- | libopie/libopie.pro | 28 | ||||
-rw-r--r-- | libopie/ofileselector/odefaultfactories.cpp | 8 | ||||
-rw-r--r-- | libopie/ofileselector/odefaultfactories.h | 3 | ||||
-rw-r--r-- | libopie/ofileselector/ofiledialog.cpp | 2 | ||||
-rw-r--r-- | libopie/ofileselector/ofiledialog.h | 3 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 8 | ||||
-rw-r--r-- | libopie/todayplugininterface.h | 6 |
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,9 +1,21 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h \ | 3 | HEADERS = 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 \ |
@@ -30,10 +42,22 @@ HEADERS = ofontmenu.h \ | |||
30 | # pim/otodoaccesssql.h \ | 42 | # pim/otodoaccesssql.h \ |
31 | 43 | ||
32 | SOURCES = ofontmenu.cc \ | 44 | SOURCES = 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 \ |
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,14 +1,22 @@ | |||
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 | ||
6 | extern "C" { | 8 | extern "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 | ||
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 | |||
@@ -4,11 +4,14 @@ | |||
4 | #include "ofilefactory.h" | 4 | #include "ofilefactory.h" |
5 | 5 | ||
6 | extern "C" { | 6 | extern "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 | |||
@@ -83,9 +83,9 @@ QString OFileDialog::getOpenFileName(int selector, | |||
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 | } |
91 | QString OFileDialog::getSaveFileName(int selector, | 91 | QString OFileDialog::getSaveFileName(int selector, |
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 | |||
@@ -31,9 +31,10 @@ | |||
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 | ||
37 | class OFileDialog : public QDialog { | 38 | class OFileDialog : public QDialog { |
38 | Q_OBJECT | 39 | Q_OBJECT |
39 | public: | 40 | public: |
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 | |||
@@ -484,8 +484,10 @@ void OFileSelector::init() | |||
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 | } |
489 | void OFileSelector::updateMimes() | 491 | void OFileSelector::updateMimes() |
490 | { | 492 | { |
491 | if( m_autoMime ){ | 493 | if( m_autoMime ){ |
@@ -650,9 +652,9 @@ void OFileSelector::initToolbar() { | |||
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& )) ); |
@@ -973,11 +975,11 @@ void OFileSelector::setView( const QString& lis ) { | |||
973 | void OFileSelector::initFactory() { | 975 | void 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 | |||
980 | void OFileSelector::fillList() { | 982 | void OFileSelector::fillList() { |
981 | qWarning("fill list"); | 983 | qWarning("fill list"); |
982 | if (!m_viewCheck ) | 984 | if (!m_viewCheck ) |
983 | return; | 985 | return; |
diff --git a/libopie/todayplugininterface.h b/libopie/todayplugininterface.h index becb79c..b37a3ab 100644 --- a/libopie/todayplugininterface.h +++ b/libopie/todayplugininterface.h | |||
@@ -58,8 +58,14 @@ public: | |||
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; |