aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--antivirus.lua4
-rw-r--r--assets.lua13
-rw-r--r--assets/icon_16_antivirus.pngbin0 -> 714 bytes
-rw-r--r--assets/icon_16_chat.pngbin0 -> 368 bytes
-rw-r--r--assets/icon_16_files.pngbin0 -> 414 bytes
-rw-r--r--assets/icon_16_help.pngbin0 -> 656 bytes
-rw-r--r--assets/icon_16_internet.pngbin0 -> 791 bytes
-rw-r--r--assets/icon_16_settings.pngbin0 -> 442 bytes
-rw-r--r--assets/icon_32_antivirus.pngbin0 -> 798 bytes
-rw-r--r--assets/win_bar_grey.pngbin0 -> 2789 bytes
-rw-r--r--elements.lua8
-rw-r--r--panel.lua20
-rw-r--r--startmenu.lua8
-rw-r--r--var.lua23
-rw-r--r--window.lua28
15 files changed, 59 insertions, 45 deletions
diff --git a/antivirus.lua b/antivirus.lua
index ebde1a2..32e3769 100644
--- a/antivirus.lua
+++ b/antivirus.lua
@@ -1,13 +1,11 @@
function drawAntivirus()
- love.graphics.setColor(150,150,150)
- love.graphics.setLineWidth(2)
if antivirus.scanning == true then
drawDownBox(49, 110, 100, 19, 2)
else
drawUpBox(49, 110, 100, 19, 2)
end
drawDownBox(10, 40, 180, 30, 2)
- love.graphics.setColor(70,70,70)
+ love.graphics.setColor(colors.font.dark)
love.graphics.print("SCAN NOW", 51, 116)
love.graphics.print(antivirus.status, 10, 77)
love.graphics.setColor(0,0,120)
diff --git a/assets.lua b/assets.lua
index ee04d89..312d0eb 100644
--- a/assets.lua
+++ b/assets.lua
@@ -6,9 +6,17 @@ function loadAssets()
files = love.graphics.newImage("assets/icon_32_files.png"),
file = love.graphics.newImage("assets/icon_32_file.png"),
help = love.graphics.newImage("assets/icon_32_help.png"),
- torrentr = love.graphics.newImage("assets/icon_32_torrentr.png"),
+ antivirus = love.graphics.newImage("assets/icon_32_antivirus.png"),
settings = love.graphics.newImage("assets/icon_32_settings.png")
}
+ icons[16] = {
+ chat = love.graphics.newImage("assets/icon_16_chat.png"),
+ internet = love.graphics.newImage("assets/icon_16_internet.png"),
+ files = love.graphics.newImage("assets/icon_16_files.png"),
+ help = love.graphics.newImage("assets/icon_16_help.png"),
+ settings = love.graphics.newImage("assets/icon_16_settings.png"),
+ antivirus = love.graphics.newImage("assets/icon_16_antivirus.png")
+ }
desktop = {}
desktop.bg = {
hills = love.graphics.newImage("assets/bg_hills.jpg"),
@@ -30,6 +38,7 @@ function loadAssets()
music.battle2:setLooping(true)
music.battle3:setLooping(true)
window = {
- barAsset = love.graphics.newImage("assets/win_bar.png")
+ bar = love.graphics.newImage("assets/win_bar.png"),
+ barGrey = love.graphics.newImage("assets/win_bar_grey.png")
}
end
diff --git a/assets/icon_16_antivirus.png b/assets/icon_16_antivirus.png
new file mode 100644
index 0000000..0c15d93
--- /dev/null
+++ b/assets/icon_16_antivirus.png
Binary files differ
diff --git a/assets/icon_16_chat.png b/assets/icon_16_chat.png
new file mode 100644
index 0000000..d61493f
--- /dev/null
+++ b/assets/icon_16_chat.png
Binary files differ
diff --git a/assets/icon_16_files.png b/assets/icon_16_files.png
new file mode 100644
index 0000000..8d81f5f
--- /dev/null
+++ b/assets/icon_16_files.png
Binary files differ
diff --git a/assets/icon_16_help.png b/assets/icon_16_help.png
new file mode 100644
index 0000000..844652d
--- /dev/null
+++ b/assets/icon_16_help.png
Binary files differ
diff --git a/assets/icon_16_internet.png b/assets/icon_16_internet.png
new file mode 100644
index 0000000..3354ad8
--- /dev/null
+++ b/assets/icon_16_internet.png
Binary files differ
diff --git a/assets/icon_16_settings.png b/assets/icon_16_settings.png
new file mode 100644
index 0000000..da6d974
--- /dev/null
+++ b/assets/icon_16_settings.png
Binary files differ
diff --git a/assets/icon_32_antivirus.png b/assets/icon_32_antivirus.png
new file mode 100644
index 0000000..5ed377b
--- /dev/null
+++ b/assets/icon_32_antivirus.png
Binary files differ
diff --git a/assets/win_bar_grey.png b/assets/win_bar_grey.png
new file mode 100644
index 0000000..3df3d98
--- /dev/null
+++ b/assets/win_bar_grey.png
Binary files differ
diff --git a/elements.lua b/elements.lua
index 17cf20a..07fb37e 100644
--- a/elements.lua
+++ b/elements.lua
@@ -1,7 +1,6 @@
function loadElements()
window.x = love.graphics.newCanvas(16, 16)
window.min = love.graphics.newCanvas(16, 16)
- window.bar = love.graphics.newCanvas(643, 20)
love.graphics.setCanvas(window.x)
love.graphics.setColor(colors.win.normal)
love.graphics.rectangle("fill", 0, 0, 16, 16)
@@ -17,7 +16,7 @@ function loadElements()
love.graphics.setCanvas(window.min)
love.graphics.setColor(colors.win.normal)
love.graphics.rectangle("fill", 0, 0, 16, 16)
- love.graphics.setColor(70,70,70)
+ love.graphics.setColor(colors.font.dark)
love.graphics.setLineWidth(3)
love.graphics.line(3, 8, 13, 8)
love.graphics.setColor(colors.win.light)
@@ -26,11 +25,6 @@ function loadElements()
love.graphics.setColor(colors.win.dark)
love.graphics.line(0, 16, 16, 16, 16, 0)
love.graphics.setCanvas()
- --
- love.graphics.setCanvas(window.bar)
- love.graphics.setColor(256, 256, 256)
- love.graphics.draw(window.barAsset, 0, 0)
- love.graphics.setCanvas()
end
function drawUpBox(x, y, w, h, t)
love.graphics.setColor(colors.win.normal)
diff --git a/panel.lua b/panel.lua
index 8b153f7..44a841f 100644
--- a/panel.lua
+++ b/panel.lua
@@ -2,14 +2,16 @@ function drawPanelButton(id)
love.graphics.setColor(150, 150, 150)
if panel.b[id] ~= 0 then
if layer[1] == panel.b[id] and win[panel.b[id]].min == false then
- drawDownBox(panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height, 2)
+ drawDownBox(panel.s.x+72+(panel.s.dis*id-panel.s.dis), panel.s.y, panel.s.width*3, panel.s.height, 2)
else
- drawUpBox(panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height, 2)
+ drawUpBox(panel.s.x+72+(panel.s.dis*id-panel.s.dis), panel.s.y, panel.s.width*3, panel.s.height, 2)
end
love.graphics.setColor(70,70,70)
- love.graphics.print(win[panel.b[id]].title, panel.s.x+4+77+(137*id-137), panel.s.y+7)
- if (sys.mouse.p.p == true and sys.mouse.p.x >= panel.s.x+72+(137*id-137)
- and sys.mouse.p.x <= (panel.s.x+72+(137*id-137))+(panel.s.width*2)
+ love.graphics.print(win[panel.b[id]].title, panel.s.x+4+90+(panel.s.dis*id-panel.s.dis), panel.s.y+7)
+ love.graphics.setColor(256,256,256)
+ love.graphics.draw(win[panel.b[id]].icon16, panel.s.x+4+72+(panel.s.dis*id-panel.s.dis), panel.s.y+2)
+ if (sys.mouse.p.p == true and sys.mouse.p.x >= panel.s.x+72+(panel.s.dis*id-panel.s.dis)
+ and sys.mouse.p.x <= (panel.s.x+72+(panel.s.dis*id-panel.s.dis))+(panel.s.width*3)
and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
if win[panel.b[id]].min == false then
layer.sentToFront = panel.b[id]
@@ -26,18 +28,18 @@ function drawStart()
panel.y = love.graphics.getHeight()
panel.y = panel.y - panel.thick
panel.s.y = panel.y + 5
- love.graphics.setColor(192, 192, 192)
+ love.graphics.setColor(colors.win.normal)
love.graphics.rectangle("fill", panel.x, panel.y, panel.width, panel.height)
- love.graphics.setColor(220, 220, 220)
+ love.graphics.setColor(colors.win.light)
love.graphics.setLineWidth(2)
love.graphics.line(panel.x, panel.y, panel.width, panel.y)
- love.graphics.setColor(150, 150, 150)
+ love.graphics.setColor(colors.win.dark)
if start.o == true then
drawDownBox(panel.s.x, panel.s.y, panel.s.width, panel.s.height, 2)
else
drawUpBox(panel.s.x, panel.s.y, panel.s.width, panel.s.height, 2)
end
- love.graphics.setColor(70,70,70)
+ love.graphics.setColor(colors.font.dark)
love.graphics.print("START", panel.s.x+4, panel.s.y+7)
drawPanelButton(1)
drawPanelButton(2)
diff --git a/startmenu.lua b/startmenu.lua
index a49d5bd..683dba5 100644
--- a/startmenu.lua
+++ b/startmenu.lua
@@ -3,7 +3,7 @@ function drawMenuItems(id)
and sys.mouse.y >= start.y+5+(id*55-55) and sys.mouse.y <= start.y+(id*55)) then
love.graphics.setColor(0,0,120)
love.graphics.rectangle("fill", 35, 5+(id*55-55), 208, 50)
- love.graphics.setColor(220,220,220)
+ love.graphics.setColor(colors.win.light)
love.graphics.print(win[id].title, 85, 5+22+(id*55-55))
if sys.mouse.p.p == true and win[id].ex == true then
win[id].ex = false
@@ -13,12 +13,12 @@ function drawMenuItems(id)
end
else
love.graphics.rectangle("fill", 35, 5+(id*55-55), 208, 50)
- love.graphics.setColor(70,70,70)
+ love.graphics.setColor(colors.font.dark)
love.graphics.print(win[id].title, 85, 5+22+(id*55-55))
end
love.graphics.setColor(255,255,255)
- love.graphics.draw(win[id].icon, 44, 13+(id*55-55))
- love.graphics.setColor(192, 192, 192)
+ love.graphics.draw(win[id].icon32, 44, 13+(id*55-55))
+ love.graphics.setColor(colors.win.normal)
end
function drawMenu()
start.y = love.graphics.getHeight()
diff --git a/var.lua b/var.lua
index 4b98fa4..53cf8ee 100644
--- a/var.lua
+++ b/var.lua
@@ -1,4 +1,4 @@
-function loadWin(id, w, h, title, ico)
+function loadWin(id, w, h, title, ico, ico16)
win[id] = {}
win[id].x = math.random(10, 200)
win[id].y = math.random(10, 200)
@@ -19,8 +19,10 @@ function loadWin(id, w, h, title, ico)
win[id].hov = false
win[id].hover = false
win[id].update = true
- win[id].icon = ico
+ win[id].icon32 = ico
+ win[id].icon16 = ico16
win[id].exit = true
+ win[id].bar = "grey"
end
function loadVar()
sys = {}
@@ -48,6 +50,7 @@ function loadVar()
panel.s.width = 65
panel.s.height = 20
panel.s.activate = false
+ panel.s.dis = 202
panel.b = {}
panel.b[1] = 0
panel.b[2] = 0
@@ -58,12 +61,12 @@ function loadVar()
panel.b[7] = 0
test = false
win = {}
- loadWin(1, 250, 400, "Chat", icons[32].chat)
- loadWin(2, 650, 550, "Internet", icons[32].internet)
- loadWin(3, 450, 400, "Files", icons[32].files)
- loadWin(4, 200, 150, "Antivirus", icons[32].torrentr)
- loadWin(5, 450, 400, "Help", icons[32].help)
- loadWin(6, 400, 550, "Settings", icons[32].settings)
+ loadWin(1, 250, 400, "Chat", icons[32].chat, icons[16].chat)
+ loadWin(2, 650, 550, "Internet", icons[32].internet, icons[16].internet)
+ loadWin(3, 450, 400, "Files", icons[32].files, icons[16].files)
+ loadWin(4, 200, 150, "Antivirus", icons[32].antivirus, icons[16].antivirus)
+ loadWin(5, 450, 400, "Help", icons[32].help, icons[16].help)
+ loadWin(6, 400, 550, "Settings", icons[32].settings, icons[16].settings)
winOpen = true
winHover = false
minim = love.graphics.getHeight()+10
@@ -94,8 +97,8 @@ function loadVar()
colors = {}
colors.win = {}
colors.win.light = {220,220,220}
- colors.win.dark = {150,150,150}
+ colors.win.dark = {135,135,135}
colors.win.normal = {192,192,192}
colors.font = {}
- colors.font.dark = {70,70,70}
+ colors.font.dark = {50,50,50}
end
diff --git a/window.lua b/window.lua
index 53a4ac2..4cc79b9 100644
--- a/window.lua
+++ b/window.lua
@@ -1,19 +1,20 @@
function drawWindow(id)
if win[id].update == true then
love.graphics.setCanvas(win[id].cvs)
- love.graphics.setColor(192, 192, 192)
- love.graphics.rectangle("fill", 0, 0, win[id].w, win[id].h) --Box
- love.graphics.setLineWidth(4)
- love.graphics.setColor(220, 220, 220)
- love.graphics.line(0, win[id].y+win[id].h, 0, 0, 0+win[id].w, 0) --BoxLight
- love.graphics.setColor(150,150,150)
- love.graphics.line(0, 0+win[id].h, 0+win[id].w, 0+win[id].h, 0+win[id].w, 0) --BoxShadow
+ drawUpBox(0, 0, win[id].w, win[id].h, 4)
+ drawDownBox(4, 27, win[id].w-8, win[id].h-32, 0.5)
love.graphics.setColor(256,256,256)
- love.graphics.draw(window.bar, 0+3, 0+3, 0, (win[id].w-7)/643, 1) --Blue Bar
+ if win[id].bar == "active" then
+ love.graphics.draw(window.bar, 0+3, 0+3, 0, (win[id].w-7)/643, 1)
+ else
+ love.graphics.draw(window.barGrey, 0+3, 0+3, 0, (win[id].w-7)/643, 1)
+ end
love.graphics.draw(window.x, 0+win[id].w-22, 5)
love.graphics.draw(window.min, 0+win[id].w-40, 0+5) --Minimize Button
- love.graphics.setColor(220, 220, 220)
- love.graphics.print(win[id].title, 0+6, 0+9) --Title
+ love.graphics.setColor(240, 240, 240)
+ love.graphics.print(win[id].title, 28, 0+9) --Title
+ love.graphics.setColor(256, 256, 256)
+ love.graphics.draw(win[id].icon16, 6, 5)
if id == 4 then
drawAntivirus(win[id].x, win[id].y, win[id].hover)
end
@@ -108,6 +109,13 @@ function drawWindow(id)
if id == 4 then
updateAntivirus()
end
+ if id == layer[1] and win[id].bar == "grey" then
+ win[id].bar = "active"
+ win[id].update = true
+ elseif id ~= layer[1] and win[id].bar == "active" then
+ win[id].bar = "grey"
+ win[id].update = true
+ end
love.graphics.setColor(255,255,255)
end
function orderWindows()