Skip to content

Commit

Permalink
1.3.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
YrracOwl committed Jul 16, 2024
1 parent f100f62 commit 4c6f78a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
11 changes: 9 additions & 2 deletions dlg/add_alarm.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ if(..dbAlarmClock.existsTable("default")){
}
else {
..logMsg("「过期」变量-outdated:",outdated)
var outdatedAlarmWin = win.loadForm("\dlg\notify_todo.aardio",,win.getDesktop());
var outdatedAlarmWin = win.loadForm("\dlg\notify_todo.aardio");
outdatedAlarmWin.plusContent.text = AlarmContent;

var alarmClockX, alarmClockY = alarmSetWinform.showPos("右下角显示", outdatedAlarmWin.width, outdatedAlarmWin.height);
Expand Down Expand Up @@ -394,7 +394,7 @@ alarmSetWinform.plusBtn.oncommand = function(id,event){
}
else {
..logMsg("「过期」变量-outdated:",outdated)
var outdatedAlarmWin = win.loadForm("\dlg\notify_todo.aardio",,win.getDesktop());
var outdatedAlarmWin = win.loadForm("\dlg\notify_todo.aardio");
outdatedAlarmWin.plusContent.text = AlarmContent;

var alarmClockX, alarmClockY = alarmSetWinform.showPos("右下角显示", outdatedAlarmWin.width, outdatedAlarmWin.height);
Expand Down Expand Up @@ -536,6 +536,13 @@ alarmSetWinform.showTodosAll = function(){
}
}

alarmSetWinform.closeTodosAll = function(){
for(k,v in outdatedTable){
v.onClose = null;
v.close();
}
}



win.loopMessage();
Expand Down
6 changes: 5 additions & 1 deletion main.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ mainForm.trayCreate = function(){
})
mainForm.popmenu.add("关于软件/手动更新",function(){
process("explorer.exe","https://github.com/YrracOwl/ChiikawaBest")
process.exploreSelect(io._exepath);
})
if(mainForm.updateStatus){//检查更新
mainForm.popmenu.add("检测更新",function(){
Expand All @@ -434,6 +435,7 @@ mainForm.trayCreate = function(){
serverMain = null;
}
mainForm.onClose = null;
alarmForm.closeTodosAll();
mainForm.onClose = function(hwnd,message,wParam,lParam){
if(webwatcher != "notExist"){
webwatcher.onClose = null;
Expand Down Expand Up @@ -484,6 +486,7 @@ mainForm.onDestroy = function(){
serverMain.stop();
serverMain = null;
}
alarmForm.closeTodosAll();
mainForm.releaseAddOns();
}

Expand Down Expand Up @@ -539,11 +542,12 @@ mainForm.updateStart = function(){
}
mainForm.onClose = null;
mainForm.releaseAddOns();
alarmForm.closeTodosAll();

var currentPath = io._exepath;
process.execute(updateFilePath+"ChiikawaBest.exe",'operation=update;path='+currentPath);
mainForm.close();
mainForm.updateStatus = true;
mainForm.close();
}
}

Expand Down
1 change: 0 additions & 1 deletion release/1.3.0.6

This file was deleted.

1 change: 1 addition & 0 deletions release/1.3.0.7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.3.0.7
Binary file modified release/ChiikawaBest.exe
Binary file not shown.

0 comments on commit 4c6f78a

Please sign in to comment.