Working through layout of extended qso window

CMakeLists.txt

@@ -297,6 +297,7 @@ set (wsjtx_CXXSRCS
   widegraph.cpp
   echograph.cpp
   echoplot.cpp
+  extendedqso.cpp
   fastgraph.cpp
   fastplot.cpp
   about.cpp
@@ -649,6 +650,7 @@ set (wsjtx_UISRCS
   about.ui
   astro.ui
   echograph.ui
+  extendedqso.ui
   fastgraph.ui
   messageaveraging.ui
   widegraph.ui

extendedqso.cpp

@@ -0,0 +1,14 @@
+#include "extendedqso.h"
+#include "ui_extendedqso.h"
+
+ExtendedQSO::ExtendedQSO(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ExtendedQSO)
+{
+    ui->setupUi(this);
+}
+
+ExtendedQSO::~ExtendedQSO()
+{
+    delete ui;
+}

extendedqso.h

@@ -0,0 +1,22 @@
+#ifndef EXTENDEDQSO_H
+#define EXTENDEDQSO_H
+
+#include <QWidget>
+
+namespace Ui {
+class ExtendedQSO;
+}
+
+class ExtendedQSO : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ExtendedQSO(QWidget *parent = 0);
+    ~ExtendedQSO();
+
+private:
+    Ui::ExtendedQSO *ui;
+};
+
+#endif // EXTENDEDQSO_H

extendedqso.ui

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExtendedQSO</class>
+ <widget class="QWidget" name="ExtendedQSO">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>877</width>
+    <height>462</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Extended QSO</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_11">
+     <item>
+      <widget class="QSplitter" name="splitter_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <widget class="QSplitter" name="splitter">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <widget class="QTextEdit" name="textEditRX_6">
+         <property name="font">
+          <font>
+           <italic>true</italic>
+          </font>
+         </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">QTextEdit { background:rgb(255, 250, 205); }</string>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="placeholderText">
+          <string>Messages from your receive frequency will appear here.</string>
+         </property>
+        </widget>
+        <widget class="QTextEdit" name="extFreeTextMsg_6">
+         <property name="acceptRichText">
+          <bool>false</bool>
+         </property>
+         <property name="placeholderText">
+          <string>Your message, if longer than 13 characters, will be split into separate free text transmissions. At the start of each tx cycle, the next chunk of the message will be removed from this textbox for transmission.</string>
+         </property>
+        </widget>
+       </widget>
+       <widget class="QListWidget" name="listWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>allcall</string>
+         </property>
+        </item>
+       </widget>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_22">
+       <item>
+        <widget class="QPushButton" name="pushButton_41">
+         <property name="text">
+          <string>CQ</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_42">
+         <property name="text">
+          <string>Selected Call</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_44">
+         <property name="text">
+          <string>QTH</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_45">
+         <property name="text">
+          <string>QTC</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_11">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Minimum</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_46">
+         <property name="text">
+          <string>Macro 1</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_47">
+         <property name="text">
+          <string>Macro 2</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_12">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Preferred</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pbNextFreeTextMsg_6">
+         <property name="text">
+          <string>Send Next</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_48">
+         <property name="text">
+          <string>Halt</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblTxNum_6">
+       <property name="text">
+        <string>Remaining Tx Sequences: 0</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

mainwindow.cpp

@@ -35,6 +35,7 @@
 #include "plotter.h"
 #include "echoplot.h"
 #include "echograph.h"
+#include "extendedqso.h"
 #include "fastplot.h"
 #include "fastgraph.h"
 #include "about.h"
@@ -201,6 +202,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
       , MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry},
   m_wideGraph (new WideGraph(m_settings)),
   m_echoGraph (new EchoGraph(m_settings)),
+  m_extendedQSO (new ExtendedQSO()),
   m_fastGraph (new FastGraph(m_settings)),
   m_logDlg (new LogQSO (program_title (), m_settings, &m_config, this)),
   m_lastDialFreq {0},
