Skip to content

Commit 9b5bcd4

Browse files
makiuchi-dmakiuchi-d
committed
2008-06-21
1 parent 4acad88 commit 9b5bcd4

File tree

5 files changed

+52
-22
lines changed

5 files changed

+52
-22
lines changed

‎delogo.rc

+31-16
Original file line numberDiff line numberDiff line change
@@ -59,41 +59,56 @@ FONT 9, "
5959
//////////////////////////////////////////////////////////////////////
6060
// �ҏW�_�C�A���O
6161
//
62-
EDIT_DLG DIALOG 0,0, 150,100
62+
EDIT_DLG DIALOG 0,0, 150,100+35
6363
STYLE WS_VISIBLE | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU
6464
FONT 9, "�l�r �o�S�V�b�N"
6565
{
6666
LTEXT "���S��", IDC_STATIC, 5,8,25,14
6767
EDITTEXT ID_EDIT_NAME, 30,5,110,14, ES_LEFT|ES_AUTOHSCROLL
6868

69-
GROUPBOX "", IDC_GROUP, 5,22,140,53,WS_VISIBLE
69+
GROUPBOX "�ʒu", IDC_GROUP, 5,23,140,31,WS_VISIBLE
7070

71-
CTEXT "�J�n", IDC_STATIC, 6,37,30,8
72-
EDITTEXT ID_EDIT_START, 36,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
71+
CTEXT "X", IDC_STATIC, 6,37,30,8
72+
EDITTEXT ID_EDIT_X, 36,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
73+
CONTROL "Spin1",ID_EDIT_SPINX,"msctls_updown32",
74+
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
75+
0,0,0,0
76+
77+
CTEXT "Y", IDC_STATIC, 75,37,30,8
78+
EDITTEXT ID_EDIT_Y, 105,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
79+
CONTROL "Spin1",ID_EDIT_SPINY,"msctls_updown32",
80+
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
81+
0,0,0,0
82+
83+
84+
GROUPBOX "�t�F�[�h", IDC_GROUP, 5,22+35,140,53,WS_VISIBLE
85+
86+
CTEXT "�J�n", IDC_STATIC, 6,37+35,30,8
87+
EDITTEXT ID_EDIT_START, 36,35+34,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
7388
CONTROL "Spin1",ID_EDIT_SPINST,"msctls_updown32",
7489
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
7590
0,0,0,0
7691

77-
CTEXT "�I��", IDC_STATIC, 75,37,30,8
78-
EDITTEXT ID_EDIT_END, 105,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
92+
CTEXT "�I��", IDC_STATIC, 75,37+35,30,8
93+
EDITTEXT ID_EDIT_END, 105,35+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
7994
CONTROL "Spin1",ID_EDIT_SPINED,"msctls_updown32",
8095
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
8196
0,0,0,0
8297

83-
CTEXT "FadeIn", IDC_STATIC, 6,57,30,8
84-
EDITTEXT ID_EDIT_FIN, 36,55,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
98+
CTEXT "FadeIn", IDC_STATIC, 6,57+35,30,8
99+
EDITTEXT ID_EDIT_FIN, 36,55+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
85100
CONTROL "Spin1",ID_EDIT_SPINFI,"msctls_updown32",
86101
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
87102
0,0,0,0
88103

89-
CTEXT "FadeOut", IDC_STATIC, 75,57,30,8
90-
EDITTEXT ID_EDIT_FOUT, 105,55,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
104+
CTEXT "FadeOut", IDC_STATIC, 75,57+35,30,8
105+
EDITTEXT ID_EDIT_FOUT, 105,55+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
91106
CONTROL "Spin1",ID_EDIT_SPINFO,"msctls_updown32",
92107
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
93108
0,0,0,0
94109

95-
DEFPUSHBUTTON "OK", IDOK, 20,80,50,14, BS_CENTER|BS_VCENTER
96-
PUSHBUTTON "CANCEL", IDCANCEL, 80,80,50,14, BS_CENTER|BS_VCENTER
110+
DEFPUSHBUTTON "OK", IDOK, 20,80+35,50,14, BS_CENTER|BS_VCENTER
111+
PUSHBUTTON "CANCEL", IDCANCEL, 80,80+35,50,14, BS_CENTER|BS_VCENTER
97112
}
98113

