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

Merge branch 'branch-qt-5.15' into dev

Browse source
This commit is contained in:
xiaoyifang 2022-01-24 22:27:04 +08:00
parent 23e148a345 c035cdc4ae
commit aa12bbe167
5 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dictionarybar.cc
View file

@ -81,10 +81,10 @@ void DictionaryBar::setDictionaries( vector< sptr< Dictionary::Class > >
QList< QSize > sizes = icon.availableSizes();
for( QList< QSize >::iterator i = sizes.begin(); i != sizes.end();
++i )
if ( i->width() == 14 && i->height() == 21 )
use14x21 = true;
// for( QList< QSize >::iterator i = sizes.begin(); i != sizes.end();
// ++i )
// if ( i->width() == 14 && i->height() == 21 )
// use14x21 = true;
dictActions.append( action );
}

10
goldendict.pro
View file

@ -122,10 +122,8 @@ win32 {
CONFIG += chinese_conversion_support
}
greaterThan(QT_MAJOR_VERSION, 4) {
LIBS += -luxtheme
}
}
unix:!mac {
DEFINES += HAVE_X11
@ -133,11 +131,7 @@ unix:!mac {
QMAKE_CXXFLAGS += -rdynamic
QMAKE_LFLAGS += -rdynamic
greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MINOR_VERSION, 0) {
QT += x11extras
}
}
CONFIG += link_pkgconfig
PKGCONFIG += vorbisfile \
@ -532,10 +526,10 @@ unix:!mac {
SOURCES += scanflag.cc
}
greaterThan(QT_MAJOR_VERSION, 4) {
HEADERS += wildcard.hh
SOURCES += wildcard.cc
}
CONFIG( zim_support ) {
DEFINES += MAKE_ZIM_SUPPORT

7
mainwindow.cc
View file

@ -1459,12 +1459,13 @@ void MainWindow::updateDictionaryBar()
dictionaryBar.setDictionaries( grp->dictionaries );
if ( useSmallIconsInToolbarsAction.isChecked() ) {
int extent = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
int extent = useSmallIconsInToolbarsAction.isChecked() ?
QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
dictionaryBar.setDictionaryIconSize( extent );
}
}
}
void MainWindow::makeScanPopup()
{

4
qtsingleapplication/qtsingleapplication.pro
View file

@ -1,4 +0,0 @@
TEMPLATE=subdirs
CONFIG += ordered
include(common.pri)
qtsingleapplication-uselib:SUBDIRS=buildlib

2
scanpopup.cc
View file

@ -1285,7 +1285,7 @@ void ScanPopup::setDictionaryIconSize()
{
int extent = cfg.usingSmallIconsInToolbars ?
QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
21;
QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
dictionaryBar.setDictionaryIconSize( extent );
}