Added tabbed view

Author: sanny32

omodsim/mainwindow.cpp

@@ -223,6 +223,7 @@ void MainWindow::on_awake()
     ui->actionScriptSettings->setEnabled(frm && !frm->canStopScript());
     _actionRunMode->setEnabled(frm && !frm->canStopScript());
 
+    ui->actionTabbedView->setChecked(ui->mdiArea->viewMode() == QMdiArea::TabbedView);
     ui->actionToolbar->setChecked(ui->toolBarMain->isVisible());
     ui->actionStatusBar->setChecked(statusBar()->isVisible());
     ui->actionDisplayBar->setChecked(ui->toolBarDisplay->isVisible());
@@ -231,6 +232,9 @@ void MainWindow::on_awake()
     ui->actionEnglish->setChecked(_lang == "en");
     ui->actionRussian->setChecked(_lang == "ru");
 
+    ui->actionTile->setEnabled(ui->mdiArea->viewMode() == QMdiArea::SubWindowView);
+    ui->actionCascade->setEnabled(ui->mdiArea->viewMode() == QMdiArea::SubWindowView);
+
     if(ui->mdiArea->subWindowList().empty())
     {
         ui->toolBarEdit->setVisible(false);
@@ -865,6 +869,19 @@ void MainWindow::on_actionCaptureOff_triggered()
     frm->stopTextCapture();
 }
 
+///
+/// \brief MainWindow::on_actionTabbedView_triggered
+///
+void MainWindow::on_actionTabbedView_triggered()
+{
+    if(ui->mdiArea->viewMode() == QMdiArea::SubWindowView) {
+        ui->mdiArea->setViewMode(QMdiArea::TabbedView);
+    }
+    else {
+        ui->mdiArea->setViewMode(QMdiArea::SubWindowView);
+    }
+}
+
 ///
 /// \brief MainWindow::on_actionToolbar_triggered
 ///
@@ -1782,17 +1799,20 @@ void MainWindow::loadSettings()
         setGeometry(geometry);
     }
 
-    const auto displaybarArea = (Qt::ToolBarArea)qBound(0, m.value("DisplayBarArea", 0x4).toInt(), 0xf);
+    const auto viewMode = (QMdiArea::ViewMode)qBound(0, m.value("ViewMode", QMdiArea::SubWindowView).toInt(), 1);
+    ui->mdiArea->setViewMode(viewMode);
+
+    const auto displaybarArea = (Qt::ToolBarArea)qBound(0, m.value("DisplayBarArea", Qt::TopToolBarArea).toInt(), 0xf);
     const auto displaybarBreak = m.value("DisplayBarBreak").toBool();
     if(displaybarBreak) addToolBarBreak(displaybarArea);
     addToolBar(displaybarArea, ui->toolBarDisplay);
 
-    const auto scriptbarArea = (Qt::ToolBarArea)qBound(0, m.value("ScriptBarArea", 0x4).toInt(), 0xf);
+    const auto scriptbarArea = (Qt::ToolBarArea)qBound(0, m.value("ScriptBarArea", Qt::TopToolBarArea).toInt(), 0xf);
     const auto scriptbarBreak = m.value("ScriptBarBreak").toBool();
     if(scriptbarBreak) addToolBarBreak(scriptbarArea);
     addToolBar(scriptbarArea, ui->toolBarScript);
 
-    const auto editbarArea = (Qt::ToolBarArea)qBound(0, m.value("EditBarArea", 0x4).toInt(), 0xf);
+    const auto editbarArea = (Qt::ToolBarArea)qBound(0, m.value("EditBarArea", Qt::TopToolBarArea).toInt(), 0xf);
     const auto editbarBreak = m.value("EditBarBreak").toBool();
     if(editbarBreak) addToolBarBreak(editbarArea);
     addToolBar(editbarArea, ui->toolBarEdit);
@@ -1819,6 +1839,19 @@ void MainWindow::loadSettings()
             m.endGroup();
         }
     }
+
+    // activate window
+    const auto activeWindowTitle = m.value("ActiveWindow").toString();
+    if(!activeWindowTitle.isEmpty()) {
+        for(auto&& wnd : ui->mdiArea->subWindowList())
+        {
+            const auto frm = qobject_cast<FormModSim*>(wnd->widget());
+            if(frm && frm->windowTitle() == activeWindowTitle) {
+                ui->mdiArea->setActiveSubWindow(wnd);
+                break;
+            }
+        }
+    }
 }
 
 ///
@@ -1860,6 +1893,10 @@ void MainWindow::saveSettings()
         m.setValue("WindowGeometry", geometry());
     }
 
+    const auto frm = currentMdiChild();
+    if(frm) m.setValue("ActiveWindow", frm->windowTitle());
+
+    m.setValue("ViewMode", ui->mdiArea->viewMode());
     m.setValue("DisplayBarArea", toolBarArea(ui->toolBarDisplay));
     m.setValue("DisplayBarBreak", toolBarBreak(ui->toolBarDisplay));
     m.setValue("ScriptBarArea", toolBarArea(ui->toolBarScript));

omodsim/mainwindow.h

@@ -102,6 +102,7 @@ private slots:
     void on_actionCaptureOff_triggered();
 
     /* View menu slots */
+    void on_actionTabbedView_triggered();
     void on_actionToolbar_triggered();
     void on_actionStatusBar_triggered();
     void on_actionDisplayBar_triggered();

omodsim/mainwindow.ui

@@ -35,7 +35,14 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="QMdiArea" name="mdiArea"/>
+     <widget class="QMdiArea" name="mdiArea">
+      <property name="tabsClosable">
+       <bool>true</bool>
+      </property>
+      <property name="tabsMovable">
+       <bool>true</bool>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -195,6 +202,8 @@
      <addaction name="actionRussian"/>
      <addaction name="actionChineseZh"/>
     </widget>
+    <addaction name="actionTabbedView"/>
+    <addaction name="separator"/>
     <addaction name="actionToolbar"/>
     <addaction name="actionStatusBar"/>
     <addaction name="actionDisplayBar"/>
@@ -1048,6 +1057,14 @@
     <string>Modbus Definitions</string>
    </property>
   </action>
+  <action name="actionTabbedView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Tabbed View</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="resources.qrc"/>