diff --git a/Desktop.qml b/Desktop.qml
index 7f38c8ad..8f3eb023 100644
--- a/Desktop.qml
+++ b/Desktop.qml
@@ -1,333 +1,333 @@
// Skeleton from https://github.com/achipa/outqross_blog.git
// Almost everything has been re-adapted
import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.2
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import Qt.labs.settings 1.0
import QtGraphicalEffects 1.0
import KDE.Ruqola.Ruqola 1.0
import KDE.Ruqola.DDPClient 1.0
import KDE.Ruqola.Notification 1.0
// import "Log.js" as Log
// import "Data.js" as Data
ApplicationWindow {
property int margin: 11
property string statusText
property string lightGreen: "#6ab141";
property string darkGreen: "#00613a";
property string selectedRoomID: "";
id: appid
title: qsTr("Ruqola")
width: 800
height: 600
visible: true
Shortcut {
sequence: StandardKey.Quit
context: Qt.ApplicationShortcut
onActivated: Qt.quit()
}
Login {
id: loginTab
visible: (Ruqola.loginStatus == DDPClient.LoginFailed || Ruqola.loginStatus == DDPClient.LoggedOut)
// visible: (Ruqola.loginStatus != DDPClient.LoggedIn)
anchors.fill:parent
z: 10
serverURL: Ruqola.serverURL
username: Ruqola.userName
onAccepted: {
Ruqola.password = loginTab.password;
Ruqola.userName = loginTab.username;
Ruqola.serverURL = loginTab.serverURL;
Ruqola.tryLogin();
}
}
BusyIndicator {
id: busy
anchors.centerIn: parent
visible: Ruqola.loginStatus == DDPClient.LoggingIn
}
Item {
id: mainWidget
anchors.fill: parent
visible: !loginTab.visible
Rectangle {
id: userBox
anchors.top: parent.top
width: parent.width
anchors.left: parent.left
anchors.right: roomsList.right
height: 40
color: darkGreen
Text {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight
anchors.rightMargin: 10
anchors.fill: parent
font.pointSize: 12
color: "white"
text: "Hello, " + Ruqola.userName
}
}
RoomsView {
anchors.top: userBox.bottom
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: 0
width: 200
height: appid.height
id: roomsList
model: Ruqola.roomModel()
visible: parent.visible
selectedRoomID: appid.selectedRoomID;
onRoomSelected: {
if (roomID == selectedRoomID) {
return;
}
console.log("Choosing room", roomID);
appid.selectedRoomID = roomID;
activeChat.model = Ruqola.getModelForRoom(roomID)
topicWidget.selectedRoom = Ruqola.getRoom(roomID)
}
onCountChanged: {
// console.log("We have", roomsList.count, "rooms")
}
LinearGradient {
id: greenGradient
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(roomsList.width, 0)
gradient: Gradient {
GradientStop { position: 0.0; color: "#6ab141" }
GradientStop { position: 1.0; color: "#00613a" }
}
z: -1;
}
} //RoomsView
Item {
anchors.right: parent.right
anchors.left: roomsList.right
anchors.top: parent.top
anchors.bottom: messageLine.top
id: chatView
Rectangle {
id: topicWidget
color: "#fff"
anchors.top: parent.top
anchors.right: parent.right
anchors.left: parent.left
height: nameLabel.height + topicLabel.height
property var selectedRoom;
Text {
id: nameLabel
text: "#" + parent.selectedRoom.name
font.pointSize: 18
verticalAlignment: Text.AlignVCenter
anchors.leftMargin: 20
height: 40
// height: font.pixelSize + 10
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
}
Text {
id: topicLabel
text: topicWidget.selectedRoom.topic
anchors.top: nameLabel.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
height: font.pixelSize + 10
}
}
ScrollView {
anchors.right: parent.right
anchors.left: parent.left
anchors.top: topicWidget.bottom
anchors.bottom: input.top
verticalScrollBarPolicy: Qt.ScrollBarAlwaysOn
// visible: parent.visible && (Ruqola.loginStatus != DDPClient.LoggingIn)
// visible: !greeter.visible
ListView {
id: activeChat
// model: Ruqola.getModelForRoom(selectedRoomID)
onCountChanged: {
// console.log("changed")
// var newIndex = count - 1 // last index
// positionViewAtEnd()
positionViewAtIndex(count - 1, ListView.Beginning)
// currentIndex = newIndex
}
// Component.onCompleted: positionViewAtEnd()
Component.onCompleted: positionViewAtIndex(count - 1, ListView.Beginning)
// onSelectedRoomIDChanged: { console.log("CHANGED"); activeChat.positionViewAtEnd(); }
// model: myModel
anchors.fill:parent
visible : count > 0
z: -1
// ScrollBar.vertical: ScrollBar { }
delegate: Message {
i_messageText: messageText
i_username: username
i_systemMessage: systemMessage
i_systemMessageType: type
width: parent.width
}
}
}
} //Item chatView
Item{
anchors.bottom: parent.bottom
anchors.top: activeChat.bottom
anchors.left: roomsList.right
anchors.right: parent.right
id: input
height: 40
TextField {
id: messageLine
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.top: parent.top
anchors.right: attachmentsButton.left
placeholderText: if (Ruqola.loginStatus != DDPClient.LoggedIn || (selectedRoomID=="")){
qsTr("Please Select a room")
}
else{
qsTr("Enter message")
}
height: 2.7*font.pixelSize
onAccepted: {
if (text != "" && Ruqola.loginStatus == DDPClient.LoggedIn && !(selectedRoomID=="")) {
Ruqola.sendMessage(selectedRoomID, text);
text = "";
}
}
}
- Button {
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- anchors.top: parent.top
- width: 50
- id : attachmentsButton
- iconName: "Button"
- text: "Click"
- height: 2.7*font.pixelSize
- visible: true
- onClicked: Ruqola.attachmentButtonClicked();
- }
+ Button {
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ anchors.top: parent.top
+ width: 50
+ id : attachmentsButton
+ iconName: "Button"
+ text: "Click"
+ height: 2.7*font.pixelSize
+ visible: true
+ onClicked: Ruqola.attachmentButtonClicked();
+ }
}//Item input
}// mainWidget Item
Rectangle {
z: -10
anchors.fill: parent
color: "white"
}
onClosing: {
console.log("Minimizing to systray...");
hide();
systrayIcon.windowVisible = visible;
}
function toggleShow() {
if (visible) {
hide();
} else {
show();
raise();
requestActivate();
}
}
Component.onCompleted: {
systrayIcon.activated.connect(toggleShow);
systrayIcon.messageClicked.connect(toggleShow);
// roomsList.model = Ruqola.roomModel();
// timer.start();
// timer.fire();
}
/*
Timer {
id: timer
interval: 1000
onTriggered: {
// console.log("FIRE");
switch (Ruqola.loginStatus) {
case Ruqola.NotConnected:
statusText = qsTr("Not connected.");
break;
case Ruqola.LoggedIn:
statusText = qsTr("Connected to " + Ruqola.serverURL);
break;
}
}
repeat: true
}*/
// onStatusTextChanged: timer.restart();
}
diff --git a/Ruqola.pro.user b/Ruqola.pro.user
new file mode 100644
index 00000000..594c0f7a
--- /dev/null
+++ b/Ruqola.pro.user
@@ -0,0 +1,656 @@
+
+
+
+
+
+ EnvironmentId
+ {ab19c5d8-e149-4a7a-9ecf-d7074f8c4302}
+
+
+ ProjectExplorer.Project.ActiveTarget
+ 0
+
+
+ ProjectExplorer.Project.EditorSettings
+
+ true
+ false
+ true
+
+ Cpp
+
+ CppGlobal
+
+
+
+ QmlJS
+
+ QmlJSGlobal
+
+
+ 2
+ UTF-8
+ false
+ 4
+ false
+ 80
+ true
+ true
+ 1
+ true
+ false
+ 0
+ true
+ true
+ 0
+ 8
+ true
+ 1
+ true
+ true
+ true
+ false
+
+
+
+ ProjectExplorer.Project.PluginSettings
+
+
+
+ ProjectExplorer.Project.Target.0
+
+ Desktop Qt 5.8.0 GCC 64bit
+ Desktop Qt 5.8.0 GCC 64bit
+ qt.58.gcc_64_kit
+ 0
+ 0
+ 0
+
+ /home/vasudha/Qt/build-Ruqola-Desktop_Qt_5_8_0_GCC_64bit-Debug
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ true
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+ 2
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 2
+ true
+
+
+ /home/vasudha/Qt/build-Ruqola-Desktop_Qt_5_8_0_GCC_64bit-Release
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+ 2
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+
+ /home/vasudha/Qt/build-Ruqola-Desktop_Qt_5_8_0_GCC_64bit-Profile
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ true
+
+ false
+ true
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+ 2
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Profile
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+ 3
+
+
+ 0
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy locally
+
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ 2
+
+ Ruqola
+ Ruqola2
+ Qt4ProjectManager.Qt4RunConfiguration:/home/vasudha/Qt/Ruqola-desktop/Ruqola/Ruqola.pro
+ true
+
+ Ruqola.pro
+ false
+
+
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+ 1
+
+
+
+ ProjectExplorer.Project.Target.1
+
+ Android for armeabi-v7a (GCC 4.9, Qt 5.8.0)
+ Android for armeabi-v7a (GCC 4.9, Qt 5.8.0)
+ {6065b6c8-337b-478a-8e04-5b38fdcd0119}
+ 0
+ 0
+ 0
+
+ /home/vasudha/Qt/build-Ruqola-Android_for_armeabi_v7a_GCC_4_9_Qt_5_8_0_6065b6-Debug
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ true
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+
+ true
+ Copy application data
+
+ Qt4ProjectManager.AndroidPackageInstallationStep
+
+
+ android-25
+
+ true
+ Build Android APK
+
+ QmakeProjectManager.AndroidBuildApkStep
+ 2
+ false
+ false
+
+ 4
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 2
+ true
+
+
+ /home/vasudha/Qt/build-Ruqola-Android_for_armeabi_v7a_GCC_4_9_Qt_5_8_0_6065b6-Release
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+
+ true
+ Copy application data
+
+ Qt4ProjectManager.AndroidPackageInstallationStep
+
+
+ android-25
+
+ true
+ Build Android APK
+
+ QmakeProjectManager.AndroidBuildApkStep
+ 2
+ false
+ false
+
+ 4
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+
+ /home/vasudha/Qt/build-Ruqola-Android_for_armeabi_v7a_GCC_4_9_Qt_5_8_0_6065b6-Profile
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ true
+
+ false
+ true
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ false
+
+
+
+
+ true
+ Copy application data
+
+ Qt4ProjectManager.AndroidPackageInstallationStep
+
+
+ android-25
+
+ true
+ Build Android APK
+
+ QmakeProjectManager.AndroidBuildApkStep
+ 2
+ false
+ false
+
+ 4
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ -w
+ -r
+
+ true
+ clean
+
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Profile
+
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+ 3
+
+
+
+ true
+ Deploy to Android device
+
+ Qt4ProjectManager.AndroidDeployQtStep
+ false
+
+ 1
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy to Android device
+ Deploy to Android device
+ Qt4ProjectManager.AndroidDeployConfiguration2
+
+ 1
+
+
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ -1
+
+
+
+ %{buildDir}
+ Custom Executable
+
+ ProjectExplorer.CustomExecutableRunConfiguration
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 2
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 18
+
+
+ Version
+ 18
+
+
diff --git a/src/ruqola.cpp b/src/ruqola.cpp
index 3b00714c..4337afa1 100644
--- a/src/ruqola.cpp
+++ b/src/ruqola.cpp
@@ -1,260 +1,274 @@
/*
*
* Copyright 2016 Riccardo Iaconelli
*
* 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 2 of
* the License or (at your option) version 3 or any later version
* accepted by the membership of KDE e.V. (or its successor approved
* by the membership of KDE e.V.), which shall act as a proxy
* defined in Section 14 of version 3 of the license.
*
* 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 .
*
*/
#include "ruqola.h"
#include "roommodel.h"
#include "ddpclient.h"
#include "notification.h"
#include
-
+#include
+#include
Ruqola *Ruqola::m_self = 0;
QString Ruqola::authToken() const
{
return m_authToken;
}
QString Ruqola::userName() const
{
return m_userName;
}
QString Ruqola::userID() const
{
return m_userID;
}
QString Ruqola::password() const
{
return m_password;
}
void Ruqola::setAuthToken(const QString& token)
{
qDebug() << "Setting token to" << token;
QSettings s;
m_authToken = token;
s.setValue("authToken", token);
}
void Ruqola::setPassword(const QString& password)
{
m_password = password;
}
void Ruqola::setUserName(const QString& username)
{
m_userName = username;
QSettings s;
s.setValue("username", username);
emit userNameChanged();
}
void Ruqola::setUserID(const QString& userID)
{
m_userName = userID;
QSettings s;
s.setValue("userID", userID);
emit userIDChanged();
}
-bool Ruqola::attachmentButtonClicked()
-{
- //open fileDialogBox, select an image, convert it to bytearray and send as message
-// QFileDialog dialog(NULL);
-// dialog.setFileMode(QFileDialog::ExistingFile);
-// dialog.setViewMode(QFileDialog::List);
- QUrl filePath = QFileDialog::getOpenFileUrl(Q_NULLPTR,
- "Select one or more files to open",
- QDir::homePath(),
- "Images (*.png *.jpeg *.jpg)");
-
-
-
- return true;
-}
-
RoomModel * Ruqola::roomModel()
{
if (!m_roomModel) {
qDebug() << "creating new RoomModel";
m_roomModel = new RoomModel(this);
qDebug() << m_roomModel;
}
return m_roomModel;
}
DDPClient * Ruqola::ddp()
{
if (!m_ddp) {
m_ddp = new DDPClient(serverURL());
connect(m_ddp, &DDPClient::loginStatusChanged, this, &Ruqola::loginStatusChanged);
// connect(m_ddp, &DDPClient::loginStatusChanged, this, [=](){qDebug() << "Signal received";});
}
return m_ddp;
}
Notification * Ruqola::notification()
{
if (m_notification == NULL) {
m_notification = new Notification();
m_notification->show();
}
return m_notification;
}
+void Ruqola::attachmentButtonClicked()
+{
+ //open fileDialogBox, select an image, convert it to bytearray and send as message
+// QFileDialog dialog(NULL);
+// dialog.setFileMode(QFileDialog::ExistingFile);
+// dialog.setViewMode(QFileDialog::List);
+ QString fileName = QFileDialog::getOpenFileName(Q_NULLPTR,
+ "Select one or more files to open",
+ QDir::homePath(),
+ "Images (*.png *.jpeg *.jpg)");
+ qDebug() << "Selected Image" << fileName;
+ sendImage(fileName);
+}
+
+void Ruqola::sendImage(QString fileName)
+{
+ qDebug() << "Sending Image";
+ QImage image(fileName);
+ QByteArray ba;
+
+ ba.append((char *)image.bits(),image.byteCount());
+ if (image.byteCount() != ba.size())
+ qDebug() << "Image not encoded correctly";
+
+ QString message(ba);
+ QString roomID("wtl-test2");
+ sendMessage(roomID,message);
+}
+
void Ruqola::sendMessage(const QString &roomID, const QString &message)
{
QString json = "{\"rid\": \"%1\", \"msg\": \"%2\"}";
json = json.arg(roomID, message);
ddp()->method("sendMessage", QJsonDocument::fromJson(json.toUtf8()));
}
MessageModel * Ruqola::getModelForRoom(const QString& roomID)
{
if (m_messageModels.contains(roomID)) {
// qDebug() << "Returning old model for " << roomID;
return m_messageModels.value(roomID);
} else {
// qDebug() << "Creating a new model";
m_messageModels[roomID] = new MessageModel(roomID, this);
return m_messageModels[roomID];
}
}
QString Ruqola::serverURL() const
{
return m_serverURL;
}
void Ruqola::setServerURL(const QString& serverURL)
{
if (m_serverURL == serverURL) {
return;
}
QSettings s;
s.setValue("serverURL", serverURL);
m_serverURL = serverURL;
// m_roomModel->reset();
emit serverURLChanged();
}
DDPClient::LoginStatus Ruqola::loginStatus()
{
if (m_ddp) {
return ddp()->loginStatus();
} else {
return DDPClient::LoggedOut;
}
}
void Ruqola::tryLogin()
{
qDebug() << "Attempting login" << userName() << "on" << serverURL();
// Reset model views
foreach (const QString key, m_messageModels.keys()) {
MessageModel *m = m_messageModels.take(key);
delete m;
}
delete m_ddp;
m_ddp = 0;
// In the meantime, load cache...
m_roomModel->reset();
// This creates a new ddp() object.
// DDP will automatically try to connect and login.
ddp();
}
void Ruqola::logOut()
{
setAuthToken(QString());
setPassword(QString());
foreach (const QString key, m_messageModels.keys()) {
MessageModel *m = m_messageModels.take(key);
delete m;
}
delete m_ddp;
m_ddp = 0;
emit loginStatusChanged();
m_roomModel->clear();
}
QString Ruqola::cacheBasePath() const
{
if (m_serverURL.isEmpty()) {
return QString();
}
return QStandardPaths::writableLocation(QStandardPaths::CacheLocation)+'/'+m_serverURL;
}
// QString Ruqola::activeRoom() const
// {
// return m_activeRoom;
// }
// void Ruqola::setActiveRoom(const QString& activeRoom)
// {
// m_activeRoom = activeRoom;
// // roomModel()->setActiveRoom(activeRoom);
// emit activeRoomChanged();
// }
RoomWrapper * Ruqola::getRoom(const QString& roomID)
{
return roomModel()->findRoom(roomID);
}
Ruqola::Ruqola(QObject* parent): QObject(parent), m_ddp(0), m_roomModel(0), m_notification(0)
{
QSettings s;
m_serverURL = s.value("serverURL", "demo.rocket.chat").toString();
m_userName = s.value("username").toString();
m_userID = s.value("userID").toString();
m_authToken = s.value("authToken").toString();
}
Ruqola * Ruqola::self()
{
if (!m_self) {
m_self = new Ruqola;
// Create DDP object so we try to connect at startup
m_self->ddp();
// Clear rooms data and refill it with data in the cache, if there is
m_self->roomModel()->reset();
// Create systray to show notifications
m_self->notification();
}
return m_self;
}
diff --git a/src/ruqola.h b/src/ruqola.h
index 1d9301ab..5bb27ec4 100644
--- a/src/ruqola.h
+++ b/src/ruqola.h
@@ -1,121 +1,122 @@
/*
*
* Copyright 2016 Riccardo Iaconelli
*
* 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 2 of
* the License or (at your option) version 3 or any later version
* accepted by the membership of KDE e.V. (or its successor approved
* by the membership of KDE e.V.), which shall act as a proxy
* defined in Section 14 of version 3 of the license.
*
* 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 .
*
*/
#ifndef USERDATA_H
#define USERDATA_H
#include
#include
#include
+#include
#include "ddpclient.h"
#include "roommodel.h"
#include "messagemodel.h"
#include "notification.h"
class QString;
class Ruqola: public QObject
{
Q_OBJECT
Q_PROPERTY(QString userName READ userName WRITE setUserName NOTIFY userNameChanged)
Q_PROPERTY(QString userID READ userID WRITE setUserID NOTIFY userIDChanged)
Q_PROPERTY(QString serverURL READ serverURL WRITE setServerURL NOTIFY serverURLChanged)
Q_PROPERTY(QString password WRITE setPassword)
// Q_PROPERTY (bool connected READ connected NOTIFY connectedChanged)
Q_PROPERTY(DDPClient::LoginStatus loginStatus READ loginStatus NOTIFY loginStatusChanged)
// Q_PROPERTY(QString activeRoom READ activeRoom WRITE setActiveRoom NOTIFY activeRoomChanged)
public:
static Ruqola* self();
void setUserName(const QString &username);
QString userName() const;
void setUserID(const QString &userID);
QString userID() const;
void setPassword(const QString &password);
QString password() const;
void setAuthToken(const QString &token);
QString authToken() const;
bool connected();
DDPClient::LoginStatus loginStatus();
QString serverURL() const;
void setServerURL(const QString &serverURL);
// QString activeRoom() const;
// void setActiveRoom(const QString &activeRoom);
DDPClient *ddp();
Notification * notification();
- Q_INVOKABLE bool attachmentButtonClicked();
-
Q_INVOKABLE RoomModel *roomModel();
Q_INVOKABLE void sendMessage(const QString &roomID, const QString &message);
Q_INVOKABLE MessageModel* getModelForRoom(const QString &roomID);
Q_INVOKABLE void tryLogin();
Q_INVOKABLE void logOut();
Q_INVOKABLE RoomWrapper* getRoom(const QString &roomID);
-// void setRoomModel();
+ Q_INVOKABLE void attachmentButtonClicked();
+
+ void sendImage(QString fileName);
QString cacheBasePath() const;
signals:
void userNameChanged();
void userIDChanged();
void serverURLChanged();
void loginStatusChanged();
private:
Ruqola(QObject *parent = 0);
static Ruqola *m_self;
QString m_password;
QString m_userName;
QString m_userID;
QString m_authToken;
QString m_serverURL;
DDPClient *m_ddp;
RoomModel *m_roomModel;
Notification *m_notification;
QHash< QString, MessageModel * > m_messageModels;
};
inline static QObject *ruqola_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
Ruqola *userData = Ruqola::self();
return userData;
}
#endif // USERDATA_H