2008-06-21

makiuchi-d · Sep 16, 2015 · 9b5bcd4 · 9b5bcd4
1 parent 4acad88
commit 9b5bcd4
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 22 deletions.
diff --git a/delogo.rc b/delogo.rc
@@ -59,41 +59,56 @@ FONT 9, "
 //////////////////////////////////////////////////////////////////////
 // �ҏW�_�C�A���O
 //
-EDIT_DLG DIALOG 0,0, 150,100
+EDIT_DLG DIALOG 0,0, 150,100+35
 STYLE WS_VISIBLE | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU
 FONT 9, "�l�r �o�S�V�b�N"
 {
  LTEXT "���S��", IDC_STATIC, 5,8,25,14
  EDITTEXT ID_EDIT_NAME, 30,5,110,14, ES_LEFT|ES_AUTOHSCROLL
 
- GROUPBOX  "", IDC_GROUP, 5,22,140,53,WS_VISIBLE
+ GROUPBOX "�ʒu", IDC_GROUP, 5,23,140,31,WS_VISIBLE
 
- CTEXT "�J�n", IDC_STATIC, 6,37,30,8
- EDITTEXT ID_EDIT_START, 36,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CTEXT "X", IDC_STATIC, 6,37,30,8
+ EDITTEXT ID_EDIT_X, 36,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CONTROL "Spin1",ID_EDIT_SPINX,"msctls_updown32",
+ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
+ 0,0,0,0
+
+ CTEXT "Y", IDC_STATIC, 75,37,30,8
+ EDITTEXT ID_EDIT_Y, 105,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CONTROL "Spin1",ID_EDIT_SPINY,"msctls_updown32",
+ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
+ 0,0,0,0
+
+
+ GROUPBOX "�t�F�[�h", IDC_GROUP, 5,22+35,140,53,WS_VISIBLE
+
+ CTEXT "�J�n", IDC_STATIC, 6,37+35,30,8
+ EDITTEXT ID_EDIT_START, 36,35+34,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
  CONTROL "Spin1",ID_EDIT_SPINST,"msctls_updown32",
  UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
  0,0,0,0
 
- CTEXT "�I��", IDC_STATIC, 75,37,30,8
- EDITTEXT ID_EDIT_END, 105,35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CTEXT "�I��", IDC_STATIC, 75,37+35,30,8
+ EDITTEXT ID_EDIT_END, 105,35+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
  CONTROL "Spin1",ID_EDIT_SPINED,"msctls_updown32",
  UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
  0,0,0,0
 
- CTEXT "FadeIn", IDC_STATIC, 6,57,30,8
- EDITTEXT ID_EDIT_FIN, 36,55,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CTEXT "FadeIn", IDC_STATIC, 6,57+35,30,8
+ EDITTEXT ID_EDIT_FIN, 36,55+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
  CONTROL "Spin1",ID_EDIT_SPINFI,"msctls_updown32",
  UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
  0,0,0,0
 
- CTEXT "FadeOut", IDC_STATIC, 75,57,30,8
- EDITTEXT ID_EDIT_FOUT, 105,55,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
+ CTEXT "FadeOut", IDC_STATIC, 75,57+35,30,8
+ EDITTEXT ID_EDIT_FOUT, 105,55+35,35,12, ES_RIGHT|ES_AUTOHSCROLL|ES_NUMBER|WS_TABSTOP
  CONTROL "Spin1",ID_EDIT_SPINFO,"msctls_updown32",
  UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ARROWKEYS,
  0,0,0,0
 
- DEFPUSHBUTTON "OK", IDOK, 20,80,50,14, BS_CENTER|BS_VCENTER
- PUSHBUTTON "CANCEL", IDCANCEL, 80,80,50,14, BS_CENTER|BS_VCENTER
+ DEFPUSHBUTTON "OK", IDOK, 20,80+35,50,14, BS_CENTER|BS_VCENTER
+ PUSHBUTTON "CANCEL", IDCANCEL, 80,80+35,50,14, BS_CENTER|BS_VCENTER
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -115,8 +130,8 @@ FONT 9, "
 // VERSION INFO
 //
 VS_VIRSION_INFO VERSIONINFO
- FILEVERSION 0,1,1,0
- PRODUCTVERSION 0,1,1
+ FILEVERSION 0,1,2,0
+ PRODUCTVERSION 0,1,2
  FILEFLAGSMASK 0x3FL
  FILEFLAGS 0x0L
  FILEOS VOS__WINDOWS32
@@ -129,12 +144,12 @@ VS_VIRSION_INFO VERSIONINFO
  {
 // VALUE "Comments", "���S�T���v���񋟎ҕ�W��\0"
  VALUE "FileDescription", "���ߐ����S �t�B���^ Plugin for AviUtl 0.98�ȍ~\0"
- VALUE "FileVersion", "0.1.1.0\0"
+ VALUE "FileVersion", "0.1.2.0\0"
  VALUE "InternalName", "deLogo\0"
  VALUE "LegalCopyright", "(C) MakKi\0"
  VALUE "OriginalFilename", "delogo.aup\0"
  VALUE "ProductName", "���ߐ����S �t�B���^\0"
- VALUE "ProductVersion", "0.11\0"
+ VALUE "ProductVersion", "0.12\0"
  }
  }
  BLOCK "VarFileInfo"

