Merge pull request #105 from Swordfish90/improvedbuild

Change build setup and name.

.gitignore

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

README.md

@@ -1,10 +1,10 @@
-#cool-old-term
+#cool-retro-term
 
 ##Description
-cool-old-term is a terminal emulator which tries to mimic the look and feel of the old cathode tube screens.
+cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens.
 It has been designed to be eye-candy, customizable, and reasonably lightweight.
 
-It now uses the Konsole engine which is powerful and mature.
+It uses the Konsole engine which is powerful and mature.
 
 This terminal emulator requires Qt 5.2 or higher to run.
 
@@ -13,14 +13,14 @@ This terminal emulator requires Qt 5.2 or higher to run.
 ![Image](<http://i.imgur.com/4LpfLF8.png>)
 ![Image](<http://i.imgur.com/MMmM6Ht.png>)
 
-## Get cool-old-term
-You can either build cool-old-term yourself (see below) or walk the easy way and install one of these packages:
+## Get cool-retro-term
+You can either build cool-retro-term yourself (see below) or walk the easy way and install one of these packages:
 
-Users of Fedora and openSUSE can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-old-term).
+Users of Fedora and openSUSE can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-retro-term).
 
-Arch users can install this [package](https://aur.archlinux.org/packages/cool-old-term-git/) directly via the [AUR](https://aur.archlinux.org):
+Arch users can install this [package](https://aur.archlinux.org/packages/cool-retro-term-git/) directly via the [AUR](https://aur.archlinux.org):
 
-    yaourt -S aur/cool-old-term-git
+    yaourt -S aur/cool-retro-term-git
 
 ##Build instructions
 
@@ -81,17 +81,14 @@ Once you installed all dependencies (Qt is installed and in your path) you need
 
 ```bash
 # Get it from GitHub
-git clone https://github.com/Swordifish90/cool-old-term.git
+git clone https://github.com/Swordfish90/cool-retro-term.git
 
 # Build it
-cd cool-old-term
-cd konsole-qml-plugin
+cd cool-retro-term
 
 # Compile (Fedora and OpenSUSE user should use qmake-qt5 instead of qmake)
-qmake && make && make install
-
-cd ..
+qmake && make
 
 # Have fun!
-./cool-old-term
+./cool-retro-term
 ```

app/app.pro

@@ -0,0 +1,15 @@
+QT += qml quick widgets
+TARGET = cool-retro-term 
+
+DESTDIR = $$OUT_PWD/../
+SOURCES = main.cpp
+
+RESOURCES += qml/resources.qrc
+
+#########################################
+##              INTALLS
+#########################################
+
+target.path += /usr/bin/
+
+INSTALLS += target

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/AboutDialog.qml

@@ -15,7 +15,7 @@ Window{
         spacing: 15
         Text {
             anchors.horizontalCenter: parent.horizontalCenter
-            text: "cool-old-term"
+            text: "cool-retro-term"
             font {bold: true; pointSize: 18}
         }
         Loader{
@@ -74,7 +74,7 @@ Window{
                 text: shadersettings.version + "\n" +
                       qsTr("Author: ") + "Filippo Scognamiglio\n" +
                       qsTr("Email: ") + "flscogna@gmail.com\n" +
-                      qsTr("Source: ") + "https://github.com/Swordifish90/cool-old-term\n"
+                      qsTr("Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
             }
         }
     }
@@ -84,9 +84,9 @@ Window{
             anchors.fill: parent
             readOnly: true
             text: "Copyright (c) 2013 Filippo Scognamiglio <flscogna@gmail.com>\n\n" +
-                  "https://github.com/Swordifish90/cool-old-term\n\n" +
+                  "https://github.com/Swordfish90/cool-retro-term\n\n" +
 
-                  "cool-old-term is free software: you can redistribute it and/or modify " +
+                  "cool-retro-term 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.\n\n" +

app/qml/ApplicationSettings.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/CheckableSlider.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/ColorButton.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/FontPixels.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/FontScanlines.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/Fonts.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/InsertNameDialog.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/PreprocessedTerminal.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.
@@ -22,7 +22,7 @@ import QtQuick 2.2
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.1
 
-import org.kde.konsole 0.1
+import org.crt.konsole 0.1
 
 Item{
     id: terminalContainer
@@ -75,7 +75,7 @@ Item{
         id: kterminal
         anchors.fill: parent
 
-        colorScheme: "cool-old-term"
+        colorScheme: "cool-retro-term"
 
         session: KSession {
             id: ksession

app/qml/SettingsEffectsTab.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/SettingsGeneralTab.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/SettingsTerminalTab.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/SettingsWindow.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/ShaderTerminal.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/SimpleSlider.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/SizeOverlay.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/Storage.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/TimeManager.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.

app/qml/main.qml

@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordifish90/cool-old-term
+* https://github.com/Swordfish90/cool-retro-term
 *
-* This file is part of cool-old-term.
+* This file is part of cool-retro-term.
 *
-* cool-old-term is free software: you can redistribute it and/or modify
+* cool-retro-term 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.
@@ -23,8 +23,6 @@ import QtQuick.Window 2.1
 import QtQuick.Controls 1.1
 import QtGraphicalEffects 1.0
 
-import org.kde.konsole 0.1
-
 ApplicationWindow{
     id: terminalWindow
 
@@ -33,12 +31,14 @@ ApplicationWindow{
     minimumWidth: 320
     minimumHeight: 240
 
+    visible: true
+
     property bool fullscreen: shadersettings.fullscreen
     onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
 
     flags: Qt.WA_TranslucentBackground
     color: "#00000000"
-    title: qsTr("cool-old-term")
+    title: qsTr("cool-retro-term")
 
     Action {
         id: showMenubarAction

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 +0,0 @@
-TEMPLATE =subdirs
-CONFIG += ordered
-SUBDIRS= konsole-qml-plugin\
-         app

cool-retro-term.pro

@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += 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

@@ -12,10 +12,34 @@ DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
 DEFINES += Q_WS_UBUNTU
 
 TARGET = kdekonsole
-PLUGIN_IMPORT_PATH = org/kde/konsole
+PLUGIN_IMPORT_PATH = org/crt/konsole
 PLUGIN_ASSETS = $$PWD/assets/*
 
-INSTALL_DIR = ../imports
+DESTDIR = $$OUT_PWD/../imports/$$PLUGIN_IMPORT_PATH
+
+INSTALL_DIR = $$[QT_INSTALL_QML]
+
+# 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

konsole-qml-plugin/src/plugin.cpp

@@ -33,7 +33,7 @@ KonsoleKterminalPlugin::~KonsoleKterminalPlugin() { }
 
 void KonsoleKterminalPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.konsole"));
+    Q_ASSERT(uri == QLatin1String("org.crt.konsole"));
 
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 
@@ -44,19 +44,19 @@ void KonsoleKterminalPlugin::initializeEngine(QQmlEngine *engine, const char *ur
         QString cs, kbl;
 
         foreach (QString pwd, pwds) {
-            cs  = pwd + "/org/kde/konsole/color-schemes";
-            kbl = pwd + "/org/kde/konsole/kb-layouts";
+            cs  = pwd + "/org/crt/konsole/color-schemes";
+            kbl = pwd + "/org/crt/konsole/kb-layouts";
             if (QDir(cs).exists()) break;
         }
 
-        setenv("KB_LAYOUT_DIR",kbl.toLatin1().constData(),1);
-        setenv("COLORSCHEMES_DIR",cs.toLatin1().constData(),1);
+        setenv("KB_LAYOUT_DIR",kbl.toUtf8().constData(),1);
+        setenv("COLORSCHEMES_DIR",cs.toUtf8().constData(),1);
     }
 }
 
 void KonsoleKterminalPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.konsole"));
+    Q_ASSERT(uri == QLatin1String("org.crt.konsole"));
 
     qmlRegisterType<KTerminalDisplay>(uri, 0, 1, "KTerminal");
     qmlRegisterType<KSession>(uri, 0, 1, "KSession");

konsole-qml-plugin/src/plugins.qmltypes

@@ -3,13 +3,15 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command '/usr/lib/x86_64-linux-gnu/qt5/bin/qmlplugindump -notrelocatable org.kde.konsole 0.1 ../../../'.
+// This file was auto-generated by:
+// 'qmlplugindump org.crt.konsole 0.1 .'
 
 Module {
     Component {
         name: "KSession"
         prototype: "QObject"
-        exports: ["org.kde.konsole/KSession 0.1"]
+        exports: ["KSession 0.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "kbScheme"; type: "string" }
         Signal { name: "finished" }
         Signal {
@@ -54,14 +56,16 @@ Module {
         name: "KTerminalDisplay"
         defaultProperty: "data"
         prototype: "QQuickPaintedItem"
-        exports: ["org.kde.konsole/KTerminal 0.1"]
+        exports: ["KTerminal 0.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "session"; type: "KSession"; isPointer: true }
         Property { name: "colorScheme"; type: "string" }
         Property { name: "font"; type: "QFont" }
         Property { name: "activeFocusOnClick"; type: "bool" }
         Property { name: "ShowIMEOnClick"; type: "bool" }
-        Property { name: "terminalSize"; type: "QSize" }
-        Property { name: "paintedFontSize"; type: "QSize"}
+        Property { name: "terminalSize"; type: "QSize"; isReadonly: true }
+        Property { name: "paintedFontSize"; type: "QSize"; isReadonly: true }
+        Property { name: "usesMouse"; type: "bool"; isReadonly: true }
         Signal {
             name: "changedScheme"
             Parameter { name: "scheme"; type: "string" }
@@ -74,6 +78,7 @@ Module {
             name: "changedAutoFocus"
             Parameter { name: "au"; type: "bool" }
         }
+        Signal { name: "updatedImage" }
         Signal {
             name: "mouseSignal"
             Parameter { type: "int" }
@@ -118,9 +123,6 @@ Module {
             name: "changedSession"
             Parameter { name: "session"; type: "KSession"; isPointer: true }
         }
-        Signal { name: "terminalSizeChanged" }
-        Singal { name: "paintedFontSizeChanged" }
-        Signal { name: "updatedImage" }
         Method { name: "forcedFocus" }
         Method {
             name: "setColorScheme"
@@ -128,31 +130,15 @@ Module {
         }
         Method { name: "availableColorSchemes"; type: "QStringList" }
         Method {
-            name: "scrollWheel"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-            Parameter { name: "lines"; type: "int" }
+            name: "scrollScreenWindow"
+            Parameter { name: "mode"; type: "ScreenWindow::RelativeScrollMode" }
+            Parameter { name: "amount"; type: "int" }
         }
         Method {
-            name: "mousePress"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-        Method {
-            name: "mouseMove"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-        Method {
-            name: "mouseRelease"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-        Method {
-            name: "mouseDoubleClick"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
+            name: "setUsesMouse"
+            Parameter { name: "usesMouse"; type: "bool" }
         }
+        Method { name: "getUsesMouse"; type: "bool" }
         Method { name: "autoFocus"; type: "bool" }
         Method {
             name: "setAutoFocus"
@@ -192,20 +178,21 @@ Module {
             Parameter { name: "color"; type: "QColor" }
         }
         Method { name: "selectionChanged" }
+        Method {
+            name: "banana"
+            Parameter { name: "x"; type: "int" }
+            Parameter { name: "y"; type: "int" }
+            Parameter { name: "z"; type: "int" }
+            Parameter { name: "w"; type: "int" }
+        }
         Method {
             name: "setSession"
             Parameter { name: "session"; type: "KSession"; isPointer: true }
         }
         Method { name: "getSession"; type: "KSession*" }
-
-        //My additions
         Method {
             name: "setLineSpacing"
-            Parameter { name: "i"; type: "uint"}
-        }
-        Method {
-            name: "setUsesMouse"
-            Parameter { name: "usesMouse"; type: "bool"}
+            Parameter { type: "uint" }
         }
     }
 }

konsole-qml-plugin/src/qmldir

@@ -1,3 +1,3 @@
-module org.kde.konsole
+module org.crt.konsole
 typeinfo plugins.qmltypes
 plugin kdekonsole