author | llornkcor <llornkcor> | 2004-09-18 09:05:57 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-18 09:05:57 (UTC) |
commit | eaf09b9b6e1abbe36e814a8e4da315ac8d96bd63 (patch) (unidiff) | |
tree | ee914747ae2494d50716ab3cda866613d4eb134c /noncore | |
parent | 5096f9bd9f1a06e5238e2206eee195c43a2bdb6b (diff) | |
download | opie-eaf09b9b6e1abbe36e814a8e4da315ac8d96bd63.zip opie-eaf09b9b6e1abbe36e814a8e4da315ac8d96bd63.tar.gz opie-eaf09b9b6e1abbe36e814a8e4da315ac8d96bd63.tar.bz2 |
fix stuff, including #1404
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 88 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 3 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 20 |
4 files changed, 71 insertions, 42 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index afb44f5..b4461cb 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -11,8 +11,9 @@ | |||
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #define DEVELOPERS_VERSION | 12 | #define DEVELOPERS_VERSION |
13 | #include "advancedfm.h" | 13 | #include "advancedfm.h" |
14 | 14 | ||
15 | #include <opie2/odebug.h> | ||
15 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
16 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
17 | #include <qpe/mimetype.h> | 18 | #include <qpe/mimetype.h> |
18 | #include <qpe/applnk.h> | 19 | #include <qpe/applnk.h> |
@@ -41,15 +42,23 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | |||
41 | renameBox = 0; | 42 | renameBox = 0; |
42 | 43 | ||
43 | unknownXpm = Resource::loadImage( "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 44 | unknownXpm = Resource::loadImage( "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
44 | 45 | ||
45 | initConnections(); | 46 | initConnections(); |
46 | whichTab=1; | 47 | |
47 | rePopulate(); | 48 | whichTab = 1; |
48 | currentPathCombo->setFocus(); | 49 | populateView(); |
49 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); | 50 | // rePopulate(); |
50 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | 51 | // currentPathCombo->setFocus(); |
51 | this, SLOT( qcopReceive(const QCString&,const QByteArray&)) ); | 52 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); |
53 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | ||
54 | this, SLOT( qcopReceive(const QCString&,const QByteArray&)) ); | ||
55 | |||
56 | // if( CurrentView() == Local_View) | ||
57 | // qDebug("LOCAL VIEW"); | ||
58 | // else | ||
59 | // qDebug("REMOTE VIEW"); | ||
60 | switchToLocalTab(); | ||
52 | } | 61 | } |
53 | 62 | ||
54 | AdvancedFm::~AdvancedFm() { | 63 | AdvancedFm::~AdvancedFm() { |
55 | } | 64 | } |
@@ -65,14 +74,19 @@ void AdvancedFm::cleanUp() { | |||
65 | if(file.exists()) | 74 | if(file.exists()) |
66 | file.remove(); | 75 | file.remove(); |
67 | } | 76 | } |
68 | 77 | ||
69 | void AdvancedFm::tabChanged(QWidget *) { | 78 | void AdvancedFm::tabChanged(QWidget *wd) { |
70 | // owarn << "tab changed" << oendl; | 79 | if(wd == tab) |
71 | QString path = CurrentDir()->canonicalPath(); | 80 | odebug << "LOCAL VIEW SHOWN"<< oendl; |
81 | else if(wd == tab_2) | ||
82 | odebug<< "REMOTE VIEW SHOWN"<< oendl; | ||
83 | |||
84 | QString path = CurrentDir()->canonicalPath(); | ||
72 | currentPathCombo->lineEdit()->setText( path ); | 85 | currentPathCombo->lineEdit()->setText( path ); |
73 | 86 | ||
74 | if(whichTab == 1) { | 87 | if ( TabWidget->currentWidget() == tab) { |
88 | // if(whichTab == 1) { | ||
75 | viewMenu->setItemChecked(viewMenu->idAt(0), true); | 89 | viewMenu->setItemChecked(viewMenu->idAt(0), true); |
76 | viewMenu->setItemChecked(viewMenu->idAt(1), false); | 90 | viewMenu->setItemChecked(viewMenu->idAt(1), false); |
77 | } else { | 91 | } else { |
78 | viewMenu->setItemChecked(viewMenu->idAt(0), false); | 92 | viewMenu->setItemChecked(viewMenu->idAt(0), false); |
@@ -83,20 +97,24 @@ void AdvancedFm::tabChanged(QWidget *) { | |||
83 | 97 | ||
84 | setCaption(tr("AdvancedFm :: ")+fs+" :: " | 98 | setCaption(tr("AdvancedFm :: ")+fs+" :: " |
85 | +checkDiskSpace( (const QString &) path )+ tr(" kB free") ); | 99 | +checkDiskSpace( (const QString &) path )+ tr(" kB free") ); |
86 | chdir( path.latin1()); | 100 | chdir( path.latin1()); |
101 | if( wd == Local_View) { | ||
102 | Remote_View->clearFocus(); | ||
103 | } else { | ||
104 | Local_View->clearFocus(); | ||
105 | } | ||
106 | |||
87 | } | 107 | } |
88 | 108 | ||
89 | 109 | ||
90 | void AdvancedFm::populateView() { | 110 | void AdvancedFm::populateView() { |
91 | 111 | ||
92 | // owarn << "PopulateView" << oendl; | ||
93 | QPixmap pm; | 112 | QPixmap pm; |
94 | QListView *thisView = CurrentView(); | 113 | QListView *thisView = CurrentView(); |
95 | QDir *thisDir = CurrentDir(); | 114 | QDir *thisDir = CurrentDir(); |
96 | QString path = thisDir->canonicalPath(); | 115 | QString path = thisDir->canonicalPath(); |
97 | 116 | ||
98 | //owarn << "path is "+path << oendl; | ||
99 | thisView->clear(); | 117 | thisView->clear(); |
100 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 118 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
101 | thisDir->setMatchAllDirs(TRUE); | 119 | thisDir->setMatchAllDirs(TRUE); |
102 | thisDir->setNameFilter(filterStr); | 120 | thisDir->setNameFilter(filterStr); |
@@ -214,10 +232,15 @@ void AdvancedFm::rePopulate() { | |||
214 | // TabWidget->setCurrentWidget( tmpTab - 1); | 232 | // TabWidget->setCurrentWidget( tmpTab - 1); |
215 | } | 233 | } |
216 | 234 | ||
217 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) { | 235 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) { |
218 | //owarn << "listclicked" << oendl; | 236 | if ( TabWidget->currentWidget() == tab) |
219 | if(selectedItem) { | 237 | qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local"); |
238 | else | ||
239 | qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote"); | ||
240 | |||
241 | |||
242 | if(selectedItem) { | ||
220 | QString strItem=selectedItem->text(0); | 243 | QString strItem=selectedItem->text(0); |
221 | // owarn << strItem << oendl; | 244 | // owarn << strItem << oendl; |
222 | QString strSize=selectedItem->text(1); | 245 | QString strSize=selectedItem->text(1); |
223 | strSize=strSize.stripWhiteSpace(); | 246 | strSize=strSize.stripWhiteSpace(); |
@@ -245,29 +268,31 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem) { | |||
245 | } | 268 | } |
246 | } | 269 | } |
247 | 270 | ||
248 | void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) { | 271 | void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) { |
249 | dealWithSchmooSchmaa( item->listView()); | 272 | Q_UNUSED(item); |
250 | switch (mouse) { | 273 | switch (mouse) { |
251 | case 1: | 274 | case 1: |
252 | { | 275 | { |
253 | if(renameBox != 0 ) { | 276 | if(renameBox != 0 ) { |
254 | cancelRename(); | 277 | cancelRename(); |
255 | } | 278 | } |
256 | } | 279 | } |
257 | break; | 280 | break; |
281 | // case 2: | ||
282 | // menuTimer.start( 50, TRUE ); | ||
283 | // break; | ||
258 | }; | 284 | }; |
259 | } | 285 | } |
260 | 286 | ||
261 | 287 | ||
262 | void AdvancedFm::switchToLocalTab() { | 288 | void AdvancedFm::switchToLocalTab() { |
263 | //owarn << "switch to local view" << oendl; | ||
264 | TabWidget->setCurrentWidget(0); | 289 | TabWidget->setCurrentWidget(0); |
265 | Local_View->setFocus(); | 290 | Local_View->setFocus(); |
291 | |||
266 | } | 292 | } |
267 | 293 | ||
268 | void AdvancedFm::switchToRemoteTab() { | 294 | void AdvancedFm::switchToRemoteTab() { |
269 | //owarn << "switch to local view" << oendl; | ||
270 | TabWidget->setCurrentWidget(1); | 295 | TabWidget->setCurrentWidget(1); |
271 | Remote_View->setFocus(); | 296 | Remote_View->setFocus(); |
272 | } | 297 | } |
273 | 298 | ||
@@ -289,9 +314,10 @@ void AdvancedFm::currentPathComboChanged() { | |||
289 | } | 314 | } |
290 | 315 | ||
291 | void AdvancedFm::fillCombo(const QString ¤tPath) { | 316 | void AdvancedFm::fillCombo(const QString ¤tPath) { |
292 | 317 | ||
293 | if ( whichTab == 1) { | 318 | if ( TabWidget->currentWidget() == tab) { |
319 | // if ( whichTab == 1) { | ||
294 | currentPathCombo->lineEdit()->setText( currentPath); | 320 | currentPathCombo->lineEdit()->setText( currentPath); |
295 | if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) { | 321 | if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) { |
296 | currentPathCombo->clear(); | 322 | currentPathCombo->clear(); |
297 | localDirPathStringList.prepend( currentPath ); | 323 | localDirPathStringList.prepend( currentPath ); |
@@ -756,26 +782,35 @@ void AdvancedFm::gotoCustomDir(const QString &dir) { | |||
756 | } | 782 | } |
757 | 783 | ||
758 | QDir *AdvancedFm::CurrentDir() { | 784 | QDir *AdvancedFm::CurrentDir() { |
759 | 785 | ||
786 | if ( TabWidget->currentWidget() == tab) | ||
787 | qDebug("CurrentTab is Local"); | ||
788 | else | ||
789 | qDebug("CurrentTab is Remote"); | ||
790 | |||
760 | if ( whichTab == 1) { | 791 | if ( whichTab == 1) { |
761 | return ¤tDir; | 792 | return ¤tDir; |
762 | } else { | 793 | } else { |
763 | return ¤tRemoteDir; | 794 | return ¤tRemoteDir; |
764 | } | 795 | } |
765 | } | 796 | } |
766 | 797 | ||
767 | QDir *AdvancedFm::OtherDir() { | 798 | QDir *AdvancedFm::OtherDir() { |
799 | // if ( TabWidget->currentWidget() == tab) { | ||
768 | if ( whichTab == 1) { | 800 | if ( whichTab == 1) { |
769 | return ¤tRemoteDir; | 801 | return ¤tRemoteDir; |
770 | } else { | 802 | } else { |
771 | return ¤tDir; | 803 | return ¤tDir; |
772 | } | 804 | } |
773 | } | 805 | } |
774 | 806 | ||
775 | QListView * AdvancedFm::CurrentView() { | 807 | QListView * AdvancedFm::CurrentView() { |
808 | if ( TabWidget->currentWidget() == tab) | ||
809 | odebug << "CurrentView local" << oendl; | ||
810 | |||
811 | // if ( TabWidget->currentWidget() == tab) { | ||
776 | if ( whichTab == 1) { | 812 | if ( whichTab == 1) { |
777 | // owarn << "CurrentView Tab 1" << oendl; | ||
778 | return Local_View; | 813 | return Local_View; |
779 | } else { | 814 | } else { |
780 | // owarn << "CurrentView Tab 2" << oendl; | 815 | // owarn << "CurrentView Tab 2" << oendl; |
781 | return Remote_View; | 816 | return Remote_View; |
@@ -789,9 +824,9 @@ QListView * AdvancedFm::OtherView() { | |||
789 | return Local_View; | 824 | return Local_View; |
790 | } | 825 | } |
791 | 826 | ||
792 | void AdvancedFm::setOtherTabCurrent() { | 827 | void AdvancedFm::setOtherTabCurrent() { |
793 | // owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; | 828 | qDebug("setOtherTabCurrent() %d",whichTab); |
794 | if ( whichTab == 1) { | 829 | if ( whichTab == 1) { |
795 | TabWidget->setCurrentWidget(1); | 830 | TabWidget->setCurrentWidget(1); |
796 | } else { | 831 | } else { |
797 | TabWidget->setCurrentWidget(0); | 832 | TabWidget->setCurrentWidget(0); |
@@ -816,9 +851,9 @@ void AdvancedFm::setDocument(const QString &file) { | |||
816 | 851 | ||
817 | } | 852 | } |
818 | 853 | ||
819 | void AdvancedFm::gotoDirectory(const QString &file) { | 854 | void AdvancedFm::gotoDirectory(const QString &file) { |
820 | // owarn << "goto dir "+file << oendl; | 855 | qDebug("goto dir "+file); |
821 | QString curDir = file; | 856 | QString curDir = file; |
822 | QDir *thisDir = CurrentDir(); | 857 | QDir *thisDir = CurrentDir(); |
823 | if(QDir( curDir).exists() ) { | 858 | if(QDir( curDir).exists() ) { |
824 | thisDir->setPath( curDir ); | 859 | thisDir->setPath( curDir ); |
@@ -856,17 +891,8 @@ void AdvancedFm::slotSwitchMenu(int ) { | |||
856 | // odebug << "Switch " << item << "" << oendl; | 891 | // odebug << "Switch " << item << "" << oendl; |
857 | // viewMenu->setItemChecked(item, true); | 892 | // viewMenu->setItemChecked(item, true); |
858 | } | 893 | } |
859 | 894 | ||
860 | void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) { | ||
861 | tabChanged( w); | ||
862 | if( w == Local_View) { | ||
863 | Remote_View->clearFocus(); | ||
864 | } else { | ||
865 | Local_View->clearFocus(); | ||
866 | } | ||
867 | } | ||
868 | |||
869 | void AdvancedFm::navigateToSelected() { | 895 | void AdvancedFm::navigateToSelected() { |
870 | if( !CurrentView()->currentItem()) return; | 896 | if( !CurrentView()->currentItem()) return; |
871 | doDirChange(); | 897 | doDirChange(); |
872 | } | 898 | } |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index effda0b..e596977 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -128,11 +128,11 @@ protected: | |||
128 | QDir *OtherDir(); | 128 | QDir *OtherDir(); |
129 | QListView *CurrentView(); | 129 | QListView *CurrentView(); |
130 | QListView *OtherView(); | 130 | QListView *OtherView(); |
131 | void setOtherTabCurrent(); | 131 | void setOtherTabCurrent(); |
132 | void dealWithSchmooSchmaa(QWidget *); | ||
133 | 132 | ||
134 | protected slots: | 133 | protected slots: |
134 | |||
135 | void openSearch(); | 135 | void openSearch(); |
136 | void dirMenuSelected(int); | 136 | void dirMenuSelected(int); |
137 | void showFileMenu(); | 137 | void showFileMenu(); |
138 | void homeButtonPushed(); | 138 | void homeButtonPushed(); |
@@ -155,8 +155,9 @@ protected slots: | |||
155 | void fileBeamFinished( Ir *); | 155 | void fileBeamFinished( Ir *); |
156 | bool copyDirectory( const QString & , const QString & ); | 156 | bool copyDirectory( const QString & , const QString & ); |
157 | // void navigateToSelected(); | 157 | // void navigateToSelected(); |
158 | bool moveDirectory( const QString & , const QString & ); | 158 | bool moveDirectory( const QString & , const QString & ); |
159 | |||
159 | // void slotSwitchtoLocal(int); | 160 | // void slotSwitchtoLocal(int); |
160 | 161 | ||
161 | private: | 162 | private: |
162 | MenuButton *menuButton; | 163 | MenuButton *menuButton; |
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index f1c518e..0644edb 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro | |||
@@ -4,9 +4,9 @@ HEADERS = advancedfm.h filePermissions.h output.h | |||
4 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp | 4 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp |
5 | TARGET = advancedfm | 5 | TARGET = advancedfm |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 7 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lqpe -lopiecore2 -lopieui2 | 8 | LIBS += -lqpe -lqte -lopiecore2 -lopieui2 |
9 | 9 | ||
10 | !contains(CONFIG,quick-app) { | 10 | !contains(CONFIG,quick-app) { |
11 | DESTDIR = $(OPIEDIR)/bin | 11 | DESTDIR = $(OPIEDIR)/bin |
12 | DEFINES += NOQUICKLAUNCH | 12 | DEFINES += NOQUICKLAUNCH |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 4628170..8d04c68 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -333,9 +333,8 @@ void AdvancedFm::copy() { | |||
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
336 | void AdvancedFm::copyAs() { | 336 | void AdvancedFm::copyAs() { |
337 | qApp->processEvents(); | ||
338 | 337 | ||
339 | QStringList curFileList = getPath(); | 338 | QStringList curFileList = getPath(); |
340 | QString curFile, item; | 339 | QString curFile, item; |
341 | InputDialog *fileDlg; | 340 | InputDialog *fileDlg; |
@@ -377,10 +376,12 @@ void AdvancedFm::copyAs() { | |||
377 | } | 376 | } |
378 | delete fileDlg; | 377 | delete fileDlg; |
379 | 378 | ||
380 | } | 379 | } |
381 | rePopulate(); | 380 | rePopulate(); |
382 | setOtherTabCurrent(); | 381 | setOtherTabCurrent(); |
382 | qApp->processEvents(); | ||
383 | |||
383 | } | 384 | } |
384 | 385 | ||
385 | void AdvancedFm::copySameDir() { | 386 | void AdvancedFm::copySameDir() { |
386 | qApp->processEvents(); | 387 | qApp->processEvents(); |
@@ -752,14 +753,15 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { | |||
752 | } | 753 | } |
753 | } | 754 | } |
754 | if ( o->inherits( "QListView" ) ) { | 755 | if ( o->inherits( "QListView" ) ) { |
755 | if ( e->type() == QEvent::FocusIn ) { | 756 | if ( e->type() == QEvent::FocusIn ) { |
756 | if( o == Local_View) { //keep track of which view | 757 | if( o == Local_View) { //keep track of which view |
757 | whichTab=1; | 758 | qDebug("local view"); |
758 | } | 759 | whichTab = 1; |
759 | else { | 760 | } else { |
760 | whichTab=2; | 761 | whichTab = 2; |
761 | } | 762 | qDebug("remote view"); |
763 | } | ||
762 | } | 764 | } |
763 | OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection | 765 | OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection |
764 | } | 766 | } |
765 | 767 | ||