w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-10 10:32:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2021-01-02 21:13:47 +00:00
commit 5fee4796b1
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
translations/wsjtx_da.ts
View File

@ -247,7 +247,7 @@
<message> <message>
<location filename="../widgets/CabrilloLogWindow.ui" line="20"/> <location filename="../widgets/CabrilloLogWindow.ui" line="20"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Right-click here for available actions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Right-click here for available actions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt; &lt;p&gt; Højreklik her for tilgængelige muligheder. &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; Højreklik her for tilgængelige muligheder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../widgets/CabrilloLogWindow.ui" line="23"/> <location filename="../widgets/CabrilloLogWindow.ui" line="23"/>
@ -318,7 +318,7 @@
<message> <message>
<location filename="../widgets/colorhighlighting.ui" line="150"/> <location filename="../widgets/colorhighlighting.ui" line="150"/>
<source>New Call</source> <source>New Call</source>
<translation>Ny kaldesignal</translation> <translation>Nyt kaldesignal</translation>
</message> </message>
<message> <message>
<location filename="../widgets/colorhighlighting.ui" line="157"/> <location filename="../widgets/colorhighlighting.ui" line="157"/>
@ -2197,7 +2197,7 @@ Fejl(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="495"/> <location filename="../widgets/mainwindow.ui" line="495"/>
<source>&amp;Decode</source> <source>&amp;Decode</source>
<translation>&amp;Dekod</translation> <translation>&amp;Dekode</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="511"/> <location filename="../widgets/mainwindow.ui" line="511"/>
@ -2492,7 +2492,7 @@ Gul er for lavt</translation>
<location filename="../widgets/mainwindow.ui" line="1337"/> <location filename="../widgets/mainwindow.ui" line="1337"/>
<location filename="../widgets/mainwindow.ui" line="2992"/> <location filename="../widgets/mainwindow.ui" line="2992"/>
<source>Fast</source> <source>Fast</source>
<translation>Fast</translation> <translation>Hurtig</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1344"/> <location filename="../widgets/mainwindow.ui" line="1344"/>
@ -5578,7 +5578,7 @@ Fejl(%2): %3</translation>
<message> <message>
<location filename="../Configuration.ui" line="400"/> <location filename="../Configuration.ui" line="400"/>
<source>Monitor returns to last used frequency</source> <source>Monitor returns to last used frequency</source>
<translation>Montor til seneste brugte frekvens</translation> <translation>Monitor til seneste brugte frekvens</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="407"/> <location filename="../Configuration.ui" line="407"/>
@ -5673,7 +5673,7 @@ den stille periode, når dekodningen er udført.</translation>
<location filename="../Configuration.ui" line="581"/> <location filename="../Configuration.ui" line="581"/>
<location filename="../Configuration.ui" line="584"/> <location filename="../Configuration.ui" line="584"/>
<source>Serial Port Parameters</source> <source>Serial Port Parameters</source>
<translation>Seriek Port Parametre</translation> <translation>Seriel Port Parametre</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="595"/> <location filename="../Configuration.ui" line="595"/>
@ -5774,7 +5774,7 @@ den stille periode, når dekodningen er udført.</translation>
<location filename="../Configuration.ui" line="729"/> <location filename="../Configuration.ui" line="729"/>
<location filename="../Configuration.ui" line="780"/> <location filename="../Configuration.ui" line="780"/>
<source>Default</source> <source>Default</source>
<translation>Deafult</translation> <translation>Default</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="742"/> <location filename="../Configuration.ui" line="742"/>

10
widgets/colorhighlighting.cpp
View File

@ -1,7 +1,7 @@
#include "colorhighlighting.h" #include "colorhighlighting.h"
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QString>
#include "SettingsGroup.hpp" #include "SettingsGroup.hpp"
#include "models/DecodeHighlightingModel.hpp" #include "models/DecodeHighlightingModel.hpp"
@ -113,16 +113,16 @@ void ColorHighlighting::set_items (DecodeHighlightingModel const& highlighting_m
default: default:
continue; continue;
} }
auto palette = example->parentWidget ()->palette (); auto style_sheet = example->parentWidget ()->styleSheet ();
if (Qt::NoBrush != item.background_.style ()) if (Qt::NoBrush != item.background_.style ())
{ {
palette.setColor (QPalette::Window, item.background_.color ()); style_sheet += QString {"; background-color: #%1"}.arg (item.background_.color ().rgb (), 8, 16, QLatin1Char {'0'});
} }
if (Qt::NoBrush != item.foreground_.style ()) if (Qt::NoBrush != item.foreground_.style ())
{ {
palette.setColor (QPalette::WindowText, item.foreground_.color ()); style_sheet += QString {"; color: #%1"}.arg (item.foreground_.color ().rgb (), 8, 16, QLatin1Char {'0'});
} }
example->setPalette (palette); example->setStyleSheet (style_sheet);
example->setEnabled (item.enabled_); example->setEnabled (item.enabled_);
label->setText (DecodeHighlightingModel::highlight_name (item.type_)); label->setText (DecodeHighlightingModel::highlight_name (item.type_));
label->setEnabled (item.enabled_); label->setEnabled (item.enabled_);