w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Qt 5.5 compliance

Browse Source 
The  header QMetaType  must now  be  included explicitly  if no  other
header includes QObject.

Adjust band  combo box  layout settings  to ensure  it is  rendered at
minimum content size otherwise it  stretches the signal meter width to
an ugly extent.

Also retired the "frequencies" settings  file key so that upgrades and
downgrades  between  1.5 and  1.6  no  longer require  rebuilding  the
working frequencies list.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5727 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-07-27 18:11:06 +00:00
parent 16c5e08197
commit 453e8405fb
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configuration.cpp
View File

@ -1202,9 +1202,13 @@ void Configuration::impl::read_settings ()
macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ()); macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ());
if (settings_->contains ("frequencies")) if (settings_->contains ("FrequenciesForModes"))
{ {
frequencies_.frequency_list (settings_->value ("frequencies").value<FrequencyList::FrequencyItems> ()); frequencies_.frequency_list (settings_->value ("FrequenciesForModes").value<FrequencyList::FrequencyItems> ());
}
else
{
frequencies_.reset_to_defaults ();
} }
stations_.station_list (settings_->value ("stations").value<StationList::Stations> ()); stations_.station_list (settings_->value ("stations").value<StationList::Stations> ());
@ -1297,7 +1301,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("After73", id_after_73_); settings_->setValue ("After73", id_after_73_);
settings_->setValue ("TxQSYAllowed", tx_QSY_allowed_); settings_->setValue ("TxQSYAllowed", tx_QSY_allowed_);
settings_->setValue ("Macros", macros_.stringList ()); settings_->setValue ("Macros", macros_.stringList ());
settings_->setValue ("frequencies", QVariant::fromValue (frequencies_.frequency_list ())); settings_->setValue ("FrequenciesForModes", QVariant::fromValue (frequencies_.frequency_list ()));
settings_->setValue ("stations", QVariant::fromValue (stations_.station_list ())); settings_->setValue ("stations", QVariant::fromValue (stations_.station_list ()));
settings_->setValue ("toRTTY", log_as_RTTY_); settings_->setValue ("toRTTY", log_as_RTTY_);
settings_->setValue ("dBtoComments", report_in_comments_); settings_->setValue ("dBtoComments", report_in_comments_);

1
WFPalette.hpp
View File

@ -1,6 +1,7 @@
#ifndef W_F_PALETTE_HPP__ #ifndef W_F_PALETTE_HPP__
#define W_F_PALETTE_HPP__ #define W_F_PALETTE_HPP__
#include <QMetaType>
#include <QList> #include <QList>
#include <QVector> #include <QVector>
#include <QColor> #include <QColor>

15
mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>934</width> <width>786</width>
<height>565</height> <height>475</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -2236,12 +2236,6 @@ QPushButton[state=&quot;ok&quot;] {
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QComboBox" name="bandComboBox"> <widget class="QComboBox" name="bandComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Select operating band or frequency in MHz</string> <string>Select operating band or frequency in MHz</string>
</property> </property>
@ -2251,6 +2245,9 @@ QPushButton[state=&quot;ok&quot;] {
<property name="insertPolicy"> <property name="insertPolicy">
<enum>QComboBox::NoInsert</enum> <enum>QComboBox::NoInsert</enum>
</property> </property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -2264,7 +2261,7 @@ QPushButton[state=&quot;ok&quot;] {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>934</width> <width>786</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>