mirror of https://github.com/saitohirga/WSJT-X.git
Merge branch 'release-2.3.0' into develop
This commit is contained in:
commit
5fee4796b1
|
@ -247,7 +247,7 @@
|
|||
<message>
|
||||
<location filename="../widgets/CabrilloLogWindow.ui" line="20"/>
|
||||
<source><html><head/><body><p>Right-click here for available actions.</p></body></html></source>
|
||||
<translation><html><head/><body> <p> Højreklik her for tilgængelige muligheder. </p> </body> </html></translation>
|
||||
<translation><html><head/><body><p> Højreklik her for tilgængelige muligheder.</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/CabrilloLogWindow.ui" line="23"/>
|
||||
|
@ -318,7 +318,7 @@
|
|||
<message>
|
||||
<location filename="../widgets/colorhighlighting.ui" line="150"/>
|
||||
<source>New Call</source>
|
||||
<translation>Ny kaldesignal</translation>
|
||||
<translation>Nyt kaldesignal</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/colorhighlighting.ui" line="157"/>
|
||||
|
@ -2197,7 +2197,7 @@ Fejl(%2): %3</translation>
|
|||
<message>
|
||||
<location filename="../widgets/mainwindow.ui" line="495"/>
|
||||
<source>&Decode</source>
|
||||
<translation>&Dekod</translation>
|
||||
<translation>&Dekode</translation>
|
||||
</message>
|
||||
<message>
|
||||
<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="2992"/>
|
||||
<source>Fast</source>
|
||||
<translation>Fast</translation>
|
||||
<translation>Hurtig</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/mainwindow.ui" line="1344"/>
|
||||
|
@ -5578,7 +5578,7 @@ Fejl(%2): %3</translation>
|
|||
<message>
|
||||
<location filename="../Configuration.ui" line="400"/>
|
||||
<source>Monitor returns to last used frequency</source>
|
||||
<translation>Montor til seneste brugte frekvens</translation>
|
||||
<translation>Monitor til seneste brugte frekvens</translation>
|
||||
</message>
|
||||
<message>
|
||||
<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="584"/>
|
||||
<source>Serial Port Parameters</source>
|
||||
<translation>Seriek Port Parametre</translation>
|
||||
<translation>Seriel Port Parametre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<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="780"/>
|
||||
<source>Default</source>
|
||||
<translation>Deafult</translation>
|
||||
<translation>Default</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="742"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "colorhighlighting.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QString>
|
||||
|
||||
#include "SettingsGroup.hpp"
|
||||
#include "models/DecodeHighlightingModel.hpp"
|
||||
|
@ -113,16 +113,16 @@ void ColorHighlighting::set_items (DecodeHighlightingModel const& highlighting_m
|
|||
default:
|
||||
continue;
|
||||
}
|
||||
auto palette = example->parentWidget ()->palette ();
|
||||
auto style_sheet = example->parentWidget ()->styleSheet ();
|
||||
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 ())
|
||||
{
|
||||
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_);
|
||||
label->setText (DecodeHighlightingModel::highlight_name (item.type_));
|
||||
label->setEnabled (item.enabled_);
|
||||
|
|
Loading…
Reference in New Issue