Commit bd49c705 authored by Jonathan Carter's avatar Jonathan Carter

Add debian/.gitignore

parent f6529c6a
2.1.4
-----
* FIXED: Automatic high DPI support.
* FIXED: Unsigned integer conversion warnings in graphics layer.
* FIXED: Could not add images with Qt 5.12
* FIXED: Window icon didn't work in Wayland.
* Added support for OpenGL ES.
* Improved loading locales.
* Require Qt 5.9
* Translation updates: Polish.
2.1.3 2.1.3
----- -----
* Replaced jhead with image auto-rotation in Qt 5.5. * Replaced jhead with image auto-rotation in Qt 5.5.
......
...@@ -3,26 +3,19 @@ ...@@ -3,26 +3,19 @@
<file>bumpmap.png</file> <file>bumpmap.png</file>
<file>shadow.png</file> <file>shadow.png</file>
<file>shaders/120/textures0.frag</file> <file>shaders/gl2/textures0.frag</file>
<file>shaders/120/textures0.vert</file> <file>shaders/gl2/textures0.vert</file>
<file>shaders/120/textures1.frag</file> <file>shaders/gl2/textures1.frag</file>
<file>shaders/120/textures1.vert</file> <file>shaders/gl2/textures1.vert</file>
<file>shaders/120/textures2.frag</file> <file>shaders/gl2/textures2.frag</file>
<file>shaders/120/textures2.vert</file> <file>shaders/gl2/textures2.vert</file>
<file>shaders/130/textures0.frag</file> <file>shaders/gl3/textures0.frag</file>
<file>shaders/130/textures0.vert</file> <file>shaders/gl3/textures0.vert</file>
<file>shaders/130/textures1.frag</file> <file>shaders/gl3/textures1.frag</file>
<file>shaders/130/textures1.vert</file> <file>shaders/gl3/textures1.vert</file>
<file>shaders/130/textures2.frag</file> <file>shaders/gl3/textures2.frag</file>
<file>shaders/130/textures2.vert</file> <file>shaders/gl3/textures2.vert</file>
<file>shaders/330/textures0.frag</file>
<file>shaders/330/textures0.vert</file>
<file>shaders/330/textures1.frag</file>
<file>shaders/330/textures1.vert</file>
<file>shaders/330/textures2.frag</file>
<file>shaders/330/textures2.vert</file>
<file>tango/16x16/image-x-generic.png</file> <file>tango/16x16/image-x-generic.png</file>
<file>tango/16x16/list-add.png</file> <file>tango/16x16/list-add.png</file>
......
#version 330
uniform vec4 color;
layout(location = 0) out vec4 out_color;
void main()
{
out_color = color;
}
#version 330
uniform mat4 matrix;
layout(location = 0) in vec3 position;
void main()
{
gl_Position = matrix * vec4(position, 1.0);
}
#version 330
uniform sampler2D texture0;
uniform vec4 color;
in vec2 frag_texcoord0;
layout(location = 0) out vec4 out_color;
void main()
{
out_color = texture(texture0, frag_texcoord0) * color;
}
#version 330
uniform mat4 matrix;
layout(location = 0) in vec3 position;
layout(location = 1) in vec2 texcoord0;
out vec2 frag_texcoord0;
void main()
{
gl_Position = matrix * vec4(position, 1.0);
frag_texcoord0 = texcoord0;
}
#version 330
uniform sampler2D texture0;
uniform sampler2D texture1;
in vec2 frag_texcoord0;
in vec2 frag_texcoord1;
layout(location = 0) out vec4 out_color;
void main()
{
out_color = texture(texture0, frag_texcoord0) + texture(texture1, frag_texcoord1) - vec4(0.5, 0.5, 0.5, 0.5);
}
#version 330
uniform mat4 matrix;
layout(location = 0) in vec3 position;
layout(location = 1) in vec2 texcoord0;
layout(location = 2) in vec2 texcoord1;
out vec2 frag_texcoord0;
out vec2 frag_texcoord1;
void main()
{
gl_Position = matrix * vec4(position, 1.0);
frag_texcoord0 = texcoord0;
frag_texcoord1 = texcoord1;
}
#version 120 uniform highp vec4 color;
uniform vec4 color;
void main() void main()
{ {
......
#version 120
uniform mat4 matrix; uniform mat4 matrix;
attribute vec3 position; attribute vec3 position;
......
#version 120
uniform sampler2D texture0; uniform sampler2D texture0;
uniform vec4 color; uniform highp vec4 color;
varying vec2 frag_texcoord0; varying highp vec2 frag_texcoord0;
void main() void main()
{ {
......
#version 120
uniform mat4 matrix; uniform mat4 matrix;
attribute vec2 texcoord0; attribute vec2 texcoord0;
......
#version 120
uniform sampler2D texture0; uniform sampler2D texture0;
uniform sampler2D texture1; uniform sampler2D texture1;
varying vec2 frag_texcoord0; varying highp vec2 frag_texcoord0;
varying vec2 frag_texcoord1; varying highp vec2 frag_texcoord1;
void main() void main()
{ {
......
#version 120
uniform mat4 matrix; uniform mat4 matrix;
attribute vec2 texcoord1; attribute vec2 texcoord1;
......
#version 130 uniform highp vec4 color;
uniform vec4 color; out highp vec4 out_color;
out vec4 out_color;
void main() void main()
{ {
......
#version 130
uniform mat4 matrix; uniform mat4 matrix;
in vec3 position; in vec3 position;
......
#version 130
uniform sampler2D texture0; uniform sampler2D texture0;
uniform vec4 color; uniform highp vec4 color;
in vec2 frag_texcoord0; in highp vec2 frag_texcoord0;
out vec4 out_color; out highp vec4 out_color;
void main() void main()
{ {
......
#version 130
uniform mat4 matrix; uniform mat4 matrix;
in vec3 position; in vec3 position;
......
#version 130
uniform sampler2D texture0; uniform sampler2D texture0;
uniform sampler2D texture1; uniform sampler2D texture1;
in vec2 frag_texcoord0; in highp vec2 frag_texcoord0;
in vec2 frag_texcoord1; in highp vec2 frag_texcoord1;
out vec4 out_color; out highp vec4 out_color;
void main() void main()
{ {
......
#version 130
uniform mat4 matrix; uniform mat4 matrix;
in vec3 position; in vec3 position;
......
data/tango/24x24/image-x-generic.png

1.33 KB | W: | H:

data/tango/24x24/image-x-generic.png

1.33 KB | W: | H:

data/tango/24x24/image-x-generic.png
data/tango/24x24/image-x-generic.png
data/tango/24x24/image-x-generic.png
data/tango/24x24/image-x-generic.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/24x24/list-add.png

528 Bytes | W: | H:

data/tango/24x24/list-add.png

528 Bytes | W: | H:

data/tango/24x24/list-add.png
data/tango/24x24/list-add.png
data/tango/24x24/list-add.png
data/tango/24x24/list-add.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/24x24/list-remove.png

412 Bytes | W: | H:

data/tango/24x24/list-remove.png

412 Bytes | W: | H:

data/tango/24x24/list-remove.png
data/tango/24x24/list-remove.png
data/tango/24x24/list-remove.png
data/tango/24x24/list-remove.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/32x32/image-x-generic.png

1.33 KB | W: | H:

data/tango/32x32/image-x-generic.png

1.14 KB | W: | H:

data/tango/32x32/image-x-generic.png
data/tango/32x32/image-x-generic.png
data/tango/32x32/image-x-generic.png
data/tango/32x32/image-x-generic.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/48x48/image-x-generic.png

2.35 KB | W: | H:

data/tango/48x48/image-x-generic.png

8.59 KB | W: | H:

data/tango/48x48/image-x-generic.png
data/tango/48x48/image-x-generic.png
data/tango/48x48/image-x-generic.png
data/tango/48x48/image-x-generic.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/48x48/list-add.png

1.6 KB | W: | H:

data/tango/48x48/list-add.png

1.6 KB | W: | H:

data/tango/48x48/list-add.png
data/tango/48x48/list-add.png
data/tango/48x48/list-add.png
data/tango/48x48/list-add.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/48x48/list-remove.png

1.24 KB | W: | H:

data/tango/48x48/list-remove.png

1.24 KB | W: | H:

data/tango/48x48/list-remove.png
data/tango/48x48/list-remove.png
data/tango/48x48/list-remove.png
data/tango/48x48/list-remove.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/64x64/image-x-generic.png

3.97 KB | W: | H:

data/tango/64x64/image-x-generic.png

9.97 KB | W: | H:

data/tango/64x64/image-x-generic.png
data/tango/64x64/image-x-generic.png
data/tango/64x64/image-x-generic.png
data/tango/64x64/image-x-generic.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/64x64/list-add.png

2.31 KB | W: | H:

data/tango/64x64/list-add.png

2.31 KB | W: | H:

data/tango/64x64/list-add.png
data/tango/64x64/list-add.png
data/tango/64x64/list-add.png
data/tango/64x64/list-add.png
  • 2-up
  • Swipe
  • Onion skin
data/tango/64x64/list-remove.png

1.46 KB | W: | H:

data/tango/64x64/list-remove.png

1.46 KB | W: | H:

data/tango/64x64/list-remove.png
data/tango/64x64/list-remove.png
data/tango/64x64/list-remove.png
data/tango/64x64/list-remove.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -98,6 +98,20 @@ ...@@ -98,6 +98,20 @@
</content_rating> </content_rating>
<releases> <releases>
<release version="2.1.4" date="2019-03-25">
<description>
<ul>
<li>FIXED: Automatic high DPI support</li>
<li>FIXED: Unsigned integer conversion warnings in graphics layer</li>
<li>FIXED: Could not add images with Qt 5.12</li>
<li>FIXED: Window icon didn't work in Wayland</li>
<li>Added support for OpenGL ES</li>
<li>Improved loading locales</li>
<li>Require Qt 5.9</li>
<li>Translation updates: Polish</li>
</ul>
</description>
</release>
<release version="2.1.3" date="2018-05-29"> <release version="2.1.3" date="2018-05-29">
<description> <description>
<ul> <ul>
......
...@@ -4,12 +4,16 @@ and mac_deploy.sh and repacking sources withe this script: ...@@ -4,12 +4,16 @@ and mac_deploy.sh and repacking sources withe this script:
#! /bin/bash #! /bin/bash
#! /bin/bash #! /bin/bash
tar -xvf tetzle-2.1.3.tar.gz tar -xvf tetzle-2.1.4.tar.gz
mv tetzle-2.1.3 tetzle-2.1.3+dfsg1 mv tetzle-2.1.4 tetzle-2.1.4+dfsg1
rm -f tetzle-2.1.3+dfsg1/mac_deploy.sh rm -f tetzle-2.1.4+dfsg1/mac_deploy.sh
rm -r tetzle-2.1.3+dfsg1/tools rm -r tetzle-2.1.4+dfsg1/tools
rm -r tetzle-2.1.3+dfsg1/windows rm -r tetzle-2.1.4+dfsg1/windows
tar -zcvf tetzle_2.1.3+dfsg1.orig.tar.gz tetzle-2.1.3+dfsg1 tar -zcvf tetzle_2.1.4+dfsg1.orig.tar.gz tetzle-2.1.4+dfsg1
-- Innocent De Marchi <tangram.peces@gmail.com> Mon, 11 Jun 2018 18:24:12 +0100 -- Innocent De Marchi <tangram.peces@gmail.com> Mon, 11 Jun 2018 18:24:12 +0100
Updated version numbers above
-- Jonathan Carter <jcc@debian.org> Thu Apr 4 14:00:08 SAST 2019 +0200
tetzle (2.1.4+dfsg1-1) unstable; urgency=medium
* New upstream release
* Update metadata license information
* Remove no longer needed debian/docs
-- Jonathan Carter <jcc@debian.org> Thu, 04 Apr 2019 13:57:56 +0200
tetzle (2.1.3+dfsg1-2) unstable; urgency=medium tetzle (2.1.3+dfsg1-2) unstable; urgency=medium
* Adopting package (Closes: #922886) * Adopting package (Closes: #922886)
......
...@@ -7,7 +7,7 @@ Files-excluded: mac_deploy.sh ...@@ -7,7 +7,7 @@ Files-excluded: mac_deploy.sh
/windows /windows
Files: * Files: *
Copyright: 2008-2018 Graeme Gott Copyright: 2008-2019 Graeme Gott
License: GPL-3 License: GPL-3
Files: debian/* Files: debian/*
...@@ -19,6 +19,10 @@ Copyright: 2009, 2011-2013 Bart Martens <bartm@debian.org> ...@@ -19,6 +19,10 @@ Copyright: 2009, 2011-2013 Bart Martens <bartm@debian.org>
2017-2018 Innocent De Marchi <tangram.peces@gmail.com> 2017-2018 Innocent De Marchi <tangram.peces@gmail.com>
License: GPL-3 License: GPL-3
Files: data/unix/tetzle.appdata.xml
Copyright: 2018 Graeme Gott
License: GPL-3+
License: GPL-3 License: GPL-3
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<!-- Copyright 2008-2017 Graeme Gott <graeme@gottcode.org> --> <!-- Copyright 2008-2017 Graeme Gott <graeme@gottcode.org> -->
<component type="desktop"> <component type="desktop">
<id>gnome-power-statistics.desktop</id> <id>gnome-power-statistics.desktop</id>
<metadata_license>GPL-3.0+</metadata_license> <metadata_license>GPL-3.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0</project_license>
<name>Peces</name> <name>Peces</name>
<summary>Jigsaw puzzle game</summary> <summary>Jigsaw puzzle game</summary>
<description> <description>
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
<url type="homepage">https://gottcode.org/tetzle/</url> <url type="homepage">https://gottcode.org/tetzle/</url>
<update_contact>graeme@gottcode.org</update_contact> <update_contact>graeme@gottcode.org</update_contact>
<project_group>KDE</project_group> <project_group>KDE</project_group>
</component> </component>
\ No newline at end of file
IDI_ICON1 ICON DISCARDABLE "tetzle.ico"
...@@ -83,7 +83,7 @@ namespace ...@@ -83,7 +83,7 @@ namespace
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Board::Board(QWidget* parent) : Board::Board(QWidget* parent) :
GLWidget(parent), QOpenGLWidget(parent),
m_id(0), m_id(0),
m_load_bevels(true), m_load_bevels(true),
m_has_bevels(true), m_has_bevels(true),
...@@ -776,7 +776,7 @@ void Board::keyPressEvent(QKeyEvent* event) ...@@ -776,7 +776,7 @@ void Board::keyPressEvent(QKeyEvent* event)
m_action_key = event->key(); m_action_key = event->key();
} }
} }
GLWidget::keyPressEvent(event); QOpenGLWidget::keyPressEvent(event);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -786,7 +786,7 @@ void Board::keyReleaseEvent(QKeyEvent* event) ...@@ -786,7 +786,7 @@ void Board::keyReleaseEvent(QKeyEvent* event)
if (!event->isAutoRepeat()) { if (!event->isAutoRepeat()) {
m_action_key = 0; m_action_key = 0;
} }
GLWidget::keyReleaseEvent(event); QOpenGLWidget::keyReleaseEvent(event);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -804,7 +804,7 @@ void Board::mousePressEvent(QMouseEvent* event) ...@@ -804,7 +804,7 @@ void Board::mousePressEvent(QMouseEvent* event)
m_select_pos = event->pos(); m_select_pos = event->pos();
} }
GLWidget::mousePressEvent(event); QOpenGLWidget::mousePressEvent(event);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -833,7 +833,7 @@ void Board::mouseReleaseEvent(QMouseEvent* event) ...@@ -833,7 +833,7 @@ void Board::mouseReleaseEvent(QMouseEvent* event)
} }
m_action_button = Qt::NoButton; m_action_button = Qt::NoButton;
GLWidget::mouseReleaseEvent(event); QOpenGLWidget::mouseReleaseEvent(event);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -912,7 +912,7 @@ void Board::wheelEvent(QWheelEvent* event) ...@@ -912,7 +912,7 @@ void Board::wheelEvent(QWheelEvent* event)
zoomOut(); zoomOut();
} }
GLWidget::wheelEvent(event); QOpenGLWidget::wheelEvent(event);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -28,18 +28,12 @@ class Piece; ...@@ -28,18 +28,12 @@ class Piece;
class Tile; class Tile;
#include <QHash> #include <QHash>
#if (QT_VERSION >= QT_VERSION_CHECK(5,4,0))
#include <QOpenGLWidget> #include <QOpenGLWidget>
typedef QOpenGLWidget GLWidget;
#else
#include <QGLWidget>
typedef QGLWidget GLWidget;
#endif
class QOpenGLTexture; class QOpenGLTexture;
#include <random> #include <random>
class Board : public GLWidget class Board : public QOpenGLWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -123,10 +117,6 @@ private: ...@@ -123,10 +117,6 @@ private:
void finishGame(); void finishGame();
void cleanup(); void cleanup();
#if (QT_VERSION < QT_VERSION_CHECK(5,6,0))
qreal devicePixelRatioF() const { return devicePixelRatio(); }
#endif
private: private:
int m_id; int m_id;
bool m_load_bevels; bool m_load_bevels;
......
This diff is collapsed.
/*********************************************************************** /***********************************************************************
* *
* Copyright (C) 2011, 2012, 2016 Graeme Gott <graeme@gottcode.org> * Copyright (C) 2011, 2012, 2016, 2018 Graeme Gott <graeme@gottcode.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -117,7 +117,7 @@ extern GraphicsLayer* graphics_layer; ...@@ -117,7 +117,7 @@ extern GraphicsLayer* graphics_layer;
class GraphicsLayer21 : public GraphicsLayer, protected QOpenGLFunctions class GraphicsLayer21 : public GraphicsLayer, protected QOpenGLFunctions
{ {
public: public:
GraphicsLayer21(QOpenGLVertexArrayObject* vertex_array = nullptr); GraphicsLayer21(QOpenGLVertexArrayObject* vertex_array, const QByteArray& glsl, const QString& shader);
~GraphicsLayer21(); ~GraphicsLayer21();
virtual void bindTexture(unsigned int unit, GLuint texture); virtual void bindTexture(unsigned int unit, GLuint texture);
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
virtual void uploadData(); virtual void uploadData();
private: private:
QOpenGLShaderProgram* loadProgram(unsigned int index); QOpenGLShaderProgram* loadProgram(unsigned int index, const QByteArray& glsl, const QString& shader);
private: private:
enum Attribute enum Attribute
...@@ -158,6 +158,7 @@ private: ...@@ -158,6 +158,7 @@ private:
}; };
#ifndef QT_OPENGL_ES_2
// Fixed function pipeline // Fixed function pipeline
class GraphicsLayer11 : public GraphicsLayer, protected QOpenGLFunctions_1_1 class GraphicsLayer11 : public GraphicsLayer, protected QOpenGLFunctions_1_1
{ {
...@@ -212,5 +213,6 @@ public: ...@@ -212,5 +213,6 @@ public:
private: private:
QOpenGLBuffer* m_vertex_buffer; QOpenGLBuffer* m_vertex_buffer;
}; };
#endif
#endif #endif
/*********************************************************************** /***********************************************************************
* *
* Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018 Graeme Gott <graeme@gottcode.org> * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2019 Graeme Gott <graeme@gottcode.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -98,50 +98,38 @@ void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadi ...@@ -98,50 +98,38 @@ void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadi
// Find current locale // Find current locale
m_current = QSettings().value("Locale/Language").toString(); m_current = QSettings().value("Locale/Language").toString();
QString current = !m_current.isEmpty() ? m_current : QLocale::system().name(); if (!m_current.isEmpty()) {
QStringList translations = findTranslations(); QLocale::setDefault(m_current);
if (!translations.contains(m_appname + current)) {
current = current.left(2);
if (!translations.contains(m_appname + current)) {
current.clear();
}
}
if (!current.isEmpty()) {
QLocale::setDefault(current);
} else {
current = "en";
} }
const QLocale locale;
// Load translators // Load translators
static QTranslator qt_translator; static QTranslator translator;
qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); if (translator.load(locale, m_appname, "", m_path)) {
QCoreApplication::installTranslator(&qt_translator); QCoreApplication::installTranslator(&translator);
static QTranslator qtbase_translator; const QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
if (translations.contains("qtbase_" + current) || translations.contains("qtbase_" + current.left(2))) {
qtbase_translator.load("qtbase_" + current, m_path);
} else {
qtbase_translator.load("qtbase_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
}
QCoreApplication::installTranslator(&qtbase_translator);
static QTranslator translator; static QTranslator qtbase_translator;
translator.load(m_appname + current, m_path); if (qtbase_translator.load(locale, "qtbase", "_", m_path) || qtbase_translator.load(locale, "qtbase", "_", path)) {
QCoreApplication::installTranslator(&translator); QCoreApplication::installTranslator(&qtbase_translator);
}
// Work around bug in Qt 5 where text direction is not loaded static QTranslator qt_translator;
QGuiApplication::setLayoutDirection(QLocale(current).textDirection()); if (qt_translator.load(locale, "qt", "_", m_path) || qt_translator.load(locale, "qt", "_", path)) {
QCoreApplication::installTranslator(&qt_translator);
}
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QString LocaleDialog::languageName(const QString& language) QString LocaleDialog::languageName(const QString& language)
{ {
QString lang_code = language.