ljp (llornkcor) commited this. Fixes fileSaveas and filedialog positioning

when input method is opened. Added home buttons on each.

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
@@ -14,4 +14,5 @@
 #include "fileBrowser.h"
 #include <qpe/config.h>
+#include <qpe/resource.h>
 
 #include <qlistview.h>
@@ -26,10 +27,17 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     if ( !name )
   setName( "fileBrowser" );
-    resize( 236, 280 );
+    resize( 240, 280 );
     setCaption(tr( "Browse for file" ) );
     filterStr=filter;
+
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
-    dirLabel->setGeometry(10,4,230,30);
+    dirLabel->setGeometry(10,20,230,15);
+
+    QPushButton *homeButton;
+    homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
+    homeButton->setGeometry(200,4,25,25);
+    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+
     ListView = new QListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
@@ -52,4 +60,5 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     currentDir.setPath(QDir::currentDirPath());
     populateList();
+    move(0,15); 
 }
 
@@ -95,5 +104,5 @@ void fileBrowser::populateList()
     }
     ListView->setSorting( 2, FALSE);
-    dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
+    dirLabel->setText(currentDir.canonicalPath());
 }
 
@@ -163,2 +172,9 @@ void fileBrowser::OnOK()
   accept();
 }
+
+void fileBrowser::homeButtonPushed() {
+        chdir( QDir::homeDirPath().latin1() );
+        currentDir.cd(  QDir::homeDirPath(), TRUE);
+        populateList();
+        update();
+}
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
@@ -51,5 +51,5 @@ public:
 QListViewItem * item;
 public slots:
-
+void homeButtonPushed();
 private:
 
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
@@ -14,4 +14,6 @@
 #include "fileSaver.h"
 #include <qpe/config.h>
+#include <qpe/resource.h>
+
 #include <qpe/qpeapplication.h>
 #include <qlistview.h>
@@ -29,13 +31,17 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     if ( !name )
   setName( "fileSaver" );
-    resize( 236, 280 );
+    resize( 240, 280 );
     setCaption(tr( "Save file" ) );
     QFileInfo fi(currentFileName);
     QString tmpFileName=fi.fileName();
 //    qDebug( tmpFileName);
-
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
-    dirLabel->setGeometry(10,4,230,30);
+    dirLabel->setGeometry(10,20,230,15);
+
+    QPushButton *homeButton;
+    homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
+    homeButton->setGeometry(200,4,25,25);
+    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
 
     ListView = new QListView( this, "ListView" );
@@ -51,8 +57,8 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
 
     ListView->setAllColumnsShowFocus( TRUE );
-    ListView->setGeometry( QRect( 10, 35, 220, 160 ) );
+    ListView->setGeometry( QRect( 10,35,220,125));
 
     fileEdit= new QLineEdit(this);
-    fileEdit->setGeometry( QRect( 10, 200, 200, 22));
+    fileEdit->setGeometry( QRect( 10, 162, 205, 17));
 
     fileEdit->setText( tmpFileName);
@@ -60,5 +66,5 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     filePermCheck = new QCheckBox( this, "SetFilePerms" );
     filePermCheck->setText("set file permissions");
-    filePermCheck->setGeometry(10, 220, 150,22);
+    filePermCheck->setGeometry(10, 178, 150,17);
       // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
@@ -69,4 +75,6 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     currentDir.setPath( QDir::currentDirPath() );
     populateList();
+    move(0,15);
+
 }
 
@@ -110,5 +118,5 @@ void fileSaver::populateList()
     }
     ListView->setSorting( 2, FALSE);
-    dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
+    dirLabel->setText(currentDir.canonicalPath());
 
 
@@ -187,2 +195,9 @@ void fileSaver::accept() {
     done(1);
 }
+
+void fileSaver::homeButtonPushed() {
+        chdir( QDir::homeDirPath().latin1() );
+        currentDir.cd(  QDir::homeDirPath(), TRUE);
+        populateList();
+        update();
+}
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
@@ -56,5 +56,5 @@ public:
 QListViewItem * item;
 public slots:
-
+void homeButtonPushed();
 private:
 
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
@@ -890,4 +890,5 @@ void TextEdit::editDelete()
               doc->removeFiles();
               clear();
+              setCaption( tr("Text Editor") );
           }
           break;