[ui] Move icon-less network logger toolbar actions under settings menu

qgis · Jun 27, 2020 · 6f82f33 · 6f82f33
1 parent fc57be6
commit 6f82f33
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/app/devtools/networklogger/qgsnetworkloggerpanelwidget.cpp b/src/app/devtools/networklogger/qgsnetworkloggerpanelwidget.cpp
@@ -13,17 +13,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsnetworkloggerpanelwidget.h"
+#include "qgsapplication.h"
 #include "qgsguiutils.h"
+#include "qgsjsonutils.h"
+#include "qgsnetworkloggerpanelwidget.h"
+#include "qgsnetworkloggernode.h"
 #include "qgsnetworklogger.h"
 #include "qgssettings.h"
-#include "qgsnetworkloggernode.h"
-#include "qgsjsonutils.h"
+
+#include <QFileDialog>
 #include <QFontDatabase>
 #include <QMenu>
-#include <QScrollBar>
-#include <QFileDialog>
 #include <QMessageBox>
+#include <QScrollBar>
+#include <QToolButton>
+
 #include <nlohmann/json.hpp>
 
 //
@@ -200,4 +204,17 @@ QgsNetworkLoggerPanelWidget::QgsNetworkLoggerPanelWidget( QgsNetworkLogger *logg
 
     fout << json;
   } );
+
+
+  QMenu *settingsMenu = new QMenu();
+  QToolButton *settingsButton = new QToolButton();
+  settingsButton->setAutoRaise( true );
+  settingsButton->setToolTip( tr( "Settings" ) );
+  settingsButton->setMenu( settingsMenu );
+  settingsButton->setPopupMode( QToolButton::InstantPopup );
+  settingsButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
+  mToolbar->addWidget( settingsButton );
+
+  settingsMenu->addAction( mActionShowSuccessful );
+  settingsMenu->addAction( mActionShowTimeouts );
 }
diff --git a/src/ui/qgsnetworkloggerpanelbase.ui b/src/ui/qgsnetworkloggerpanelbase.ui
@@ -39,10 +39,8 @@
      </property>
      <addaction name="mActionRecord"/>
      <addaction name="mActionClear"/>
-     <addaction name="mActionShowSuccessful"/>
-     <addaction name="mActionShowTimeouts"/>
-     <addaction name="separator"/>
      <addaction name="mActionSaveLog"/>
+     <addaction name="separator"/>
     </widget>
    </item>
    <item>