Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dorian Zedler 2020-06-13 12:38:42 +02:00
commit 257aa4ebf3
Signed by: dorian
GPG key ID: 989DE36109AFA354
21 changed files with 203 additions and 18 deletions

View file

@ -38,5 +38,5 @@ CONFIG(release, debug|release): {
} }
# Default rules for deployment. # Default rules for deployment.
target.path = $$GLOBAL_TARGET_PATH/lib target.path = /usr/local/lib
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#ifndef APPTHEME_H #ifndef APPTHEME_H
#define APPTHEME_H #define APPTHEME_H

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#ifndef SCSTWAPPTHEMEMANAGER_H #ifndef SCSTWAPPTHEMEMANAGER_H
#define SCSTWAPPTHEMEMANAGER_H #define SCSTWAPPTHEMEMANAGER_H

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#ifndef SCSTWSTYLING_H #ifndef SCSTWSTYLING_H
#define SCSTWSTYLING_H #define SCSTWSTYLING_H

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Templates 2.0 as T import QtQuick.Templates 2.0 as T
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0

View file

@ -1,19 +1,20 @@
/* /****************************************************************************
Speed Climbing Stopwatch - Simple Stopwatch for Climbers ** ScStw Styling
Copyright (C) 2018 Itsblue Development - Dorian Zeder ** Copyright (C) 2020 Itsblue development
**
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 Affero General Public License as published ** it under the terms of the GNU General Public License as published by
by the Free Software Foundation, version 3 of the License. ** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
This program is distributed in the hope that it will be useful, **
but WITHOUT ANY WARRANTY; without even the implied warranty of ** This program is distributed in the hope that it will be useful,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Affero General Public License for more details. ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
You should have received a copy of the GNU Affero General Public License **
along with this program. If not, see <https://www.gnu.org/licenses/>. ** You should have received a copy of the GNU General Public License
*/ ** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
import QtQuick 2.12 import QtQuick 2.12
Item { Item {

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import de.itsblue.ScStw 2.0 import de.itsblue.ScStw 2.0

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#include "headers/scstwapptheme.h" #include "headers/scstwapptheme.h"
ScStwAppTheme::ScStwAppTheme(QString name, QVariantMap colors, QVariantMap icons, QVariantMap fonts, QVariantMap images, QObject *parent) : QObject(parent) ScStwAppTheme::ScStwAppTheme(QString name, QVariantMap colors, QVariantMap icons, QVariantMap fonts, QVariantMap images, QObject *parent) : QObject(parent)

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#include "../headers/scstwappthememanager.h" #include "../headers/scstwappthememanager.h"
ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent) ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent)

View file

@ -1,3 +1,21 @@
/****************************************************************************
** ScStw Styling
** Copyright (C) 2020 Itsblue development
**
** 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
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#include "../headers/scstwstyling.h" #include "../headers/scstwstyling.h"
ScStwStyling::ScStwStyling(QObject *parent) : QObject(parent) ScStwStyling::ScStwStyling(QObject *parent) : QObject(parent)

1
docs/.gitignore vendored
View file

@ -1,3 +1,4 @@
/html/ /html/
/latex/ /latex/
/xml/ /xml/
/m.css/

View file

@ -1,5 +1,5 @@
Package: libScStwSharedLibraries Package: libScStwSharedLibraries
Version: 1.0.0 Version: 1.1.0
Section: base Section: base
Priority: optional Priority: optional
Architecture: armhf Architecture: armhf

View file

@ -0,0 +1 @@
libScStwStyling.so.1.0.0

View file

@ -0,0 +1 @@
libScStwStyling.so.1.0.0

View file

@ -0,0 +1 @@
libScStwStyling.so.1.0.0

Binary file not shown.

Binary file not shown.

Binary file not shown.