1.3.0.2

build_error_log.txt

@@ -0,0 +1,9 @@
+错误发生在文件---------------:
+D:\aardio\project\ChiikawaBest\dlg\add_alarm.aardio
+错误信息---------------:
+
+{Error}:
+{Line}:#522
+{File}:D:\aardio\project\ChiikawaBest\dlg\add_alarm.aardio
+{Error}:<unexpected symbol>
+{Near}:','

default.aproj

@@ -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.3.0.2" ProductVersion="1.3.0.2" publishDir="/dist/" dstrip="true" 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.3.0.3" ProductVersion="1.3.0.3" publishDir="/dist/" dstrip="true" 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"/>

dlg/add_alarm.aardio

@@ -146,6 +146,7 @@ alarm_taskScheduler.start();
 var taskTable = {};
 var scheduleTable = {};
 var outdatedTable = {};
+var todoCnt = 1;
 if(..dbAlarmClock.existsTable("default")){
 	..logMsg(">>>加载闹钟：")
 	for rowid, time, content in ..dbAlarmClock.each("SELECT rowid,* FROM [default]") {
@@ -202,10 +203,13 @@ if(..dbAlarmClock.existsTable("default")){
 				outdatedAlarmWin.plusContent.text = AlarmContent;
 
 				var alarmClockX, alarmClockY = alarmSetWinform.showPos("右下角显示", outdatedAlarmWin.width, outdatedAlarmWin.height);
-				win.setPos(outdatedAlarmWin.hwnd, alarmClockX, alarmClockY);
-
+				win.setPos(outdatedAlarmWin.hwnd, alarmClockX, alarmClockY-(todoCnt-1)*outdatedAlarmWin.height-10);
+
+				outdatedAlarmWin.rank = todoCnt;
+				outdatedTable[todoCnt] = outdatedAlarmWin;
+				todoCnt = todoCnt+1;
+
 				outdatedAlarmWin.show();
-				outdatedTable[k] = outdatedAlarmWin;
 			}
 
 		}
@@ -392,9 +396,15 @@ alarmSetWinform.plusBtn.oncommand = function(id,event){
 		outdatedAlarmWin.plusContent.text = AlarmContent;
 
 		var alarmClockX, alarmClockY = alarmSetWinform.showPos("右下角显示", outdatedAlarmWin.width, outdatedAlarmWin.height);
-		win.setPos(outdatedAlarmWin.hwnd, alarmClockX, alarmClockY);
-		outdatedAlarmWin.show();
-		outdatedTable[k] = outdatedAlarmWin;
+		win.setPos(outdatedAlarmWin.hwnd, alarmClockX, alarmClockY-(todoCnt-1)*outdatedAlarmWin.height-10);
+
+		outdatedAlarmWin.rank = todoCnt;
+		outdatedTable[todoCnt] = outdatedAlarmWin;
+		todoCnt = todoCnt+1;
+
+		alarmSetWinform.showTodosAll();
+
+		//outdatedAlarmWin.show();
 	}
 
 	alarmSetWinform.datetimepick.time = time.now();
@@ -496,5 +506,35 @@ alarmSetWinform.reSetAlarm = function(text){
 }
 
 
+alarmSetWinform.pipeline = function(caller){
+	for(k,v in outdatedTable){
+		if(k>caller){
+			var xxs,yys,widths,heights = win.getPos(v.hwnd,true);
+			var tempHwnd = v.hwnd;
+			thread.invoke( 
+				function(tempHwnd,xxs,yys,heights){
+					import win;
+					var aniCycles = 10;
+					for(aniSecs=1;aniCycles;1){
+						win.setPos(tempHwnd, xxs, yys+heights*aniSecs/aniCycles);
+						win.delay(3);
+					}
+				},tempHwnd,xxs,yys,heights
+			);
+		}
+	}
+}
+
+alarmSetWinform.showTodosAll = function(){
+	for(k,v in outdatedTable){
+		v.show(false)
+		var alarmClockX, alarmClockY = alarmSetWinform.showPos("右下角显示", v.width, v.height);
+		win.setPos(v.hwnd, alarmClockX, alarmClockY-(k-1)*v.height-10);
+		v.show(true);
+	}
+}
+
+
+
 win.loopMessage();
 return alarmSetWinform;

dlg/notify_todo.aardio

@@ -1,10 +1,10 @@
 import win.ui;
 /*DSG{{*/
-var winform = win.form(text="待处理";right=295;bottom=159;border="none";max=false;min=false)
+var winform = win.form(text="待处理";right=295;bottom=143;border="none";max=false;min=false)
 winform.add(
-btnDel={cls="button";text="删除";left=168;top=128;right=264;bottom=152;db=1;z=3};
-btnRe={cls="button";text="重新添加";left=24;top=128;right=120;bottom=152;db=1;z=2};
-plusContent={cls="plus";text="-占位-";left=8;top=31;right=288;bottom=120;db=1;dl=1;dr=1;dt=1;font=LOGFONT(h=-16;weight=700);multiline=1;valign="top";wrap=1;z=1}
+btnDel={cls="button";text="删除";left=168;top=116;right=264;bottom=140;db=1;z=3};
+btnRe={cls="button";text="重新添加";left=24;top=116;right=120;bottom=140;db=1;z=2};
+plusContent={cls="plus";text="-占位-";left=8;top=30;right=288;bottom=113;db=1;dl=1;dr=1;dt=1;edge=1;font=LOGFONT(h=-16;weight=700);multiline=1;valign="top";wrap=1;z=1}
 )
 /*}}*/
 
@@ -33,6 +33,14 @@ winform.btnDel.oncommand = function(id,event){
 	winform.close();
 }
 
+winform.rank = 0;
+
+winform.onClose = function(hwnd,message,wParam,lParam){
+	winform.show(false);
+    ..alarmForm.pipeline(winform.rank);
+    return true; 
+}
+
 //winform.show();
 win.loopMessage();
 return winform;

release/1.3.0.2

@@ -0,0 +1 @@
+1.3.0.2