Skip to content

Commit 17509d9

Browse files
author
lobtao
committed
增加窗口icon从文件加载
1 parent 12015c7 commit 17509d9

File tree

9 files changed

+28
-6
lines changed

9 files changed

+28
-6
lines changed

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
__history/ufrmMain.pas.~1~
3+
__history/ufrmModal.pas.~1~
4+
__history/ufrmModal.pas.~2~
5+
__history/unConfig.pas.~1~
6+
__history/unConfig.pas.~2~
7+
__history/unConfig.pas.~3~
8+
*.dcu
9+
Win32/debug/app/runtime/*
10+
Win32/debug/cache/*
11+
niu_new.dproj.local
12+
niu_new.identcache
13+
__history/ufrmModal.pas.~4~
14+
__history/ufrmModal.pas.~3~

Win32/debug/app/application/index/controller/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function audio1() {
2121
}
2222

2323
function audio2() {
24-
$this->redirect('http://web.kugou.com/');
24+
$this->redirect('http://www.kugou.com/song/70n9db.html?frombaidu#hash=089B020FBCCE50716835341067B91EAA&album_id=0');
2525
}
2626

2727
function video1() {

Win32/debug/app/application/index/view/index/index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<ul class="layui-nav layui-nav-tree layui-inline" lay-filter="user">
99
<li class="layui-nav-item" data-url="<?= url('index/audio1') ?>"><a href="javascript:;"> <i
1010
class="icon icon-volume-up"></i> 音频播放1 </a></li>
11-
<li class="layui-nav-item layui-this" data-url="<?= url('index/audio2') ?>"><a href="javascript:;"> <i
11+
<li class="layui-nav-item layui-this" data-url="http://music.taihe.com/song/537201076?pst=sug"><a href="javascript:;"> <i
1212
class="icon icon-volume-up"></i> 音频播放2 </a></li>
1313
<li class="layui-nav-item" data-url="<?= url('index/video1') ?>"><a href="javascript:;"> <i
1414
class="icon icon-film"></i> 视频播放1 </a>
1515
</li>
16-
<li class="layui-nav-item" data-url="<?= url('index/video2') ?>"><a href="javascript:;"> <i
16+
<li class="layui-nav-item" data-url="https://www.bilibili.com/video/av11539082/"><a href="javascript:;"> <i
1717
class="icon icon-film"></i> 视频播放2 </a>
1818
</li>
1919
<li class="layui-nav-item " data-url="<?= url('index/link') ?>"><a href="javascript:;"> <i
@@ -31,7 +31,7 @@ class="icon icon-copy"></i> 本地文件 </a></li>
3131
</div>
3232

3333
<div class="frameCls">
34-
<iframe class="frameContent" src="<?= url('index/audio2') ?>" frameborder="0"></iframe>
34+
<iframe class="frameContent" src="http://music.taihe.com/song/537201076?pst=sug" frameborder="0"></iframe>
3535
</div>
3636

3737
<script>

Win32/debug/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"web_port": "46150",
99
"database":"database\\Demos.abs",
1010
"data_port": "46151",
11-
"skin": "skin\\niu.skn",
11+
"skin": "skin\\niu.skn",
12+
"icon": "niu.icon",
1213
"workerman":{
1314
"enable":1,
1415
"servers":[

Win32/debug/niu_new.exe

64.5 KB
Binary file not shown.

niu_new.identcache

-48 Bytes
Binary file not shown.

ufrmMain.pas

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ procedure TfrmMain.FormCreate(Sender: TObject);
5555
begin
5656
frmSplash := TfrmSplash.Create(nil);
5757
try
58+
if FileExists(unConfig.FIcon) then
59+
Self.Icon.LoadFromFile(unConfig.FIcon);
5860
frmSplash.Show;
5961

6062
Application.ProcessMessages;

ufrmModal.pas

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TfrmModal = class(TForm)
3333
implementation
3434

3535
uses
36-
unMoudle, unChromeMessage;
36+
unMoudle, unChromeMessage,unConfig;
3737
{$R *.dfm}
3838
{ TfrmModel }
3939

@@ -56,6 +56,9 @@ procedure TfrmModal.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
5656

5757
procedure TfrmModal.FormCreate(Sender: TObject);
5858
begin
59+
if FileExists(unConfig.FIcon) then
60+
Self.Icon.LoadFromFile(unConfig.FIcon);
61+
5962
// ×¢²á¼àÌý
6063
// if Assigned(subject) then
6164
// subject.attach(Self.Handle);

unConfig.pas

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ interface
4141
FHost: string; // 监听IP
4242
FDataPort: Integer; // 数据库端口
4343
FWebPort: Integer; // web端口
44+
FIcon: string; // 窗口icon
4445
// FWsPort: Integer; // websocket服务端口
4546
// FWsPHPUrl: string; // websocket服务处理PHP路径
4647

@@ -120,6 +121,7 @@ function getWorkerman(): TDValue;
120121
initialization
121122

122123
FAppPath := ExtractFilePath(Application.ExeName);
124+
FIcon := FAppPath + unConfig.getValue('icon');
123125
FSkinFile := FAppPath + unConfig.getValue('skin');
124126
FDataBaseFile := FAppPath + unConfig.getValue('database');
125127
FDebug := StrToIntDef(unConfig.getValue('debug'), 0);

0 commit comments

Comments
 (0)