Changeset 92400 in vbox

Timestamp:

Nov 12, 2021 3:07:42 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148254

Message:

FE/Qt: bugref:10067: UINotificationCenter: Support for Ascending/Descending notification ordering; Corresponding flag is GUI/NotificationCenter/Order.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• notificationcenter/UINotificationCenter.cpp (modified) (4 diffs)
• notificationcenter/UINotificationCenter.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -78 +78 @@
 
 /* Declare global canConvert specializations: */
+template<> SHARED_LIBRARY_STUFF bool canConvert<Qt::SortOrder>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<SizeSuffix>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<StorageSlot>();
@@ -157 +158 @@
 
 /* Declare global conversion specializations: */
+template<> SHARED_LIBRARY_STUFF QString toInternalString(const Qt::SortOrder &enmSortOrder);
+template<> SHARED_LIBRARY_STUFF Qt::SortOrder fromInternalString<Qt::SortOrder>(const QString &strSortOrder);
 template<> SHARED_LIBRARY_STUFF QString toString(const SizeSuffix &sizeSuffix);
 template<> SHARED_LIBRARY_STUFF SizeSuffix fromString<SizeSuffix>(const QString &strSizeSuffix);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -32 +32 @@
 /* Determines if <Object of type X> can be converted to object of other type.
  * These functions returns 'true' for all allowed conversions. */
+template<> bool canConvert<Qt::SortOrder>() { return true; }
 template<> bool canConvert<SizeSuffix>() { return true; }
 template<> bool canConvert<StorageSlot>() { return true; }
@@ -83 +84 @@
 
 
+/* QString <= Qt::SortOrder: */
+template<> QString toInternalString(const Qt::SortOrder &enmSortOrder)
+{
+    QString strResult;
+    switch (enmSortOrder)
+    {
+        case Qt::AscendingOrder: strResult = "Ascending"; break;
+        case Qt::DescendingOrder: strResult = "Descending"; break;
+        default:
+        {
+            AssertMsgFailed(("No text for sort order=%d", enmSortOrder));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* Qt::SortOrder <= QString: */
+template<> Qt::SortOrder fromInternalString<Qt::SortOrder>(const QString &strSortOrder)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;     QList<Qt::SortOrder> values;
+    keys << "Ascending";  values << Qt::AscendingOrder;
+    keys << "Descending"; values << Qt::DescendingOrder;
+    /* Qt::AscendingOrder type for unknown words: */
+    if (!keys.contains(strSortOrder, Qt::CaseInsensitive))
+        return Qt::AscendingOrder;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strSortOrder, Qt::CaseInsensitive)));
+}
+
 /* QString <= SizeSuffix: */
 template<> QString toString(const SizeSuffix &sizeSuffix)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -29 +29 @@
 const char *UIExtraDataDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
 const char *UIExtraDataDefs::GUI_NotificationCenter_KeepSuccessfullProgresses = "GUI/NotificationCenter/KeepSuccessfullProgresses";
+const char *UIExtraDataDefs::GUI_NotificationCenter_Order = "GUI/NotificationCenter/Order";
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
 const char *UIExtraDataDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -59 +59 @@
         /** Holds whether successfull notification-progresses should NOT close automatically. */
         SHARED_LIBRARY_STUFF extern const char *GUI_NotificationCenter_KeepSuccessfullProgresses;
+        /** Holds notification-center order. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_NotificationCenter_Order;
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
         /** Holds version for which user wants to prevent BETA build warning. */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1896 +1896 @@
            << GUI_RestrictedDialogs
            << GUI_SuppressMessages << GUI_InvertMessageOption
-           << GUI_NotificationCenter_KeepSuccessfullProgresses
+           << GUI_NotificationCenter_KeepSuccessfullProgresses << GUI_NotificationCenter_Order
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
            << GUI_PreventApplicationUpdate << GUI_UpdateDate << GUI_UpdateCheckCount
@@ -2352 +2352 @@
 }
 
+Qt::SortOrder UIExtraDataManager::notificationCenterOrder()
+{
+    return gpConverter->fromInternalString<Qt::SortOrder>(extraDataString(GUI_NotificationCenter_Order));
+}
+
+void UIExtraDataManager::setNotificationCenterOrder(Qt::SortOrder enmOrder)
+{
+    const QString strValue = enmOrder == Qt::AscendingOrder ? QString() : gpConverter->toInternalString(enmOrder);
+    setExtraDataString(GUI_NotificationCenter_Order, strValue);
+}
+
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
 QString UIExtraDataManager::preventBetaBuildWarningForVersion()
@@ -4726 +4737 @@
         if (strKey.startsWith("GUI/"))
         {
+            /* Notification-center order? */
+            if (strKey == GUI_NotificationCenter_Order)
+                emit sigNotificationCenterOrderChange();
             /* Language changed? */
             if (strKey == GUI_LanguageID)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -66 +66 @@
     void sigExtraDataChange(const QUuid &uID, const QString &strKey, const QString &strValue);
 
+    /** Notifies about notification-center order change. */
+    void sigNotificationCenterOrderChange();
+
     /** Notifies about GUI language change. */
     void sigLanguageChange(QString strLanguage);
@@ -188 +191 @@
         /** Defines whether successfull notification-progresses should NOT close (@a fKeep) automatically. */
         void setKeepSuccessfullNotificationProgresses(bool fKeep);
+
+        /** Returns notification-center order. */
+        Qt::SortOrder notificationCenterOrder();
+        /** Defines notification-progresses @a enmOrder. */
+        void setNotificationCenterOrder(Qt::SortOrder enmOrder);
 
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -148 +148 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pModel(0)
+    , m_enmOrder(Qt::AscendingOrder)
     , m_pLayoutMain(0)
     , m_pLayoutButtons(0)
@@ -352 +353 @@
 }
 
+void UINotificationCenter::sltHandleOrderChange()
+{
+    m_enmOrder = gEDataManager->notificationCenterOrder();
+    sltModelChanged();
+}
+
 void UINotificationCenter::sltHandleOpenButtonToggled(bool fToggled)
 {
@@ -402 +409 @@
 
     /* Populate model contents again: */
-    foreach (const QUuid &uId, m_pModel->ids())
-        m_pLayoutItems->addWidget(UINotificationItem::create(this, m_pModel->objectById(uId)));
+    const int iCount = m_pModel->ids().count();
+    for (int iIndex = 0; iIndex < iCount; ++iIndex)
+    {
+        const QUuid &uId = m_pModel->ids().at(iIndex);
+        m_pLayoutItems->insertWidget(m_enmOrder == Qt::AscendingOrder ? iCount : 0,
+                                     UINotificationItem::create(this, m_pModel->objectById(uId)));
+    }
 
     /* Since there is a scroll-area expanded up to whole
@@ -443 +455 @@
     prepareStateMachineSliding();
     prepareOpenTimer();
+
+    /* Prepare order: */
+    m_enmOrder = gEDataManager->notificationCenterOrder();
+    connect(gEDataManager, &UIExtraDataManager::sigNotificationCenterOrderChange,
+            this, &UINotificationCenter::sltHandleOrderChange);
 
     /* Apply language settings: */

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -101 +101 @@
 private slots:
 
+    /** Handles order changes. */
+    void sltHandleOrderChange();
+
     /** Issues request to make open button @a fToggled. */
     void sltHandleOpenButtonToggled(bool fToggled);
@@ -151 +154 @@
     /** Holds the model instance. */
     UINotificationModel *m_pModel;
+
+    /** Holds the order. */
+    Qt::SortOrder  m_enmOrder;
 
     /** Holds the main layout instance. */