summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 835fb0d0a2..ee77505e06 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -370,19 +370,25 @@ void RbUtilQt::updateDevice()
370 // displayed device info 370 // displayed device info
371 QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); 371 QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
372 QString brand = SystemInfo::value(SystemInfo::CurBrand).toString(); 372 QString brand = SystemInfo::value(SystemInfo::CurBrand).toString();
373 QString name = SystemInfo::value(SystemInfo::CurName).toString() + 373 QString name = SystemInfo::value(SystemInfo::CurName).toString() +
374 " (" + ServerInfo::value(ServerInfo::CurStatus).toString() + ")"; 374 " (" + ServerInfo::value(ServerInfo::CurStatus).toString() + ")";
375 QString mountdisplay = QDir::toNativeSeparators(mountpoint);
376 QString label = Utils::filesystemName(mountpoint);
377 if(!label.isEmpty())
378 mountdisplay += " (" + label + ")";
379
375 if(name.isEmpty()) name = "<none>"; 380 if(name.isEmpty()) name = "<none>";
376 if(mountpoint.isEmpty()) mountpoint = "<invalid>"; 381 if(mountpoint.isEmpty())
382 mountpoint = "<invalid>";
377 ui.labelDevice->setText(tr("<b>%1 %2</b> at <b>%3</b>") 383 ui.labelDevice->setText(tr("<b>%1 %2</b> at <b>%3</b>")
378 .arg(brand, name, QDir::toNativeSeparators(mountpoint))); 384 .arg(brand, name, mountdisplay));
379 385
380 // hide quickstart buttons if no release available 386 // hide quickstart buttons if no release available
381 bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); 387 bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty();
382 ui.buttonSmall->setEnabled(installable); 388 ui.buttonSmall->setEnabled(installable);
383 ui.buttonComplete->setEnabled(installable); 389 ui.buttonComplete->setEnabled(installable);
384 ui.actionSmall_Installation->setEnabled(installable); 390 ui.actionSmall_Installation->setEnabled(installable);
385 ui.actionComplete_Installation->setEnabled(installable); 391 ui.actionComplete_Installation->setEnabled(installable);
386} 392}
387 393
388 394