Skip to content

Commit 575862f

Browse files
k-takatak-takata
committed
Merge branch 'topic/import-050716'
2 parents 6e4410d + 3c918a0 commit 575862f

30 files changed

+1054
-121
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ work64/
2626
tags
2727

2828
/source_all/*
29+
!/source_all/Makefile
2930
!/source_all/config.h
3031
/source_custom/*
32+
!/source_custom/Makefile
3133
!/source_custom/config.h

‎lang/tclang-ja.txt‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Main]
22
DialogFont=�l�r �o�S�V�b�N,9
3-
Version=TClock Light kt160827
3+
Version=TClock Light kt160828
44
HelpURL=http://homepage1.nifty.com/kazubon/tclocklight/help/ja/
55

66
[Property]
@@ -14,9 +14,11 @@ Line01=" [
1414
Line02=" [ �w�i�F2][ ][...]"
1515
Line03=" [ �O���f�[�V����] [ ��] [ �c]"
1616
Line04=" [ �g���C�̔w�i��h��‚Ԃ�]"
17-
Line05=" [�����F ][ ][...]"
18-
Line06=" [�t�H���g][ ]"
17+
Line05=" [ �����F ][ ][...]"
18+
Line06=" [ �t�H���g][ ]"
1919
Line07="[�t�H���g�T�C�Y][ ] [ ����] [ �Α�]"
20+
Line08=" [ ����][ �Ȃ�] [ �e] [ �����]"
21+
Line09=" [ �F][ ][...][����][ ][]"
2022

2123
[Size]
2224
HelpURL=size.html
@@ -48,6 +50,17 @@ Line02=" [
4850
Line03=" [ 12����0���ƕ\��]"
4951
Line04=" [ OK ] [�L�����Z�� ]"
5052

53+
[AnalogClock]
54+
HelpURL=analog.html
55+
Line01="[ �A�i���O���v��\������]"
56+
Line02=" [���j] [ ][...] [ ���� ]"
57+
Line03=" [���j] [ ][...] [ ���� ]"
58+
Line04=" [�ʒu] [ �e�L�X�g�ɏd�˂� ] [ �� ] [ �E ]"
59+
Line05=" [�ʒu���� ]"
60+
Line06=" [���E][ ][][�㉺][ ][]"
61+
Line07=" [�T�C�Y] [ ][]"
62+
Line08="[�r�b�g�}�b�v][ ][...]"
63+
5164
[Alarm]
5265
HelpURL=alarm.html
5366
Line01=" [ ���O][ ] [ �lj� ] [ �폜 ]"
@@ -190,6 +203,7 @@ Clock=
190203
Color=�F�ƃt�H���g
191204
SizePos=�ʒu�ƃT�C�Y
192205
Format=����
206+
AnalogClock=�A�i���O���v
193207
Alarm=�A���[��
194208
Cuckoo=�͂Ǝ��v
195209
Mouse=�}�E�X����

‎lang/tclang.txt‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Main]
22
DialogFont=MS Sans Serif, 9
3-
Version=TClock Light kt160827
3+
Version=TClock Light kt160828
44
HelpURL=http://homepage1.nifty.com/kazubon/tclocklight/help/en/
55

66
[Property]
@@ -10,13 +10,15 @@ Line02=" [OK ] [Cancel ] [&Apply
1010

1111
[Color]
1212
HelpURL=color.html
13-
Line01=" [ Background1][ ][...]"
14-
Line02=" [ Background2][ ][...]"
13+
Line01=" [ Background1][ ][...]"
14+
Line02=" [ Background2][ ][...]"
1515
Line03=" [Gradation ] [ Horizontal][ Vertical]"
1616
Line04=" [ Paint Tray background]"
17-
Line05=" [Text ][ ][...]"
18-
Line06=" [Font ][ ]"
17+
Line05=" [Text ][ ][...]"
18+
Line06=" [Font ][ ]"
1919
Line07=" [Size ][ ] [ Bold] [ Italic]"
20+
Line08=" [ Decoration ][ None][ Shadow][ Border]"
21+
Line09=" [ Color ][ ][...][ Range][ ][] "
2022

2123
[Size]
2224
HelpURL=size.html
@@ -48,6 +50,17 @@ Line02=" [PM symbol ][ ]"
4850
Line03=" [ Show 0:xx at 12:xx]"
4951
Line04=" [ OK ] [ Cancel ]"
5052

53+
[AnalogClock]
54+
HelpURL=analog.html
55+
Line01="[ Display analog clock]"
56+
Line02=" [Hour hand] [ ][...] [ Bold ]"
57+
Line03=" [Minute hand] [ ][...] [ Bold ]"
58+
Line04=" [Position] [ Over the text ] [ Left ] [ Right ]"
59+
Line05=" [Arrangement of position ]"
60+
Line06=" [Horizontal][ ][][Vertical][ ][]"
61+
Line07=" [Size] [ ][]"
62+
Line08=" [ Background][ ][...]"
63+
5164
[Alarm]
5265
HelpURL=alarm.html
5366
Line01=" [ Name][ ] [ Add ] [Delete ]"
@@ -190,6 +203,7 @@ Clock=Clock
190203
Color=Color and Font
191204
SizePos=Size and Position
192205
Format=Format
206+
AnalogClock=Analog clock
193207
Alarm=Alarm
194208
Cuckoo=Cuckoo clock
195209
Mouse=Mouse

‎pack.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setlocal DISABLEDELAYEDEXPANSION
55
:: Normal version
66
set execfiles=tcdll.tclock tclock.exe tcplayer.exe tcprop.exe tcsntp.exe tctimer.exe
77
set pkgfiles=readme-kt.txt config-kt.txt format-kt.txt readme.html
8-
set srcfiles=source source_all\config.h source_custom\config.h pack.bat make_all.bat prepare_custom.bat
8+
set srcfiles=source source_all\Makefile source_all\config.h source_custom\Makefile source_custom\config.h pack.bat make_all.bat prepare_custom.bat
99

1010
if not exist pkg mkdir pkg
1111

‎prepare_custom.bat‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ goto :eof
1414

1515

1616
:createlink
17-
if exist Makefile del Makefile
1817
if exist common rmdir common
1918
if exist dll rmdir dll
2019
if exist exe rmdir exe
@@ -23,7 +22,6 @@ if exist property rmdir property
2322
if exist sntp rmdir sntp
2423
if exist timer rmdir timer
2524

26-
mklink Makefile ..\source\Makefile
2725
mklink /d common ..\source\common
2826
mklink /d dll ..\source\dll
2927
mklink /d exe ..\source\exe

‎readme-kt.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ Privilege Isolation)
104104
�ETClock Light Unofficial 060502
105105
�Etclocklight- 080409
106106

107-
�@�c�[���`�b�v�̊g����A�A�i���O���v�A�e�A�����͎�荞��ł��܂���B
108-
109107
2.13. x64 �ւ̑Ή�
110108
�@x64 �ɐ����Ή����܂����B
111109
�@x64 �f�B���N�g���ɓ����Ă���t�@�C���� x64 �p�̎��s�t�@�C���ł��B�g����
@@ -399,6 +397,8 @@ UAC (User Account Control)
399397
- �A���[���A�}�E�X�@�\�A�^�C�}�[�̏����������N���X�g�ɕύX�B
400398
- (memreduce �͕s�̗p)
401399
�EExplorer�̃N���b�V����ɉ����������ݒ���f�t�H���g�ŗL�����B
400+
�Etclocklight-050716 �̑����ƃA�i���O���v�@�\����荞�ށB(all ��)
401+
����ɔ����Aall �ł̓f�t�H���g���C�u�����Ƃ̃����N���K�{�ƂȂ����B
402402

403403

404404
�T�D���C�Z���X

‎source/common/combobox.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ void InitColorCombo(HWND hDlg, int idCombo,
1616
const COLORREF* pColAdd, int nAdd, COLORREF colDef);
1717
void OnMeasureItemColorCombo(LPMEASUREITEMSTRUCT pmis);
1818
void OnDrawItemColorCombo(LPDRAWITEMSTRUCT pdis, char (*pTexts)[80]);
19-
void ChooseColorWithCombo(HINSTANCE hInst, HWND hDlg,
20-
int idCombo);
19+
BOOL ChooseColorWithCombo(HWND hDlg, int idCombo);
2120

2221
/*------------------------------------------------
2322
initialize
@@ -131,8 +130,7 @@ void OnDrawItemColorCombo(LPDRAWITEMSTRUCT pdis, char (*pTexts)[80])
131130
/*--------------------------------------------------------
132131
open a choose color dialog and set color to combobox
133132
----------------------------------------------------------*/
134-
void ChooseColorWithCombo(HINSTANCE hInst, HWND hDlg,
135-
int idCombo)
133+
BOOL ChooseColorWithCombo(HWND hDlg, int idCombo)
136134
{
137135
CHOOSECOLOR cc;
138136
COLORREF col, colarray[16];
@@ -146,12 +144,11 @@ void ChooseColorWithCombo(HINSTANCE hInst, HWND hDlg,
146144
memset(&cc, 0, sizeof(CHOOSECOLOR));
147145
cc.lStructSize = sizeof(CHOOSECOLOR);
148146
cc.hwndOwner = hDlg;
149-
cc.hInstance = (HWND)hInst;
150147
cc.rgbResult = col;
151148
cc.lpCustColors = colarray;
152149
cc.Flags = CC_FULLOPEN | CC_RGBINIT;
153150

154-
if(!ChooseColor(&cc)) return;
151+
if(!ChooseColor(&cc)) return FALSE;
155152

156153
for(i = 0; i < CBGetCount(hDlg, idCombo); i++)
157154
{
@@ -162,6 +159,8 @@ void ChooseColorWithCombo(HINSTANCE hInst, HWND hDlg,
162159
CBAddString(hDlg, idCombo, cc.rgbResult);
163160

164161
CBSetCurSel(hDlg, idCombo, i);
162+
163+
return TRUE;
165164
}
166165

167166
/* ---------------------- Font combobox -------------------------------*/

‎source/common/common.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <shlobj.h>
1616
#include "../config.h"
1717

18-
#define TCLOCKVERSION "TClock Light kt160827"
18+
#define TCLOCKVERSION "TClock Light kt160828"
1919

2020
#define CLASS_TCLOCKMAIN "TClockMainClass"
2121
#define CLASS_TCLOCKPROP "TClockPropertyClass"
@@ -177,8 +177,7 @@ void InitColorCombo(HWND hDlg, int idCombo,
177177
const COLORREF *pColAdd, int nAdd, COLORREF colDef);
178178
void OnMeasureItemColorCombo(LPMEASUREITEMSTRUCT pmis);
179179
void OnDrawItemColorCombo(LPDRAWITEMSTRUCT pdis, char (*pTexts)[80]);
180-
void ChooseColorWithCombo(HINSTANCE hInst, HWND hDlg,
181-
int idCombo);
180+
BOOL ChooseColorWithCombo(HWND hDlg, int idCombo);
182181
void InitFontNameCombo(HWND hDlg, int idCombo, const char* deffont);
183182
void InitFontSizeCombo(HWND hDlg, int idCombo,
184183
const char *fontname, int charset);
@@ -249,9 +248,9 @@ int r_strnicmp(const char* d, const char* s, size_t n);
249248
int r_atoi(const char *p);
250249
int r_atox(const char *p);
251250
int r__wtoi(const WCHAR *p);
252-
int r_wcslen(const wchar_t *p);
251+
size_t r_wcslen(const wchar_t *p);
253252
wchar_t *r_wcscpy(wchar_t *dp, const wchar_t *sp);
254-
int r_wcsncmp(const wchar_t *p1, const wchar_t *p2, int count);
253+
int r_wcsncmp(const wchar_t *p1, const wchar_t *p2, size_t count);
255254
wchar_t *r_wcscat(wchar_t *dp, const wchar_t *sp);
256255
wchar_t *r_wcsstr(const wchar_t *string, const wchar_t *strCharSet);
257256

@@ -331,7 +330,6 @@ DWORDLONG r_M32x32to64(DWORD a, DWORD b);
331330

332331
BOOL PlayFile(HWND hwnd, const char *fname, int loops);
333332
BOOL PlayFileCmdLine(HWND hwnd, const char *str);
334-
BOOL Player(HWND hwnd, const char *fname);
335333
void StopFile(void);
336334
void OnMCINotify(HWND hwnd, WPARAM wFlags, LONG lDevID);
337335
BOOL IsSoundFile(const char* fname);

‎source/common/nodeflib.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ int r__wtoi(const WCHAR *p)
124124
/*-------------------------------------------
125125
wcslen
126126
---------------------------------------------*/
127-
int r_wcslen(const wchar_t *p)
127+
size_t r_wcslen(const wchar_t *p)
128128
{
129-
int n = 0; while(*p) { n++; p++; } return n;
129+
size_t n = 0; while(*p) { n++; p++; } return n;
130130
}
131131

132132
/*-------------------------------------------
@@ -141,9 +141,9 @@ wchar_t *r_wcscpy(wchar_t *dp, const wchar_t *sp)
141141
/*-------------------------------------------
142142
wcsncmp
143143
---------------------------------------------*/
144-
int r_wcsncmp(const wchar_t *p1, const wchar_t *p2, int count)
144+
int r_wcsncmp(const wchar_t *p1, const wchar_t *p2, size_t count)
145145
{
146-
int i;
146+
size_t i;
147147
for(i = 0; i < count; i++)
148148
{
149149
if(*p1 == 0 && *p2 == 0) break;

‎source/common/playfile.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
BOOL PlayFile(HWND hwnd, const char *fname, int loops);
1414
BOOL PlayFileCmdLine(HWND hwnd, const char *str);
15-
BOOL Player(HWND hwnd, const char *fname);
1615
void StopFile(void);
1716
void OnMCINotify(HWND hwnd, WPARAM wFlags, LONG lDevID);
1817
BOOL IsSoundFile(const char* fname);

0 commit comments

Comments
 (0)