summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp10
-rw-r--r--noncore/net/opieftp/opieftp.h2
2 files changed, 9 insertions, 3 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 7c83223..db365ca 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -77,24 +77,29 @@ OpieFtp::OpieFtp( )
77 setCaption( tr( "OpieFtp" ) ); 77 setCaption( tr( "OpieFtp" ) );
78 fuckeduphack=FALSE; 78 fuckeduphack=FALSE;
79 QGridLayout *layout = new QGridLayout( this ); 79 QGridLayout *layout = new QGridLayout( this );
80 layout->setSpacing( 2); 80 layout->setSpacing( 2);
81 layout->setMargin( 2); 81 layout->setMargin( 2);
82 82
83 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 83 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
84 84
85 QPEMenuBar *menuBar = new QPEMenuBar(this); 85 QPEMenuBar *menuBar = new QPEMenuBar(this);
86// QPEToolBar *menuBar = new QPEToolBar(this); 86// QPEToolBar *menuBar = new QPEToolBar(this);
87// menuBar->setHorizontalStretchable( TRUE ); 87// menuBar->setHorizontalStretchable( TRUE );
88 88
89 QWMatrix matrix;
90 QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
91 matrix.scale( .4, .4);
92 unknownXpm = pix.xForm(matrix);
93
89 connectionMenu = new QPopupMenu( this ); 94 connectionMenu = new QPopupMenu( this );
90 localMenu = new QPopupMenu( this ); 95 localMenu = new QPopupMenu( this );
91 remoteMenu = new QPopupMenu( this ); 96 remoteMenu = new QPopupMenu( this );
92 tabMenu = new QPopupMenu( this ); 97 tabMenu = new QPopupMenu( this );
93 98
94 layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 ); 99 layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
95 100
96 menuBar->insertItem( tr( "Connection" ), connectionMenu); 101 menuBar->insertItem( tr( "Connection" ), connectionMenu);
97 menuBar->insertItem( tr( "Local" ), localMenu); 102 menuBar->insertItem( tr( "Local" ), localMenu);
98 menuBar->insertItem( tr( "Remote" ), remoteMenu); 103 menuBar->insertItem( tr( "Remote" ), remoteMenu);
99 menuBar->insertItem( tr( "View" ), tabMenu); 104 menuBar->insertItem( tr( "View" ), tabMenu);
100 105
@@ -679,37 +684,36 @@ void OpieFtp::populateLocalView()
679 if( !QDir( fi->filePath() ).isReadable()) 684 if( !QDir( fi->filePath() ).isReadable())
680 pm = Resource::loadPixmap( "lockedfolder" ); 685 pm = Resource::loadPixmap( "lockedfolder" );
681 else 686 else
682 pm= Resource::loadPixmap( "folder" ); 687 pm= Resource::loadPixmap( "folder" );
683 item->setPixmap( 0,pm ); 688 item->setPixmap( 0,pm );
684 } else { 689 } else {
685 if( !fi->isReadable() ) 690 if( !fi->isReadable() )
686 pm = Resource::loadPixmap( "locked" ); 691 pm = Resource::loadPixmap( "locked" );
687 else { 692 else {
688 MimeType mt(fi->filePath()); 693 MimeType mt(fi->filePath());
689 pm=mt.pixmap(); //sets the correct pixmap for mimetype 694 pm=mt.pixmap(); //sets the correct pixmap for mimetype
690 if(pm.isNull()) 695 if(pm.isNull())
691 pm = Resource::loadPixmap( "UnknownDocument-14" ); 696 pm = unknownXpm;
692 item->setPixmap( 0,pm);
693 } 697 }
694 } 698 }
695 if( fileL.find("->",0,TRUE) != -1) { 699 if( fileL.find("->",0,TRUE) != -1) {
696 // overlay link image 700 // overlay link image
697 pm= Resource::loadPixmap( "folder" ); 701 pm= Resource::loadPixmap( "folder" );
698 QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); 702 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
699 QPainter painter( &pm ); 703 QPainter painter( &pm );
700 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); 704 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
701 pm.setMask( pm.createHeuristicMask( FALSE ) ); 705 pm.setMask( pm.createHeuristicMask( FALSE ) );
702 item->setPixmap( 0, pm);
703 } 706 }
707 item->setPixmap( 0,pm);
704 } 708 }
705 isDir=FALSE; 709 isDir=FALSE;
706 ++it; 710 ++it;
707 } 711 }
708 Local_View->setSorting( 3,FALSE); 712 Local_View->setSorting( 3,FALSE);
709 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); 713 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
710 fillCombo( (const QString &)currentDir); 714 fillCombo( (const QString &)currentDir);
711} 715}
712 716
713bool OpieFtp::populateRemoteView( ) 717bool OpieFtp::populateRemoteView( )
714{ 718{
715// qDebug("populate remoteview"); 719// qDebug("populate remoteview");
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 109b5f8..9d5d211 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -9,24 +9,25 @@
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#ifndef OPIEFTP_H 12#ifndef OPIEFTP_H
13#define OPIEFTP_H 13#define OPIEFTP_H
14 14
15#include <qvariant.h> 15#include <qvariant.h>
16#include <qdialog.h> 16#include <qdialog.h>
17#include <qmainwindow.h> 17#include <qmainwindow.h>
18#include <qdir.h> 18#include <qdir.h>
19#include <qstring.h> 19#include <qstring.h>
20#include <qpoint.h> 20#include <qpoint.h>
21#include <qpixmap.h>
21 22
22class QVBoxLayout; 23class QVBoxLayout;
23class QHBoxLayout; 24class QHBoxLayout;
24class QGridLayout; 25class QGridLayout;
25class QComboBox; 26class QComboBox;
26class QListView; 27class QListView;
27class QListViewItem; 28class QListViewItem;
28class QLabel; 29class QLabel;
29class QProgressBar; 30class QProgressBar;
30class QSpinBox; 31class QSpinBox;
31class QTabWidget; 32class QTabWidget;
32class QWidget; 33class QWidget;
@@ -118,23 +119,24 @@ protected slots:
118 119
119 void fillCombos(); 120 void fillCombos();
120 void clearCombos(); 121 void clearCombos();
121 void fillRemoteCombo(const QString&); 122 void fillRemoteCombo(const QString&);
122 void fillCombo(const QString &); 123 void fillCombo(const QString &);
123 void serverComboSelected(int); 124 void serverComboSelected(int);
124 void deleteServer(); 125 void deleteServer();
125 void connectorBtnToggled(bool); 126 void connectorBtnToggled(bool);
126 void NewServer(); 127 void NewServer();
127 void serverListClicked( const QString &); 128 void serverListClicked( const QString &);
128 129
129protected: 130protected:
131 QPixmap unknownXpm;
130 bool fuckeduphack; 132 bool fuckeduphack;
131 QStringList remoteDirPathStringList, localDirPathStringList; 133 QStringList remoteDirPathStringList, localDirPathStringList;
132 QString newServerName; 134 QString newServerName;
133 void nullifyCallBack(); 135 void nullifyCallBack();
134 QGridLayout* tabLayout; 136 QGridLayout* tabLayout;
135 QGridLayout* tabLayout_2; 137 QGridLayout* tabLayout_2;
136 QGridLayout* tabLayout_3; 138 QGridLayout* tabLayout_3;
137 139
138}; 140};
139 141
140#endif // OPIEFTP_H 142#endif // OPIEFTP_H