Deprecated the Electric Arrow. Added customization option for EOT character.

This commit is contained in:
Jordan Sherer 2019-04-21 11:29:31 -04:00
parent a14b524056
commit 4bd52f2e04
32 changed files with 374 additions and 126 deletions

View File

@ -591,6 +591,7 @@ private:
QStringList my_groups_;
QStringList auto_whitelist_;
QStringList auto_blacklist_;
QString eot_;
QString my_info_;
QString cq_;
QString reply_;
@ -986,6 +987,10 @@ QSet<QString> Configuration::auto_blacklist() const {
return QSet<QString>::fromList(m_->auto_blacklist_);
}
QString Configuration::eot() const {
return m_->eot_;
}
QString Configuration::my_info() const
{
auto info = m_->my_info_;
@ -1375,6 +1380,7 @@ void Configuration::impl::initialize_models ()
ui_->groups_line_edit->setText(my_groups_.join(", "));
ui_->auto_whitelist_line_edit->setText(auto_whitelist_.join(", "));
ui_->auto_blacklist_line_edit->setText(auto_blacklist_.join(", "));
ui_->eot_line_edit->setText(eot_.trimmed().left(2));
ui_->info_message_line_edit->setText (my_info_.toUpper());
ui_->cq_message_line_edit->setText(cq_.toUpper());
ui_->reply_message_line_edit->setText (reply_.toUpper());
@ -1524,6 +1530,7 @@ void Configuration::impl::read_settings ()
auto_blacklist_ = settings_->value("AutoBlacklist", QStringList{}).toStringList();
callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString().trimmed().left(2);
my_info_ = settings_->value("MyInfo", QString {}).toString();
cq_ = settings_->value("CQMessage", QString {"CQCQCQ <MYGRID4>"}).toString();
reply_ = settings_->value("Reply", QString {"HW CPY?"}).toString();
@ -1785,6 +1792,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("MyGroups", my_groups_);
settings_->setValue ("AutoWhitelist", auto_whitelist_);
settings_->setValue ("AutoBlacklist", auto_blacklist_);
settings_->setValue ("EOTCharacter", eot_);
settings_->setValue ("MyInfo", my_info_);
settings_->setValue ("CQMessage", cq_);
settings_->setValue ("Reply", reply_);
@ -2376,6 +2384,7 @@ void Configuration::impl::accept ()
auto_blacklist_ = splitCalls(ui_->auto_blacklist_line_edit->text().toUpper().trimmed());
cq_ = ui_->cq_message_line_edit->text().toUpper();
reply_ = ui_->reply_message_line_edit->text().toUpper();
eot_ = ui_->eot_line_edit->text().trimmed().left(2);
my_info_ = ui_->info_message_line_edit->text().toUpper();
callsign_aging_ = ui_->callsign_aging_spin_box->value();
activity_aging_ = ui_->activity_aging_spin_box->value();

View File

@ -104,6 +104,7 @@ public:
QSet<QString> auto_blacklist() const;
int activity_aging() const;
int callsign_aging() const;
QString eot() const;
QString my_info () const;
QString cq_message () const;
QString reply_message () const;

View File

@ -63,7 +63,7 @@
<x>0</x>
<y>0</y>
<width>738</width>
<height>448</height>
<height>453</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@ -277,9 +277,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>726</width>
<height>631</height>
<y>-297</y>
<width>724</width>
<height>750</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_26">
@ -748,6 +748,32 @@ text message.</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_12">
<property name="title">
<string>Characters</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>End of Transmission Character:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="eot_line_edit">
<property name="text">
<string>♢</string>
</property>
<property name="maxLength">
<number>2</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
@ -925,8 +951,8 @@ text message.</string>
<rect>
<x>0</x>
<y>0</y>
<width>285</width>
<height>397</height>
<width>718</width>
<height>435</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
@ -1346,8 +1372,8 @@ a few, particularly some Kenwood rigs, require it).</string>
<rect>
<x>0</x>
<y>0</y>
<width>257</width>
<height>427</height>
<width>237</width>
<height>467</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
@ -1774,8 +1800,8 @@ radio interface behave as expected.</string>
<rect>
<x>0</x>
<y>0</y>
<width>267</width>
<height>302</height>
<width>760</width>
<height>502</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_29">
@ -2087,8 +2113,8 @@ both here.</string>
<rect>
<x>0</x>
<y>0</y>
<width>572</width>
<height>498</height>
<width>746</width>
<height>525</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_30">
@ -2550,8 +2576,8 @@ for assessing propagation and system performance.</string>
<rect>
<x>0</x>
<y>0</y>
<width>498</width>
<height>321</height>
<width>760</width>
<height>502</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
@ -3128,8 +3154,8 @@ QListView::item:hover {
<rect>
<x>0</x>
<y>0</y>
<width>280</width>
<height>201</height>
<width>738</width>
<height>378</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
@ -3383,8 +3409,8 @@ QListView::item:hover {
<rect>
<x>0</x>
<y>0</y>
<width>236</width>
<height>258</height>
<width>233</width>
<height>253</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
@ -3587,8 +3613,8 @@ QListView::item:hover {
<rect>
<x>0</x>
<y>0</y>
<width>288</width>
<height>96</height>
<width>277</width>
<height>93</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
@ -4196,12 +4222,12 @@ soundcard changes</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
</buttongroups>
</ui>

View File

@ -15,9 +15,9 @@
viewBox="0 0 270.93333 270.93334"
version="1.1"
id="svg16"
inkscape:export-filename="/home/jordan/bitmap.png"
inkscape:export-xdpi="300.06662"
inkscape:export-ydpi="300.06662"
inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/js8call_icon.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="icon_1024.svg">
<defs
@ -38,11 +38,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.48333333"
inkscape:cx="1350"
inkscape:cy="512"
inkscape:zoom="0.82"
inkscape:cx="619.41789"
inkscape:cy="491.10861"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:current-layer="g5633"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1053"
@ -50,7 +50,8 @@
inkscape:window-y="27"
inkscape:window-maximized="1"
units="px"
inkscape:pagecheckerboard="true" />
inkscape:pagecheckerboard="true"
showguides="false" />
<metadata
id="metadata13">
<rdf:RDF>
@ -71,25 +72,91 @@
<g
id="g6030"
transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)">
<circle
inkscape:export-ydpi="300.06662"
inkscape:export-xdpi="300.06662"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
r="81.642853"
cy="98.940475"
cx="105.07738"
id="path18" />
<text
id="text24"
y="152.33945"
x="52.539673"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
y="152.33945"
x="52.539673"
id="tspan22"
sodipodi:role="line">⌁</tspan></text>
<g
id="g4254">
<g
id="g5633">
<circle
inkscape:export-ydpi="300.06662"
inkscape:export-xdpi="300.06662"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
r="81.642853"
cy="98.940475"
cx="105.07738"
id="path18" />
<g
aria-label="J"
style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="text5787"
transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)">
<path
d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z"
style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5791"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscaccscscc" />
</g>
<g
id="g5677"
transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)">
<g
aria-label="8"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
id="text4763"
transform="translate(-162.89081,-6.63358)">
<path
d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
id="path4765"
inkscape:connector-curvature="0" />
</g>
<g
id="g4796"
transform="translate(-163.22926,-6.63358)"
style="fill:#808080">
<g
transform="translate(271.30057,21.863906)"
id="text24-5"
style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
aria-label="8">
<path
sodipodi:nodetypes="csccscc"
inkscape:connector-curvature="0"
id="path4709"
d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445" />
</g>
<g
transform="translate(0.12624987,0.06768044)"
aria-label="8"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
id="g4772">
<path
sodipodi:nodetypes="ccscsccc"
inkscape:connector-curvature="0"
id="path4770"
d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0;stroke:#ffff00;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)" />
</g>
</g>
</g>
<rect
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect5817"
width="16.71962"
height="2.8891957"
x="129.76146"
y="62.946335" />
<rect
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect5817-3"
width="16.71962"
height="2.8891957"
x="63.206753"
y="127.60851" />
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

