Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Korean Translate #82

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
df1f8e2
Add Korean Translate
mirusu400 Oct 9, 2019
61e423c
Add French translation
maltaisn Oct 5, 2020
96d968e
Fix OpenGL rendering on Wayland
mara004 Aug 2, 2021
e122ba0
Improve code formatting
mara004 Aug 2, 2021
2de32ff
Add Polish translation
fyrtax Sep 25, 2021
e03960a
Ignore build folder
Feb 5, 2022
595a1ee
German translation added
Feb 5, 2022
592300b
Merge remote-tracking branch 'polish/master'
Feb 5, 2022
d3a03bc
Merge remote-tracking branch 'french/master'
Feb 5, 2022
87af484
Add option to use black as filling background color
Feb 5, 2022
b83d557
Better translation
Feb 5, 2022
7d4c4f3
Add 1200 DPI as option
Feb 5, 2022
692ffd8
Fix for #87af484 which broke the build
Feb 5, 2022
d16344c
Merge remote-tracking branch 'korean/master'
Feb 5, 2022
ca7d423
Update readme
Feb 5, 2022
b472a7a
German translation synced with project and translated missing phrases
Feb 6, 2022
a07c618
Translations synced with project
Feb 6, 2022
f3fe586
Bump version
Feb 6, 2022
2474dc0
Merge branch 'wayland-opengl' of https://github.com/mara004/scantailo…
Feb 9, 2022
8d4e15f
Enable negative margins
Feb 9, 2022
a2ad776
Qt6 port, warning suppression
kunzjacq Feb 15, 2022
f8be714
Enable compilation with both Qt5 and Qt6
kunzjacq Feb 16, 2022
06238ee
Require at least Qt 5.15
kunzjacq Feb 16, 2022
1359b27
Enable compilation with Qt5 starting from version 5.9
kunzjacq Feb 17, 2022
8ad0ec2
misc fix regarding the use of a deprecated function
kunzjacq Feb 18, 2022
a4c655f
misc fix regarding the use of a deprecated function (take two)
kunzjacq Feb 18, 2022
e1218c5
Update README.md
vigri Feb 24, 2022
4df65ca
Enable compilation with Qt6 and MSVC
kunzjacq Feb 25, 2022
a0112f9
fix install with MinGW GCC from command-line
kunzjacq Mar 5, 2022
5442e12
ignore CMake user settings
kunzjacq Mar 5, 2022
4e3d89b
Enable the installation of scantailor-advanced with libjpeg-turbo under
kunzjacq Mar 6, 2022
bd35d95
Merge branch 'master' into Qt6
kunzjacq Mar 9, 2022
5f4db25
Merge pull request #7 from kunzjacq/Qt6
vigri Mar 19, 2022
1590e99
Update Polish translation
fyrtax Apr 2, 2022
155807e
Merge pull request #11 from ukolaj-s/master
vigri Apr 2, 2022
70d87e4
Merge branch 'master' into develop
vigri Apr 23, 2022
b3481bf
Merge pull request #14 from vigri/develop
vigri Apr 23, 2022
85c3310
Update version.h.in
vigri Apr 23, 2022
713a0fb
Update README.md
mirusu400 May 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix OpenGL rendering on Wayland
Move away from the deprecated QGLWidget involving problematic native widgets.
Use the newer QOpenGLWidget instead.
  • Loading branch information
mara004 authored Aug 2, 2021
commit 96d968ef6756d998ab527332ecd3b04b30ab319a
19 changes: 10 additions & 9 deletions src/core/ImageViewBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#include <Transform.h>

#include <QApplication>
#include <QGLWidget>
// #include <QGLWidget>
#include <QOpenGLWidget>
#include <QMouseEvent>
#include <QPaintEngine>
#include <QPainter>
Expand Down Expand Up @@ -149,17 +150,17 @@ ImageViewBase::ImageViewBase(const QImage& image,

if (ApplicationSettings::getInstance().isOpenGlEnabled()) {
if (OpenGLSupport::supported()) {
QGLFormat format;
format.setSampleBuffers(true);
format.setStencil(true);
format.setAlpha(true);
format.setRgba(true);
format.setDepth(false);
// QGLFormat format;
// format.setSampleBuffers(true);
// format.setStencil(true);
// format.setAlpha(true);
// format.setRgba(true);
// format.setDepth(false);

// Most of hardware refuses to work for us with direct rendering enabled.
format.setDirectRendering(false);
// format.setDirectRendering(false);

setViewport(new QGLWidget(format));
setViewport(new QOpenGLWidget());
}
}

Expand Down