99114
//////////////////////////////////////////////////////////////////////
@@ -115,8 +130,8 @@ FONT 9, "
115130
// VERSION INFO
116131
//
117132
VS_VIRSION_INFO VERSIONINFO
118-
FILEVERSION 0,1,1,0
119-
PRODUCTVERSION 0,1,1
133+
FILEVERSION 0,1,2,0
134+
PRODUCTVERSION 0,1,2
120135
FILEFLAGSMASK 0x3FL
121136
FILEFLAGS 0x0L
122137
FILEOS VOS__WINDOWS32
@@ -129,12 +144,12 @@ VS_VIRSION_INFO VERSIONINFO
129144
{
130145
// VALUE "Comments", "���S�T���v���񋟎ҕ�W��\0"
131146
VALUE "FileDescription", "���ߐ����S �t�B���^ Plugin for AviUtl 0.98�ȍ~\0"
132-
VALUE "FileVersion", "0.1.1.0\0"
147+
VALUE "FileVersion", "0.1.2.0\0"
133148
VALUE "InternalName", "deLogo\0"
134149
VALUE "LegalCopyright", "(C) MakKi\0"
135150
VALUE "OriginalFilename", "delogo.aup\0"
136151
VALUE "ProductName", "���ߐ����S �t�B���^\0"
137-
VALUE "ProductVersion", "0.11\0"
152+
VALUE "ProductVersion", "0.12\0"
138153
}
139154
}
140155
BLOCK "VarFileInfo"

‎editdlg.c

+10-1
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,18 @@ void on_wm_initdialog(HWND hdlg)
7171
SendDlgItemMessage(hdlg,ID_EDIT_SPINED, UDM_SETRANGE, 0, LOGO_STED_MAX);
7272
SendDlgItemMessage(hdlg,ID_EDIT_SPINFI, UDM_SETRANGE, 0, LOGO_FADE_MAX);
7373
SendDlgItemMessage(hdlg,ID_EDIT_SPINFO, UDM_SETRANGE, 0, LOGO_FADE_MAX);
74+
SendDlgItemMessage(hdlg,ID_EDIT_X, EM_SETLIMITTEXT, 5,0);
75+
SendDlgItemMessage(hdlg,ID_EDIT_Y, EM_SETLIMITTEXT, 5,0);
76+
SendDlgItemMessage(hdlg,ID_EDIT_SPINX, UDM_SETRANGE, 0, 0x7fff); // signed 16bitの上限
77+
SendDlgItemMessage(hdlg,ID_EDIT_SPINY, UDM_SETRANGE, 0, 0x7fff);
78+
7479
SetDlgItemText(hdlg,ID_EDIT_NAME,lp->name);
7580
SetDlgItemInt(hdlg,ID_EDIT_START,lp->st,FALSE);
7681
SetDlgItemInt(hdlg,ID_EDIT_END ,lp->ed,FALSE);
7782
SetDlgItemInt(hdlg,ID_EDIT_FIN ,lp->fi,FALSE);
7883
SetDlgItemInt(hdlg,ID_EDIT_FOUT ,lp->fo,FALSE);
84+
SetDlgItemInt(hdlg,ID_EDIT_X,lp->x,FALSE);
85+
SetDlgItemInt(hdlg,ID_EDIT_Y,lp->y,FALSE);
7986

8087
// キャプション
8188
wsprintf(title,"%s - 編集",lp->name);
@@ -108,7 +115,7 @@ BOOL on_IDOK(HWND hdlg)
108115
// メモリ確保
109116
newdata = (LOGO_HEADER *)malloc(LOGO_DATASIZE(olddata));
110117
if(newdata==NULL){
111-
MessageBox(hdlg,"メモリが確保できませんでした",filter_name,MB_OK|MB_ICONERROR);
118+
MessageBox(hdlg,"メモリを確保できませんでした",filter_name,MB_OK|MB_ICONERROR);
112119
return TRUE;
113120
}
114121
// ロゴデータコピー
@@ -120,6 +127,8 @@ BOOL on_IDOK(HWND hdlg)
120127
newdata->ed = min(GetDlgItemInt(hdlg,ID_EDIT_END, NULL,FALSE),LOGO_STED_MAX);
121128
newdata->fi = min(GetDlgItemInt(hdlg,ID_EDIT_FIN, NULL,FALSE),LOGO_FADE_MAX);
122129
newdata->fo = min(GetDlgItemInt(hdlg,ID_EDIT_FOUT, NULL,FALSE),LOGO_FADE_MAX);
130+
newdata->x = GetDlgItemInt(hdlg,ID_EDIT_X,NULL,FALSE);
131+
newdata->y = GetDlgItemInt(hdlg,ID_EDIT_Y,NULL,FALSE);
123132

