summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp40
-rw-r--r--core/apps/textedit/textedit.cpp1
2 files changed, 28 insertions, 13 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index c16bd41..2e88067 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -20,6 +20,7 @@
20#include <qpushbutton.h> 20#include <qpushbutton.h>
21#include <qfile.h> 21#include <qfile.h>
22#include <qmessagebox.h> 22#include <qmessagebox.h>
23#include <qlayout.h>
23#include <unistd.h> 24#include <unistd.h>
24 25
25 26
@@ -29,31 +30,44 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
29{ 30{
30 if ( !name ) 31 if ( !name )
31 setName( "fileBrowser" ); 32 setName( "fileBrowser" );
32 resize( 240, 280 );
33 setCaption(tr( name ) ); 33 setCaption(tr( name ) );
34 filterStr=filter; 34 filterStr=filter;
35 35
36 QGridLayout *layout = new QGridLayout( this );
37 layout->setSpacing( 4 );
38 layout->setMargin( 4 );
39
40
36 dirLabel = new QLabel(this, "DirLabel"); 41 dirLabel = new QLabel(this, "DirLabel");
37 dirLabel->setText(currentDir.canonicalPath()); 42 dirLabel->setText(currentDir.canonicalPath());
38 dirLabel->setGeometry(10,20,230,15); 43 dirLabel->setMinimumSize( QSize( 50, 15 ) );
44 dirLabel->setMaximumSize( QSize( 250, 15 ) );
45 layout->addWidget( dirLabel, 0, 0 );
39 46
40 homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton"); 47 hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton");
41 homeButton->setGeometry(200,4,25,25); 48 hideButton->setMinimumSize( QSize( 25, 25 ) );
42 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 49 hideButton->setMaximumSize( QSize( 25, 25 ) );
43 homeButton->setFlat(TRUE); 50 connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
51 hideButton->setToggleButton(TRUE);
52 hideButton->setFlat(TRUE);
53 layout->addWidget( hideButton, 0, 1 );
44 54
45 docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); 55 docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
46 docButton->setGeometry(170,4,25,25); 56 docButton->setMinimumSize( QSize( 25, 25 ) );
57 docButton->setMaximumSize( QSize( 25, 25 ) );
47 connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); 58 connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
48 docButton->setFlat(TRUE); 59 docButton->setFlat(TRUE);
60 layout->addWidget( docButton, 0, 2 );
49 61
50 hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton"); 62 homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
51 hideButton->setGeometry(140,4,25,25); 63 homeButton->setMinimumSize( QSize( 25, 25 ) );
52 connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) ); 64 homeButton->setMaximumSize( QSize( 25, 25 ) );
53 hideButton->setToggleButton(TRUE); 65 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
54 hideButton->setFlat(TRUE); 66 homeButton->setFlat(TRUE);
67 layout->addWidget( homeButton, 0, 3 );
55 68
56 ListView = new QListView( this, "ListView" ); 69 ListView = new QListView( this, "ListView" );
70 ListView->setMinimumSize( QSize( 100, 25 ) );
57 ListView->addColumn( tr( "Name" ) ); 71 ListView->addColumn( tr( "Name" ) );
58 ListView->setColumnWidth(0,140); 72 ListView->setColumnWidth(0,140);
59 ListView->setSorting( 2, FALSE); 73 ListView->setSorting( 2, FALSE);
@@ -66,7 +80,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
66// ListView->setSelectionMode(QListView::Extended); 80// ListView->setSelectionMode(QListView::Extended);
67 81
68 ListView->setAllColumnsShowFocus( TRUE ); 82 ListView->setAllColumnsShowFocus( TRUE );
69 ListView->setGeometry( QRect( 10, 35, 220, 240 ) ); 83 layout->addMultiCellWidget( ListView, 1, 1, 0, 3 );
70 84
71 // signals and slots connections 85 // signals and slots connections
72 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); 86 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index c46f089..3a189cb 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -540,6 +540,7 @@ void TextEdit::fileOpen()
540void TextEdit::newFileOpen() 540void TextEdit::newFileOpen()
541{ 541{
542 browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*"); 542 browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
543 browseForFiles->showMaximized();
543 if( browseForFiles->exec() != -1 ) { 544 if( browseForFiles->exec() != -1 ) {
544 QString selFile= browseForFiles->selectedFileName; 545 QString selFile= browseForFiles->selectedFileName;
545 QStringList fileList=browseForFiles->fileList; 546 QStringList fileList=browseForFiles->fileList;