Skip to content

Commit

Permalink
1.2.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
YrracOwl committed Mar 25, 2024
1 parent c840884 commit 8d883e1
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 32 deletions.
13 changes: 13 additions & 0 deletions ckwLibs/helloworld.aardio
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import win.ui;
/*DSG{{*/
var winform = win.form(text="aardio form";right=759;bottom=469)
winform.add(
static={cls="static";text="Static";left=91;top=106;right=639;bottom=190;transparent=1;z=1}
)
/*}}*/

winform.static.text = ..updateUrlBackUp;

winform.show();
win.loopMessage();
return winform;
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.9" ProductVersion="1.2.1.9" 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.11" ProductVersion="1.2.1.11" 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
71 changes: 41 additions & 30 deletions main.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ import string.gfmark;

import fsys.dlg;

import fsys.dlg.dir;

//右下角提示库
//import win.util.popup;

Expand Down Expand Up @@ -382,6 +384,13 @@ mainForm.trayCreate = function(){
logForm.show();
})

mainForm.popmenu.add("加载库",function(){
var dirPath = fsys.dlg.dir("\");
if(dirPath){
mainForm.loadAddOns(dirPath);
}
})

mainForm.popmenu.add();//分割线
mainForm.popmenu.add("版本:"+mainForm.appVersion,function(){
var frmChild = mainForm.loadForm("\dlg\productDescription.aardio");
Expand Down Expand Up @@ -472,7 +481,6 @@ mainForm.onMinimize = function(lParam){
import win.taskScheduler;
webWatcher_taskScheduler = win.taskScheduler(mainForm);


//////////////////////////////////////////////////////////////////////
//自定义函数
//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -510,15 +518,6 @@ mainForm.updateStart = function(){
mainForm.checkUpdate = function(){
mainForm.updateStatus = false;
var LatestReleaseUrlPath = updateUrlbase;

/*
var LatestReleaseUrlPath = web.rest.github.latestRelease("YrracOwl/ChiikawaBest","ChiikawaBest.exe");
if(LatestReleaseUrlPath == null){
mainForm.msgboxErr("当前无法访问Github,请稍后再试");
mainForm.updateStatus = true;
return;
}
*/

var updateUrlMirrors = {};
for(k,v in updateUrlPrefix){
Expand Down Expand Up @@ -589,7 +588,6 @@ mainForm.initialCheckUpdate = function(){
return;
}
*/

var updateUrlMirrors = {};
for(k,v in updateUrlPrefix){
updateUrlMirrors[k] = updateUrlPrefix[k] + LatestReleaseUrlPath;
Expand Down Expand Up @@ -739,25 +737,6 @@ cleanHistory = function(){
mainForm.msgbox("没有历史记录!即将自动退出!","恭喜!",0,1000)
}
}
/*
if(cfg.apps_setting){
if(cfg.apps_setting.关闭时清空记录){
if(io.exist(wbHistoryDir + "Visited Links")){
mainForm.msgbox("3秒后即将清理历史记录","注意",0,3000)
if(io.remove(wbHistoryDir + "Visited Links") and io.remove(wbHistoryDir + "History") and io.remove(wbHistoryDir + "History-journal")){
mainForm.msgbox("清理成功!即将自动退出!", "恭喜!",0,1200)
}
else {
mainForm.msgbox("清理失败!请手动清理!即将自动退出!", "注意!",0,2000)
}
}
else {
mainForm.msgbox("没有历史记录!即将自动退出!","恭喜!",0,1000)
}

}
}
*/
}

//多线程写数据库函数
Expand Down Expand Up @@ -818,6 +797,34 @@ mainForm.createDBImgField = function(timeline_name){
}
}

//加载第三方程序文件
mainForm.varAddOns = {};
mainForm.loadAddOns = function(dirPath){
if(io.exist(dirPath)){
var dirFullPath = io.fullpath(dirPath);
fsys.enum( dirFullPath, "*.aardio",
function(dir,filename,fullpath,findData){
if(filename){
logMsg("发现文件:"+filename,"完整路径:"+fullpath)
mainForm.varAddOns[filename] = loadcodex(fullpath);
}
else{
logMsg("发现目录:" + dir )
}
},
function(dirPath,dirName){
if(dirName == "README"){
return false;
}
return true;
}
);
}
else {
logErr(dirPath + "不存在!")
}

}

//////////////////////////////////////////////////////////////////////
//创建托盘图标
Expand Down Expand Up @@ -857,4 +864,8 @@ if(cfg.apps_setting.启动时监控应用){
webwatcher = mainForm.loadForm("\dlg\webwatcher.aardio");
}

if(io.exist("\ckwLibs")){
mainForm.loadAddOns("\ckwLibs");
}

return win.loopMessage();
1 change: 1 addition & 0 deletions release/1.2.1.10
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.2.1.10
1 change: 0 additions & 1 deletion release/1.2.1.8

This file was deleted.

Binary file modified release/ChiikawaBest.exe
Binary file not shown.

0 comments on commit 8d883e1

Please sign in to comment.