124133
// リストボックスを更新
125134
DeleteItem(owner,list_n);

‎filter.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*********************************************************************
22
* 透過性ロゴ（BSマークとか）除去フィルタ
3-
* ver 0.11
3+
* ver 0.12
44
*
55
* 2003
66
* 02/01: 製作開始
@@ -69,7 +69,8 @@
6969
* 2008
7070
* 01/07: ロゴのサイズ制限を撤廃
7171
* 開始・終了パラメタの範囲変更(負の値も許可)
72-
* ロゴファイルのデータ数を拡張(1byte -> 4byte)
72+
* ロゴファイルのデータ数を拡張(1byte -> 4byte) (0.11)
73+
* 06/21: 編集ダイアログで位置(X,Y)も編集できるようにした。(0.12)
7374
*
7475
*********************************************************************/
7576

@@ -180,7 +181,7 @@ BOOL func_proc_add_logo(FILTER *fp,FILTER_PROC_INFO *fpip,LOGO_HEADER *lgh,int);
180181
// FILTER_DLL構造体
181182
//----------------------------
182183
char filter_name[] = LOGO_FILTER_NAME;
183-
char filter_info[] = LOGO_FILTER_NAME" ver 0.11 by MakKi";
184+
char filter_info[] = LOGO_FILTER_NAME" ver 0.12 by MakKi";
184185
#define track_N 10
185186
#if track_N
186187
TCHAR *track_name[] = { "位置 X", "位置 Y",

‎readme.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----------------------------------------------------------------------
2-
���ߐ����S �t�B���^�v���O�C�� ver0.11 by MakKi
2+
���ߐ����S �t�B���^�v���O�C�� ver0.12 by MakKi
33
-----------------------------------------------------------------------
44

55
�y�@�\�z
@@ -74,7 +74,7 @@
7474
���X�g�őI������Ă��郍�S�����S�f�[�^�t�@�C��(*.lgd)�Ƃ��ď����o���܂�
7575

7676
�E�ҏW �{�^��
77-
���S�̖��̂ƊJ�n��I���FadeIn�FadeOut�̃f�t�H���g�l��ҏW���܂�
77+
���S�̖��̂Ɗ�{�ʒu�A�t�F�[�h�̊J�n��I���FadeIn�FadeOut�̃f�t�H���g�l��ҏW���܂�
7878

7979
�E��,�� �{�^��
8080
���X�g�̃��S�̏�����ύX���܂�
@@ -131,6 +131,7 @@
131131

132132
�y�X�V�����z
133133

134+
2008/06/21 ver 0.12 �E�ҏW�_�C�A���O�ňʒu(X,Y)���ҏW�ł���悤�ɂ���
134135
2008/01/07 ver 0.11 �E���S�t�@�C���̍ő�f�[�^���g��
135136
�E���S�T�C�Y�̐�����P�p
136137
�E�J�n��I���p�����^�͈̔͂�ύX(���̒l������)

‎resource.h

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
#define ID_EDIT_SPINED 4207
3434
#define ID_EDIT_SPINFI 4208
3535
#define ID_EDIT_SPINFO 4209
36+
#define ID_EDIT_X 4210
37+
#define ID_EDIT_Y 4211
38+
#define ID_EDIT_SPINX 4212
39+
#define ID_EDIT_SPINY 4213
3640

3741
//////////////////////////////////////////////////////////////////////
3842
// 文字列表示ダイアログ

0 commit comments

Comments
 (0)