Skip to content

Commit

Permalink
1.2.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
YrracOwl committed Mar 24, 2024
1 parent ddbb082 commit c840884
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion default.aproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.2.1.2" ProductVersion="1.2.1.2" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.2.1.9" ProductVersion="1.2.1.9" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
<file name="chiikawa.png" path="res\chiikawa.png" comment="res\chiikawa.png"/>
Expand Down
6 changes: 4 additions & 2 deletions dlg/add_alarm.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ if(..dbAlarmClock.existsTable("default")){
win.setForeground(foregroundHwnd);
frmChild.show();
frmChild.redrawBackground();
win.flash(frmChild.hwnd,32);
win.delay(980)
win.flash(frmChild.hwnd,9);

},AlarmContent,k);

Expand Down Expand Up @@ -350,7 +351,8 @@ alarmSetWinform.plusBtn.oncommand = function(id,event){
win.setForeground(foregroundHwnd);
frmChild.show();
frmChild.redrawBackground();
win.flash(frmChild.hwnd,32);
win.delay(980)
win.flash(frmChild.hwnd,9);

},AlarmContent,tempTime);

Expand Down
2 changes: 2 additions & 0 deletions dlg/alarms.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ plusTime={cls="plus";left=8;top=32;right=288;bottom=72;dl=1;dr=1;dt=1;font=LOGFO
)
/*}}*/

import win.ui.fade;
var timeFormatted = null;
winform.updateContent = function(contentStr,timeStr){
timeFormatted = time(timeStr,"%Y年%m月%d日%H时%M分%S秒");
Expand Down Expand Up @@ -45,6 +46,7 @@ winform.btnD30.oncommand = function(id,event){
}

winform.enableDpiScaling();
win.ui.fade(winform,960);
//winform.show();
win.loopMessage();
return winform;
10 changes: 5 additions & 5 deletions main.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ mainForm.onClose = function(hwnd,message,wParam,lParam){
mainForm.show(false); //隐藏窗口
if(!cfg.apps_setting.启动到托盘 and minimize_1st_show){
minimize_1st_show = false;
mainForm.tray.pop("应用已启动,右击托盘获取更多菜单","ChiikawaBest",,3000);
mainForm.tray.pop("应用"+mainForm.appVersion+"已启动,右击托盘获取更多菜单","ChiikawaBest",,3000);
}
//mainForm.popmenu.setString(1,"显示")
return true;//阻击默认消息传递,取消最小化过程
Expand All @@ -458,7 +458,7 @@ mainForm.onMinimize = function(lParam){
mainForm.show(false); //隐藏窗口
if(!cfg.apps_setting.启动到托盘 and minimize_1st_show){
minimize_1st_show = false;
mainForm.tray.pop("应用已启动,右击托盘获取更多菜单","ChiikawaBest",,3000);
mainForm.tray.pop("应用"+mainForm.appVersion+"已启动,右击托盘获取更多菜单","ChiikawaBest",,3000);
}
//mainForm.popmenu.setString(1,"显示")
return true;//阻击默认消息传递,取消最小化过程
Expand Down Expand Up @@ -839,14 +839,14 @@ if(!cfg.apps_setting.启动次数){
mainForm.enableDpiScaling();
if(cfg.apps_setting.启动到托盘){
if(checkFirstLaunch){
mainForm.tray.pop("应用已启动,右击托盘获取更多菜单","ChiikawaBest");
mainForm.tray.pop("应用"+mainForm.appVersion+"已启动,右击托盘获取更多菜单","ChiikawaBest");
}
elseif(cfg.apps_setting.启动次数 < 6){
mainForm.tray.pop("应用已启动,右击托盘获取更多菜单","ChiikawaBest");
mainForm.tray.pop("应用"+mainForm.appVersion+"已启动,右击托盘获取更多菜单","ChiikawaBest");
cfg.apps_setting.启动次数 = cfg.apps_setting.启动次数 + 1;
}
else {
mainForm.tray.pop("应用已启动","ChiikawaBest");
mainForm.tray.pop("应用"+mainForm.appVersion+"已启动","ChiikawaBest");
}
}
else {
Expand Down
1 change: 0 additions & 1 deletion release/1.2.1.1

This file was deleted.

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

0 comments on commit c840884

Please sign in to comment.