From 66b1023bb079c7e5785ef6636c82c06de8854c4d Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Fri, 16 Aug 2019 18:17:54 +0200 Subject: glib integration --- QRema.pro | 15 +++++++++++++++ data/ui/qremamain.ui | 22 +++++++++++++++++++--- src/qremamain.cpp | 8 +++++++- src/qremamain.h | 3 +++ src/qremaprofileparser.h | 1 - 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/QRema.pro b/QRema.pro index 451827d..827e376 100644 --- a/QRema.pro +++ b/QRema.pro @@ -6,6 +6,21 @@ QT += core gui + +LIBS += -lglib-2.0 +LIBS += -lcairo + +INCLUDEPATH+=/usr/include/pixman-1 +INCLUDEPATH+=/usr/include/freetype2 +INCLUDEPATH+=/usr/include/libpng12 +INCLUDEPATH+=/usr/include/glib-2.0 +INCLUDEPATH+=/usr/lib64/glib-2.0/include +INCLUDEPATH+=/usr/include/pango-1.0 +INCLUDEPATH+=/usr/include/cairo +INCLUDEPATH+=/usr/include/gdk-pixbuf-2.0 +INCLUDEPATH+=/usr/include/gio-unix-2.0 + + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = QRema diff --git a/data/ui/qremamain.ui b/data/ui/qremamain.ui index 9af9811..a724c56 100644 --- a/data/ui/qremamain.ui +++ b/data/ui/qremamain.ui @@ -33,7 +33,7 @@ - + true @@ -47,7 +47,7 @@ - + 0 @@ -81,7 +81,7 @@ 0 0 800 - 28 + 21 @@ -181,5 +181,21 @@ + + groupCombo + currentTextChanged(QString) + treeView + update() + + + 128 + 80 + + + 139 + 136 + + + diff --git a/src/qremamain.cpp b/src/qremamain.cpp index 33a1536..f68b7d1 100644 --- a/src/qremamain.cpp +++ b/src/qremamain.cpp @@ -7,7 +7,7 @@ QRemaMain::QRemaMain(QWidget *parent) : ui(new Ui::QRemaMain) { ui->setupUi(this); - QString mPath = QDir::homePath() + "/remmina/profiles"; + QString mPath = QDir::homePath() + "/remmina"; @@ -21,6 +21,9 @@ QRemaMain::QRemaMain(QWidget *parent) : // QFileSystemModel requires root path dirModel->setRootPath(mPath); + QSortFilterProxyModel *proxyDirModel = new QSortFilterProxyModel(this); + proxyDirModel->setSourceModel(dirModel); + // Attach the model to the view ui->treeView->setModel(dirModel); ui->treeView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); @@ -34,6 +37,9 @@ QRemaMain::QRemaMain(QWidget *parent) : // FILES + GKeyFile *keyFile = g_key_file_new(); + + fileModel = new QFileSystemModel(this); // Set filter diff --git a/src/qremamain.h b/src/qremamain.h index d0d27b2..2378546 100644 --- a/src/qremamain.h +++ b/src/qremamain.h @@ -6,6 +6,9 @@ #include #include #include +#include +#include +#include diff --git a/src/qremaprofileparser.h b/src/qremaprofileparser.h index d1742f1..e57926d 100644 --- a/src/qremaprofileparser.h +++ b/src/qremaprofileparser.h @@ -1,7 +1,6 @@ #ifndef QREMAPROFILEPARSER_H #define QREMAPROFILEPARSER_H -#include ; class QRemaProfileParser { -- cgit v1.2.3