View File

@ -15,11 +15,11 @@
viewBox="0 0 33.866666 33.866667"
version="1.1"
id="svg16"
inkscape:export-filename="/home/jordan/bitmap.png"
inkscape:export-xdpi="300.06662"
inkscape:export-ydpi="300.06662"
inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/js8call_icon.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="icon_1024.svg">
sodipodi:docname="icon_128.svg">
<defs
id="defs10">
<linearGradient
@ -38,11 +38,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.48333333"
inkscape:cx="1350"
inkscape:cy="512"
inkscape:zoom="0.82"
inkscape:cx="619.41789"
inkscape:cy="491.10861"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:current-layer="g5633"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1053"
@ -50,7 +50,8 @@
inkscape:window-y="27"
inkscape:window-maximized="1"
units="px"
inkscape:pagecheckerboard="true" />
inkscape:pagecheckerboard="true"
showguides="false" />
<metadata
id="metadata13">
<rdf:RDF>
@ -70,26 +71,96 @@
transform="translate(0,-263.13332)">
<g
id="g6030"
transform="matrix(0.19543832,0,0,0.19543832,-3.6028125,260.72988)">
<circle
inkscape:export-ydpi="300.06662"
inkscape:export-xdpi="300.06662"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
r="81.642853"
cy="98.940475"
cx="105.07738"
id="path18" />
<text
id="text24"
y="152.33945"
x="52.539673"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
y="152.33945"
x="52.539673"
id="tspan22"
sodipodi:role="line">⌁</tspan></text>
transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)">
<g
id="g4254">
<g
id="g5633">
<g
id="g5908"
transform="matrix(0.125,0,0,0.125,16.130209,162.38541)">
<circle
id="path18"
cx="105.07738"
cy="98.940475"
r="81.642853"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:export-xdpi="300.06662"
inkscape:export-ydpi="300.06662" />
<g
transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)"
id="text5787"
style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
aria-label="J">
<path
sodipodi:nodetypes="cscaccscscc"
inkscape:connector-curvature="0"
id="path5791"
style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z" />
</g>
<g
transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)"
id="g5677">
<g
transform="translate(-162.89081,-6.63358)"
id="text4763"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
aria-label="8">
<path
inkscape:connector-curvature="0"
id="path4765"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z" />
</g>
<g
style="fill:#808080"
transform="translate(-163.22926,-6.63358)"
id="g4796">
<g
aria-label="8"
style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
id="text24-5"
transform="translate(271.30057,21.863906)">
<path
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445"
d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
id="path4709"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csccscc" />
</g>
<g
id="g4772"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
aria-label="8"
transform="translate(0.12624987,0.06768044)">
<path
transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
id="path4770"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccscsccc" />
</g>
</g>
</g>
<rect
y="62.946335"
x="129.76146"
height="2.8891957"
width="16.71962"
id="rect5817"
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
y="127.60851"
x="63.206753"
height="2.8891957"
width="16.71962"
id="rect5817-3"
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

