Updated log window layout and tab ordering. Wired up log 'now' buttons

This commit is contained in:
Jordan Sherer 2019-06-01 10:43:03 -04:00
parent ad748865a6
commit c9f0cce564
3 changed files with 478 additions and 380 deletions

View File

@ -12,6 +12,7 @@
#include "Configuration.hpp" #include "Configuration.hpp"
#include "Bands.hpp" #include "Bands.hpp"
#include "MaidenheadLocatorValidator.hpp" #include "MaidenheadLocatorValidator.hpp"
#include "DriftingDateTime.h"
#include "ui_logqso.h" #include "ui_logqso.h"
#include "moc_logqso.cpp" #include "moc_logqso.cpp"
@ -33,6 +34,14 @@ LogQSO::~LogQSO ()
{ {
} }
void LogQSO::on_start_now_button_pressed(){
ui->start_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc());
}
void LogQSO::on_end_now_button_pressed(){
ui->end_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc());
}
void LogQSO::loadSettings () void LogQSO::loadSettings ()
{ {
m_settings->beginGroup ("LogQSO"); m_settings->beginGroup ("LogQSO");

View File

@ -49,6 +49,10 @@ signals:
protected: protected:
void hideEvent (QHideEvent *); void hideEvent (QHideEvent *);
private slots:
void on_start_now_button_pressed();
void on_end_now_button_pressed();
private: private:
void loadSettings (); void loadSettings ();
void storeSettings () const; void storeSettings () const;

255
logqso.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>600</width> <width>600</width>
<height>535</height> <height>450</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -18,11 +18,47 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>600</width> <width>300</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>582</width>
<height>401</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
@ -31,6 +67,9 @@
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>6</number>
</property> </property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -56,35 +95,38 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="lab4"> <widget class="QLabel" name="lab1">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Mode:</string> <string>Contact Callsign:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="mode"> <widget class="QLineEdit" name="call">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>70</width> <width>300</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lab2"> <widget class="QLabel" name="lab2">
<property name="font"> <property name="font">
<font> <font>
@ -99,7 +141,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
@ -108,7 +150,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="start_now_button">
<property name="text"> <property name="text">
<string>Now</string> <string>Now</string>
</property> </property>
@ -142,7 +184,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QLabel" name="lab2_3"> <widget class="QLabel" name="lab2_3">
<property name="font"> <property name="font">
<font> <font>
@ -157,13 +199,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="end_now_button">
<property name="text"> <property name="text">
<string>Now</string> <string>Now</string>
</property> </property>
@ -197,38 +239,35 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QLabel" name="lab1"> <widget class="QLabel" name="lab4">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Callsign:</string> <string>Mode:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="call"> <widget class="QLineEdit" name="mode">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>300</width> <width>70</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="5" column="0">
<widget class="QLabel" name="lab5"> <widget class="QLabel" name="lab5">
<property name="font"> <property name="font">
<font> <font>
@ -243,7 +282,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="5" column="1">
<widget class="QLineEdit" name="band"> <widget class="QLineEdit" name="band">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -253,7 +292,15 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lab6"> <widget class="QLabel" name="lab6">
<property name="font"> <property name="font">
<font> <font>
@ -261,24 +308,62 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Signal Report Sent:</string> <string>Signal Report:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> </layout>
<widget class="QLineEdit" name="sent"> </item>
<property name="maximumSize"> <item row="6" column="1">
<size> <layout class="QGridLayout" name="gridLayout_3">
<width>50</width> <property name="topMargin">
<height>16777215</height> <number>0</number>
</size> </property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Sent:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="1" column="1">
<widget class="QLineEdit" name="sent">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="rcvd">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="lab7"> <widget class="QLabel" name="lab7">
<property name="font"> <property name="font">
<font> <font>
@ -286,24 +371,45 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Signal Report Rcvd:</string> <string>Received:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="1" column="2">
<widget class="QLineEdit" name="rcvd"> <spacer name="horizontalSpacer_4">
<property name="maximumSize"> <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>50</width> <width>20</width>
<height>16777215</height> <height>20</height>
</size> </size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="9" column="0"> <item row="1" column="5">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="7" column="0">
<widget class="QLabel" name="lab8"> <widget class="QLabel" name="lab8">
<property name="font"> <property name="font">
<font> <font>
@ -318,7 +424,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="7" column="1">
<widget class="QLineEdit" name="grid"> <widget class="QLineEdit" name="grid">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -328,7 +434,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="8" column="0">
<widget class="QLabel" name="lab9"> <widget class="QLabel" name="lab9">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -346,7 +452,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="8" column="1">
<widget class="QLineEdit" name="name"> <widget class="QLineEdit" name="name">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -359,7 +465,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="9" column="0">
<widget class="QLabel" name="lab10"> <widget class="QLabel" name="lab10">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -374,47 +480,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="9" column="1">
<widget class="QLineEdit" name="comments"> <widget class="QLineEdit" name="comments">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="10" column="1">
<widget class="QCheckBox" name="cbComments"> <widget class="QCheckBox" name="cbComments">
<property name="text"> <property name="text">
<string>Retain Comments</string> <string>Retain Comments</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> </layout>
<spacer name="verticalSpacer"> </widget>
<property name="orientation"> </widget>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
@ -430,12 +514,12 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>loggedOperator</tabstop> <tabstop>loggedOperator</tabstop>
<tabstop>mode</tabstop>
<tabstop>start_date_time</tabstop>
<tabstop>pushButton</tabstop>
<tabstop>end_date_time</tabstop>
<tabstop>pushButton_2</tabstop>
<tabstop>call</tabstop> <tabstop>call</tabstop>
<tabstop>start_date_time</tabstop>
<tabstop>start_now_button</tabstop>
<tabstop>end_date_time</tabstop>
<tabstop>end_now_button</tabstop>
<tabstop>mode</tabstop>
<tabstop>band</tabstop> <tabstop>band</tabstop>
<tabstop>sent</tabstop> <tabstop>sent</tabstop>
<tabstop>rcvd</tabstop> <tabstop>rcvd</tabstop>
@ -443,6 +527,7 @@
<tabstop>name</tabstop> <tabstop>name</tabstop>
<tabstop>comments</tabstop> <tabstop>comments</tabstop>
<tabstop>cbComments</tabstop> <tabstop>cbComments</tabstop>
<tabstop>scrollArea</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>