summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-16 09:55:52 (UTC)
committer llornkcor <llornkcor>2005-08-16 09:55:52 (UTC)
commitdd4792fe0ac89205e7d7a7e38f3d4350e19f25d7 (patch) (side-by-side diff)
tree4a9bcee8e558a66ab9ecd0c1c6337581821c9d95
parent8c44cc4fdb67ea6b96cf7e49ec648de4049a9f1c (diff)
downloadopie-dd4792fe0ac89205e7d7a7e38f3d4350e19f25d7.zip
opie-dd4792fe0ac89205e7d7a7e38f3d4350e19f25d7.tar.gz
opie-dd4792fe0ac89205e7d7a7e38f3d4350e19f25d7.tar.bz2
fix a few things
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opie-smb/qsmb.cpp19
-rw-r--r--noncore/net/opie-smb/qsmb.h4
2 files changed, 21 insertions, 2 deletions
diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index 7f3ae89..d35e09a 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -23,48 +23,49 @@
#include <pthread.h>
#include <signal.h>
#include <ctype.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <rpc/clnt.h>
#include <sys/vfs.h>
#include <mntent.h>
// #include <opie2/odebug.h>
// using namespace Opie::Core;
Qsmb::Qsmb( QWidget* parent, const char* name, WFlags fl )
: FormQPESMBBase( parent, name, fl )
{
connect(CBHost, SIGNAL(activated(int)), this, SLOT(hostSelected(int)));
connect(DoItBtn, SIGNAL(clicked()), this, SLOT(DoItClicked()));
connect(UnmountBtn, SIGNAL(clicked()), this, SLOT(umountIt()));
connect(BtnScan, SIGNAL(clicked()), this, SLOT(scanClicked()));
connect(BtnClear, SIGNAL(clicked()), this, SLOT(clear()));
+ connect(ListViewScan, SIGNAL(clicked(QListViewItem*)), this, SLOT(TextViewClicked(QListViewItem*)));
mountpt->setEditable(true);
mountpt->insertItem("/mnt/samba1",-1);
mountpt->insertItem("/mnt/samba2",-1);
mountpt->insertItem("/mnt/samba3",-1);
setTabOrder(BtnScan, username);
setTabOrder(username, password);
setTabOrder(password, CBHost);
setTabOrder(CBHost, TextViewOutput);
setTabOrder(TextViewOutput, mountpt);
setTabOrder(mountpt, DoItBtn);
setTabOrder(DoItBtn, UnmountBtn);
top_element = NULL;
scanning = false;
}
Qsmb::~Qsmb()
{
}
void Qsmb::clear()
{
@@ -332,59 +333,63 @@ void Qsmb::DoIt()
smbv << ccmd.join(" ") ;
sambenv.close();
}
noerr = runCommand(ccmd);
LScan->setText("");
if(noerr && isMounted(mount)) {
element->setText(2, mount);
TextViewOutput->append("\n\n================CheckMounts==================\n");
ccmd = "/bin/mount";
runCommand(ccmd);
TextViewOutput->append("\n\n============================================\n");
qApp->processEvents();
} else {
//do nothing
}
scanning = false;
}
void Qsmb::umountIt()
{
+ QListViewItem *element;
+ element = ListViewScan->selectedItem();
+ if(!element) {
+ return;
+ }
+
QString mount = mountpt->currentText();
if(!isMounted(mount)) {
qWarning(mount +" is not mounted");
TextViewOutput->append(mount +" is not mounted");
return;
}
QStringList ccmd;
QString share;
- QListViewItem *element;
- element = ListViewScan->selectedItem();
share = element->text(0);
qWarning("selected share is "+share);
if(mount.left(1) != "/")
mount = QDir::currentDirPath()+"/"+mount;
mount = mount.stripWhiteSpace();
ccmd << "/usr/bin/smbumount";
ccmd << mount;
runCommand(ccmd);
element->setText(2, "");
ccmd = "/bin/mount";
runCommand(ccmd);
}
bool Qsmb::runCommand(const QStringList & command) {
qWarning( "runCommand " + command.join(" ") );
TextViewOutput->append(command.join(" "));
out = "";
Process ipkg_status( command);
bool r = ipkg_status.exec("",out);
@@ -414,24 +419,34 @@ bool Qsmb::isMounted(const QString &mountPoint)
mounted = true;
}
}
endmntent( mntfp );
return mounted;
}
QString Qsmb::getMount(const QString &shareName)
{
struct mntent *me;
QString mount;
FILE *mntfp = setmntent( "/etc/mtab", "r" );
if ( mntfp ){
while ( (me = getmntent( mntfp )) != 0 ) {
QString deviceName = me->mnt_fsname;
QString mountDir = me->mnt_dir;
QString fsType = me->mnt_type;
if( fsType == "smbfs" && deviceName.find(shareName) != -1)
mount = mountDir;
}
}
endmntent( mntfp );
return mount;
}
+
+void Qsmb::TextViewClicked(QListViewItem* item)
+{
+ if(item == NULL) return;
+
+ QString text = item->text(2);
+ qWarning(text);
+ if( !text.isEmpty())
+ mountpt->insertItem(text,0);
+}
diff --git a/noncore/net/opie-smb/qsmb.h b/noncore/net/opie-smb/qsmb.h
index abf27da..175b2c3 100644
--- a/noncore/net/opie-smb/qsmb.h
+++ b/noncore/net/opie-smb/qsmb.h
@@ -1,45 +1,49 @@
#ifndef QSMB_H
#define QSMB_H
#include "qsmbbase.h"
#include <stdlib.h>
#include <stdlib.h>
#include <stdio.h>
#include <qlistview.h>
#include <pthread.h>
+#include <qlistview.h>
+
class Qsmb : public FormQPESMBBase
{
Q_OBJECT
public:
static QString appName() { return QString::fromLatin1("opie-smb"); }
Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Qsmb();
void scan();
void DoIt();
private:
QListViewItem *top_element;
QComboBox *hosts;
pthread_t tpid;
bool scanning;
bool isMounted(const QString &);
QString getMount(const QString &);
public slots:
void clear();
void scanClicked();
void hostSelected(int);
void DoItClicked();
void umountIt();
QString out;
bool runCommand(const QStringList &);
+private slots:
+ void TextViewClicked(QListViewItem*);
};
void* runit(void *arg);
void* runitm(void *arg);
#endif // QSMB_H