View File

@ -16,7 +16,10 @@
version="1.1"
id="svg16"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="icon_1024.svg">
sodipodi:docname="installer_logo.svg"
inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/installer_logo.svg.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs10">
<linearGradient
@ -36,8 +39,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.48333333"
inkscape:cx="1350"
inkscape:cy="512"
inkscape:cx="649.65516"
inkscape:cy="880.82504"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -56,7 +59,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -66,27 +69,98 @@
id="layer1"
transform="translate(0,-26.06665)">
<g
id="g6030"
transform="matrix(1.4906384,0,0,1.4906384,-20.910237,15.983062)">
<circle
inkscape:export-ydpi="300.06662"
inkscape:export-xdpi="300.06662"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
r="81.642853"
cy="98.940475"
cx="105.07738"
id="path18" />
<text
id="text24"
y="152.33945"
x="52.539673"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
y="152.33945"
x="52.539673"
id="tspan22"
sodipodi:role="line">⌁</tspan></text>
transform="matrix(0.97656252,0,0,0.97656252,2.6458332,3.7859373)"
id="layer1-7"
inkscape:label="Layer 1">
<g
transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)"
id="g6030">
<g
id="g4254">
<g
id="g5633">
<circle
id="path18"
cx="105.07738"
cy="98.940475"
r="81.642853"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:export-xdpi="300.06662"
inkscape:export-ydpi="300.06662" />
<g
transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)"
id="text5787"
style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
aria-label="J">
<path
sodipodi:nodetypes="cscaccscscc"
inkscape:connector-curvature="0"
id="path5791"
style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z" />
</g>
<g
transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)"
id="g5677">
<g
transform="translate(-162.89081,-6.63358)"
id="text4763"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
aria-label="8">
<path
inkscape:connector-curvature="0"
id="path4765"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z" />
</g>
<g
style="fill:#808080"
transform="translate(-163.22926,-6.63358)"
id="g4796">
<g
aria-label="8"
style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
id="text24-5"
transform="translate(271.30057,21.863906)">
<path
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445"
d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
id="path4709"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csccscc" />
</g>
<g
id="g4772"
style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
aria-label="8"
transform="translate(0.12624987,0.06768044)">
<path
transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
id="path4770"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccscsccc" />
</g>
</g>
</g>
<rect
y="62.946335"
x="129.76146"
height="2.8891957"
width="16.71962"
id="rect5817"
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
y="127.60851"
x="63.206753"
height="2.8891957"
width="16.71962"
id="rect5817-3"
style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 830 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 830 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 KiB

