Changeset 70746 in vbox

Timestamp:

Jan 25, 2018 4:01:15 PM (7 years ago)

Author:

vboxsync

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

120513

Message:

FE\Qt: bugref:9072 Reorder logviewer actions

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (8 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -70 +70 @@
     , m_pActionRefresh(0)
     , m_pActionSave(0)
-    , m_pActionBookmark(0)
+    , m_pActionBookmarks(0)
     , m_pActionSettings(0)
     , m_pMenu(0)
@@ -210 +210 @@
     if (m_pActionSave)
         m_pActionSave->setEnabled(!noLogsToShow);
-    if (m_pActionBookmark)
-        m_pActionBookmark->setEnabled(!noLogsToShow);
+    if (m_pActionBookmarks)
+        m_pActionBookmarks->setEnabled(!noLogsToShow);
     //m_pTabWidget->setEnabled(!noLogsToShow);
     if (m_pActionSettings)
@@ -374 +374 @@
     retranslateUi();
 
-    m_panelActionMap.insert(m_pBookmarksPanel, m_pActionBookmark);
+    m_panelActionMap.insert(m_pBookmarksPanel, m_pActionBookmarks);
     m_panelActionMap.insert(m_pSearchPanel, m_pActionFind);
     m_panelActionMap.insert(m_pFilterPanel, m_pActionFilter);
@@ -473 +473 @@
     }
     /* Create and configure 'Bookmark' action: */
-    m_pActionBookmark = new QAction(this);
-    if (m_pActionBookmark)
+    m_pActionBookmarks = new QAction(this);
+    if (m_pActionBookmarks)
     {
         /* tie Ctrl+D to save only if we show this in a dialog since Ctrl+D is
            already assigned to another action in the selector UI: */
         if (m_enmEmbedding == EmbedTo_Dialog)
-            m_pActionBookmark->setShortcut(QKeySequence("Ctrl+D"));
-        m_pActionBookmark->setCheckable(true);
-        connect(m_pActionBookmark, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
+            m_pActionBookmarks->setShortcut(QKeySequence("Ctrl+D"));
+        m_pActionBookmarks->setCheckable(true);
+        connect(m_pActionBookmarks, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
     }
 
@@ -538 +538 @@
                                                        QString(":/%1_save_disabled_24px.png").arg(strPrefix)));
 
-    if (m_pActionBookmark)
-        m_pActionBookmark->setIcon(UIIconPool::iconSet(QString(":/%1_bookmark_24px.png").arg(strPrefix),
+    if (m_pActionBookmarks)
+        m_pActionBookmarks->setIcon(UIIconPool::iconSet(QString(":/%1_bookmark_24px.png").arg(strPrefix),
                                                        QString(":/%1_bookmark_disabled_24px.png").arg(strPrefix)));
 
@@ -558 +558 @@
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
         /* Add toolbar actions: */
+        if (m_pActionSave)
+        {
+            m_pToolBar->addAction(m_pActionSave);
+            m_pToolBar->addSeparator();
+        }
         if (m_pActionFind)
             m_pToolBar->addAction(m_pActionFind);
-
         if (m_pActionFilter)
             m_pToolBar->addAction(m_pActionFilter);
-
-        if (m_pActionRefresh)
-            m_pToolBar->addAction(m_pActionRefresh);
-
-        if (m_pActionSave)
-            m_pToolBar->addAction(m_pActionSave);
-
-        if (m_pActionBookmark)
-            m_pToolBar->addAction(m_pActionBookmark);
-
+        if (m_pActionBookmarks)
+            m_pToolBar->addAction(m_pActionBookmarks);
         if (m_pActionSettings)
             m_pToolBar->addAction(m_pActionSettings);
+        if (m_pActionRefresh)
+        {
+            m_pToolBar->addSeparator();
+            m_pToolBar->addAction(m_pActionRefresh);
+        }
 
 #ifdef VBOX_WS_MAC
@@ -596 +597 @@
     if (m_pMenu)
     {
+        if (m_pActionSave)
+        {
+            m_pMenu->addAction(m_pActionSave);
+            m_pMenu->addSeparator();
+        }
         if (m_pActionFind)
             m_pMenu->addAction(m_pActionFind);
         if (m_pActionFilter)
             m_pMenu->addAction(m_pActionFilter);
-        if (m_pActionRefresh)
-            m_pMenu->addAction(m_pActionRefresh);
-        if (m_pActionSave)
-            m_pMenu->addAction(m_pActionSave);
-        if (m_pActionBookmark)
-            m_pMenu->addAction(m_pActionBookmark);
+        if (m_pActionBookmarks)
+            m_pMenu->addAction(m_pActionBookmarks);
         if (m_pActionSettings)
             m_pMenu->addAction(m_pActionSettings);
+        if (m_pActionRefresh)
+        {
+            m_pMenu->addSeparator();
+            m_pMenu->addAction(m_pActionRefresh);
+        }
     }
 }
@@ -658 +665 @@
     }
 
-    if (m_pActionBookmark)
-    {
-        m_pActionBookmark->setText(tr("&Bookmarks"));
+    if (m_pActionBookmarks)
+    {
+        m_pActionBookmarks->setText(tr("&Bookmarks"));
         if (m_enmEmbedding == EmbedTo_Dialog)
         {
-            m_pActionBookmark->setToolTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
-            m_pActionBookmark->setStatusTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
+            m_pActionBookmarks->setToolTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
+            m_pActionBookmarks->setStatusTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
         }
         else
         {
-            m_pActionBookmark->setToolTip(tr("Show/Hide 'Bookmarks' Panel"));
-            m_pActionBookmark->setStatusTip(tr("Show/Hide 'Bookmarks' Panel"));
+            m_pActionBookmarks->setToolTip(tr("Show/Hide 'Bookmarks' Panel"));
+            m_pActionBookmarks->setStatusTip(tr("Show/Hide 'Bookmarks' Panel"));
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -194 +194 @@
         QAction   *m_pActionRefresh;
         QAction   *m_pActionSave;
-        QAction   *m_pActionBookmark;
+        QAction   *m_pActionBookmarks;
         QAction   *m_pActionSettings;
         QMenu     *m_pMenu;