diff --git a/editdlg.c b/editdlg.c
@@ -71,11 +71,18 @@ void on_wm_initdialog(HWND hdlg)
  SendDlgItemMessage(hdlg,ID_EDIT_SPINED, UDM_SETRANGE, 0, LOGO_STED_MAX);
  SendDlgItemMessage(hdlg,ID_EDIT_SPINFI, UDM_SETRANGE, 0, LOGO_FADE_MAX);
  SendDlgItemMessage(hdlg,ID_EDIT_SPINFO, UDM_SETRANGE, 0, LOGO_FADE_MAX);
+ SendDlgItemMessage(hdlg,ID_EDIT_X, EM_SETLIMITTEXT, 5,0);
+ SendDlgItemMessage(hdlg,ID_EDIT_Y, EM_SETLIMITTEXT, 5,0);
+ SendDlgItemMessage(hdlg,ID_EDIT_SPINX, UDM_SETRANGE, 0, 0x7fff); // signed 16bitの上限
+ SendDlgItemMessage(hdlg,ID_EDIT_SPINY, UDM_SETRANGE, 0, 0x7fff);
+
  SetDlgItemText(hdlg,ID_EDIT_NAME,lp->name);
  SetDlgItemInt(hdlg,ID_EDIT_START,lp->st,FALSE);
  SetDlgItemInt(hdlg,ID_EDIT_END ,lp->ed,FALSE);
  SetDlgItemInt(hdlg,ID_EDIT_FIN ,lp->fi,FALSE);
  SetDlgItemInt(hdlg,ID_EDIT_FOUT ,lp->fo,FALSE);
+ SetDlgItemInt(hdlg,ID_EDIT_X,lp->x,FALSE);
+ SetDlgItemInt(hdlg,ID_EDIT_Y,lp->y,FALSE);
 
  // キャプション
  wsprintf(title,"%s - 編集",lp->name);
@@ -108,7 +115,7 @@ BOOL on_IDOK(HWND hdlg)
  // メモリ確保
  newdata = (LOGO_HEADER *)malloc(LOGO_DATASIZE(olddata));
  if(newdata==NULL){
- MessageBox(hdlg,"メモリが確保できませんでした",filter_name,MB_OK|MB_ICONERROR);
+ MessageBox(hdlg,"メモリを確保できませんでした",filter_name,MB_OK|MB_ICONERROR);
  return TRUE;
  }
  // ロゴデータコピー