After

Width:  |  Height:  |  Size: 286 KiB

View File

@ -1829,19 +1829,21 @@ void MainWindow::initializeDummyData(){
cmd.utcTimestamp = dt;
addCommandToMyInbox(cmd);
displayTextForFreq("KN4CRD: @ALLCALL? \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true);
displayTextForFreq("J1Y: KN4CRD SNR -05 \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true);
displayTextForFreq("HELLO BRAVE NEW WORLD \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true);
QString eot = m_config.eot();
displayTextForFreq(QString("KN4CRD: @ALLCALL? %1 ").arg(eot), 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true);
displayTextForFreq(QString("J1Y: KN4CRD SNR -05 %1 ").arg(eot), 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true);
displayTextForFreq(QString("HELLO BRAVE NEW WORLD %1 ").arg(eot), 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true);
auto now = DriftingDateTime::currentDateTimeUtc();
displayTextForFreq("KN4CRD: JY1 ACK -12 \u2301 ", 780, now, false, true, true);
displayTextForFreq("KN4CRD: JY1 ACK -12 \u2301 ", 780, now, false, true, true); // should be hidden (duplicate)
displayTextForFreq("OH8STN: JY1 ACK -12 \u2301 ", 780, now, false, true, true);
displayTextForFreq(QString("KN4CRD: JY1 ACK -12 %1 ").arg(eot), 780, now, false, true, true);
displayTextForFreq(QString("KN4CRD: JY1 ACK -12 %1 ").arg(eot), 780, now, false, true, true); // should be hidden (duplicate)
displayTextForFreq(QString("OH8STN: JY1 ACK -12 %1 ").arg(eot), 780, now, false, true, true);
displayTextForFreq("KN4CRD: JY1 ACK -10 \u2301 ", 800, now, false, true, true);
displayTextForFreq("KN4CRD: JY1 ACK -12 \u2301 ", 780, now.addSecs(120), false, true, true);
displayTextForFreq(QString("KN4CRD: JY1 ACK -10 %1 ").arg(eot), 800, now, false, true, true);
displayTextForFreq(QString("KN4CRD: JY1 ACK -12 %1 ").arg(eot), 780, now.addSecs(120), false, true, true);
displayTextForFreq("HELLO\\nBRAVE\\nNEW\\nWORLD \u2301 ", 1500, now, false, true, true);
displayTextForFreq(QString("HELLO\\nBRAVE\\nNEW\\nWORLD %1 ").arg(eot), 1500, now, false, true, true);
displayActivity(true);
}
@ -5920,7 +5922,7 @@ int MainWindow::writeMessageTextToUI(QDateTime date, QString text, int freq, boo
c.clearSelection();
c.movePosition(QTextCursor::EndOfBlock, QTextCursor::MoveAnchor);
if(!blockText.contains("\u2301")){
if(!blockText.contains(m_config.eot())){
found = true;
}
}
@ -6150,7 +6152,7 @@ QString MainWindow::createMessageTransmitQueue(QString const& text, bool reset){
// TODO: jsherer - parse outgoing message so we can add it to the inbox as an outgoing message
auto joined = Varicode::rstrip(lines.join(""));
displayTextForFreq(QString("%1 \u2301 ").arg(joined), freq, DriftingDateTime::currentDateTimeUtc(), true, true, true);
displayTextForFreq(QString("%1 %2 ").arg(joined).arg(m_config.eot()), freq, DriftingDateTime::currentDateTimeUtc(), true, true, true);
// if we're transmitting a message to be displayed, we should bump the repeat buttons...
resetAutomaticIntervalTransmissions(false, false);
@ -8167,8 +8169,7 @@ void MainWindow::on_tableWidgetRXAll_cellDoubleClicked(int row, int col){
isLast = (d.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast;
if(isLast){
// can also use \u0004 \u2666 \u2404
activityText = QString("%1 \u2301 ").arg(Varicode::rstrip(activityText));
activityText = QString("%1 %2 ").arg(Varicode::rstrip(activityText)).arg(m_config.eot());
}
}
if(!activityText.isEmpty()){
@ -9753,8 +9754,7 @@ void MainWindow::processRxActivity() {
// if we're the last message, let's display our EOT character
if (isLast) {
// can also use \u0004 \u2666 \u2404
d.text = QString("%1 \u2301 ").arg(Varicode::rstrip(d.text));
d.text = QString("%1 %2 ").arg(Varicode::rstrip(d.text).arg(m_config.eot()));
}
// log it to the display!
@ -10132,8 +10132,8 @@ void MainWindow::processCommandActivity() {
QString text = textList.join(" ");
bool isLast = (d.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast;
if (isLast) {
// can also use \u0004 \u2666 \u2404
text = QString("%1 \u2301 ").arg(Varicode::rstrip(text));
// append the eot character to the text
text = QString("%1 %2 ").arg(Varicode::rstrip(text)).arg(m_config.eot());
}
// log the text to directed txt log
@ -11210,8 +11210,8 @@ void MainWindow::displayBandActivity() {
}
if ((item.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast) {
// can also use \u0004 \u2666 \u2404
item.text = QString("%1 \u2301 ").arg(Varicode::rstrip(item.text));
// append the eot character to the text
item.text = QString("%1 %2 ").arg(Varicode::rstrip(item.text)).arg(m_config.eot());
}
text.append(item.text);
snr = item.snr;
@ -11251,7 +11251,7 @@ void MainWindow::displayBandActivity() {
int colWidth = ui->tableWidgetRXAll->columnWidth(3);
auto textItem = new QTableWidgetItem(joined);
auto html = QString("<qt/>%1").arg(joined.toHtmlEscaped());
html = html.replace("\u2301", "\u2301<br/><br/>");
html = html.replace(m_config.eot(), m_config.eot() + "<br/><br/>");
html = html.replace(QRegularExpression("([<]br[/][>])+$"), "");
textItem->setToolTip(html);