Attachment #524220 for bug #645428

Lines 14-24 Link Here

(-)a/QtADB.pro (-1 / +3 lines)
14	# limitations under the License.	14	# limitations under the License.
15	#	15	#
16	# @author Jakub Motyczko	16	# @author Jakub Motyczko
17	# -------------------------------------------------	17	# -------------------------------------------------
18	QT += network	18	QT += network
19	QT += declarative	19	QT += widgets
		20	QT += qml
		21	QT += quick
20	TARGET = QtADB	22	TARGET = QtADB
21		23
22	TEMPLATE = app	24	TEMPLATE = app
23	SOURCES += main.cpp \	25	SOURCES += main.cpp \
24	./dialogs/mainwindow.cpp \	26	./dialogs/mainwindow.cpp \




#ifndef MESSAGEWIDGET_H
#define MESSAGEWIDGET_H

#include <QtGui>
#include <QtNetwork>
#include <QtWidgets>
#include <QQmlContext>
#include <QQuickView>

#include "../classes/models/messagethreadmodel.h"
#include "../classes/models/contactmodel.h"



protected:
    void changeEvent(QEvent *e);

private:
    Ui::MessageWidget *ui;
    QQuickView *qmlView;
    QQmlContext *qmlViewCtx;

    MessageModel messageModel;
    MessageThreadModel messageThreadModel;
    ContactModel contactModel;
    QSortFilterProxyModel sortModel;

Lines 20-29 Link Here

(-)a/widgets/appwidget.h (+1 lines)
20		20
21	#ifndef APPWIDGET_H	21	#ifndef APPWIDGET_H
22	#define APPWIDGET_H	22	#define APPWIDGET_H
23		23
24	#include <QtGui>	24	#include <QtGui>
		25	#include <QtWidgets>
25		26
26	#include "../classes/phone.h"	27	#include "../classes/phone.h"
27	#include "../classes/computer.h"	28	#include "../classes/computer.h"
28	#include "../dialogs/appinfo.h"	29	#include "../dialogs/appinfo.h"
29	#include "../dialogs/appdialog.h"	30	#include "../dialogs/appdialog.h"




    this->sortContactModel.setSortRole(ContactModel::NameRole);
    this->sortContactModel.sort(0, Qt::AscendingOrder);

    this->messageCount=0;

    this->qmlView =  new QQuickView;
    this->qmlViewCtx = this->qmlView->rootContext();
    if (QFile::exists("qml/messageView.qml"))
        this->qmlView->setSource(QUrl::fromLocalFile("qml/messageView.qml"));
    else
        //this->qmlView->setSource(QUrl::fromLocalFile("../messages/qml/messageView.qml"));

    this->qmlViewCtx->setContextProperty("threadModel", &sortThreadModel);
    this->qmlViewCtx->setContextProperty("contactModel", &sortContactModel);
    this->qmlViewCtx->setContextProperty("messageModel", &sortModel);
    this->qmlViewCtx->setContextProperty("myNickname", "Me");
    this->qmlViewCtx->setContextProperty("contactDefault", "qrc:/icons/contactDefault.png");
    qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
    
    this->qmlViewCtx->setContextProperty("messageWidget", this);
    QWidget *container = QWidget::createWindowContainer(qmlView, this);
    container->setFocusPolicy(Qt::TabFocus);

    ui->layoutMessages->addWidget(container);

    //QSettings settings;
    //this->sdk = settings.value("sdkPath").toString();
    this->tcpServer.listen(QHostAddress::Any,4445);


Return to bug 645428

Lines 21-32 Link Here

(-)a/widgets/messagewidget.h (-4 / +5 lines)
21	#ifndef MESSAGEWIDGET_H	21	#ifndef MESSAGEWIDGET_H
22	#define MESSAGEWIDGET_H	22	#define MESSAGEWIDGET_H
23		23
24	#include <QtGui>	24	#include <QtGui>
25	#include <QtNetwork>	25	#include <QtNetwork>
26	#include <QDeclarativeView>	26	#include <QtWidgets>
27	#include <QDeclarativeContext>	27	#include <QQmlContext>
		28	#include <QQuickView>
