From 23efa0ab35c8cfeea4c72225cf4a5188fff0e467 Mon Sep 17 00:00:00 2001
From: 1029chris <1029chris@gmail.com>
Date: Wed, 25 May 2016 13:17:32 -0700
Subject: Finished adding different file type icons

---
 assets.lua                      |   4 +++-
 assets/icon_48_documentfile.png | Bin 0 -> 329 bytes
 assets/icon_48_downloadfile.png | Bin 0 -> 474 bytes
 files.lua                       |  16 ++++++++++++++--
 var.lua                         |   2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 assets/icon_48_documentfile.png
 create mode 100644 assets/icon_48_downloadfile.png

diff --git a/assets.lua b/assets.lua
index fd44007..e118031 100644
--- a/assets.lua
+++ b/assets.lua
@@ -25,7 +25,9 @@ function loadAssets(id)
     icons[48] = {
       imageFile = love.graphics.newImage("assets/icon_48_imagefile.png"),
       videoFile = love.graphics.newImage("assets/icon_48_videofile.png"),
-      musicFile = love.graphics.newImage("assets/icon_48_musicfile.png")
+      musicFile = love.graphics.newImage("assets/icon_48_musicfile.png"),
+      downloadFile = love.graphics.newImage("assets/icon_48_downloadfile.png"),
+      documentFile = love.graphics.newImage("assets/icon_48_documentfile.png")
     }
   end
   if id == 4 then
diff --git a/assets/icon_48_documentfile.png b/assets/icon_48_documentfile.png
new file mode 100644
index 0000000..bad1498
Binary files /dev/null and b/assets/icon_48_documentfile.png differ
diff --git a/assets/icon_48_downloadfile.png b/assets/icon_48_downloadfile.png
new file mode 100644
index 0000000..9923854
Binary files /dev/null and b/assets/icon_48_downloadfile.png differ
diff --git a/files.lua b/files.lua
index 105d7db..981007c 100644
--- a/files.lua
+++ b/files.lua
@@ -26,7 +26,19 @@ function drawFiles()
       end
       love.graphics.setFont(pixeloperators)
       love.graphics.setColor(256,256,256)
-      love.graphics.draw(icons[32].file,files[i].x,files[i].y,0,1.5,1.5)
+      if f.home == files then
+        love.graphics.draw(icons[32].file,files[i].x,files[i].y,0,1.5,1.5)
+      elseif files == f.pictures then
+        love.graphics.draw(icons[48].imageFile,files[i].x,files[i].y,0,1,1)
+      elseif files == f.videos then
+        love.graphics.draw(icons[48].videoFile,files[i].x,files[i].y,0,1,1)
+      elseif files == f.music then
+        love.graphics.draw(icons[48].musicFile,files[i].x,files[i].y,0,1,1)
+      elseif files == f.downloads then
+        love.graphics.draw(icons[48].downloadFile,files[i].x,files[i].y,0,1,1)
+      elseif files == f.documents then
+        love.graphics.draw(icons[48].documentFile,files[i].x,files[i].y,0,1,1)
+      end
       if files[i].hl == true then
         love.graphics.setColor(0,0,120)
         love.graphics.rectangle("fill", files[i].x-13,files[i].y+48,75,20)
@@ -53,8 +65,8 @@ function updateFiles()
         win[3].update = true
       elseif files[i].hl == true then
         win[3].update = true
-        file.title = "/User/" .. files[i].name .. "/"
         if f.home == files then
+          file.title = "/User/" .. files[i].name .. "/"
           if i == 4 then
             files = f.pictures
           elseif i == 1 then
diff --git a/var.lua b/var.lua
index 243d664..5cdf087 100644
--- a/var.lua
+++ b/var.lua
@@ -210,7 +210,7 @@ function loadVar()
   f.home[4] = {name="Pictures",type=0,x=0,y=0,hl=false}
   f.home[5] = {name="Videos",type=0,x=0,y=0,hl=false}
   f.pictures = {}
-  f.pictures[1] = {name="Pictures",type=0,x=0,y=0,hl=false}
+  f.pictures[1] = {name="meme.jpg",type=0,x=0,y=0,hl=false}
   f.documents = {}
   f.music = {}
   f.videos = {}
-- 
cgit