Skip to content

Commit

Permalink
Merge pull request #33 from Nigh/update
Browse files Browse the repository at this point in the history
add version display
  • Loading branch information
Nigh authored Apr 1, 2024
2 parents e81af97 + a37497d commit 04981d1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ahk-compile-toolset
Submodule ahk-compile-toolset updated 94 files
+ tcc/i386-win32-tcc.exe
+0 −170 tcc/include/_mingw.h
+0 −57 tcc/include/assert.h
+0 −409 tcc/include/conio.h
+0 −281 tcc/include/ctype.h
+0 −31 tcc/include/dir.h
+0 −68 tcc/include/direct.h
+0 −135 tcc/include/dirent.h
+0 −55 tcc/include/dos.h
+0 −75 tcc/include/errno.h
+0 −123 tcc/include/excpt.h
+0 −52 tcc/include/fcntl.h
+0 −108 tcc/include/fenv.h
+0 −57 tcc/include/float.h
+0 −297 tcc/include/inttypes.h
+0 −418 tcc/include/io.h
+0 −111 tcc/include/limits.h
+0 −91 tcc/include/locale.h
+0 −181 tcc/include/malloc.h
+0 −737 tcc/include/math.h
+0 −13 tcc/include/mem.h
+0 −40 tcc/include/memory.h
+0 −176 tcc/include/process.h
+0 −42 tcc/include/sec_api/conio_s.h
+0 −19 tcc/include/sec_api/crtdbg_s.h
+0 −33 tcc/include/sec_api/io_s.h
+0 −52 tcc/include/sec_api/mbstring_s.h
+0 −25 tcc/include/sec_api/search_s.h
+0 −145 tcc/include/sec_api/stdio_s.h
+0 −67 tcc/include/sec_api/stdlib_s.h
+0 −30 tcc/include/sec_api/stralign_s.h
+0 −41 tcc/include/sec_api/string_s.h
+0 −34 tcc/include/sec_api/sys/timeb_s.h
+0 −266 tcc/include/sec_api/tchar_s.h
+0 −61 tcc/include/sec_api/time_s.h
+0 −128 tcc/include/sec_api/wchar_s.h
+0 −160 tcc/include/setjmp.h
+0 −28 tcc/include/share.h
+0 −63 tcc/include/signal.h
+0 −79 tcc/include/stdarg.h
+0 −11 tcc/include/stdbool.h
+0 −54 tcc/include/stddef.h
+0 −212 tcc/include/stdint.h
+0 −429 tcc/include/stdio.h
+0 −580 tcc/include/stdlib.h
+0 −164 tcc/include/string.h
+0 −13 tcc/include/sys/fcntl.h
+0 −14 tcc/include/sys/file.h
+0 −30 tcc/include/sys/locking.h
+0 −290 tcc/include/sys/stat.h
+0 −69 tcc/include/sys/time.h
+0 −133 tcc/include/sys/timeb.h
+0 −118 tcc/include/sys/types.h
+0 −14 tcc/include/sys/unistd.h
+0 −146 tcc/include/sys/utime.h
+0 −201 tcc/include/tcc/tcc_libm.h
+0 −80 tcc/include/tcclib.h
+0 −1,102 tcc/include/tchar.h
+0 −287 tcc/include/time.h
+0 −11 tcc/include/vadefs.h
+0 −4 tcc/include/values.h
+0 −12 tcc/include/varargs.h
+0 −873 tcc/include/wchar.h
+0 −172 tcc/include/wctype.h
+0 −149 tcc/include/winapi/basetsd.h
+0 −85 tcc/include/winapi/basetyps.h
+0 −156 tcc/include/winapi/guiddef.h
+0 −8 tcc/include/winapi/poppack.h
+0 −8 tcc/include/winapi/pshpack1.h
+0 −8 tcc/include/winapi/pshpack2.h
+0 −8 tcc/include/winapi/pshpack4.h
+0 −8 tcc/include/winapi/pshpack8.h
+0 −2,951 tcc/include/winapi/winbase.h
+0 −301 tcc/include/winapi/wincon.h
+0 −293 tcc/include/winapi/windef.h
+0 −127 tcc/include/winapi/windows.h
+0 −3,166 tcc/include/winapi/winerror.h
+0 −4,080 tcc/include/winapi/wingdi.h
+0 −5,835 tcc/include/winapi/winnt.h
+0 −272 tcc/include/winapi/winreg.h
+0 −5,651 tcc/include/winapi/winuser.h
+0 −160 tcc/include/winapi/winver.h
+0 −337 tcc/lib/gdi32.def
+0 −770 tcc/lib/kernel32.def
+ tcc/lib/libtcc1-32.a
+ tcc/lib/libtcc1-64.a
+0 −1,399 tcc/lib/msvcrt.def
+0 −658 tcc/lib/user32.def
+ tcc/libtcc.dll
+0 −37 tcc/libtcc/libtcc.def
+0 −100 tcc/libtcc/libtcc.h
+0 −295 tcc/sha1/sha1.c
+0 −52 tcc/sha1/sha1.h
+ tcc/tcc.exe
3 changes: 2 additions & 1 deletion html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
button#btn_exit:hover {
background-color: #0188FF;
}
.sign {
.sign, .ver {
font-family: "Brush Script MT", Verdana;
text-align: right;
font-size: .24rem;
Expand Down Expand Up @@ -597,6 +597,7 @@
<button id="btn_exit" onclick="neutron.Close()">Exit</button>
</div>
<div class="sign"><span>github.com/Nigh</span></div>
<div class="ver"><span id="iwck"></span><br><span id="ahk"></span></div>
</div>
<div class="area">
<ul class="circles unlocked">
Expand Down
18 changes: 15 additions & 3 deletions main.ahk
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

#Requires AutoHotkey v2.0
#Requires AutoHotkey v2.0
#NoTrayIcon
#MaxThreadsPerHotkey 1
VNT := 0
Expand All @@ -8,6 +7,7 @@ VNT := 0
;@Ahk2Exe-AddResource *10 %A_ScriptDir%\html\index.html

#include *i setting.ahk
#include meta.ahk

block := 0
InHook := InputHook("M L16")
Expand All @@ -21,11 +21,23 @@ if VNT == 1 {
dpiScale := A_ScreenDPI / 96
winW := dpiScale * 350
winH := dpiScale * 247
neutron := NeutronWindow().Load("index.html")
if A_IsCompiled {
path := "index.html"
} else {
path := "./html/index.html"
}
neutron := NeutronWindow().Load(path)
.Opt("-Resize")
.OnEvent("Close", (neutron) => ExitApp())
.Show("w" winW " h" winH, "iwck")

neutron.qs(".ver>span#ahk").innerHTML := "ahk" A_AhkVersion
neutron.qs(".ver>span#ahk").classList.add("hidden")
ver := "v" version
if VNT == 1 {
ver .= " VNT"
}
neutron.qs(".ver>span#iwck").innerHTML := ver
neutron.qs("html").setAttribute("style", "font-size:" Round(A_ScreenDPI * 100 / 192) "px")
if VNT == 1 {
neutron.qs("div#vnt").classList.remove("hidden")
Expand Down
2 changes: 1 addition & 1 deletion meta.ahk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FileEncoding("UTF-8")
baseName := "iwck"
appName := "i wanna clean keyboard"
version := "3.04"
version := "3.05"
ahkFilename := "main.ahk"

0 comments on commit 04981d1

Please sign in to comment.