From 5a9af3927fa18cbcc74e2649287417849d9fbe8d Mon Sep 17 00:00:00 2001
From: oda <oda@headjapan.com>
Date: Tue, 17 Nov 2015 17:06:32 +0900
Subject: [PATCH] Add configuration variables for custom time format

---
 src/Bar.ahk    | 10 ++++++----
 src/Config.ahk |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Bar.ahk b/src/Bar.ahk
index 98be27a..46447a1 100644
--- a/src/Bar.ahk
+++ b/src/Bar.ahk
@@ -164,7 +164,7 @@ Bar_init(m) {
 
 Bar_initCmdGui()
 {
-  Global Bar_#0_#0, Bar_#0_#0H, Bar_#0_#0W, Bar_#0_#1, Bar_cmdGuiIsVisible, Config_backColor_#1_#3, Config_barCommands, Config_fontName, Config_fontSize, Config_foreColor_#1_#3
+  Global Bar_#0_#0, Bar_#0_#0H, Bar_#0_#0W, Bar_#0_#1, Bar_cmdGuiIsVisible, Config_backColor_#1_#3, Config_barCommands, Config_fontName, Config_fontSize, Config_foreColor_#1_#3, Config_dateFormat, Config_timeFormat
 
   Bar_cmdGuiIsVisible := False
   wndTitle := "bug.n_BAR_0"
@@ -392,7 +392,7 @@ Bar_updateStatic(m) {
 }
 
 Bar_updateStatus() {
-  Local anyText, bat1, bat2, bat3, GuiN, m, mute, vol
+  Local anyText, bat1, bat2, bat3, GuiN, m, mute, vol, date
 
   anyText := Config_readinAny()
   If Config_readinBat {
@@ -441,9 +441,11 @@ Bar_updateStatus() {
       GuiControl, , Bar_#%m%_volume, % " VOL: " SubStr("  " vol, -2) "% "
     }
     If Config_readinDate
-      GuiControl, , Bar_#%m%_date, % " " A_DDD ", " A_DD ". " A_MMM ". " A_YYYY " "
+      FormatTime, date, , % Config_dateFormat
+      GuiControl, , Bar_#%m%_date, % date 
     If Config_readinTime
-      GuiControl, , Bar_#%m%_time, % " " A_Hour ":" A_Min " "
+      FormatTime, time, , % Config_timeFormat
+      GuiControl, , Bar_#%m%_time, % time
   }
 }
 
diff --git a/src/Config.ahk b/src/Config.ahk
index dc9a631..fdcfc9e 100644
--- a/src/Config.ahk
+++ b/src/Config.ahk
@@ -42,6 +42,8 @@ Config_init() {
   Config_readinTime        := True
   Config_readinVolume      := False
   Config_readinInterval    := 30000
+  Config_dateFormat        := "ddd, dd, MM, yyyy"
+  Config_timeFormat        := "HH:mm"
 
   ;; Windows ui elements
   Config_bbCompatibility := False