added medium toolbar icon size

3 files changed, 20 insertions, 9 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3da571f9..753b6a5d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -190,6 +190,7 @@ using namespace MOBase;
 using namespace MOShared;
 
 const QSize SmallToolbarSize(24, 24);
+const QSize MediumToolbarSize(32, 32);
 const QSize LargeToolbarSize(42, 36);
 
 
@@ -655,8 +656,9 @@ void MainWindow::toolbarMenu_aboutToShow()
   ui->actionToolBarMainToggle->setChecked(ui->toolBar->isVisible());
   ui->actionToolBarLinksToggle->setChecked(ui->linksToolBar->isVisible());
 
-  ui->actionToolBarLargeIcons->setChecked(ui->toolBar->iconSize() == LargeToolbarSize);
   ui->actionToolBarSmallIcons->setChecked(ui->toolBar->iconSize() == SmallToolbarSize);
+  ui->actionToolBarMediumIcons->setChecked(ui->toolBar->iconSize() == MediumToolbarSize);
+  ui->actionToolBarLargeIcons->setChecked(ui->toolBar->iconSize() == LargeToolbarSize);
 
   ui->actionToolBarIconsOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonIconOnly);
   ui->actionToolBarTextOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextOnly);
@@ -678,14 +680,19 @@ void MainWindow::on_actionToolBarLinksToggle_triggered()
   ui->linksToolBar->setVisible(!ui->linksToolBar->isVisible());
 }
 
-void MainWindow::on_actionToolBarLargeIcons_triggered()
+void MainWindow::on_actionToolBarSmallIcons_triggered()
 {
-  setToolbarSize(LargeToolbarSize);
+  setToolbarSize(SmallToolbarSize);
 }
 
-void MainWindow::on_actionToolBarSmallIcons_triggered()
+void MainWindow::on_actionToolBarMediumIcons_triggered()
 {
-  setToolbarSize(SmallToolbarSize);
+  setToolbarSize(MediumToolbarSize);
+}
+
+void MainWindow::on_actionToolBarLargeIcons_triggered()
+{
+  setToolbarSize(LargeToolbarSize);
 }
 
 void MainWindow::on_actionToolBarIconsOnly_triggered()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 18aa525e..a0cce858 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -635,8 +635,9 @@ private slots: // ui slots
   void on_actionExit_triggered();
   void on_actionToolBarMainToggle_triggered();
   void on_actionToolBarLinksToggle_triggered();
-  void on_actionToolBarLargeIcons_triggered();
   void on_actionToolBarSmallIcons_triggered();
+  void on_actionToolBarMediumIcons_triggered();
+  void on_actionToolBarLargeIcons_triggered();
   void on_actionToolBarIconsOnly_triggered();
   void on_actionToolBarTextOnly_triggered();
   void on_actionToolBarIconsAndText_triggered();
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index a4bd2888..29a8ac76 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1358,9 +1358,6 @@ p, li { white-space: pre-wrap; }
      <height>36</height>
     </size>
    </property>
-   <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonTextUnderIcon</enum>
-   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -1438,6 +1435,7 @@ p, li { white-space: pre-wrap; }
      <addaction name="actionToolBarLinksToggle"/>
      <addaction name="separator"/>
      <addaction name="actionToolBarSmallIcons"/>
+     <addaction name="actionToolBarMediumIcons"/>
      <addaction name="actionToolBarLargeIcons"/>
      <addaction name="separator"/>
      <addaction name="actionToolBarIconsOnly"/>
@@ -1786,6 +1784,11 @@ p, li { white-space: pre-wrap; }
     <string>I&amp;cons and Text</string>
    </property>
   </action>
+  <action name="actionToolBarMediumIcons">
+   <property name="text">
+    <string>M&amp;edium Icons</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>