summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ofileselector/ofileselector.cpp15
-rw-r--r--libopie/ofileselector/olister.cpp10
-rw-r--r--libopie/ofileselector/olister.h18
-rw-r--r--libopie/ofileselector/olocallister.cpp29
-rw-r--r--libopie/ofileselector/olocallister.h5
5 files changed, 62 insertions, 15 deletions
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 255e79e..9ce07dd 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -261,22 +261,16 @@ void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ )
m_showPopup = true;
*/
}
-//void OFileSelector::updateL
-
QString OFileSelector::selectedName() const
{
QString name;
if( m_selector == Normal ){
DocLnk lnk = m_select->selectedDocument();
name = lnk.file();
}else {
- if ( m_shLne ) {
- name = m_currentDir + "/" +m_edit->text();
- }else{
- name = m_currentDir + "/" + currentView()->selectedName();
- }
+ name = currentLister()->selectedName();
}
return name;
}
QStringList OFileSelector::selectedNames()const
@@ -421,9 +415,8 @@ void OFileSelector::slotLocationActivated(const QString &file)
if ( info.isFile() )
cd(info.dirPath( TRUE ) ); //absolute
else
cd(name );
- reparse();
}
void OFileSelector::slotInsertLocationPath(const QString &currentPath, int count)
{
QStringList pathList;
@@ -453,10 +446,8 @@ void OFileSelector::locationComboChanged()
if (info.isFile() )
cd(info.dirPath(TRUE) ); //absolute path
else
cd( m_location->lineEdit()->text() );
-
- reparse();
}
void OFileSelector::init()
{
initFactory();
@@ -853,18 +844,18 @@ void OFileSelector::slotDelete()
*/
}
void OFileSelector::cdUP()
{
+ // FIXME won't work on non filesystem based systems
+ // better call the Olister
QDir dir( m_currentDir );
dir.cdUp();
if(dir.exists() ){
m_currentDir = dir.absPath();
reparse();
int count = m_location->count();
slotInsertLocationPath( m_currentDir, count);
m_location->setCurrentItem( indexByString( m_location, m_currentDir));
- //this wont work in all instances
- // FIXME
}
}
void OFileSelector::slotHome()
{
diff --git a/libopie/ofileselector/olister.cpp b/libopie/ofileselector/olister.cpp
index ea09940..aaaf6a2 100644
--- a/libopie/ofileselector/olister.cpp
+++ b/libopie/ofileselector/olister.cpp
@@ -1,5 +1,6 @@
#include <qcombobox.h>
+#include <qlineedit.h>
#include "olister.h"
#include "ofileview.h"
#include "opixmapprovider.h"
@@ -111,8 +112,11 @@ void OLister::addSymlink( const QString& mine,
}
OFileSelector* OLister::view() {
return m_view;
}
+OFileSelector* OLister::view()const {
+ return m_view;
+}
OPixmapProvider* OLister::provider() {
return m_prov;
}
bool OLister::compliesMime( const QString& mime ) {
@@ -168,4 +172,10 @@ QString OListerCmbAccess::currentText()const {
str = m_cmb->currentText();
return str;
}
+QString OLister::lineEdit()const {
+ if ( view()->m_shLne )
+ return view()->m_edit->text();
+
+ return QString::null;
+}
diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h
index cd84316..4adb9f8 100644
--- a/libopie/ofileselector/olister.h
+++ b/libopie/ofileselector/olister.h
@@ -22,9 +22,13 @@ class OListerCmbAccess;
class OLister {
public:
OLister( OFileSelector* );
virtual ~OLister();
- virtual void reparse(const QString& path) = 0;
+
+ /**
+ * if path == QString::null reread current dir
+ */
+ virtual void reparse(const QString& path = QString::null ) = 0;
/**
* return a list of available mimetypes
*/
@@ -34,8 +38,10 @@ public:
/* some way a slot */
virtual void fileSelected( const QString& dir, const QString& file, const QString& extra ) = 0;
virtual void changedDir( const QString& dir, const QString& file, const QString& extra ) = 0;
+ virtual QString selectedName()const = 0;
+ virtual QStringList selectedNames()const = 0;
protected:
/**
* I hate too big classes
* this is a way to group
@@ -76,11 +82,21 @@ protected:
const QString& name,
const QString& extra = QString::null,
bool isSymlink = FALSE );
OFileSelector* view();
+ OFileSelector* view()const;
OPixmapProvider* provider();
void internFileSelected( const QString& file );
void internChangedDir( const QString& dir );
+
+ /**
+ * try to take
+ * the text from the mainwindows
+ * lineedit
+ * if it's not available QString::null
+ * will be returned
+ */
+ QString lineEdit()const;
private:
OFileSelector* m_view;
OPixmapProvider* m_prov;
OListerCmbAccess* m_acc;
diff --git a/libopie/ofileselector/olocallister.cpp b/libopie/ofileselector/olocallister.cpp
index 5d7884d..4d36d64 100644
--- a/libopie/ofileselector/olocallister.cpp
+++ b/libopie/ofileselector/olocallister.cpp
@@ -4,13 +4,15 @@
#include <qpe/mimetype.h>
#include "ofileselector.h"
+#include "ofileview.h"
#include "olocallister.h"
OLocalLister::OLocalLister( OFileSelector* file )
: OLister( file )
{
+ m_dir = QDir::homeDirPath();
}
OLocalLister::~OLocalLister() {
}
@@ -50,11 +52,14 @@ QMap<QString, QStringList> OLocalLister::mimeTypes( const QString& curDir ) {
* filter filters
* filter files
* filter mimetypes
*/
-void OLocalLister::reparse( const QString& path ) {
+void OLocalLister::reparse( const QString& pa ) {
+ if (!pa.isEmpty() )
+ m_dir = pa;
+
QString currentMimeType;
- QDir dir( path );
+ QDir dir( m_dir );
dir.setSorting( view()->sorting() );
dir.setFilter( view()->filter() );
@@ -122,4 +127,24 @@ void OLocalLister::fileSelected( const QString& dir, const QString& file, const
}
void OLocalLister::changedDir( const QString& dir, const QString& file, const QString& ) {
internChangedDir( dir + "/" + file );
}
+/*
+ * assemble the the Url now
+ */
+QString OLocalLister::selectedName()const {
+ QString str = m_dir;
+ QString name = lineEdit();
+
+ if ( name.isEmpty() )
+ name = view()->currentView()->selectedName();
+
+ str += "/" + name;
+
+ return str;
+}
+QStringList OLocalLister::selectedNames()const {
+ QStringList list;
+ list << selectedName();
+
+ return list;
+}
diff --git a/libopie/ofileselector/olocallister.h b/libopie/ofileselector/olocallister.h
index 01e6f3c..0cdf51f 100644
--- a/libopie/ofileselector/olocallister.h
+++ b/libopie/ofileselector/olocallister.h
@@ -10,7 +10,12 @@ public:
void reparse( const QString& path );
QMap<QString, QStringList> mimeTypes(const QString& dir );
void fileSelected( const QString& dir, const QString& file, const QString& );
void changedDir( const QString& dir, const QString& file,const QString& );
+ QString selectedName()const;
+ QStringList selectedNames()const;
+
+private:
+ QString m_dir;
};
#endif