Refactoring of build system and use of native executable instead of qmlscene.

.gitignore

@@ -34,3 +34,7 @@ Makefile*
 # Others
 
 *.xcf
+
+# Ubuntu SDk
+*.excludes
+*.json

app/app.pro

@@ -0,0 +1,8 @@
+QT += qml quick widgets
+TARGET = cool-old-term 
+
+DESTDIR = $$OUT_PWD/../
+SOURCES = main.cpp
+
+RESOURCES += qml/resources.qrc
+

app/main.cpp

@@ -0,0 +1,27 @@
+#include <QtQml/QQmlApplicationEngine>
+#include <QtGui/QGuiApplication>
+
+#include <QtWidgets/QApplication>
+
+#include <QDebug>
+#include <stdlib.h>
+
+
+int main(int argc, char *argv[])
+{
+    setenv("QT_QPA_PLATFORMTHEME", "", 1);
+    QApplication app(argc, argv);
+    QQmlApplicationEngine engine;
+
+    // Managing some env variables
+
+    // Manage import paths
+    QStringList importPathList = engine.importPathList();
+    importPathList.prepend(QCoreApplication::applicationDirPath() + "/imports/");
+    engine.setImportPathList(importPathList);
+
+    engine.load(QUrl("qrc:/main.qml"));
+
+    return app.exec();
+}
+

app/qml/main.qml

