Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/Remmina/QRema.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntenore Gatta <antenore@simbiosi.org>2019-08-16 02:35:03 +0300
committerAntenore Gatta <antenore@simbiosi.org>2019-08-16 02:35:03 +0300
commit278fb6ba6f57fb9c11f3c9aca34553873c729b17 (patch)
tree21e68b60037354b1e447d81c88d57e7429ea5a95
parentefdfab3463d38e56c768bcd6d7764a9d6ff16bc2 (diff)
Added resources
-rw-r--r--QRema.pro12
-rw-r--r--data/ui/qremamain.ui62
-rw-r--r--main.cpp11
-rw-r--r--qremares.qrc15
-rw-r--r--src/qremamain.cpp11
-rw-r--r--src/qremamain.h3
6 files changed, 95 insertions, 19 deletions
diff --git a/QRema.pro b/QRema.pro
index 74d40e1..3ea3cbd 100644
--- a/QRema.pro
+++ b/QRema.pro
@@ -25,7 +25,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
CONFIG += c++11
SOURCES += \
- main.cpp \
+ src/main.cpp \
src/qremamain.cpp
HEADERS += \
@@ -38,3 +38,13 @@ FORMS += \
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
+
+DISTFILES += \
+ data/icons/scalable/actions/add.svg \
+ data/icons/scalable/actions/copy.svg \
+ data/icons/scalable/actions/edit.svg \
+ data/icons/scalable/actions/remove.svg \
+ data/icons/scalable/actions/settings.svg
+
+RESOURCES += \
+ qremares.qrc
diff --git a/data/ui/qremamain.ui b/data/ui/qremamain.ui
index 5dd7218..1460fde 100644
--- a/data/ui/qremamain.ui
+++ b/data/ui/qremamain.ui
@@ -19,6 +19,10 @@
<property name="windowTitle">
<string>QRemaMain</string>
</property>
+ <property name="windowIcon">
+ <iconset resource="../../qremares.qrc">
+ <normaloff>:/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg</normaloff>:/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg</iconset>
+ </property>
<widget class="QWidget" name="centralWidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -26,7 +30,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QComboBox" name="comboBox_2">
@@ -40,7 +44,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QComboBox" name="comboBox">
@@ -70,9 +74,21 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>21</height>
+ <height>40</height>
</rect>
</property>
+ <widget class="QMenu" name="menu_File">
+ <property name="title">
+ <string>&amp;File</string>
+ </property>
+ <addaction name="action_Add"/>
+ <addaction name="action_Delete"/>
+ <addaction name="separator"/>
+ <addaction name="action_Find"/>
+ <addaction name="separator"/>
+ <addaction name="actionAbout"/>
+ </widget>
+ <addaction name="menu_File"/>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">
@@ -81,11 +97,49 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
+ <addaction name="action_Find"/>
+ <addaction name="action_Add"/>
+ <addaction name="action_Delete"/>
+ <addaction name="actionAbout"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
+ <action name="action_Add">
+ <property name="icon">
+ <iconset theme="add"/>
+ </property>
+ <property name="text">
+ <string>&amp;Add</string>
+ </property>
+ </action>
+ <action name="action_Delete">
+ <property name="icon">
+ <iconset theme="remove"/>
+ </property>
+ <property name="text">
+ <string>&amp;Delete</string>
+ </property>
+ </action>
+ <action name="action_Find">
+ <property name="icon">
+ <iconset theme="find"/>
+ </property>
+ <property name="text">
+ <string>&amp;Find</string>
+ </property>
+ </action>
+ <action name="actionAbout">
+ <property name="icon">
+ <iconset theme="help-about"/>
+ </property>
+ <property name="text">
+ <string>About</string>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+ <include location="../../qremares.qrc"/>
+ </resources>
<connections>
<connection>
<sender>treeView</sender>
diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index eaca329..0000000
--- a/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "qremamain.h"
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- QRemaMain w;
- w.show();
-
- return a.exec();
-}
diff --git a/qremares.qrc b/qremares.qrc
index 90f4a83..e1e71ac 100644
--- a/qremares.qrc
+++ b/qremares.qrc
@@ -1,2 +1,13 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"/>
+<RCC>
+ <qresource prefix="/data/icons/scalable/actions">
+ <file>data/icons/scalable/actions/add.svg</file>
+ <file>data/icons/scalable/actions/copy.svg</file>
+ <file>data/icons/scalable/actions/edit.svg</file>
+ <file>data/icons/scalable/actions/remove.svg</file>
+ <file>data/icons/scalable/actions/settings.svg</file>
+ <file>data/icons/scalable/actions/search.svg</file>
+ </qresource>
+ <qresource prefix="/data/desktop/scalable/apps">
+ <file>data/desktop/scalable/apps/org.remmina.QRema.svg</file>
+ </qresource>
+</RCC>
diff --git a/src/qremamain.cpp b/src/qremamain.cpp
index 76b4dd3..8a36836 100644
--- a/src/qremamain.cpp
+++ b/src/qremamain.cpp
@@ -7,7 +7,11 @@ QRemaMain::QRemaMain(QWidget *parent) :
ui(new Ui::QRemaMain)
{
ui->setupUi(this);
- QString mPath = "/home/antenore/remmina/profiles";
+ QString mPath = QDir::homePath() + "/remmina/profiles";
+
+
+
+ qDebug() << "Profile Path: "<< mPath ;
dirModel = new QFileSystemModel(this);
// Set filter
@@ -76,3 +80,8 @@ void QRemaMain::on_listView_doubleClicked(const QModelIndex &index)
QString sPath = fileModel->fileInfo(index).absoluteFilePath();
QDesktopServices::openUrl(QUrl::fromLocalFile(sPath));
}
+
+void QRemaMain::on_action_Add_triggered()
+{
+
+}
diff --git a/src/qremamain.h b/src/qremamain.h
index c20c0a7..a35715c 100644
--- a/src/qremamain.h
+++ b/src/qremamain.h
@@ -2,6 +2,7 @@
#define QREMAMAIN_H
#include <QMainWindow>
+#include <QDebug>
#include <QFileSystemModel>
#include <QDesktopServices>
#include <QUrl>
@@ -24,6 +25,8 @@ private slots:
void on_treeView_clicked(const QModelIndex &index);
void on_listView_doubleClicked(const QModelIndex &index);
+ void on_action_Add_triggered();
+
private:
Ui::QRemaMain *ui;
// Make two models instead of one