mirror of
				https://github.com/Swordfish90/cool-retro-term.git
				synced 2025-10-30 22:54:21 +00:00 
			
		
		
		
	Changed plugin name to avoid future conflicts.
This commit is contained in:
		| @@ -22,7 +22,7 @@ import QtQuick 2.2 | |||||||
| import QtGraphicalEffects 1.0 | import QtGraphicalEffects 1.0 | ||||||
| import QtQuick.Controls 1.1 | import QtQuick.Controls 1.1 | ||||||
|  |  | ||||||
| import org.kde.konsole 0.1 | import org.crt.konsole 0.1 | ||||||
|  |  | ||||||
| Item{ | Item{ | ||||||
|     id: terminalContainer |     id: terminalContainer | ||||||
|   | |||||||
| @@ -23,8 +23,6 @@ import QtQuick.Window 2.1 | |||||||
| import QtQuick.Controls 1.1 | import QtQuick.Controls 1.1 | ||||||
| import QtGraphicalEffects 1.0 | import QtGraphicalEffects 1.0 | ||||||
|  |  | ||||||
| import org.kde.konsole 0.1 |  | ||||||
|  |  | ||||||
| ApplicationWindow{ | ApplicationWindow{ | ||||||
|     id: terminalWindow |     id: terminalWindow | ||||||
|  |  | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX | |||||||
| DEFINES += Q_WS_UBUNTU | DEFINES += Q_WS_UBUNTU | ||||||
|  |  | ||||||
| TARGET = kdekonsole | TARGET = kdekonsole | ||||||
| PLUGIN_IMPORT_PATH = org/kde/konsole | PLUGIN_IMPORT_PATH = org/crt/konsole | ||||||
| PLUGIN_ASSETS = $$PWD/assets/* | PLUGIN_ASSETS = $$PWD/assets/* | ||||||
|  |  | ||||||
| DESTDIR = $$OUT_PWD/../imports/$$PLUGIN_IMPORT_PATH | DESTDIR = $$OUT_PWD/../imports/$$PLUGIN_IMPORT_PATH | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ KonsoleKterminalPlugin::~KonsoleKterminalPlugin() { } | |||||||
|  |  | ||||||
| void KonsoleKterminalPlugin::initializeEngine(QQmlEngine *engine, const char *uri) | 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); |     QQmlExtensionPlugin::initializeEngine(engine, uri); | ||||||
|  |  | ||||||
| @@ -44,8 +44,8 @@ void KonsoleKterminalPlugin::initializeEngine(QQmlEngine *engine, const char *ur | |||||||
|         QString cs, kbl; |         QString cs, kbl; | ||||||
|  |  | ||||||
|         foreach (QString pwd, pwds) { |         foreach (QString pwd, pwds) { | ||||||
|             cs  = pwd + "/org/kde/konsole/color-schemes"; |             cs  = pwd + "/org/crt/konsole/color-schemes"; | ||||||
|             kbl = pwd + "/org/kde/konsole/kb-layouts"; |             kbl = pwd + "/org/crt/konsole/kb-layouts"; | ||||||
|             if (QDir(cs).exists()) break; |             if (QDir(cs).exists()) break; | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -56,7 +56,7 @@ void KonsoleKterminalPlugin::initializeEngine(QQmlEngine *engine, const char *ur | |||||||
|  |  | ||||||
| void KonsoleKterminalPlugin::registerTypes(const char *uri) | 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<KTerminalDisplay>(uri, 0, 1, "KTerminal"); | ||||||
|     qmlRegisterType<KSession>(uri, 0, 1, "KSession"); |     qmlRegisterType<KSession>(uri, 0, 1, "KSession"); | ||||||
|   | |||||||
| @@ -3,13 +3,15 @@ import QtQuick.tooling 1.1 | |||||||
| // This file describes the plugin-supplied types contained in the library. | // This file describes the plugin-supplied types contained in the library. | ||||||
| // It is used for QML tooling purposes only. | // 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 { | Module { | ||||||
|     Component { |     Component { | ||||||
|         name: "KSession" |         name: "KSession" | ||||||
|         prototype: "QObject" |         prototype: "QObject" | ||||||
|         exports: ["org.kde.konsole/KSession 0.1"] |         exports: ["KSession 0.1"] | ||||||
|  |         exportMetaObjectRevisions: [0] | ||||||
|         Property { name: "kbScheme"; type: "string" } |         Property { name: "kbScheme"; type: "string" } | ||||||
|         Signal { name: "finished" } |         Signal { name: "finished" } | ||||||
|         Signal { |         Signal { | ||||||
| @@ -54,14 +56,16 @@ Module { | |||||||
|         name: "KTerminalDisplay" |         name: "KTerminalDisplay" | ||||||
|         defaultProperty: "data" |         defaultProperty: "data" | ||||||
|         prototype: "QQuickPaintedItem" |         prototype: "QQuickPaintedItem" | ||||||
|         exports: ["org.kde.konsole/KTerminal 0.1"] |         exports: ["KTerminal 0.1"] | ||||||
|  |         exportMetaObjectRevisions: [0] | ||||||
|         Property { name: "session"; type: "KSession"; isPointer: true } |         Property { name: "session"; type: "KSession"; isPointer: true } | ||||||
|         Property { name: "colorScheme"; type: "string" } |         Property { name: "colorScheme"; type: "string" } | ||||||
|         Property { name: "font"; type: "QFont" } |         Property { name: "font"; type: "QFont" } | ||||||
|         Property { name: "activeFocusOnClick"; type: "bool" } |         Property { name: "activeFocusOnClick"; type: "bool" } | ||||||
|         Property { name: "ShowIMEOnClick"; type: "bool" } |         Property { name: "ShowIMEOnClick"; type: "bool" } | ||||||
|         Property { name: "terminalSize"; type: "QSize" } |         Property { name: "terminalSize"; type: "QSize"; isReadonly: true } | ||||||
|         Property { name: "paintedFontSize"; type: "QSize"} |         Property { name: "paintedFontSize"; type: "QSize"; isReadonly: true } | ||||||
|  |         Property { name: "usesMouse"; type: "bool"; isReadonly: true } | ||||||
|         Signal { |         Signal { | ||||||
|             name: "changedScheme" |             name: "changedScheme" | ||||||
|             Parameter { name: "scheme"; type: "string" } |             Parameter { name: "scheme"; type: "string" } | ||||||
| @@ -74,6 +78,7 @@ Module { | |||||||
|             name: "changedAutoFocus" |             name: "changedAutoFocus" | ||||||
|             Parameter { name: "au"; type: "bool" } |             Parameter { name: "au"; type: "bool" } | ||||||
|         } |         } | ||||||
|  |         Signal { name: "updatedImage" } | ||||||
|         Signal { |         Signal { | ||||||
|             name: "mouseSignal" |             name: "mouseSignal" | ||||||
|             Parameter { type: "int" } |             Parameter { type: "int" } | ||||||
| @@ -118,9 +123,6 @@ Module { | |||||||
|             name: "changedSession" |             name: "changedSession" | ||||||
|             Parameter { name: "session"; type: "KSession"; isPointer: true } |             Parameter { name: "session"; type: "KSession"; isPointer: true } | ||||||
|         } |         } | ||||||
|         Signal { name: "terminalSizeChanged" } |  | ||||||
|         Singal { name: "paintedFontSizeChanged" } |  | ||||||
|         Signal { name: "updatedImage" } |  | ||||||
|         Method { name: "forcedFocus" } |         Method { name: "forcedFocus" } | ||||||
|         Method { |         Method { | ||||||
|             name: "setColorScheme" |             name: "setColorScheme" | ||||||
| @@ -128,31 +130,15 @@ Module { | |||||||
|         } |         } | ||||||
|         Method { name: "availableColorSchemes"; type: "QStringList" } |         Method { name: "availableColorSchemes"; type: "QStringList" } | ||||||
|         Method { |         Method { | ||||||
|             name: "scrollWheel" |             name: "scrollScreenWindow" | ||||||
|             Parameter { name: "x"; type: "double" } |             Parameter { name: "mode"; type: "ScreenWindow::RelativeScrollMode" } | ||||||
|             Parameter { name: "y"; type: "double" } |             Parameter { name: "amount"; type: "int" } | ||||||
|             Parameter { name: "lines"; type: "int" } |  | ||||||
|         } |         } | ||||||
|         Method { |         Method { | ||||||
|             name: "mousePress" |             name: "setUsesMouse" | ||||||
|             Parameter { name: "x"; type: "double" } |             Parameter { name: "usesMouse"; type: "bool" } | ||||||
|             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" } |  | ||||||
|         } |         } | ||||||
|  |         Method { name: "getUsesMouse"; type: "bool" } | ||||||
|         Method { name: "autoFocus"; type: "bool" } |         Method { name: "autoFocus"; type: "bool" } | ||||||
|         Method { |         Method { | ||||||
|             name: "setAutoFocus" |             name: "setAutoFocus" | ||||||
| @@ -192,20 +178,21 @@ Module { | |||||||
|             Parameter { name: "color"; type: "QColor" } |             Parameter { name: "color"; type: "QColor" } | ||||||
|         } |         } | ||||||
|         Method { name: "selectionChanged" } |         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 { |         Method { | ||||||
|             name: "setSession" |             name: "setSession" | ||||||
|             Parameter { name: "session"; type: "KSession"; isPointer: true } |             Parameter { name: "session"; type: "KSession"; isPointer: true } | ||||||
|         } |         } | ||||||
|         Method { name: "getSession"; type: "KSession*" } |         Method { name: "getSession"; type: "KSession*" } | ||||||
|  |  | ||||||
|         //My additions |  | ||||||
|         Method { |         Method { | ||||||
|             name: "setLineSpacing" |             name: "setLineSpacing" | ||||||
|             Parameter { name: "i"; type: "uint"} |             Parameter { type: "uint" } | ||||||
|         } |  | ||||||
|         Method { |  | ||||||
|             name: "setUsesMouse" |  | ||||||
|             Parameter { name: "usesMouse"; type: "bool"} |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,3 +1,3 @@ | |||||||
| module org.kde.konsole | module org.crt.konsole | ||||||
| typeinfo plugins.qmltypes | typeinfo plugins.qmltypes | ||||||
| plugin kdekonsole | plugin kdekonsole | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user