28		29
29	#include "../classes/models/messagethreadmodel.h"	30	#include "../classes/models/messagethreadmodel.h"
30	#include "../classes/models/contactmodel.h"	31	#include "../classes/models/contactmodel.h"
31		32
32		33
Lines 46-57 Link Here
46	protected:	49	protected:
47	void changeEvent(QEvent *e);	50	void changeEvent(QEvent *e);
48		51
49	private:	52	private:
50	Ui::MessageWidget *ui;	53	Ui::MessageWidget *ui;
51	QDeclarativeView *qmlView;	54	QQuickView *qmlView;
52	QDeclarativeContext *qmlViewCtx;	55	QQmlContext *qmlViewCtx;
53		56
54	MessageModel messageModel;	57	MessageModel messageModel;
55	MessageThreadModel messageThreadModel;	58	MessageThreadModel messageThreadModel;
56	ContactModel contactModel;	59	ContactModel contactModel;
57	QSortFilterProxyModel sortModel;	60	QSortFilterProxyModel sortModel;

Lines 51-61 Link Here

(-)a/widgets/messagewidget.cpp (-4 / +6 lines)
51	this->sortContactModel.setSortRole(ContactModel::NameRole);	51	this->sortContactModel.setSortRole(ContactModel::NameRole);
52	this->sortContactModel.sort(0, Qt::AscendingOrder);	52	this->sortContactModel.sort(0, Qt::AscendingOrder);
53		53
54	this->messageCount=0;	54	this->messageCount=0;
55		55
56	this->qmlView = new QDeclarativeView;	56	this->qmlView = new QQuickView;
57	this->qmlViewCtx = this->qmlView->rootContext();	57	this->qmlViewCtx = this->qmlView->rootContext();
58	if (QFile::exists("qml/messageView.qml"))	58	if (QFile::exists("qml/messageView.qml"))
59	this->qmlView->setSource(QUrl::fromLocalFile("qml/messageView.qml"));	59	this->qmlView->setSource(QUrl::fromLocalFile("qml/messageView.qml"));
60	else	60	else
61	//this->qmlView->setSource(QUrl::fromLocalFile("../messages/qml/messageView.qml"));	61	//this->qmlView->setSource(QUrl::fromLocalFile("../messages/qml/messageView.qml"));
Lines 63-77 Link Here
63	this->qmlViewCtx->setContextProperty("threadModel", &sortThreadModel);	63	this->qmlViewCtx->setContextProperty("threadModel", &sortThreadModel);
64	this->qmlViewCtx->setContextProperty("contactModel", &sortContactModel);	64	this->qmlViewCtx->setContextProperty("contactModel", &sortContactModel);
65	this->qmlViewCtx->setContextProperty("messageModel", &sortModel);	65	this->qmlViewCtx->setContextProperty("messageModel", &sortModel);
66	this->qmlViewCtx->setContextProperty("myNickname", "Me");	66	this->qmlViewCtx->setContextProperty("myNickname", "Me");
67	this->qmlViewCtx->setContextProperty("contactDefault", "qrc:/icons/contactDefault.png");	67	this->qmlViewCtx->setContextProperty("contactDefault", "qrc:/icons/contactDefault.png");
68	qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);	68	qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
69		69
70	this->qmlViewCtx->setContextProperty("messageWidget", this);	70	this->qmlViewCtx->setContextProperty("messageWidget", this);
		71	QWidget *container = QWidget::createWindowContainer(qmlView, this);
		72	container->setFocusPolicy(Qt::TabFocus);
71		73
72	ui->layoutMessages->addWidget(this->qmlView,1,1);	74	ui->layoutMessages->addWidget(container);
73		75
74	//QSettings settings;	76	//QSettings settings;
75	//this->sdk = settings.value("sdkPath").toString();	77	//this->sdk = settings.value("sdkPath").toString();
76	this->tcpServer.listen(QHostAddress::Any,4445);	78	this->tcpServer.listen(QHostAddress::Any,4445);
77		79