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 | 10 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 2 |
2 files changed, 9 insertions, 3 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 | |||
@@ -78,36 +78,40 @@ AdvancedFm::~AdvancedFm() { | |||
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 | ||
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 | |||
@@ -256,24 +256,26 @@ void Output::processFinished() { | |||
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() { |