@@ -2104,6 +2106,11 @@ void MainWindow::on_actionEcho_Graph_triggered()
   m_echoGraph->show();
 }
 
+void MainWindow::on_actionExtended_QSO_triggered()
+{
+  m_extendedQSO->show();
+}
+
 void MainWindow::on_actionFast_Graph_triggered()
 {
   m_fastGraph->show();

mainwindow.h

@@ -64,6 +64,7 @@ class QLineEdit;
 class QFont;
 class QHostInfo;
 class EchoGraph;
+class ExtendedQSO;
 class FastGraph;
 class WideGraph;
 class LogQSO;
@@ -272,6 +273,7 @@ private slots:
   void on_WSPRfreqSpinBox_valueChanged(int n);
   void on_pbTxNext_clicked(bool b);
   void on_actionEcho_Graph_triggered();
+  void on_actionExtended_QSO_triggered();
   void on_actionEcho_triggered();
   void on_actionISCAT_triggered();
   void on_actionFast_Graph_triggered();
@@ -340,6 +342,7 @@ private:
 
   QScopedPointer<WideGraph> m_wideGraph;
   QScopedPointer<EchoGraph> m_echoGraph;
+  QScopedPointer<ExtendedQSO> m_extendedQSO;
   QScopedPointer<FastGraph> m_fastGraph;
   QScopedPointer<LogQSO> m_logDlg;
   QScopedPointer<Astro> m_astroWidget;

mainwindow.ui

@@ -20,6 +20,9 @@
    <layout class="QVBoxLayout" name="verticalLayout_3">
     <item>
      <widget class="QTabWidget" name="mainTabWidget">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
       <property name="tabPosition">
        <enum>QTabWidget::North</enum>
       </property>
@@ -27,7 +30,13 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
+      </property>
+      <property name="tabsClosable">
+       <bool>true</bool>
+      </property>
+      <property name="tabBarAutoHide">
+       <bool>true</bool>
       </property>
       <widget class="QWidget" name="mainTabOne">
        <attribute name="title">
@@ -2384,6 +2393,9 @@ QPushButton[state=&quot;ok&quot;] {
        </layout>
       </widget>
       <widget class="QWidget" name="mainTabTwo">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
        <attribute name="title">
         <string>Free Text</string>
        </attribute>
@@ -2571,6 +2583,7 @@ QPushButton[state=&quot;ok&quot;] {
     <addaction name="actionWide_Waterfall"/>
     <addaction name="actionAstronomical_data"/>
     <addaction name="actionMessage_averaging"/>
+    <addaction name="actionExtended_QSO"/>
     <addaction name="actionEcho_Graph"/>
     <addaction name="actionFast_Graph"/>
     <addaction name="separator"/>
@@ -3209,6 +3222,11 @@ QPushButton[state=&quot;ok&quot;] {
     <string>Shift+F1</string>
    </property>
   </action>
+  <action name="actionExtended_QSO">
+   <property name="text">
+    <string>Extended QSO</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

wsjtx.pro

@@ -67,7 +67,8 @@ SOURCES += \
   echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
   WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
   MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
-  EqualizationToolsDialog.cpp
+  EqualizationToolsDialog.cpp \
+    extendedqso.cpp
 
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
@@ -83,7 +84,8 @@ HEADERS  += qt_helpers.hpp \
   logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \
   messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
   WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
-  IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp
+  IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp \
+    extendedqso.h
 
 
 INCLUDEPATH += qmake_only
@@ -95,7 +97,8 @@ HEADERS += OmniRigTransceiver.hpp
 
 FORMS    += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
     logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \
-    fastgraph.ui
+    fastgraph.ui \
+    extendedqso.ui
 
 RC_FILE = wsjtx.rc
 RESOURCES = wsjtx.qrc

wsjtx.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2018-02-02T18:34:55. -->
+<!-- Written by QtCreator 3.5.1, 2018-02-25T18:27:10. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>