iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial work on remote (sshfs) devices.

Browse Source
This commit is contained in:
craig
2012-02-21 17:01:43 +00:00
committed by craig
parent a382a34c08
commit 5b68bd2e2b
33 changed files with 2450 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
devices/actiondialog.cpp
View File

@@ -26,6 +26,7 @@
#include "device.h"
#include "utils.h"
#include "devicepropertiesdialog.h"
#include "devicepropertieswidget.h"
#include "settings.h"
#include "musiclibrarymodel.h"
#include "dirviewmodel.h"
@@ -91,6 +92,12 @@ void ActionDialog::copy(const QString &srcUdi, const QString &dstUdi, const QLis
return;
}
if (!dev->isConnected()) {
KMessageBox::error(parentWidget(), i18n("Device is not connected."));
deleteLater();
return;
}
if (!dev->isIdle()) {
KMessageBox::error(parentWidget(), i18n("Device is currently busy."));
deleteLater();
@@ -419,7 +426,7 @@ void ActionDialog::configure(const QString &udi)
connect(dlg, SIGNAL(updatedSettings(const QString &, const QString &, const Device::Options &)),
SLOT(saveProperties(const QString &, const QString &, const Device::Options &)));
dlg->setCaption(i18n("Local Music Library Properties"));
dlg->show(Settings::self()->mpdDir(), QString(), namingOptions, DevicePropertiesDialog::Prop_Basic);
dlg->show(Settings::self()->mpdDir(), QString(), namingOptions, DevicePropertiesWidget::Prop_Basic);
} else {
Device *dev=DevicesModel::self()->device(udi);
if (dev) {