Merge remote-tracking branch 'origin/master'

MiniMatrixRPi/MiniMatrixRPi.pro

@@ -14,7 +14,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
         main.cpp \
-    animhandler.cpp
+    animhandler.cpp \
+    browser.cpp
 
 RESOURCES += qml.qrc
 
@@ -30,4 +31,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 HEADERS += \
-    animhandler.h
+    animhandler.h \
+    browser.h

MiniMatrixRPi/browser.cpp

+#include "browser.h"
+
+Browser::Browser(QString path)
+{
+    QDir newDirectory(path);
+    currentDirectory = newDirectory;
+    ListDir();
+}
+
+void Browser::ChDir(QString relPath)
+{
+    QDir newDirectory(currentDirectory.currentPath() + relPath);
+    currentDirectory = newDirectory;
+    ListDir();
+}
+
+void Browser::ListDir()
+{
+    this->currentDirectory.setFilter(QDir::Dirs);
+    this->currentDirectory.setSorting(QDir::Name);
+    subdirs.clear();
+    subdirs += this->currentDirectory.entryList();
+    this->currentDirectory.setFilter(QDir::Files);
+    QStringList filter;
+    filter << ".qt4";
+    this->currentDirectory.setNameFilters(filter);
+    subdirs += this->currentDirectory.entryList();
+}

MiniMatrixRPi/browser.h

+#ifndef BROWSER_H
+#define BROWSER_H
+#include <QDir>
+#include <QString>
+#include <QStringList>
+
+class Browser
+{
+private:
+    QDir currentDirectory;
+    QStringList subdirs;
+public:
+    Browser(QString path);
+    void ChDir(QString relPath);
+    void ListDir();
+};
+
+#endif // BROWSER_H

MiniMatrixRPi/main.cpp

 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include "animhandler.h"
-#include <QDir>
-
+#include "browser.h"
 
 
 int main(int argc, char *argv[])
@@ -16,16 +15,8 @@ int main(int argc, char *argv[])
     if (engine.rootObjects().isEmpty())
         return -1;
 
-    QDir directory("/");
-    QStringList images = directory.entryList(QStringList(),QDir::Dirs);
-    foreach(QString filename, images) {
-        qDebug() << filename;
-    }
-
-
-//    connect(animhandler, &AnimHandler::resultReady, )
     Alma alma;
-
+    Browser browser("/");
     return app.exec();
 }
 

MiniMatrixRPi/mxframe.cpp

+#include "mxframe.h"
+
+MxFrame::MxFrame()
+{
+
+}

MiniMatrixRPi/mxframe.h

+#ifndef MXFRAME_H
+#define MXFRAME_H
+
+
+class MxFrame
+{
+public:
+    MxFrame();
+};
+
+#endif // MXFRAME_H
\ No newline at end of file