hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-28 03:44:07 +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:
yifang 2022-01-27 08:24:21 +08:00
parent 1d32ec4609 2e5ca5f70f
commit f1337862f1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
article-style-st-modern.css
View file

@ -125,6 +125,7 @@ a:hover
padding-right: -1em; padding-right: -1em;
padding-left: 0.3em; padding-left: 0.3em;
-webkit-box-ordinal-group: 2; -webkit-box-ordinal-group: 2;
height: 1em;
} }
.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover .gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover

3
mainwindow.cc
View file

@ -3413,7 +3413,8 @@ void MainWindow::on_pageSetup_triggered()
void MainWindow::on_printPreview_triggered() void MainWindow::on_printPreview_triggered()
{ {
QPrintPreviewDialog dialog( &getPrinter(), this ); QPrinter printer;
QPrintPreviewDialog dialog( &printer, this );
connect( &dialog, SIGNAL( paintRequested( QPrinter * ) ), connect( &dialog, SIGNAL( paintRequested( QPrinter * ) ),
this, SLOT( printPreviewPaintRequested( QPrinter * ) ) ); this, SLOT( printPreviewPaintRequested( QPrinter * ) ) );