author | llornkcor <llornkcor> | 2002-11-16 15:30:56 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-16 15:30:56 (UTC) |
commit | 88435a3192f09453e035a7f1cf73bbc8c24245c9 (patch) (unidiff) | |
tree | b6209349129bd2f0051c6b0cc9856893efcee7ad | |
parent | 1fde54b44ba888094fc47201567ea9454857f5a1 (diff) | |
download | opie-88435a3192f09453e035a7f1cf73bbc8c24245c9.zip opie-88435a3192f09453e035a7f1cf73bbc8c24245c9.tar.gz opie-88435a3192f09453e035a7f1cf73bbc8c24245c9.tar.bz2 |
fix tab switches, and inputdialog focus on edit
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 38 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 2 |
2 files changed, 23 insertions, 17 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 23244a2..92804b2 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -58,85 +58,89 @@ | |||
58 | #include <time.h> | 58 | #include <time.h> |
59 | #include <fcntl.h> | 59 | #include <fcntl.h> |
60 | #include <mntent.h> | 60 | #include <mntent.h> |
61 | #include <string.h> | 61 | #include <string.h> |
62 | #include <errno.h> | 62 | #include <errno.h> |
63 | #include <sys/vfs.h> | 63 | #include <sys/vfs.h> |
64 | #include <mntent.h> | 64 | #include <mntent.h> |
65 | #include <sys/utsname.h> | 65 | #include <sys/utsname.h> |
66 | 66 | ||
67 | AdvancedFm::AdvancedFm( ) | 67 | AdvancedFm::AdvancedFm( ) |
68 | : QMainWindow( ) { | 68 | : QMainWindow( ) { |
69 | init(); | 69 | init(); |
70 | initConnections(); | 70 | initConnections(); |
71 | populateLocalView(); | 71 | populateLocalView(); |
72 | populateRemoteView(); | 72 | populateRemoteView(); |
73 | currentPathCombo->setFocus(); | 73 | currentPathCombo->setFocus(); |
74 | } | 74 | } |
75 | 75 | ||
76 | AdvancedFm::~AdvancedFm() { | 76 | AdvancedFm::~AdvancedFm() { |
77 | } | 77 | } |
78 | 78 | ||
79 | void AdvancedFm::cleanUp() { | 79 | void AdvancedFm::cleanUp() { |
80 | QString sfile=QDir::homeDirPath(); | 80 | QString sfile=QDir::homeDirPath(); |
81 | if(sfile.right(1) != "/") | 81 | if(sfile.right(1) != "/") |
82 | sfile+="/._temp"; | 82 | sfile+="/._temp"; |
83 | else | 83 | else |
84 | sfile+="._temp"; | 84 | sfile+="._temp"; |
85 | QFile file( sfile); | 85 | QFile file( sfile); |
86 | if(file.exists()) | 86 | if(file.exists()) |
87 | file.remove(); | 87 | file.remove(); |
88 | } | 88 | } |
89 | 89 | ||
90 | void AdvancedFm::tabChanged(QWidget *) { | 90 | void AdvancedFm::tabChanged(QWidget *w) { |
91 | if (TabWidget->getCurrentTab() == 0) { | 91 | qDebug("tab changed %d",TabWidget->getCurrentTab()); |
92 | |||
93 | if ( w == tab) { | ||
94 | // if (TabWidget->getCurrentTab() == 0) { | ||
92 | // if (TabWidget->currentPageIndex() == 0) { | 95 | // if (TabWidget->currentPageIndex() == 0) { |
93 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 96 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
94 | viewMenu->setItemChecked(viewMenu->idAt(0),TRUE); | 97 | viewMenu->setItemChecked(viewMenu->idAt(0),TRUE); |
95 | viewMenu->setItemChecked(viewMenu->idAt(1),FALSE); | 98 | viewMenu->setItemChecked(viewMenu->idAt(1),FALSE); |
96 | QString fs= getFileSystemType((const QString &) currentDir.canonicalPath()); | 99 | QString fs= getFileSystemType((const QString &) currentDir.canonicalPath()); |
97 | setCaption("AdvancedFm :: "+fs+" :: " | 100 | setCaption("AdvancedFm :: "+fs+" :: " |
98 | +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); | 101 | +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); |
99 | 102 | ||
100 | } | 103 | } |
101 | if (TabWidget->getCurrentTab() == 1) { | 104 | if ( w == tab_2) { |
105 | // if (TabWidget->getCurrentTab() == 1) { | ||
102 | 106 | ||
103 | // if (TabWidget->currentPageIndex() == 1) { | 107 | // if (TabWidget->currentPageIndex() == 1) { |
104 | currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath()); | 108 | currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath()); |
105 | viewMenu->setItemChecked(viewMenu->idAt(1),TRUE); | 109 | viewMenu->setItemChecked(viewMenu->idAt(1),TRUE); |
106 | viewMenu->setItemChecked(viewMenu->idAt(0),FALSE); | 110 | viewMenu->setItemChecked(viewMenu->idAt(0),FALSE); |
107 | QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath()); | 111 | QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath()); |
108 | setCaption("AdvancedFm :: "+fs+" :: " | 112 | setCaption("AdvancedFm :: "+fs+" :: " |
109 | +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" ); | 113 | +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" ); |
110 | } | 114 | } |
111 | } | 115 | } |
112 | 116 | ||
113 | 117 | ||
114 | void AdvancedFm::populateLocalView() { | 118 | void AdvancedFm::populateLocalView() { |
115 | QPixmap pm; | 119 | QPixmap pm; |
116 | Local_View->clear(); | 120 | Local_View->clear(); |
117 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 121 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
118 | currentDir.setMatchAllDirs(TRUE); | 122 | currentDir.setMatchAllDirs(TRUE); |
119 | currentDir.setNameFilter(filterStr); | 123 | currentDir.setNameFilter(filterStr); |
120 | QString fileL, fileS, fileDate; | 124 | QString fileL, fileS, fileDate; |
121 | QString fs= getFileSystemType((const QString &) currentDir.canonicalPath()); | 125 | QString fs= getFileSystemType((const QString &) currentDir.canonicalPath()); |
122 | setCaption("AdvancedFm :: "+fs+" :: " | 126 | setCaption("AdvancedFm :: "+fs+" :: " |
123 | +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); | 127 | +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); |
124 | bool isDir=FALSE; | 128 | bool isDir=FALSE; |
125 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 129 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
126 | QFileInfoListIterator it(*list); | 130 | QFileInfoListIterator it(*list); |
127 | QFileInfo *fi; | 131 | QFileInfo *fi; |
128 | while ( (fi=it.current()) ) { | 132 | while ( (fi=it.current()) ) { |
129 | if (fi->isSymLink() ) { | 133 | if (fi->isSymLink() ) { |
130 | QString symLink=fi->readLink(); | 134 | QString symLink=fi->readLink(); |
131 | QFileInfo sym( symLink); | 135 | QFileInfo sym( symLink); |
132 | fileS.sprintf( "%10i", sym.size() ); | 136 | fileS.sprintf( "%10i", sym.size() ); |
133 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() ); | 137 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() ); |
134 | fileDate = sym.lastModified().toString(); | 138 | fileDate = sym.lastModified().toString(); |
135 | } else { | 139 | } else { |
136 | fileS.sprintf( "%10i", fi->size() ); | 140 | fileS.sprintf( "%10i", fi->size() ); |
137 | fileL.sprintf( "%s",fi->fileName().data() ); | 141 | fileL.sprintf( "%s",fi->fileName().data() ); |
138 | fileDate= fi->lastModified().toString(); | 142 | fileDate= fi->lastModified().toString(); |
139 | if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 143 | if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
140 | fileL+="/"; | 144 | fileL+="/"; |
141 | isDir=TRUE; | 145 | isDir=TRUE; |
142 | } | 146 | } |
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 946d038..a60cea6 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -236,47 +236,49 @@ void Output::commandStdin( const QByteArray &data) { | |||
236 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { | 236 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { |
237 | qWarning("received stderrt %d bytes", buflen); | 237 | qWarning("received stderrt %d bytes", buflen); |
238 | 238 | ||
239 | QString lineStr = buffer; | 239 | QString lineStr = buffer; |
240 | // lineStr=lineStr.left(lineStr.length()-1); | 240 | // lineStr=lineStr.left(lineStr.length()-1); |
241 | OutputEdit->append(lineStr); | 241 | OutputEdit->append(lineStr); |
242 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 242 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
243 | } | 243 | } |
244 | 244 | ||
245 | void Output::processFinished() { | 245 | void Output::processFinished() { |
246 | 246 | ||
247 | delete proc; | 247 | delete proc; |
248 | OutputEdit->append( "\nFinished\n"); | 248 | OutputEdit->append( "\nFinished\n"); |
249 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 249 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
250 | // close(); | 250 | // close(); |
251 | // disconnect( layer(), SIGNAL(received(const QByteArray &)), | 251 | // disconnect( layer(), SIGNAL(received(const QByteArray &)), |
252 | // this, SLOT(commandStdin(const QByteArray &))); | 252 | // this, SLOT(commandStdin(const QByteArray &))); |
253 | } | 253 | } |
254 | 254 | ||
255 | //============================== | 255 | //============================== |
256 | 256 | ||
257 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 257 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
258 | : QDialog( parent, name, modal, fl ) | 258 | : QDialog( parent, name, modal, fl ) |
259 | { | 259 | { |
260 | if ( !name ) | 260 | if ( !name ) |
261 | setName( "InputDialog" ); | 261 | setName( "InputDialog" ); |
262 | resize( 234, 50 ); | 262 | resize( 234, 50 ); |
263 | setMaximumSize( QSize( 240, 50 ) ); | 263 | setMaximumSize( QSize( 240, 50 ) ); |
264 | setCaption( tr(name ) ); | 264 | setCaption( tr(name ) ); |
265 | 265 | ||
266 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 266 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
267 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); | 267 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); |
268 | LineEdit1->setFocus(); | ||
269 | LineEdit1->setFocus(); | ||
268 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(returned() )); | 270 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(returned() )); |
269 | } | 271 | } |
270 | 272 | ||
271 | InputDialog::~InputDialog() { | 273 | InputDialog::~InputDialog() { |
272 | inputText = LineEdit1->text(); | 274 | inputText = LineEdit1->text(); |
273 | } | 275 | } |
274 | 276 | ||
275 | void InputDialog::setInputText(const QString &string) { | 277 | void InputDialog::setInputText(const QString &string) { |
276 | LineEdit1->setText( string); | 278 | LineEdit1->setText( string); |
277 | } | 279 | } |
278 | 280 | ||
279 | void InputDialog::returned() { | 281 | void InputDialog::returned() { |
280 | inputText = LineEdit1->text(); | 282 | inputText = LineEdit1->text(); |
281 | this->accept(); | 283 | this->accept(); |
282 | } | 284 | } |