@@ -120,6 +127,8 @@ BOOL on_IDOK(HWND hdlg)
  newdata->ed = min(GetDlgItemInt(hdlg,ID_EDIT_END, NULL,FALSE),LOGO_STED_MAX);
  newdata->fi = min(GetDlgItemInt(hdlg,ID_EDIT_FIN, NULL,FALSE),LOGO_FADE_MAX);
  newdata->fo = min(GetDlgItemInt(hdlg,ID_EDIT_FOUT, NULL,FALSE),LOGO_FADE_MAX);
+ newdata->x = GetDlgItemInt(hdlg,ID_EDIT_X,NULL,FALSE);
+ newdata->y = GetDlgItemInt(hdlg,ID_EDIT_Y,NULL,FALSE);
 
  // リストボックスを更新
  DeleteItem(owner,list_n);

diff --git a/filter.c b/filter.c
@@ -1,6 +1,6 @@
 /*********************************************************************
 * 透過性ロゴ（BSマークとか）除去フィルタ
-* ver 0.11
+* ver 0.12
 * 
 * 2003
 * 02/01: 製作開始
@@ -69,7 +69,8 @@
 * 2008
 * 01/07: ロゴのサイズ制限を撤廃
 * 開始・終了パラメタの範囲変更(負の値も許可)
-* ロゴファイルのデータ数を拡張(1byte -> 4byte)
+* ロゴファイルのデータ数を拡張(1byte -> 4byte) (0.11)
+* 06/21: 編集ダイアログで位置(X,Y)も編集できるようにした。(0.12)
 * 
 *********************************************************************/
 
@@ -180,7 +181,7 @@ BOOL func_proc_add_logo(FILTER *fp,FILTER_PROC_INFO *fpip,LOGO_HEADER *lgh,int);
 // FILTER_DLL構造体
 //----------------------------
 char filter_name[] = LOGO_FILTER_NAME;
-char filter_info[] = LOGO_FILTER_NAME" ver 0.11 by MakKi";
+char filter_info[] = LOGO_FILTER_NAME" ver 0.12 by MakKi";
 #define track_N 10
 #if track_N
 TCHAR *track_name[] = { "位置 X", "位置 Y", 

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------
- ���ߐ����S �t�B���^�v���O�C�� ver0.11 by MakKi
+ ���ߐ����S �t�B���^�v���O�C�� ver0.12 by MakKi
 -----------------------------------------------------------------------
 
 �y�@�\�z
@@ -74,7 +74,7 @@
  ���X�g�őI������Ă��郍�S�����S�f�[�^�t�@�C��(*.lgd)�Ƃ��ď����o���܂�
 
  �E�ҏW �{�^��
- ���S�̖��̂ƊJ�n��I���FadeIn�FadeOut�̃f�t�H���g�l��ҏW���܂�
+ ���S�̖��̂Ɗ�{�ʒu�A�t�F�[�h�̊J�n��I���FadeIn�FadeOut�̃f�t�H���g�l��ҏW���܂�
 
  �E��,�� �{�^��
  ���X�g�̃��S�̏�����ύX���܂�
@@ -131,6 +131,7 @@
 
 �y�X�V�����z
 
+ 2008/06/21 ver 0.12 �E�ҏW�_�C�A���O�ňʒu(X,Y)���ҏW�ł���悤�ɂ���
  2008/01/07 ver 0.11 �E���S�t�@�C���̍ő�f�[�^���g��
  �E���S�T�C�Y�̐�����P�p
  �E�J�n��I���p�����^�͈̔͂�ύX(���̒l������)

diff --git a/resource.h b/resource.h
@@ -33,6 +33,10 @@
 #define ID_EDIT_SPINED 4207
 #define ID_EDIT_SPINFI 4208
 #define ID_EDIT_SPINFO 4209
+#define ID_EDIT_X 4210
+#define ID_EDIT_Y 4211
+#define ID_EDIT_SPINX 4212
+#define ID_EDIT_SPINY 4213
 
 //////////////////////////////////////////////////////////////////////
 // 文字列表示ダイアログ