1 files changed, 22 insertions, 0 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 62a4f583f7..aa0c365303 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -110,6 +110,11 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
         RegCloseKey(hk);
     }
 #endif
+
+#if !defined(Q_OS_WIN32)
+    /* eject funtionality is only implemented on W32 right now. */
+    ui.buttonEject->setEnabled(false);
+#endif
     updateDevice();
     downloadInfo();
 
@@ -142,6 +147,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     connect(ui.action_Configure, SIGNAL(triggered()), this, SLOT(configDialog()));
     connect(ui.actionE_xit, SIGNAL(triggered()), this, SLOT(shutdown()));
     connect(ui.buttonChangeDevice, SIGNAL(clicked()), this, SLOT(configDialog()));
+    connect(ui.buttonEject, SIGNAL(clicked()), this, SLOT(eject()));
     connect(ui.buttonTalk, SIGNAL(clicked()), this, SLOT(createTalkFiles()));
     connect(ui.buttonCreateVoice, SIGNAL(clicked()), this, SLOT(createVoiceFile()));
     connect(ui.buttonVoice, SIGNAL(clicked()), this, SLOT(installVoice()));
@@ -733,3 +739,19 @@ void RbUtilQt::changeEvent(QEvent *e)
     }
 }
 
+void RbUtilQt::eject(void)
+{
+    QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
+    if(Utils::ejectDevice(mountpoint)) {
+        QMessageBox::information(this, tr("Device ejected"),
+                tr("Device successfully ejected. "
+                   "You may now disconnect the player from the PC."));
+    }
+    else {
+        QMessageBox::critical(this, tr("Ejecting failed"),
+                tr("Ejecting the device failed. Please make sure no programs "
+                   "are accessing files on the device. If ejecting still "
+                   "fails please use your computers eject funtionality."));
+    }
+}
+