hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 16:54:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-12-11 21:02:51 +08:00
parent 16d76f2cc7 1507bf9c6c
commit ffca14556c
12 changed files with 82 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/ubuntu-6.2.yml vendored
View file

@ -54,6 +54,7 @@ jobs:
sudo apt-get install libxtst-dev liblzo2-dev libbz2-dev
sudo apt-get install libao-dev libavutil-dev libavformat-dev libtiff5-dev libeb16-dev
sudo apt-get install doxygen libzstd-dev libxkbcommon-dev libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0
sudo apt install libfuse2
sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld
#build opencc

2
article-style-st-classic.css
View file

@ -390,7 +390,7 @@ div.xdxf
display:inline;
}
.dsl_article font[color=c_default_color]
.dsl_article .c_default_color
{
color: green;
}

2
article-style.css
View file

@ -396,7 +396,7 @@ div.xdxf
display:inline;
}
.dsl_article font[color=c_default_color]
.dsl_article .c_default_color
{
color: green;
}

6
articleview.cc
View file

@ -2149,9 +2149,9 @@ void ArticleView::resourceDownloadFinished()
if ( resourceDownloadRequests.empty() )
{
emit statusBarMessage(
tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
10000, QPixmap(":/icons/error.svg"));
// emit statusBarMessage(
// tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
// 10000, QPixmap(":/icons/error.svg"));
}
}

8
config.cc
View file

@ -219,6 +219,7 @@ Preferences::Preferences():
selectWordBySingleClick( false ),
autoScrollToTargetArticle( true ),
escKeyHidesMainWindow( false ),
darkMode( false ),
alwaysOnTop ( false ),
searchInDock ( false ),
@ -869,6 +870,9 @@ Class load()
if ( !preferences.namedItem( "escKeyHidesMainWindow" ).isNull() )
c.preferences.escKeyHidesMainWindow = ( preferences.namedItem( "escKeyHidesMainWindow" ).toElement().text() == "1" );
if ( !preferences.namedItem( "darkMode" ).isNull() )
c.preferences.darkMode = ( preferences.namedItem( "darkMode" ).toElement().text() == "1" );
if ( !preferences.namedItem( "zoomFactor" ).isNull() )
c.preferences.zoomFactor = preferences.namedItem( "zoomFactor" ).toElement().text().toDouble();
@ -1711,6 +1715,10 @@ void save( Class const & c )
opt.appendChild( dd.createTextNode( c.preferences.escKeyHidesMainWindow ? "1":"0" ) );
preferences.appendChild( opt );
opt = dd.createElement( "darkMode" );
opt.appendChild( dd.createTextNode( c.preferences.darkMode ? "1":"0" ) );
preferences.appendChild( opt );
opt = dd.createElement( "zoomFactor" );
opt.appendChild( dd.createTextNode( QString::number( c.preferences.zoomFactor ) ) );
preferences.appendChild( opt );

1
config.hh
View file

@ -307,6 +307,7 @@ struct Preferences
bool selectWordBySingleClick;
bool autoScrollToTargetArticle;
bool escKeyHidesMainWindow;
bool darkMode;
bool alwaysOnTop;
/// An old UI mode when tranlateLine and wordList

14
dsl.cc
View file

