summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp22
-rw-r--r--core/apps/textedit/fileBrowser.h2
-rw-r--r--core/apps/textedit/fileSaver.cpp29
-rw-r--r--core/apps/textedit/fileSaver.h2
-rw-r--r--core/apps/textedit/textedit.cpp1
5 files changed, 44 insertions, 12 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 2275388..3e3cc3a 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -13,6 +13,7 @@
13****************************************************************************/ 13****************************************************************************/
14#include "fileBrowser.h" 14#include "fileBrowser.h"
15#include <qpe/config.h> 15#include <qpe/config.h>
16#include <qpe/resource.h>
16 17
17#include <qlistview.h> 18#include <qlistview.h>
18#include <qpushbutton.h> 19#include <qpushbutton.h>
@@ -25,12 +26,19 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
25{ 26{
26 if ( !name ) 27 if ( !name )
27 setName( "fileBrowser" ); 28 setName( "fileBrowser" );
28 resize( 236, 280 ); 29 resize( 240, 280 );
29 setCaption(tr( "Browse for file" ) ); 30 setCaption(tr( "Browse for file" ) );
30 filterStr=filter; 31 filterStr=filter;
32
31 dirLabel = new QLabel(this, "DirLabel"); 33 dirLabel = new QLabel(this, "DirLabel");
32 dirLabel->setText(currentDir.canonicalPath()); 34 dirLabel->setText(currentDir.canonicalPath());
33 dirLabel->setGeometry(10,4,230,30); 35 dirLabel->setGeometry(10,20,230,15);
36
37 QPushButton *homeButton;
38 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
39 homeButton->setGeometry(200,4,25,25);
40 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
41
34 ListView = new QListView( this, "ListView" ); 42 ListView = new QListView( this, "ListView" );
35 ListView->addColumn( tr( "Name" ) ); 43 ListView->addColumn( tr( "Name" ) );
36 ListView->setColumnWidth(0,140); 44 ListView->setColumnWidth(0,140);
@@ -51,6 +59,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
51 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); 59 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
52 currentDir.setPath(QDir::currentDirPath()); 60 currentDir.setPath(QDir::currentDirPath());
53 populateList(); 61 populateList();
62 move(0,15);
54} 63}
55 64
56fileBrowser::~fileBrowser() 65fileBrowser::~fileBrowser()
@@ -94,7 +103,7 @@ void fileBrowser::populateList()
94 ++it; 103 ++it;
95 } 104 }
96 ListView->setSorting( 2, FALSE); 105 ListView->setSorting( 2, FALSE);
97 dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath()); 106 dirLabel->setText(currentDir.canonicalPath());
98} 107}
99 108
100void fileBrowser::upDir() 109void fileBrowser::upDir()
@@ -162,3 +171,10 @@ void fileBrowser::OnOK()
162 } 171 }
163 accept(); 172 accept();
164} 173}
174
175void fileBrowser::homeButtonPushed() {
176 chdir( QDir::homeDirPath().latin1() );
177 currentDir.cd( QDir::homeDirPath(), TRUE);
178 populateList();
179 update();
180}
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index 17ed862..c0e1d4a 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -50,7 +50,7 @@ public:
50 50
51QListViewItem * item; 51QListViewItem * item;
52public slots: 52public slots:
53 53void homeButtonPushed();
54private: 54private:
55 55
56private slots: 56private slots:
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index 9e9e863..de594aa 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -13,6 +13,8 @@
13****************************************************************************/ 13****************************************************************************/
14#include "fileSaver.h" 14#include "fileSaver.h"
15#include <qpe/config.h> 15#include <qpe/config.h>
16#include <qpe/resource.h>
17
16#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
17#include <qlistview.h> 19#include <qlistview.h>
18#include <qpushbutton.h> 20#include <qpushbutton.h>
@@ -28,15 +30,19 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl
28{ 30{
29 if ( !name ) 31 if ( !name )
30 setName( "fileSaver" ); 32 setName( "fileSaver" );
31 resize( 236, 280 ); 33 resize( 240, 280 );
32 setCaption(tr( "Save file" ) ); 34 setCaption(tr( "Save file" ) );
33 QFileInfo fi(currentFileName); 35 QFileInfo fi(currentFileName);
34 QString tmpFileName=fi.fileName(); 36 QString tmpFileName=fi.fileName();
35// qDebug( tmpFileName); 37// qDebug( tmpFileName);
36
37 dirLabel = new QLabel(this, "DirLabel"); 38 dirLabel = new QLabel(this, "DirLabel");
38 dirLabel->setText(currentDir.canonicalPath()); 39 dirLabel->setText(currentDir.canonicalPath());
39 dirLabel->setGeometry(10,4,230,30); 40 dirLabel->setGeometry(10,20,230,15);
41
42 QPushButton *homeButton;
43 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
44 homeButton->setGeometry(200,4,25,25);
45 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
40 46
41 ListView = new QListView( this, "ListView" ); 47 ListView = new QListView( this, "ListView" );
42 ListView->addColumn( tr( "Name" ) ); 48 ListView->addColumn( tr( "Name" ) );
@@ -50,16 +56,16 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl
50// ListView->setSelectionMode(QListView::Extended); 56// ListView->setSelectionMode(QListView::Extended);
51 57
52 ListView->setAllColumnsShowFocus( TRUE ); 58 ListView->setAllColumnsShowFocus( TRUE );
53 ListView->setGeometry( QRect( 10, 35, 220, 160 ) ); 59 ListView->setGeometry( QRect( 10,35,220,125));
54 60
55 fileEdit= new QLineEdit(this); 61 fileEdit= new QLineEdit(this);
56 fileEdit->setGeometry( QRect( 10, 200, 200, 22)); 62 fileEdit->setGeometry( QRect( 10, 162, 205, 17));
57 63
58 fileEdit->setText( tmpFileName); 64 fileEdit->setText( tmpFileName);
59 65
60 filePermCheck = new QCheckBox( this, "SetFilePerms" ); 66 filePermCheck = new QCheckBox( this, "SetFilePerms" );
61 filePermCheck->setText("set file permissions"); 67 filePermCheck->setText("set file permissions");
62 filePermCheck->setGeometry(10, 220, 150,22); 68 filePermCheck->setGeometry(10, 178, 150,17);
63 // signals and slots connections 69 // signals and slots connections
64 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); 70 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
65 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); 71 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
@@ -68,6 +74,8 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl
68// qDebug( tmpFileName); 74// qDebug( tmpFileName);
69 currentDir.setPath( QDir::currentDirPath() ); 75 currentDir.setPath( QDir::currentDirPath() );
70 populateList(); 76 populateList();
77 move(0,15);
78
71} 79}
72 80
73fileSaver::~fileSaver() 81fileSaver::~fileSaver()
@@ -109,7 +117,7 @@ void fileSaver::populateList()
109 ++it; 117 ++it;
110 } 118 }
111 ListView->setSorting( 2, FALSE); 119 ListView->setSorting( 2, FALSE);
112 dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath()); 120 dirLabel->setText(currentDir.canonicalPath());
113 121
114 122
115} 123}
@@ -186,3 +194,10 @@ void fileSaver::accept() {
186 qDebug("going to save "+selectedFileName); 194 qDebug("going to save "+selectedFileName);
187 done(1); 195 done(1);
188} 196}
197
198void fileSaver::homeButtonPushed() {
199 chdir( QDir::homeDirPath().latin1() );
200 currentDir.cd( QDir::homeDirPath(), TRUE);
201 populateList();
202 update();
203}
diff --git a/core/apps/textedit/fileSaver.h b/core/apps/textedit/fileSaver.h
index ce4493e..526085d 100644
--- a/core/apps/textedit/fileSaver.h
+++ b/core/apps/textedit/fileSaver.h
@@ -55,7 +55,7 @@ public:
55 55
56QListViewItem * item; 56QListViewItem * item;
57public slots: 57public slots:
58 58void homeButtonPushed();
59private: 59private:
60 60
61private slots: 61private slots:
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index bc975f3..72cc4d1 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -889,6 +889,7 @@ void TextEdit::editDelete()
889 if(doc) { 889 if(doc) {
890 doc->removeFiles(); 890 doc->removeFiles();
891 clear(); 891 clear();
892 setCaption( tr("Text Editor") );
892 } 893 }
893 break; 894 break;
894 case 1: 895 case 1: