From 44fb4197cad551d54d61d339374b0f60da435117 Mon Sep 17 00:00:00 2001
From: Matt Keeter <matt.j.keeter@gmail.com>
Date: Thu, 13 Mar 2014 06:17:51 -0700
Subject: [PATCH] Big reorganization

---
 gl/gl.qrc                |  8 ++++++++
 {src/gl => gl}/mesh.frag |  0
 {src/gl => gl}/mesh.vert |  0
 {src/gl => gl}/quad.frag |  0
 {src/gl => gl}/quad.vert |  0
 qt/fstl.pro              | 31 +++++++++++++++++++++++++++++++
 qt/qt.qrc                |  5 +++++
 {src => qt}/style.qss    |  0
 src/fstl.pro             | 30 ------------------------------
 src/resources.qrc        |  9 ---------
 src/window.cpp           |  2 +-
 11 files changed, 45 insertions(+), 40 deletions(-)
 create mode 100644 gl/gl.qrc
 rename {src/gl => gl}/mesh.frag (100%)
 rename {src/gl => gl}/mesh.vert (100%)
 rename {src/gl => gl}/quad.frag (100%)
 rename {src/gl => gl}/quad.vert (100%)
 create mode 100644 qt/fstl.pro
 create mode 100644 qt/qt.qrc
 rename {src => qt}/style.qss (100%)
 delete mode 100644 src/fstl.pro
 delete mode 100644 src/resources.qrc

diff --git a/gl/gl.qrc b/gl/gl.qrc
new file mode 100644
index 0000000..38d525c
--- /dev/null
+++ b/gl/gl.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="gl/">
+        <file>mesh.frag</file>
+        <file>mesh.vert</file>
+        <file>quad.frag</file>
+        <file>quad.vert</file>
+    </qresource>
+</RCC>
diff --git a/src/gl/mesh.frag b/gl/mesh.frag
similarity index 100%
rename from src/gl/mesh.frag
rename to gl/mesh.frag
diff --git a/src/gl/mesh.vert b/gl/mesh.vert
similarity index 100%
rename from src/gl/mesh.vert
rename to gl/mesh.vert
diff --git a/src/gl/quad.frag b/gl/quad.frag
similarity index 100%
rename from src/gl/quad.frag
rename to gl/quad.frag
diff --git a/src/gl/quad.vert b/gl/quad.vert
similarity index 100%
rename from src/gl/quad.vert
rename to gl/quad.vert
diff --git a/qt/fstl.pro b/qt/fstl.pro
new file mode 100644
index 0000000..74cab3b
--- /dev/null
+++ b/qt/fstl.pro
@@ -0,0 +1,31 @@
+QT       += core gui opengl widgets
+
+TARGET = fstl
+TEMPLATE = app
+
+SOURCES += \
+    ../src/main.cpp\
+    ../src/canvas.cpp \
+    ../src/mesh.cpp \
+    ../src/glmesh.cpp \
+    ../src/loader.cpp \
+    ../src/window.cpp \
+    ../src/backdrop.cpp
+
+HEADERS  += \
+    ../src/canvas.h \
+    ../src/mesh.h \
+    ../src/glmesh.h \
+    ../src/loader.h \
+    ../src/window.h \
+    ../src/backdrop.h
+
+CONFIG += c++11
+
+RESOURCES += \
+    qt.qrc \
+    ../gl/gl.qrc
+
+QMAKE_INFO_PLIST = ../misc/Info.plist
+
+ICON = ../misc/fstl.icns
diff --git a/qt/qt.qrc b/qt/qt.qrc
new file mode 100644
index 0000000..883ac14
--- /dev/null
+++ b/qt/qt.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="qt/">
+        <file>style.qss</file>
+    </qresource>
+</RCC>
diff --git a/src/style.qss b/qt/style.qss
similarity index 100%
rename from src/style.qss
rename to qt/style.qss
diff --git a/src/fstl.pro b/src/fstl.pro
deleted file mode 100644
index 8729f8c..0000000
--- a/src/fstl.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-QT       += core gui opengl widgets
-
-TARGET = fstl
-TEMPLATE = app
-
-SOURCES += \
-    main.cpp\
-    canvas.cpp \
-    mesh.cpp \
-    glmesh.cpp \
-    loader.cpp \
-    window.cpp \
-    backdrop.cpp
-
-HEADERS  += \
-    canvas.h \
-    mesh.h \
-    glmesh.h \
-    loader.h \
-    window.h \
-    backdrop.h
-
-CONFIG += c++11
-
-RESOURCES += \
-    resources.qrc
-
-QMAKE_INFO_PLIST = ../misc/Info.plist
-
-ICON = ../misc/fstl.icns
diff --git a/src/resources.qrc b/src/resources.qrc
deleted file mode 100644
index a88f834..0000000
--- a/src/resources.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>gl/mesh.frag</file>
-        <file>gl/mesh.vert</file>
-        <file>gl/quad.frag</file>
-        <file>gl/quad.vert</file>
-        <file>style.qss</file>
-    </qresource>
-</RCC>
diff --git a/src/window.cpp b/src/window.cpp
index 13d3583..f3a7438 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -11,7 +11,7 @@ Window::Window(QWidget *parent) :
 {
     setWindowTitle("fstl");
 
-    QFile styleFile( ":/style.qss" );
+    QFile styleFile( ":/qt/style.qss" );
     styleFile.open( QFile::ReadOnly );
     setStyleSheet(styleFile.readAll());
 
-- 
2.39.5