summaryrefslogtreecommitdiff
path: root/noncore/net/opie-smb/qsmb.cpp
Side-by-side diff
Diffstat (limited to 'noncore/net/opie-smb/qsmb.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opie-smb/qsmb.cpp19
1 files changed, 17 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
@@ -35,24 +35,25 @@
// #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);
@@ -344,35 +345,39 @@ void Qsmb::DoIt()
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, "");
@@ -426,12 +431,22 @@ QString Qsmb::getMount(const QString &shareName)
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);
+}