@ -809,9 +809,17 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
}
else if( node.tagName == U"c" )
{
result += "<font color=\"" + ( node.tagAttrs.size() ?
Html::escape( Utf8::encode( node.tagAttrs ) ) : string( "c_default_color" ) )
+ "\">" + processNodeChildren( node ) + "</font>";
if( node.tagAttrs.empty() )
{
result += "<span class=\"c_default_color\">"
+ processNodeChildren( node ) + "</span>";
}
else
{
result += "<font color=\""
+ Html::escape( Utf8::encode( node.tagAttrs ) ) + "\">"
+ processNodeChildren( node ) + "</font>";
}
}
else if( node.tagName == U"*" )
{

2
ffmpegaudio.cc
View file

@ -186,7 +186,7 @@ bool DecoderContext::openCodec( QString & errorString )
int ret = 0;
avformatOpened_ = true;
ret = avformat_open_input( &formatContext_, "_STREAM_", NULL, NULL );
ret = avformat_open_input( &formatContext_, NULL, NULL, NULL );
if ( ret < 0 )
{
errorString = QObject::tr( "avformat_open_input() failed: %1." ).arg( avErrorString( ret ) );

49
mainwindow.cc
View file

@ -834,7 +834,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
translateLine->setFocus();
applyQtStyleSheet( cfg.preferences.displayStyle, cfg.preferences.addonStyle );
applyQtStyleSheet( cfg.preferences.displayStyle, cfg.preferences.addonStyle, cfg.preferences.darkMode );
makeScanPopup();
@ -1175,8 +1175,45 @@ QPrinter & MainWindow::getPrinter()
return *printer;
}
void MainWindow::applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle )
void MainWindow::applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle, bool const & darkMode )
{
if( darkMode )
{
//https://forum.qt.io/topic/101391/windows-10-dark-theme
#ifdef Q_OS_WIN32
qApp->setStyle( QStyleFactory::create( "Fusion" ) );
#endif
QPalette darkPalette;
QColor darkColor = QColor( 45, 45, 45 );
QColor disabledColor = QColor( 127, 127, 127 );
darkPalette.setColor( QPalette::Window, darkColor );
darkPalette.setColor( QPalette::WindowText, Qt::white );
darkPalette.setColor( QPalette::Base, QColor( 18, 18, 18 ) );
darkPalette.setColor( QPalette::AlternateBase, darkColor );
darkPalette.setColor( QPalette::ToolTipBase, Qt::white );
darkPalette.setColor( QPalette::ToolTipText, Qt::white );
darkPalette.setColor( QPalette::Text, Qt::white );
darkPalette.setColor( QPalette::Disabled, QPalette::Text, disabledColor );
darkPalette.setColor( QPalette::Button, darkColor );
darkPalette.setColor( QPalette::ButtonText, Qt::white );
darkPalette.setColor( QPalette::Disabled, QPalette::ButtonText, disabledColor );
darkPalette.setColor( QPalette::BrightText, Qt::red );
darkPalette.setColor( QPalette::Link, QColor( 42, 130, 218 ) );
darkPalette.setColor( QPalette::Highlight, QColor( 42, 130, 218 ) );
darkPalette.setColor( QPalette::HighlightedText, Qt::black );
darkPalette.setColor( QPalette::Disabled, QPalette::HighlightedText, disabledColor );
qApp->setPalette( darkPalette );
}
else
{
#ifdef Q_OS_WIN32
qApp->setStyle( QStyleFactory::create( "Windows" ) );
#endif
qApp->setPalette( QPalette() );
}
QFile builtInCssFile( ":/qt-style.css" );
builtInCssFile.open( QFile::ReadOnly );
QByteArray css = builtInCssFile.readAll();
@ -1210,6 +1247,10 @@ void MainWindow::applyQtStyleSheet( QString const & displayStyle, QString const
css += addonCss.readAll();
}
if(darkMode){
css += "QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }";
}
setStyleSheet( css );
}
@ -2237,9 +2278,9 @@ void MainWindow::editPreferences()
bool needReload = false;
// See if we need to reapply stylesheets
if ( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.addonStyle != p.addonStyle )
if ( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.addonStyle != p.addonStyle || cfg.preferences.darkMode != p.darkMode)
{
applyQtStyleSheet( p.displayStyle, p.addonStyle );
applyQtStyleSheet( p.displayStyle, p.addonStyle, p.darkMode );
articleMaker.setDisplayStyle( p.displayStyle, p.addonStyle );
needReload = true;
}

2
mainwindow.hh
View file

@ -184,7 +184,7 @@ private:
ResourceSchemeHandler * resourceSchemeHandler;
/// Applies the qt's stylesheet, given the style's name.
void applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle );
void applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle, bool const & darkMode );
/// Creates, destroys or otherwise updates tray icon, according to the
/// current configuration and situation.

2
preferences.cc
View file

@ -181,6 +181,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
ui.selectBySingleClick->setChecked( p.selectWordBySingleClick);
ui.autoScrollToTargetArticle->setChecked( p.autoScrollToTargetArticle );
ui.escKeyHidesMainWindow->setChecked( p.escKeyHidesMainWindow );
ui.darkMode->setChecked(p.darkMode);
ui.enableMainWindowHotkey->setChecked( p.enableMainWindowHotkey );
ui.mainWindowHotkey->setHotKey( p.mainWindowHotkey );
@ -400,6 +401,7 @@ Config::Preferences Preferences::getPreferences()
p.autoScrollToTargetArticle = ui.autoScrollToTargetArticle->isChecked();
p.escKeyHidesMainWindow = ui.escKeyHidesMainWindow->isChecked();
p.darkMode = ui.darkMode->isChecked();
p.enableMainWindowHotkey = ui.enableMainWindowHotkey->isChecked();
p.mainWindowHotkey = ui.mainWindowHotkey->getHotKey();
p.enableClipboardHotkey = ui.enableClipboardHotkey->isChecked();

7
preferences.ui
View file

@ -412,6 +412,13 @@ be the last ones.</string>
</item>
</layout>
</item>
<item row="12" column="0">
<widget class="QCheckBox" name="darkMode">
<property name="text">
<string>dark mode</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4">