@@ -33,6 +33,8 @@ ApplicationWindow{
     minimumWidth: 320
     minimumHeight: 240
 
+    visible: true
+
     property bool fullscreen: shadersettings.fullscreen
     onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
 

app/qml/resources.qrc

@@ -0,0 +1,68 @@
+<RCC>
+    <qresource prefix="/">
+        <file>frames/BlackRoughFrame.qml</file>
+        <file>frames/NoFrame.qml</file>
+        <file>frames/images/black-frame.png</file>
+        <file>frames/images/screen-frame-normals.png</file>
+        <file>frames/images/black-frame-normals.png</file>
+        <file>frames/images/screen-frame.png</file>
+        <file>frames/images/black-frame-original.png</file>
+        <file>frames/images/randfunction.png</file>
+        <file>frames/images/screen-frame-original.png</file>
+        <file>frames/WhiteSimpleFrame.qml</file>
+        <file>frames/utils/FrameShader.qml</file>
+        <file>frames/utils/NoFrameShader.qml</file>
+        <file>frames/utils/TerminalFrame.qml</file>
+        <file>SizeOverlay.qml</file>
+        <file>ShaderTerminal.qml</file>
+        <file>CheckableSlider.qml</file>
+        <file>ApplicationSettings.qml</file>
+        <file>SettingsWindow.qml</file>
+        <file>Fonts.qml</file>
+        <file>FontPixels.qml</file>
+        <file>SettingsGeneralTab.qml</file>
+        <file>PreprocessedTerminal.qml</file>
+        <file>TimeManager.qml</file>
+        <file>SimpleSlider.qml</file>
+        <file>ColorButton.qml</file>
+        <file>Glossy.qml</file>
+        <file>AboutDialog.qml</file>
+        <file>InsertNameDialog.qml</file>
+        <file>SettingsEffectsTab.qml</file>
+        <file>main.qml</file>
+        <file>SettingsTerminalTab.qml</file>
+        <file>FontScanlines.qml</file>
+        <file>fonts/1982-commodore64/C64_Pro_v1.0-STYLE.ttf</file>
+        <file>fonts/1982-commodore64/license.txt</file>
+        <file>fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf</file>
+        <file>fonts/1982-commodore64/C64_Elite_Mono_v1.0-STYLE.ttf</file>
+        <file>fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf</file>
+        <file>fonts/1982-commodore64/C64_User_v1.0-STYLE.ttf</file>
+        <file>fonts/1977-apple2/FreeLicense.txt</file>
+        <file>fonts/1977-apple2/PRNumber3.ttf</file>
+        <file>fonts/1977-apple2/PrintChar21.ttf</file>
+        <file>fonts/1971-ibm-3278/README.md</file>
+        <file>fonts/1971-ibm-3278/LICENSE.txt</file>
+        <file>fonts/1971-ibm-3278/3270Medium.ttf</file>
+        <file>fonts/1985-atari-st/AtariST8x16SystemFont.ttf</file>
+        <file>fonts/modern-terminus/TerminusTTF-Bold-4.38.2.ttf</file>
+        <file>fonts/modern-terminus/TerminusTTF-4.38.2.ttf</file>
+        <file>fonts/1977-commodore-pet/FreeLicense.txt</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_128_2y.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_64_2y.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_2y.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_64.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_128.ttf</file>
+        <file>fonts/1977-commodore-pet/COMMODORE_PET_2x.ttf</file>
+        <file>fonts/1979-atari-400-800/ReadMe.rtf</file>
+        <file>fonts/1979-atari-400-800/ATARI400800_original.TTF</file>
+        <file>fonts/1979-atari-400-800/ATARI400800_squared.TTF</file>
+        <file>fonts/1979-atari-400-800/ATARI400800_rounded.TTF</file>
+        <file>fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf</file>
+        <file>fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf</file>
+        <file>fonts/1985-ibm-pc-vga/dos437.txt</file>
+        <file>Storage.qml</file>
+    </qresource>
+</RCC>
+

cool-old-term

@@ -1,4 +0,0 @@
-#!/bin/sh
-#This is a workaround for an ubuntu specific problem with appmenu-qt5.
-QT_QPA_PLATFORMTHEME=
-qmlscene -I $(dirname $0)/imports $(dirname $0)/app/main.qml

cool-old-term.pro

@@ -1,4 +1,4 @@
-TEMPLATE =subdirs
+TEMPLATE = subdirs
-CONFIG += ordered
+
-SUBDIRS= konsole-qml-plugin\
+SUBDIRS += app
-         app
+SUBDIRS += konsole-qml-plugin

konsole-qml-plugin/debian/changelog

@@ -1,29 +0,0 @@
-konsole-qml-plugin (0.1.2) raring; urgency=low
-
-  * Fixed text display bug (LP:#1182503)
-
- -- Dmitry Zagnoyko <hiroshidi@gmail.com>  Mon, 10 Jun 2013 09:49:02 +0300
-
-konsole-qml-plugin (0.1.1) raring; urgency=low
-
-  * Fixed issue with float values of widget size
-  * Added virtual key event for qml KSession component
-
- -- Dmitry Zagnoyko <hiroshidi@gmail.com>  Mon, 06 May 2013 20:11:10 +0300
-
-konsole-qml-plugin (0.1.0ubuntu1~quantal1~test2) quantal; urgency=low
-
-  * Added qml properties for KTerminal
-  * Fixed visibility sope: removed konsole namespace
-  * Added qmltypes
-  * Fixed qml plugin path
-  * Added KSession class
-
- -- Dmitry Zagnoyko <hiroshidi@gmail.com>  Sat, 20 Apr 2013 21:44:26 +0300
-
-konsole-qml-plugin (0.1.0ubuntu1~quantal1~test1) quantal; urgency=low
-
-  * Initial release
-  * Ported KDE Konsole
-
- -- Dmitry Zagnoyko <hiroshidi@gmail.com>  Fri, 19 Apr 2013 20:22:12 +0300

konsole-qml-plugin/debian/compat

@@ -1 +0,0 @@
-9

konsole-qml-plugin/debian/control

@@ -1,40 +0,0 @@
-Source: konsole-qml-plugin
-Section: libs
-Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 9.0.0),
-#               libgl1-mesa-dev | libgl-dev,
-#               libgles2-mesa-dev
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qt5-default,
-Standards-Version: 3.9.4
-Homepage: http://konsole.kde.org/
-
-Package: qtdeclarative5-konsole-qml-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Description: KDE Konsole QML plugin - qml terminal plugin 
- Originaly, Konsole is a terminal emulator from KDE. This is ported
- version and do not require KDE.
- .
- This package contains the Konsole terminal emulator plugin
- for Qt Qml, which offers access to terminal by KTerminal and
- KSession elements. KTerminal is used for displaying information
- given by KSession.
-
-
-#Package: konsole-qml-plugin-dbg
-#Priority: extra
-#Architecture: any
-#Section: debug
-#Depends: ${misc:Depends}
-#Description: KDE Konsole QML plugin debugging symbols
-# Originaly, Konsole is a terminal emulator from KDE. This is ported
-# version without KDE tails and do not require KDE.
-# .
-# This package contains the debugging symbols for the KDE Konsole
-# QML plugin.
-

konsole-qml-plugin/debian/copyright

@@ -1,50 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/3.0/
-Upstream-Name: konsole-qml-plugin
-Source:
-
-Files: *
-Copyright: 2013          Dmitry Zagnoyko  <hiroshidi@gmail.com> 
-           2008                      e_k  <e_k@users.sourceforge.net>
-           2006-2008       Robert Knight  <robertknight@gmail.com>
-           2003-2007  Oswald Buddenhagen  <ossi@kde.org>
-	   2000            Stephan Kulow  <coolo@kde.org>
-           1997-1998         Lars Doelle  <lars.doelle@on-line.de>
-License: GPL-3
-
-Files: debian/*
-Copyright: 2013 Dmitry Zagnoyko <hiroshidi@gmail.com> 
-License: LGPL-3
-
-License: GPL-3
- This package 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.
- .
- This package 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/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL-3".
-
-License: LGPL-3
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License.
- .
- This package 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
- Lesser 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/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-3".

konsole-qml-plugin/debian/rules

@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-#export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-#export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-#export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-
-override_dh_auto_configure:
-	QT_SELECT=qt5 dh_auto_configure
-
-%:
-	dh $@ --list-missing --parallel 
-# WARN: currently, no pakgage
-# --dbg-package=konsole-qml-plugin-dbg
-
-
-#override_dh_builddeb:
-#	dh_builddeb -- -Zxz
-

konsole-qml-plugin/debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

konsole-qml-plugin/konsole-qml-plugin.pro

@@ -15,7 +15,29 @@ TARGET = kdekonsole
 PLUGIN_IMPORT_PATH = org/kde/konsole
 PLUGIN_ASSETS = $$PWD/assets/*
 
-INSTALL_DIR = ../imports
+DESTDIR = $$OUT_PWD/../imports/$$PLUGIN_IMPORT_PATH
+
+# Copy additional plugin files
+QMAKE_COPY = "cp -r"
+
+defineTest(copyToDestdir) {
+    files = $$1
+
+    for(FILE, files) {
+        DDIR = $$DESTDIR
+
+        # Replace slashes in paths with backslashes for Windows
+        win32:FILE ~= s,/,\\,g
+        win32:DDIR ~= s,/,\\,g
+
+        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
+    }
+
+    export(QMAKE_POST_LINK)
+}
+
+copyToDestdir($$PLUGIN_ASSETS)
+copyToDestdir($$PWD/src/qmldir)
 
 #########################################
 ##              SOURCES