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

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

5 files changed, 45 insertions, 13 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
@@ -8,34 +8,42 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileBrowser.h"
 #include <qpe/config.h>
+#include <qpe/resource.h>
 
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <unistd.h>
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter )
     : QDialog( parent, name, modal, fl )
 {
     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" ) );
     ListView->setColumnWidth(0,140);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,59);
 //      ListView->addColumn( tr( "" ) );
     ListView->setColumnWidthMode(0,QListView::Manual);
@@ -46,16 +54,17 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setGeometry( QRect( 10, 35, 220, 240 ) );
 
     // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     currentDir.setPath(QDir::currentDirPath());
     populateList();
+    move(0,15); 
 }
 
 fileBrowser::~fileBrowser()
 {
 }
 
 
 void fileBrowser::populateList()
@@ -89,17 +98,17 @@ void fileBrowser::populateList()
                 fileL+="/";
 //     qDebug(currentDir.canonicalPath()+fileL);
             }
         }
         item= new QListViewItem( ListView,fileL,fileS );
         ++it;
     }
     ListView->setSorting( 2, FALSE);
-    dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
+    dirLabel->setText(currentDir.canonicalPath());
 }
 
 void fileBrowser::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
 
 void fileBrowser::listDoubleClicked(QListViewItem *selectedItem)
@@ -157,8 +166,15 @@ void fileBrowser::OnOK()
       if ( it1.current()->isSelected() ) {
          selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
          qDebug("selected filename is "+selectedFileName);
        fileList.append( selectedFileName );
       }
     }
   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
@@ -45,17 +45,17 @@ public:
     QLabel *dirLabel;
     QString selectedFileName, filterStr;
     QDir currentDir;
     QFile file;
     QStringList fileList;
  
 QListViewItem * item;
 public slots:
-
+void homeButtonPushed();
 private:
 
 private slots: 
         void upDir();
         void listDoubleClicked(QListViewItem *);
         void listClicked(QListViewItem *);
         void OnOK();
 protected 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
@@ -8,71 +8,79 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileSaver.h"
 #include <qpe/config.h>
+#include <qpe/resource.h>
+
 #include <qpe/qpeapplication.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 
 #include <unistd.h>
 
 fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString currentFileName )
     : QDialog( parent, name, modal, 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" );
     ListView->addColumn( tr( "Name" ) );
     ListView->setColumnWidth(0,140);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,59);
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     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);
 
     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 *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
 
 //      tmpFileName=fi.FilePath();
 //      qDebug( tmpFileName);
     currentDir.setPath( QDir::currentDirPath() );
     populateList();
+    move(0,15);
+
 }
 
 fileSaver::~fileSaver()
 {
 }
 
 
 void fileSaver::populateList()
@@ -104,17 +112,17 @@ void fileSaver::populateList()
                 fileL+="/";
 //     qDebug(currentDir.canonicalPath()+fileL);
             }
         }
         item= new QListViewItem( ListView,fileL,fileS );
         ++it;
     }
     ListView->setSorting( 2, FALSE);
-    dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
+    dirLabel->setText(currentDir.canonicalPath());
 
 
 }
 
 void fileSaver::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
@@ -181,8 +189,15 @@ void fileSaver::accept() {
     if( path.find("//",0,TRUE) ==-1 ) {
         selectedFileName = path;
     } else {
         selectedFileName = currentDir.canonicalPath()+selectedFileName;
     }
     qDebug("going to save "+selectedFileName);
     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
@@ -50,17 +50,17 @@ public:
     QString selectedFileName, filterStr;
     QDir currentDir;
     QFile file;
     QStringList fileList;
     QCheckBox *filePermCheck;
  
 QListViewItem * item;
 public slots:
-
+void homeButtonPushed();
 private:
 
 private slots:
         void accept(); 
         void upDir();
         void listDoubleClicked(QListViewItem *);
         void listClicked(QListViewItem *);
         void closeEvent( QCloseEvent * );
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
@@ -758,17 +758,17 @@ bool TextEdit::saveAs()
             if ( docname.isEmpty() )
                 docname = "Unnamed";
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
     
-    fileSaveDlg=new fileSaver(this,"SaveFile",TRUE,0, currentFileName);
+    fileSaveDlg=new fileSaver(this,"SaveFile",TRUE, 0, currentFileName);
     qDebug("wanna save filename "+currentFileName);
     fileSaveDlg->exec();
     if( fileSaveDlg->result() == 1 ) {
         QString fileNm=fileSaveDlg->selectedFileName;
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc) {
@@ -884,15 +884,16 @@ void TextEdit::changeFont() {
 
 void TextEdit::editDelete()
 {
     switch ( QMessageBox::warning(this,"Text Editor","Do you really want\nto delete the current file\nfrom the disk?\nThis is irreversable!!","Yes","No",0,0,1) ) {
       case 0:
           if(doc) {
               doc->removeFiles();
               clear();
+              setCaption( tr("Text Editor") );
           }
           break;
       case 1: 
             // exit
           break;
     };
 }