Cleaning up and initial profile parser

7 files changed, 54 insertions, 25 deletions

diff --git a/QRema.pro b/QRema.pro
index 3ea3cbd..451827d 100644
--- a/QRema.pro
+++ b/QRema.pro
@@ -26,10 +26,12 @@ CONFIG += c++11
 
 SOURCES += \
         src/main.cpp \
-        src/qremamain.cpp
+        src/qremamain.cpp \
+        src/qremaprofileparser.cpp
 
 HEADERS += \
-    src/qremamain.h
+    src/qremamain.h \
+    src/qremaprofileparser.h
 
 FORMS += \
     data/ui/qremamain.ui
diff --git a/data/ui/qremamain.ui b/data/ui/qremamain.ui
index 1460fde..9af9811 100644
--- a/data/ui/qremamain.ui
+++ b/data/ui/qremamain.ui
@@ -60,7 +60,14 @@
          </widget>
         </item>
         <item>
-         <widget class="QListView" name="listView"/>
+         <widget class="QListView" name="listView">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::MultiSelection</enum>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
         </item>
        </layout>
       </widget>
@@ -74,7 +81,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>40</height>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -83,29 +90,36 @@
     </property>
     <addaction name="action_Add"/>
     <addaction name="action_Delete"/>
-    <addaction name="separator"/>
-    <addaction name="action_Find"/>
-    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
     <addaction name="actionAbout"/>
    </widget>
    <addaction name="menu_File"/>
+   <addaction name="menu_Help"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextBesideIcon</enum>
+   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="action_Find"/>
    <addaction name="action_Add"/>
    <addaction name="action_Delete"/>
    <addaction name="actionAbout"/>
+   <addaction name="separator"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="action_Add">
    <property name="icon">
-    <iconset theme="add"/>
+    <iconset theme="add">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Add</string>
@@ -113,23 +127,17 @@
   </action>
   <action name="action_Delete">
    <property name="icon">
-    <iconset theme="remove"/>
+    <iconset theme="remove">
+     <normaloff>.</normaloff>.</iconset>
    </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"/>
+    <iconset theme="help-about">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>About</string>
@@ -160,16 +168,16 @@
   <connection>
    <sender>listView</sender>
    <signal>doubleClicked(QModelIndex)</signal>
-   <receiver>listView</receiver>
-   <slot>setCurrentIndex(QModelIndex)</slot>
+   <receiver>QRemaMain</receiver>
+   <slot>update()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>565</x>
      <y>311</y>
     </hint>
     <hint type="destinationlabel">
-     <x>689</x>
-     <y>301</y>
+     <x>399</x>
+     <y>199</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/main.cpp b/src/main.cpp
index eaca329..b7d54a8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,9 @@
 
 int main(int argc, char *argv[])
 {
+    // ensure that glib integration of Qt is not turned off
+    // This fixes #168: https://github.com/lxqt/pcmanfm-qt/issues/168
+    qunsetenv("QT_NO_GLIB");
     QApplication a(argc, argv);
     QRemaMain w;
     w.show();
diff --git a/src/qremamain.cpp b/src/qremamain.cpp
index 8a36836..33a1536 100644
--- a/src/qremamain.cpp
+++ b/src/qremamain.cpp
@@ -48,7 +48,6 @@ QRemaMain::QRemaMain(QWidget *parent) :
 
     // Attach the model to the view
     ui->listView->setModel(fileModel);
-    ui->listView->setWordWrap( true );
     ui->listView->setViewMode(QListView::IconMode);
     ui->listView->setIconSize(QSize(64, 64));
     ui->listView->setResizeMode(QListView::Adjust);
diff --git a/src/qremamain.h b/src/qremamain.h
index a35715c..d0d27b2 100644
--- a/src/qremamain.h
+++ b/src/qremamain.h
@@ -24,7 +24,6 @@ public:
 private slots:
     void on_treeView_clicked(const QModelIndex &index);
     void on_listView_doubleClicked(const QModelIndex &index);
-
     void on_action_Add_triggered();
 
 private:
diff --git a/src/qremaprofileparser.cpp b/src/qremaprofileparser.cpp
new file mode 100644
index 0000000..1d60ecd
--- /dev/null
+++ b/src/qremaprofileparser.cpp
@@ -0,0 +1,6 @@
+#include "qremaprofileparser.h"
+
+QRemaProfileParser::QRemaProfileParser()
+{
+
+}
diff --git a/src/qremaprofileparser.h b/src/qremaprofileparser.h
new file mode 100644
index 0000000..d1742f1
--- /dev/null
+++ b/src/qremaprofileparser.h
@@ -0,0 +1,12 @@
+#ifndef QREMAPROFILEPARSER_H
+#define QREMAPROFILEPARSER_H
+
+#include <glib.h>;
+
+class QRemaProfileParser
+{
+public:
+    QRemaProfileParser();
+};
+
+#endif // QREMAPROFILEPARSER_H