author | harlekin <harlekin> | 2003-04-22 17:39:18 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-04-22 17:39:18 (UTC) |
commit | b22d89883cd92bd9d858caf5ca90b6eef80598d4 (patch) (unidiff) | |
tree | 695ff1e42ca09098d8b0cba0b95f0f2f736e0fd2 /noncore/apps/advancedfm | |
parent | ab9387322c5802f75bc9b37b3bb334bd98dd5dd1 (diff) | |
download | opie-b22d89883cd92bd9d858caf5ca90b6eef80598d4.zip opie-b22d89883cd92bd9d858caf5ca90b6eef80598d4.tar.gz opie-b22d89883cd92bd9d858caf5ca90b6eef80598d4.tar.bz2 |
- a lot of includes and gui cleanups
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 39 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 5 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 82 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 4 |
4 files changed, 47 insertions, 83 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 41e83c7..66353bb 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -3,91 +3,66 @@ | |||
3 | ------------------- | 3 | ------------------- |
4 | ** Created: Sat Mar 9 23:33:09 2002 | 4 | ** Created: Sat Mar 9 23:33:09 2002 |
5 | copyright : (C) 2002 by ljp | 5 | copyright : (C) 2002 by ljp |
6 | email : ljp@llornkcor.com | 6 | email : ljp@llornkcor.com |
7 | * This program is free software; you can redistribute it and/or modify * | 7 | * This program is free software; you can redistribute it and/or modify * |
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #define DEVELOPERS_VERSION | 12 | #define DEVELOPERS_VERSION |
13 | #include "advancedfm.h" | 13 | #include "advancedfm.h" |
14 | 14 | ||
15 | #include <opie/otabwidget.h> | 15 | |
16 | // #include <opie/ofileselector.h> | 16 | // #include <opie/ofileselector.h> |
17 | // #include <opie/ofiledialog.h> | 17 | // #include <opie/ofiledialog.h> |
18 | 18 | ||
19 | #include <qpe/config.h> | 19 | #include <opie/otabwidget.h> |
20 | |||
20 | #include <qpe/filemanager.h> | 21 | #include <qpe/filemanager.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
22 | #include <qpe/qpemenubar.h> | ||
23 | #include <qpe/qpetoolbar.h> | ||
24 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/qcopenvelope_qws.h> | ||
26 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
27 | #include <qpe/mimetype.h> | 25 | #include <qpe/mimetype.h> |
28 | #include <qpe/applnk.h> | 26 | #include <qpe/applnk.h> |
29 | #include <qpe/ir.h> | 27 | #include <qpe/ir.h> |
30 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
31 | #include <qpe/menubutton.h> | 29 | #include <qpe/menubutton.h> |
32 | 30 | ||
33 | |||
34 | #include <qwmatrix.h> | ||
35 | #include <qregexp.h> | ||
36 | #include <qtabwidget.h> | ||
37 | #include <qtextstream.h> | ||
38 | #include <qpushbutton.h> | ||
39 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
40 | #include <qdir.h> | ||
41 | #include <qfile.h> | 32 | #include <qfile.h> |
42 | #include <qstring.h> | ||
43 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
44 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
45 | #include <qlistview.h> | 35 | #include <qlistview.h> |
46 | #include <qmainwindow.h> | ||
47 | #include <qlabel.h> | 36 | #include <qlabel.h> |
48 | #include <qprogressbar.h> | ||
49 | #include <qspinbox.h> | ||
50 | #include <qwidget.h> | 37 | #include <qwidget.h> |
51 | #include <qlayout.h> | 38 | #include <qlayout.h> |
52 | #include <qimage.h> | 39 | #include <qimage.h> |
53 | #include <qpixmap.h> | ||
54 | #include <qmessagebox.h> | 40 | #include <qmessagebox.h> |
55 | #include <qlineedit.h> | 41 | #include <qlineedit.h> |
56 | #include <qregexp.h> | ||
57 | 42 | ||
58 | #include <unistd.h> | ||
59 | #include <stdlib.h> | ||
60 | #include <sys/stat.h> | 43 | #include <sys/stat.h> |
61 | #include <dirent.h> | ||
62 | #include <stdio.h> | ||
63 | #include <time.h> | 44 | #include <time.h> |
45 | #include <dirent.h> | ||
64 | #include <fcntl.h> | 46 | #include <fcntl.h> |
65 | #include <mntent.h> | ||
66 | #include <string.h> | ||
67 | #include <errno.h> | ||
68 | #include <sys/vfs.h> | 47 | #include <sys/vfs.h> |
69 | #include <mntent.h> | 48 | #include <mntent.h> |
70 | #include <sys/utsname.h> | ||
71 | 49 | ||
72 | AdvancedFm::AdvancedFm( ) | 50 | AdvancedFm::AdvancedFm( ) |
73 | : QMainWindow( ) { | 51 | : QMainWindow( ) { |
74 | init(); | 52 | init(); |
75 | renameBox = 0; | 53 | renameBox = 0; |
76 | 54 | ||
77 | QWMatrix matrix; | 55 | unknownXpm = Resource::loadImage( "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
78 | QPixmap pix(Resource::loadPixmap( "UnknownDocument" )); | 56 | |
79 | matrix.scale( .4, .4); | ||
80 | unknownXpm = pix.xForm(matrix); | ||
81 | |||
82 | initConnections(); | 57 | initConnections(); |
83 | whichTab=1; | 58 | whichTab=1; |
84 | rePopulate(); | 59 | rePopulate(); |
85 | currentPathCombo->setFocus(); | 60 | currentPathCombo->setFocus(); |
86 | } | 61 | } |
87 | 62 | ||
88 | AdvancedFm::~AdvancedFm() { | 63 | AdvancedFm::~AdvancedFm() { |
89 | } | 64 | } |
90 | 65 | ||
91 | 66 | ||
92 | void AdvancedFm::cleanUp() | 67 | void AdvancedFm::cleanUp() |
93 | { | 68 | { |
@@ -201,25 +176,25 @@ void AdvancedFm::populateView() | |||
201 | } | 176 | } |
202 | } | 177 | } |
203 | if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) | 178 | if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) |
204 | { | 179 | { |
205 | // overlay link image | 180 | // overlay link image |
206 | pm= Resource::loadPixmap( "folder" ); | 181 | pm= Resource::loadPixmap( "folder" ); |
207 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | 182 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); |
208 | QPainter painter( &pm ); | 183 | QPainter painter( &pm ); |
209 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | 184 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); |
210 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | 185 | pm.setMask( pm.createHeuristicMask( FALSE ) ); |
211 | } | 186 | } |
212 | item->setPixmap( 0,pm); | 187 | item->setPixmap( 0,pm); |
213 | 188 | ||
214 | } | 189 | } |
215 | isDir=FALSE; | 190 | isDir=FALSE; |
216 | ++it; | 191 | ++it; |
217 | } | 192 | } |
218 | 193 | ||
219 | if( path.find("dev",0,TRUE) != -1) | 194 | if( path.find("dev",0,TRUE) != -1) |
220 | { | 195 | { |
221 | struct stat buf; | 196 | struct stat buf; |
222 | dev_t devT; | 197 | dev_t devT; |
223 | DIR *dir; | 198 | DIR *dir; |
224 | struct dirent *mydirent; | 199 | struct dirent *mydirent; |
225 | 200 | ||
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index c30d8e0..4480051 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -31,39 +31,36 @@ | |||
31 | class OTabWidget; | 31 | class OTabWidget; |
32 | class QVBoxLayout; | 32 | class QVBoxLayout; |
33 | class QHBoxLayout; | 33 | class QHBoxLayout; |
34 | class QGridLayout; | 34 | class QGridLayout; |
35 | class QComboBox; | 35 | class QComboBox; |
36 | class QListView; | 36 | class QListView; |
37 | class QListviewItem; | 37 | class QListviewItem; |
38 | class QLabel; | 38 | class QLabel; |
39 | class QProgressBar; | 39 | class QProgressBar; |
40 | class QSpinBox; | 40 | class QSpinBox; |
41 | class QTabWidget; | 41 | class QTabWidget; |
42 | class QWidget; | 42 | class QWidget; |
43 | class QPEToolBar; | ||
44 | class QPEMenuBar; | ||
45 | class QPopupMenu; | 43 | class QPopupMenu; |
46 | class QFile; | 44 | class QFile; |
47 | class QListViewItem; | 45 | class QListViewItem; |
48 | class QLineEdit; | 46 | class QLineEdit; |
49 | class MenuButton; | 47 | class MenuButton; |
50 | 48 | ||
51 | //class QPushButton; | ||
52 | class QToolButton; | 49 | class QToolButton; |
53 | class Ir; | 50 | class Ir; |
54 | 51 | ||
55 | class AdvancedFm : public QMainWindow | 52 | class AdvancedFm : public QMainWindow |
56 | { | 53 | { |
57 | Q_OBJECT | 54 | Q_OBJECT |
58 | public: | 55 | public: |
59 | AdvancedFm(); | 56 | AdvancedFm(); |
60 | ~AdvancedFm(); | 57 | ~AdvancedFm(); |
61 | protected slots: | 58 | protected slots: |
62 | void selectAll(); | 59 | void selectAll(); |
63 | void addToDocs(); | 60 | void addToDocs(); |
64 | void doDirChange(); | 61 | void doDirChange(); |
65 | void mkDir(); | 62 | void mkDir(); |
66 | void del(); | 63 | void del(); |
67 | void rn(); | 64 | void rn(); |
68 | void populateView(); | 65 | void populateView(); |
69 | void rePopulate(); | 66 | void rePopulate(); |
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 1a7a6d7..eb2bcd8 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -4,147 +4,141 @@ | |||
4 | ** Created: Mon 09-23-2002 13:24:11 | 4 | ** Created: Mon 09-23-2002 13:24:11 |
5 | copyright : (C) 2002 by ljp | 5 | copyright : (C) 2002 by ljp |
6 | email : ljp@llornkcor.com | 6 | email : ljp@llornkcor.com |
7 | * This program is free software; you can redistribute it and/or modify * | 7 | * This program is free software; you can redistribute it and/or modify * |
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | 13 | ||
14 | #include <opie/otabwidget.h> | 14 | #include <opie/otabwidget.h> |
15 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
16 | #include <qpe/qpemenubar.h> | ||
17 | #include <qpe/qpetoolbar.h> | ||
18 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
19 | #include <qpe/menubutton.h> | 17 | #include <qpe/menubutton.h> |
20 | #include <qpe/config.h> | ||
21 | 18 | ||
22 | #include <qlayout.h> | 19 | #include <qlayout.h> |
23 | #include <qpixmap.h> | 20 | #include <qhbox.h> |
21 | #include <qmenubar.h> | ||
24 | #include <qcombobox.h> | 22 | #include <qcombobox.h> |
25 | #include <qpopupmenu.h> | ||
26 | #include <qtabwidget.h> | ||
27 | #include <qtoolbutton.h> | 23 | #include <qtoolbutton.h> |
28 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
29 | #include <qlistview.h> | 25 | #include <qlistview.h> |
30 | 26 | ||
31 | #include <sys/utsname.h> | 27 | #include <sys/utsname.h> |
32 | 28 | ||
33 | 29 | ||
34 | void AdvancedFm::init() { | 30 | void AdvancedFm::init() { |
35 | #if defined(QT_QWS_OPIE) | 31 | #if defined(QT_QWS_OPIE) |
36 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!"); | 32 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!"); |
37 | #endif | 33 | #endif |
38 | setCaption( tr( "AdvancedFm" ) ); | 34 | setCaption( tr( "AdvancedFm" ) ); |
39 | 35 | ||
40 | QGridLayout *layout = new QGridLayout( this ); | 36 | QVBoxLayout *layout = new QVBoxLayout( this ); |
41 | layout->setSpacing( 2); | 37 | layout->setSpacing( 2); |
42 | layout->setMargin( 2); | 38 | layout->setMargin( 2); |
43 | 39 | ||
44 | 40 | ||
45 | QPEMenuBar *menuBar = new QPEMenuBar(this); | 41 | QMenuBar *menuBar = new QMenuBar(this); |
46 | fileMenu = new QPopupMenu( this ); | 42 | fileMenu = new QPopupMenu( this ); |
47 | viewMenu = new QPopupMenu( this ); | 43 | viewMenu = new QPopupMenu( this ); |
48 | // customDirMenu = new QPopupMenu( this ); | 44 | // customDirMenu = new QPopupMenu( this ); |
49 | 45 | ||
50 | layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 ); | 46 | layout->addWidget( menuBar ); |
51 | 47 | ||
52 | menuBar->insertItem( tr( "File" ), fileMenu); | 48 | menuBar->insertItem( tr( "File" ), fileMenu); |
53 | menuBar->insertItem( tr( "View" ), viewMenu); | 49 | menuBar->insertItem( tr( "View" ), viewMenu); |
54 | // menuBar->insertItem( tr( "^" ), customDirMenu); | ||
55 | 50 | ||
56 | cdUpButton = new QToolButton( this,"cdUpButton"); | 51 | cdUpButton = new QToolButton( 0,"cdUpButton"); |
57 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | 52 | cdUpButton->setPixmap(Resource::loadPixmap("up")); |
58 | cdUpButton->setFixedSize( QSize( 20, 20 ) ); | 53 | cdUpButton->setAutoRaise( true ); |
59 | layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2); | 54 | menuBar->insertItem( cdUpButton ); |
60 | 55 | ||
61 | menuButton = new MenuButton(this); | ||
62 | menuButton->setFixedSize( QSize( 20, 20 ) ); | ||
63 | layout->addMultiCellWidget( menuButton , 0, 0, 3, 3); | ||
64 | 56 | ||
65 | qpeDirButton= new QToolButton(this,"QPEButton"); | 57 | QHBox *lineBox = new QHBox( this ); |
58 | |||
59 | qpeDirButton= new QToolButton( 0,"QPEButton"); | ||
66 | qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton"); | 60 | qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton"); |
67 | qpeDirButton ->setFixedSize( QSize( 20, 20 ) ); | 61 | qpeDirButton->setAutoRaise( true ); |
68 | layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4); | 62 | menuBar->insertItem( qpeDirButton ); |
69 | 63 | ||
70 | cfButton = new QToolButton( this,"CFButton"); | 64 | cfButton = new QToolButton( 0, "CFButton"); |
71 | cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia")); | 65 | cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia")); |
72 | cfButton ->setFixedSize( QSize( 20, 20 ) ); | 66 | cfButton->setAutoRaise( true ); |
73 | layout->addMultiCellWidget( cfButton , 0, 0, 5, 5); | 67 | menuBar->insertItem( cfButton ); |
74 | 68 | ||
75 | sdButton = new QToolButton( this,"SDButton"); | 69 | sdButton = new QToolButton( 0, "SDButton"); |
76 | sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard")); | 70 | sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard")); |
77 | sdButton->setFixedSize( QSize( 20, 20 ) ); | 71 | sdButton->setAutoRaise( true ); |
78 | layout->addMultiCellWidget( sdButton , 0, 0, 6, 6); | 72 | menuBar->insertItem( sdButton ); |
79 | |||
80 | 73 | ||
81 | docButton = new QToolButton( this,"docsButton"); | 74 | docButton = new QToolButton( 0,"docsButton"); |
82 | docButton->setPixmap(Resource::loadPixmap("DocsIcon")); | 75 | docButton->setPixmap(Resource::loadPixmap("DocsIcon")); |
83 | docButton->setFixedSize( QSize( 20, 20 ) ); | 76 | docButton->setAutoRaise( true ); |
84 | layout->addMultiCellWidget( docButton, 0, 0, 7, 7); | 77 | menuBar->insertItem( docButton ); |
85 | 78 | ||
86 | homeButton = new QToolButton( this,"homeButton"); | 79 | homeButton = new QToolButton( 0, "homeButton"); |
87 | homeButton->setPixmap(Resource::loadPixmap("home")); | 80 | homeButton->setPixmap(Resource::loadPixmap("home")); |
88 | homeButton->setFixedSize( QSize( 20, 20 ) ); | 81 | homeButton->setAutoRaise( true ); |
89 | layout->addMultiCellWidget( homeButton, 0, 0, 8, 8); | 82 | menuBar->insertItem( homeButton ); |
90 | 83 | ||
91 | fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() )); | 84 | fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() )); |
92 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); | 85 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); |
93 | fileMenu->insertSeparator(); | 86 | fileMenu->insertSeparator(); |
94 | fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() )); | 87 | fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() )); |
95 | fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() )); | 88 | fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() )); |
96 | fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() )); | 89 | fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() )); |
97 | fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() )); | 90 | fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() )); |
98 | fileMenu->insertSeparator(); | 91 | fileMenu->insertSeparator(); |
99 | fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); | 92 | fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); |
100 | fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() )); | 93 | fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() )); |
101 | fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() )); | 94 | fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() )); |
102 | fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() )); | 95 | fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() )); |
103 | fileMenu->setCheckable(TRUE); | 96 | fileMenu->setCheckable(TRUE); |
104 | 97 | ||
105 | viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); | 98 | viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); |
106 | viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); | 99 | viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); |
107 | // viewMenu->insertSeparator(); | 100 | // viewMenu->insertSeparator(); |
108 | // viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); | 101 | // viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); |
109 | viewMenu->setCheckable(TRUE); | 102 | viewMenu->setCheckable(TRUE); |
110 | 103 | ||
111 | s_addBookmark = tr("Bookmark Directory"); | 104 | s_addBookmark = tr("Bookmark Directory"); |
112 | s_removeBookmark = tr("Remove Current Directory from Bookmarks"); | 105 | s_removeBookmark = tr("Remove Current Directory from Bookmarks"); |
113 | 106 | ||
114 | menuButton->setUseLabel(false); | ||
115 | menuButton->insertItem( s_addBookmark); | ||
116 | menuButton->insertItem( s_removeBookmark); | ||
117 | menuButton->insertSeparator(); | ||
118 | // menuButton->insertItem(""); | 107 | // menuButton->insertItem(""); |
119 | 108 | ||
120 | // customDirMenu->insertItem(tr("Add This Directory")); | 109 | // customDirMenu->insertItem(tr("Add This Directory")); |
121 | // customDirMenu->insertItem(tr("Remove This Directory")); | 110 | // customDirMenu->insertItem(tr("Remove This Directory")); |
122 | // customDirMenu->insertSeparator(); | 111 | // customDirMenu->insertSeparator(); |
123 | 112 | ||
124 | customDirsToMenu(); | 113 | customDirsToMenu(); |
125 | 114 | ||
126 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); | 115 | menuButton = new MenuButton( lineBox ); |
127 | currentPathCombo->setEditable(TRUE); | ||
128 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8); | ||
129 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | ||
130 | 116 | ||
117 | menuButton->setUseLabel(false); | ||
118 | menuButton->setMaximumWidth( 20 ); | ||
119 | menuButton->insertItem( s_addBookmark); | ||
120 | menuButton->insertItem( s_removeBookmark); | ||
121 | menuButton->insertSeparator(); | ||
122 | |||
123 | currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); | ||
124 | currentPathCombo->setEditable(TRUE); | ||
131 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 125 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
132 | 126 | ||
133 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8); | 127 | layout->addWidget( lineBox ); |
134 | 128 | ||
135 | 129 | ||
136 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); | 130 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); |
137 | // TabWidget = new QTabWidget( this, "TabWidget" ); | 131 | // TabWidget = new QTabWidget( this, "TabWidget" ); |
138 | layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8); | 132 | layout->addWidget( TabWidget, 4 ); |
139 | 133 | ||
140 | tab = new QWidget( TabWidget, "tab" ); | 134 | tab = new QWidget( TabWidget, "tab" ); |
141 | tabLayout = new QGridLayout( tab ); | 135 | tabLayout = new QGridLayout( tab ); |
142 | tabLayout->setSpacing( 2); | 136 | tabLayout->setSpacing( 2); |
143 | tabLayout->setMargin( 2); | 137 | tabLayout->setMargin( 2); |
144 | 138 | ||
145 | Local_View = new QListView( tab, "Local_View" ); | 139 | Local_View = new QListView( tab, "Local_View" ); |
146 | Local_View->addColumn( tr("File"),130); | 140 | Local_View->addColumn( tr("File"),130); |
147 | Local_View->addColumn( tr("Size"),-1); | 141 | Local_View->addColumn( tr("Size"),-1); |
148 | Local_View->setColumnAlignment(1,QListView::AlignRight); | 142 | Local_View->setColumnAlignment(1,QListView::AlignRight); |
149 | Local_View->addColumn( tr("Date"),-1); | 143 | Local_View->addColumn( tr("Date"),-1); |
150 | Local_View->setColumnAlignment(2,QListView::AlignRight); | 144 | Local_View->setColumnAlignment(2,QListView::AlignRight); |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index eae86a4..575833a 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -9,26 +9,24 @@ | |||
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | #include "output.h" | 13 | #include "output.h" |
14 | #include "filePermissions.h" | 14 | #include "filePermissions.h" |
15 | 15 | ||
16 | #include <opie/otabwidget.h> | 16 | #include <opie/otabwidget.h> |
17 | #include <opie/oprocess.h> | 17 | #include <opie/oprocess.h> |
18 | 18 | ||
19 | #include <qpe/lnkproperties.h> | 19 | #include <qpe/lnkproperties.h> |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/qpemenubar.h> | ||
22 | #include <qpe/qpetoolbar.h> | ||
23 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
24 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/applnk.h> | 23 | #include <qpe/applnk.h> |
26 | #include <qpe/ir.h> | 24 | #include <qpe/ir.h> |
27 | 25 | ||
28 | #include <qmessagebox.h> | 26 | #include <qmessagebox.h> |
29 | #include <qmultilineedit.h> | 27 | #include <qmultilineedit.h> |
30 | 28 | ||
31 | #include <qstring.h> | 29 | #include <qstring.h> |
32 | 30 | ||
33 | #include <qlayout.h> | 31 | #include <qlayout.h> |
34 | #include <qpixmap.h> | 32 | #include <qpixmap.h> |
@@ -765,25 +763,25 @@ void AdvancedFm::startProcess(const QString & cmd) | |||
765 | void AdvancedFm::processEnded(OProcess *) | 763 | void AdvancedFm::processEnded(OProcess *) |
766 | { | 764 | { |
767 | // populateLocalView(); | 765 | // populateLocalView(); |
768 | populateView(); | 766 | populateView(); |
769 | } | 767 | } |
770 | 768 | ||
771 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int buflen) { | 769 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int buflen) { |
772 | qWarning("received stderrt %d bytes", buflen); | 770 | qWarning("received stderrt %d bytes", buflen); |
773 | 771 | ||
774 | QString lineStr = buffer; | 772 | QString lineStr = buffer; |
775 | // lineStr=lineStr.left(lineStr.length()-1); | 773 | // lineStr=lineStr.left(lineStr.length()-1); |
776 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); | 774 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); |
777 | 775 | ||
778 | // OutputEdit->append(lineStr); | 776 | // OutputEdit->append(lineStr); |
779 | // OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 777 | // OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
780 | } | 778 | } |
781 | 779 | ||
782 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) | 780 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) |
783 | { | 781 | { |
784 | if ( o->inherits( "QLineEdit" ) ) | 782 | if ( o->inherits( "QLineEdit" ) ) |
785 | { | 783 | { |
786 | if ( e->type() == QEvent::KeyPress ) | 784 | if ( e->type() == QEvent::KeyPress ) |
787 | { | 785 | { |
788 | QKeyEvent *ke = (QKeyEvent*)e; | 786 | QKeyEvent *ke = (QKeyEvent*)e; |
789 | if ( ke->key() == Key_Return || | 787 | if ( ke->key() == Key_Return || |