diff --git a/FeedMonkey.pro.user b/FeedMonkey.pro.user deleted file mode 100644 index b4b282a..0000000 --- a/FeedMonkey.pro.user +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - EnvironmentId - {bfaa7e62-4f32-4919-9766-d100cb227d05} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {ece721a5-e3e4-445c-ac73-358149ddd82b} - 0 - 0 - 0 - - /home/jeena/Projects/build-FeedMonkey-Desktop-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - false - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/jeena/Projects/build-FeedMonkey-Desktop-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - - false - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/FeedTheMonkey.pro b/FeedTheMonkey.pro index 7a6c048..f9f47f5 100644 --- a/FeedTheMonkey.pro +++ b/FeedTheMonkey.pro @@ -4,17 +4,17 @@ TEMPLATE = app QT += qml quick CONFIG += c++11 -SOURCES += main.cpp \ - tinytinyrss.cpp \ - tinytinyrsslogin.cpp \ - post.cpp +SOURCES += \ + src/main.cpp \ + src/post.cpp \ + src/tinytinyrss.cpp \ + src/tinytinyrsslogin.cpp -RESOURCES += qml.qrc \ - images.qrc \ - html.qrc +RESOURCES += \ + resources/resources.qrc \ mac { - RC_FILE = Icon.icns + RC_FILE = misc/Icon.icns } unix { @@ -42,11 +42,11 @@ include(deployment.pri) OTHER_FILES += HEADERS += \ - tinytinyrss.h \ - tinytinyrsslogin.h \ - post.h + src/post.h \ + src/tinytinyrss.h \ + src/tinytinyrsslogin.h DISTFILES += \ - feedthemonkey.desktop \ + misc/feedthemonkey.desktop \ README.md \ LICENSE.txt diff --git a/html.qrc b/html.qrc deleted file mode 100644 index 8f02629..0000000 --- a/html.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - content.css - content.html - content.js - - diff --git a/images.qrc b/images.qrc deleted file mode 100644 index cda1bc1..0000000 --- a/images.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - feedthemonkey.xpm - Icon.icns - - diff --git a/qml.qrc b/qml.qrc deleted file mode 100644 index 9a4f510..0000000 --- a/qml.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - main.qml - TheMenuBar.qml - Content.qml - Login.qml - PostListItem.qml - Sidebar.qml - - diff --git a/content.css b/resources/html/content.css similarity index 100% rename from content.css rename to resources/html/content.css diff --git a/content.html b/resources/html/content.html similarity index 100% rename from content.html rename to resources/html/content.html diff --git a/content.js b/resources/html/content.js similarity index 100% rename from content.js rename to resources/html/content.js diff --git a/Icon.icns b/resources/misc/Icon.icns similarity index 100% rename from Icon.icns rename to resources/misc/Icon.icns diff --git a/feedthemonkey.desktop b/resources/misc/feedthemonkey.desktop similarity index 100% rename from feedthemonkey.desktop rename to resources/misc/feedthemonkey.desktop diff --git a/feedthemonkey.xpm b/resources/misc/feedthemonkey.xpm similarity index 100% rename from feedthemonkey.xpm rename to resources/misc/feedthemonkey.xpm diff --git a/Content.qml b/resources/qml/Content.qml similarity index 100% rename from Content.qml rename to resources/qml/Content.qml diff --git a/Login.qml b/resources/qml/Login.qml similarity index 100% rename from Login.qml rename to resources/qml/Login.qml diff --git a/PostListItem.qml b/resources/qml/PostListItem.qml similarity index 100% rename from PostListItem.qml rename to resources/qml/PostListItem.qml diff --git a/Sidebar.qml b/resources/qml/Sidebar.qml similarity index 100% rename from Sidebar.qml rename to resources/qml/Sidebar.qml diff --git a/TheMenuBar.qml b/resources/qml/TheMenuBar.qml similarity index 100% rename from TheMenuBar.qml rename to resources/qml/TheMenuBar.qml diff --git a/main.qml b/resources/qml/main.qml similarity index 100% rename from main.qml rename to resources/qml/main.qml diff --git a/resources/resources.qrc b/resources/resources.qrc new file mode 100644 index 0000000..e654991 --- /dev/null +++ b/resources/resources.qrc @@ -0,0 +1,20 @@ + + + html/content.css + html/content.html + html/content.js + + + qml/main.qml + qml/TheMenuBar.qml + qml/Content.qml + qml/Login.qml + qml/PostListItem.qml + qml/Sidebar.qml + + + misc/feedthemonkey.xpm + misc/Icon.icns + misc/feedthemonkey.desktop + + diff --git a/main.cpp b/src/main.cpp similarity index 91% rename from main.cpp rename to src/main.cpp index a457295..c835418 100644 --- a/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) qmlRegisterType("TTRSS", 1, 0, "Post"); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); return app.exec(); } diff --git a/post.cpp b/src/post.cpp similarity index 100% rename from post.cpp rename to src/post.cpp diff --git a/post.h b/src/post.h similarity index 100% rename from post.h rename to src/post.h diff --git a/tinytinyrss.cpp b/src/tinytinyrss.cpp similarity index 100% rename from tinytinyrss.cpp rename to src/tinytinyrss.cpp diff --git a/tinytinyrss.h b/src/tinytinyrss.h similarity index 100% rename from tinytinyrss.h rename to src/tinytinyrss.h diff --git a/tinytinyrsslogin.cpp b/src/tinytinyrsslogin.cpp similarity index 100% rename from tinytinyrsslogin.cpp rename to src/tinytinyrsslogin.cpp diff --git a/tinytinyrsslogin.h b/src/tinytinyrsslogin.h similarity index 100% rename from tinytinyrsslogin.h rename to src/tinytinyrsslogin.h