summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-16 15:30:56 (UTC)
committer llornkcor <llornkcor>2002-11-16 15:30:56 (UTC)
commit88435a3192f09453e035a7f1cf73bbc8c24245c9 (patch) (side-by-side diff)
treeb6209349129bd2f0051c6b0cc9856893efcee7ad
parent1fde54b44ba888094fc47201567ea9454857f5a1 (diff)
downloadopie-88435a3192f09453e035a7f1cf73bbc8c24245c9.zip
opie-88435a3192f09453e035a7f1cf73bbc8c24245c9.tar.gz
opie-88435a3192f09453e035a7f1cf73bbc8c24245c9.tar.bz2
fix tab switches, and inputdialog focus on edit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp38
-rw-r--r--noncore/apps/advancedfm/output.cpp2
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
@@ -66,69 +66,73 @@
AdvancedFm::AdvancedFm( )
: QMainWindow( ) {
init();
initConnections();
populateLocalView();
populateRemoteView();
currentPathCombo->setFocus();
}
AdvancedFm::~AdvancedFm() {
}
void AdvancedFm::cleanUp() {
QString sfile=QDir::homeDirPath();
if(sfile.right(1) != "/")
sfile+="/._temp";
else
sfile+="._temp";
QFile file( sfile);
if(file.exists())
file.remove();
}
-void AdvancedFm::tabChanged(QWidget *) {
- if (TabWidget->getCurrentTab() == 0) {
+void AdvancedFm::tabChanged(QWidget *w) {
+ qDebug("tab changed %d",TabWidget->getCurrentTab());
+
+ if ( w == tab) {
+// if (TabWidget->getCurrentTab() == 0) {
// if (TabWidget->currentPageIndex() == 0) {
- currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
- viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
- viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
- QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
- setCaption("AdvancedFm :: "+fs+" :: "
- +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
+ currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+ viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
+ viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
+ QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
+ setCaption("AdvancedFm :: "+fs+" :: "
+ +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
- }
- if (TabWidget->getCurrentTab() == 1) {
+ }
+ if ( w == tab_2) {
+// if (TabWidget->getCurrentTab() == 1) {
// if (TabWidget->currentPageIndex() == 1) {
- currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
- viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
- viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
- QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
- setCaption("AdvancedFm :: "+fs+" :: "
- +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
- }
+ currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
+ viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
+ viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
+ QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
+ setCaption("AdvancedFm :: "+fs+" :: "
+ +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
+ }
}
void AdvancedFm::populateLocalView() {
QPixmap pm;
Local_View->clear();
currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
currentDir.setMatchAllDirs(TRUE);
currentDir.setNameFilter(filterStr);
QString fileL, fileS, fileDate;
QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
setCaption("AdvancedFm :: "+fs+" :: "
+checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
bool isDir=FALSE;
const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
QFileInfoListIterator it(*list);
QFileInfo *fi;
while ( (fi=it.current()) ) {
if (fi->isSymLink() ) {
QString symLink=fi->readLink();
QFileInfo sym( symLink);
fileS.sprintf( "%10i", sym.size() );
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() );
fileDate = sym.lastModified().toString();
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
@@ -244,39 +244,41 @@ void Output::commandStderr(OProcess*, char *buffer, int buflen) {
void Output::processFinished() {
delete proc;
OutputEdit->append( "\nFinished\n");
OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
// close();
// disconnect( layer(), SIGNAL(received(const QByteArray &)),
// this, SLOT(commandStdin(const QByteArray &)));
}
//==============================
InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl )
{
if ( !name )
setName( "InputDialog" );
resize( 234, 50 );
setMaximumSize( QSize( 240, 50 ) );
setCaption( tr(name ) );
LineEdit1 = new QLineEdit( this, "LineEdit1" );
LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) );
+ LineEdit1->setFocus();
+ LineEdit1->setFocus();
connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(returned() ));
}
InputDialog::~InputDialog() {
inputText = LineEdit1->text();
}
void InputDialog::setInputText(const QString &string) {
LineEdit1->setText( string);
}
void InputDialog::returned() {
inputText = LineEdit1->text();
this->accept();
}