[PC-BSD Commits] r19646 - in pcbsd/current/src-qt4/pc-mounttray: . icons

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-10-11 16:34:25 +0000 (Thu, 11 Oct 2012)
New Revision: 19646

Modified:
   pcbsd/current/src-qt4/pc-mounttray/icons/dvd.png
   pcbsd/current/src-qt4/pc-mounttray/icons/harddrive.png
   pcbsd/current/src-qt4/pc-mounttray/icons/musiccd.png
   pcbsd/current/src-qt4/pc-mounttray/icons/sdcard.png
   pcbsd/current/src-qt4/pc-mounttray/icons/usb.png
   pcbsd/current/src-qt4/pc-mounttray/menuItem.cpp
   pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp
Log:
Finish fixing a few minor bugs in the new mounttray



Modified: pcbsd/current/src-qt4/pc-mounttray/icons/dvd.png
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-mounttray/icons/harddrive.png
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-mounttray/icons/musiccd.png
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-mounttray/icons/sdcard.png
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-mounttray/icons/usb.png
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-mounttray/menuItem.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-mounttray/menuItem.cpp	2012-10-11 15:35:04 UTC (rev 19645)
+++ pcbsd/current/src-qt4/pc-mounttray/menuItem.cpp	2012-10-11 16:34:25 UTC (rev 19646)
@@ -371,7 +371,7 @@
   //this method only works if the device is currently mounted
   bool ok = FALSE;
   if(isMounted()){
-    QString cmd = "df "+device;
+    QString cmd = "df "+mountpoint;
     QStringList output = Utils::runShellCommand(cmd);
     if(output.length() > 1){
       //parse the output (1K blocks) and save them

Modified: pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp	2012-10-11 15:35:04 UTC (rev 19645)
+++ pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp	2012-10-11 16:34:25 UTC (rev 19646)
@@ -296,5 +296,6 @@
 
 void MountTray::slotDisplayPopup(QString title, QString msg){
   //Display a popup bubble with the given message for 3 seconds
+  trayIcon->contextMenu()->hide(); //close the menu list
   trayIcon->showMessage(title, msg , QSystemTrayIcon::NoIcon,3000 );
 }