hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-23 20:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

opt: use QFontCombox instead (#781)

Browse source 
* opt: use QFontCombox instead

* 🎨 apply clang-format changes

* remove comment code

---------

Co-authored-by: xiaoyifang <xiaoyifang@users.noreply.github.com>
This commit is contained in:
xiaoyifang 2023-06-07 21:53:21 +08:00 committed by GitHub
parent db00fac907
commit f58eb43bd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ui/preferences.cc
View file

@ -59,8 +59,6 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
// Load values into form
ui.interfaceLanguage->addItem( tr( "System default" ), QString() );
ui.fontFamilies->addItem( tr( "System default" ), QString() );
// See which other translations do we have
QStringList availLocs = QDir( Config::getLocDir() ).entryList( QStringList( "*.qm" ),
@ -99,20 +97,13 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
}
}
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
const QStringList fontFamilies = QFontDatabase::families();
#else
QFontDatabase fontDb;
const QStringList fontFamilies = fontDb.families();
#endif
for( const QString & family : fontFamilies )
{
ui.fontFamilies->addItem( family );
}
prevWebFontFamily = p.webFontFamily;
if(!p.webFontFamily.isEmpty())
ui.fontFamilies->setCurrentText( p.webFontFamily );
else {
ui.fontFamilies->setCurrentFont( QApplication::font() );
}
ui.displayStyle->addItem( QIcon( ":/icons/programicon_old.png" ), tr( "Default" ), QString() );
ui.displayStyle->addItem( QIcon( ":/icons/programicon.png" ), tr( "Classic" ), QString( "classic" ) );
@ -566,7 +557,7 @@ void Preferences::on_buttonBox_accepted()
QMessageBox::information( this, tr( "Changing Language" ),
tr( "Restart the program to apply the language change." ) );
auto currentFontFamily = ui.fontFamilies->currentText();
auto currentFontFamily = ui.fontFamilies->currentFont().family();
if( prevWebFontFamily != currentFontFamily )
{
//reset to default font .

2
src/ui/preferences.ui
View file

@ -264,7 +264,7 @@ however, the article from the topmost dictionary is shown.</string>
</widget>
</item>
<item row="8" column="0">
<widget class="QComboBox" name="fontFamilies">
<widget class="QFontComboBox" name="fontFamilies">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>