Changeset 48090 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2013 4:10:14 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Virtual Medium Manager: Rework (part 3).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumManager.cpp (modified) (4 diffs)
• UIMediumManager.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -1445 +1445 @@
 }
 
+void UIMediumManager::setCurrentItem(QTreeWidget *pTree, QTreeWidgetItem *pItem)
+{
+    if (pTree && pItem)
+    {
+        pItem->setSelected(true);
+        pTree->setCurrentItem(pItem);
+        pTree->scrollToItem(pItem, QAbstractItemView::EnsureVisible);
+        sltHandleCurrentItemChanged(pItem);
+    }
+    else
+        sltHandleCurrentTabChanged();
+}
+
 UIMediumItem* UIMediumManager::toMediumItem(QTreeWidgetItem *pItem) const
 {
@@ -1454 +1467 @@
 }
 
-void UIMediumManager::setCurrentItem(QTreeWidget *pTree, QTreeWidgetItem *pItem)
-{
-    if (pTree && pItem)
-    {
-        pItem->setSelected(true);
-        pTree->setCurrentItem(pItem);
-        pTree->scrollToItem(pItem, QAbstractItemView::EnsureVisible);
-        sltHandleCurrentItemChanged(pItem);
-    }
-    else
-        sltHandleCurrentTabChanged();
+UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTree, const QString &strId) const
+{
+    /* Make sure passed ID is valid: */
+    if (strId.isNull())
+        return 0;
+
+    /* Iterate other all the mediums of passed tree: */
+    UIMediumItemIterator iterator(pTree);
+    while (*iterator)
+    {
+        if ((*iterator)->id() == strId)
+            return *iterator;
+        ++iterator;
+    }
+
+    /* Null by default: */
+    return 0;
 }
 
@@ -1582 +1601 @@
 }
 
-UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTree, const QString &strId) const
-{
-    /* Make sure passed ID is valid: */
-    if (strId.isNull())
-        return 0;
-
-    /* Iterate other all the mediums of passed tree: */
-    UIMediumItemIterator iterator(pTree);
-    while (*iterator)
-    {
-        if ((*iterator)->id() == strId)
-            return *iterator;
-        ++iterator;
-    }
-
-    /* Null by default: */
-    return 0;
-}
-
 bool UIMediumManager::checkMediumFor(UIMediumItem *pItem, Action action)
 {
@@ -1702 +1702 @@
 }
 
+/* static */
 QString UIMediumManager::formatPaneText(const QString &strText, bool fCompact /* = true */,
                                         const QString &strElipsis /* = "middle" */)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -125 +125 @@
     void retranslateUi();
 
-    /* Helper: Medium-modification stuff: */
+    /* Helpers: Medium-modification stuff: */
     bool releaseMediumFrom(const UIMedium &medium, const QString &strMachineId);
     bool releaseHardDiskFrom(const UIMedium &medium, CMachine &machine);
@@ -135 +135 @@
     UIMediumType currentTreeWidgetType() const;
     QTreeWidget* currentTreeWidget() const;
-    UIMediumItem* toMediumItem(QTreeWidgetItem *aItem) const;
     void setCurrentItem(QTreeWidget *pTree, QTreeWidgetItem *pItem);
+    UIMediumItem* toMediumItem(QTreeWidgetItem *pItem) const;
+    UIMediumItem* searchItem(QTreeWidget *pTree, const QString &strId) const;
+    UIMediumItem* createHardDiskItem(QTreeWidget *pTree, const UIMedium &medium) const;
 
-    UIMediumItem* createHardDiskItem (QTreeWidget *aTree, const UIMedium &aMedium) const;
+    /* Internal API: Tab-widget access stuff: */
+    void updateTabIcons(UIMediumItem *pItem, ItemAction action);
 
-    void updateTabIcons (UIMediumItem *aItem, ItemAction aAction);
+    /* Helpers: Other stuff: */
+    bool checkMediumFor(UIMediumItem *pItem, Action action);
+    void clearInfoPanes();
+    void prepareToRefresh(int iTotal = 0);
 
-    UIMediumItem* searchItem (QTreeWidget *aTree, const QString &aId) const;
+    /* Static helper: Formatting stuff: */
+    static QString formatPaneText(const QString &strText, bool fCompact = true, const QString &strElipsis = "middle");
 
-    bool checkMediumFor (UIMediumItem *aItem, Action aAction);
-
-    void clearInfoPanes();
-    void prepareToRefresh (int aTotal = 0);
-
-    QString formatPaneText (const QString &aText, bool aCompact = true, const QString &aElipsis = "middle");
-
-    /* Helper: Enumeration stuff: */
+    /* Static helper: Enumeration stuff: */
     static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
 
@@ -188 +188 @@
 
 #endif /* __UIMediumManager_h__ */
-