Digits for the Clock (ktt-ol#10)

Add Custom Digits for Clock

Author: mm-chen

src/curses-ui/clock.vala

@@ -21,8 +21,8 @@ public class ClockWindow {
 	string dateformat;
 	Config cfg;
 
-	public ClockWindow() {
-		ascii = new AsciiNumbers();
+	public ClockWindow(string binarylocation) {
+		ascii = new AsciiNumbers(binarylocation);
 		win   = new Window(6, 18, 1, COLS-2-18);
 		win.bkgdset(COLOR_PAIR(0) | Attribute.BOLD);
 

src/curses-ui/curses-ui.vala

@@ -41,7 +41,7 @@ public class CursesUI {
 		banner    = new Logo(binarylocation);
 		//statuswin = new StatusPanel();
 		messages  = new MessageBox();
-		clkwin    = new ClockWindow();
+		clkwin    = new ClockWindow(binarylocation);
 
 		clkwin.update();
 

src/curses-ui/numbers.vala

@@ -15,96 +15,48 @@
 
 public class AsciiNumbers {
 
-	public string[] zero = {
-		" _ ",
-		"/ \\",
-		"\\_/"
-	};
+	string binarylocation;
 
-	public string[] one = {
-		"   ",
-		" /|",
-		"  |"
-	};
-
-	public string[] two = {
-		"__ ",
-		" _)",
-		"(__"
-	};
-
-	public string[] three = {
-		"__ ",
-		" _)",
-		"__)"
-	};
-
-	public string[] four = {
-		"   ",
-		"|_|",
-		"  |"
-	};
-
-	public string[] five = {
-		" __",
-		"|_ ",
-		"__)"
-	};
-
-	public string[] six = {
-		" _ ",
-		"/_ ",
-		"\\_)"
-	};
-
-	public string[] seven = {
-		"___",
-		"  /",
-		" / "
-	};
-
-	public string[] eight = {
-		" _ ",
-		"(_)",
-		"(_)"
-	};
+	public AsciiNumbers(string binarylocation){
+		this.binarylocation = binarylocation;
+	}
 
-	public string[] nine = {
-		" _ ",
-		"(_\\",
-		" _/"
-	};
+	private string[] readNumber(string fileName){
+		var file = File.new_for_path(binarylocation + "/numbers/" + fileName);
+		var dis = new DataInputStream(file.read());
+		string line;
+		string[] number;
+		while((line = dis.read_line(null)) != null){
+			number += line;
+		}
+		return number;
+	}
 
-	public string[] colon = {
-		"   ",
-		" o ",
-		" o "
-	};
 
 	public string[] get(char c) {
 		switch(c) {
 			case '0':
-				return zero;
+				return readNumber("0.txt");
 			case '1':
-				return one;
+				return readNumber("1.txt");
 			case '2':
-				return two;
+				return readNumber("2.txt");
 			case '3':
-				return three;
+				return readNumber("3.txt");
 			case '4':
-				return four;
+				return readNumber("4.txt");
 			case '5':
-				return five;
+				return readNumber("5.txt");
 			case '6':
-				return six;
+				return readNumber("6.txt");
 			case '7':
-				return seven;
+				return readNumber("7.txt");
 			case '8':
-				return eight;
+				return readNumber("8.txt");
 			case '9':
-				return nine;
+				return readNumber("9.txt");
 			case ':':
-				return colon;
+				return readNumber("colon.txt");
 			default:
 				return {};
 		}

src/curses-ui/numbers/0.txt

@@ -0,0 +1,3 @@
+ _ 
+| |
+|_|

src/curses-ui/numbers/1.txt

@@ -0,0 +1,3 @@
+   
+ /|
+  |  

src/curses-ui/numbers/2.txt

@@ -0,0 +1,3 @@
+ _
+ _|
+|_

src/curses-ui/numbers/3.txt

@@ -0,0 +1,3 @@
+ _
+ _|
+ _|

src/curses-ui/numbers/4.txt

@@ -0,0 +1,3 @@
+
+|_|
+  |

src/curses-ui/numbers/5.txt

@@ -0,0 +1,3 @@
+ _
+|_
+ _|

src/curses-ui/numbers/6.txt

@@ -0,0 +1,3 @@
+ _
+|_
+|_|

src/curses-ui/numbers/7.txt

@@ -0,0 +1,3 @@
+ _
+  |
+  |

src/curses-ui/numbers/8.txt

@@ -0,0 +1,3 @@
+ _
+|_|
+|_|

src/curses-ui/numbers/9.txt

@@ -0,0 +1,3 @@
+ _
+|_|
+ _|

src/curses-ui/numbers/colon.txt

@@ -0,0 +1,3 @@
+   
+ o 
+ o