提交: 5066ed427345003de51b0f7d77a4ba03ade499d9 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修訂: 5066ed427345003de51b0f7d77a4ba03ade499d9 (tree)
• 時間: 2007-07-25 04:12:36
• 作者: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_56_0_715'.

Change Summary

• modified: InputAssist.pas
• modified: gikoNavi.res
• modified: readme/readme.txt
• modified: res/default/replace.default

差異

--- a/InputAssist.pas
+++ b/InputAssist.pas
@@ -64,8 +64,7 @@ type
 	FSortColumn : Integer;
 	FInsertText : String;
 	procedure AddListViewItem(ResWord : TResistWord);
-    procedure SetCategory(combo: TComboBox; selected: String);
-    function ValidateKey(key, category: String): boolean;
+    procedure SetCategory(combo: TComboBox);
   public
 	{ Public éŒ¾ }
 	procedure SetUpFromEditor();
@@ -144,35 +143,22 @@ procedure TInputAssistForm.AddButtonClick(Sender: TObject);
 var
 	resWord : TResistWord;
 begin
-	if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
+	if (Length(KeyNameEdit.Text) = 0) then begin
+		ShowMessage('ƒL[–¼‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
+	end else begin
 		if (not InputAssistDM.IsDupulicate(
 			KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
 			resWord := InputAssistDM.Add(KeyNameEdit.Text);
 			resWord.SetCategory(CategoryNameComboBox.Text);
 			resWord.SetText(TextMemo.Text);
 			AddListViewItem(resWord);
-            SetCategory(CategoryNameComboBox, resWord.GetCategory);
+            SetCategory(CategoryNameComboBox);
 			GikoListView1.AlphaSort;
 		end else begin
 			ShowMessage('“¯ˆê‚̃L[–¼EƒJƒeƒSƒŠ–¼‚ÅŠù‚É“o˜^Ï‚Ý‚Å‚·B');
 		end;
 	end;
 end;
-//! ƒL[–¼EƒJƒeƒSƒŠ—LŒøƒ`ƒFƒbƒN
-function TInputAssistForm.ValidateKey(key, category: String): boolean;
-begin
-    Result := True;
-    if (Length(key) = 0) then begin
-        ShowMessage('ƒL[–¼‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
-        Result := False;
-    end else begin
-        if (Length(category) = 0) then begin
-            ShowMessage('ƒJƒeƒSƒŠ‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
-            Result := False;
-        end;
-    end;
-end;
-
 //! íœƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
 procedure TInputAssistForm.DeleteButtonClick(Sender: TObject);
 begin
@@ -188,7 +174,9 @@ var
 	resWord : TResistWord;
 begin
 	if GikoListView1.Selected <> nil then begin
-    	if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
+		if (Length(KeyNameEdit.Text) = 0) then begin
+			ShowMessage('ƒL[–¼‚𖳂µ‚É‚Í‚Å‚«‚Ü‚¹‚ñB');
+		end else begin
             if (not InputAssistDM.IsDupulicate(
     			KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
 	    		resWord := TResistWord(GikoListView1.Selected.Data);
@@ -198,7 +186,7 @@ begin
 		    	// ˆê——‚̍XV
 			    GikoListView1.Selected.Caption := resWord.GetKey;
     			GikoListView1.Selected.SubItems[0] := resWord.GetCategory;
-                SetCategory(CategoryNameComboBox, resWord.GetCategory);
+                SetCategory(CategoryNameComboBox);
 		    	GikoListView1.AlphaSort;
     		end else begin
 	    		ShowMessage('“¯ˆê‚̃L[–¼EƒJƒeƒSƒŠ–¼‚ÅŠù‚É“o˜^Ï‚Ý‚Å‚·B');
@@ -309,10 +297,9 @@ begin
 	LockWindowUpdate(0);
 end;
 //! ƒJƒeƒSƒŠƒRƒ“ƒ{ƒ{ƒbƒNƒXÝ’è
-procedure TInputAssistForm.SetCategory(combo: TComboBox; selected: String);
+procedure TInputAssistForm.SetCategory(combo: TComboBox);
 var
 	cat : TStringList;
-    i : Integer;
 begin
 	// ŒŸõ—p
 	cat := TStringList.Create;
@@ -324,11 +311,6 @@ begin
 		combo.Items.AddStrings(cat);
 		combo.ItemIndex := 0;
         combo.Items.EndUpdate;
-        // ‘I‘ðÏ‚݂̃JƒeƒSƒŠ‚ɃCƒ“ƒfƒbƒNƒX‚ð•ÏX
-        i := combo.Items.IndexOf(selected);
-        if (i <> -1) then begin
-            combo.ItemIndex := i;
-        end;
 	finally
 		cat.Free;
 	end;
@@ -344,9 +326,11 @@ begin
 	FInsertText := '';
 	CloseAction.ShortCut := TShortCut(0);
 	// ’ljÁ—pƒL[“ü—ÍOK
-    SetCategory(CategoryNameComboBox, '');
+    SetCategory(CategoryNameComboBox);
 end;
 procedure TInputAssistForm.SetUpFromEditor();
+var
+	cat : TStringList;
 begin
 	Self.Caption := '“ü—̓AƒVƒXƒg';
 	Panel3.Visible := False;
@@ -356,7 +340,7 @@ begin
 	FInsertText := '';
 	CloseAction.ShortCut := ShortCut(VK_ESCAPE, []);
 	// ŒŸõ—p
-    SetCategory(CategoryComboBox, '');
+    SetCategory(CategoryComboBox);
 end;
 function TInputAssistForm.GetInsertText(): String;
 begin

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -108,17 +108,9 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2007/08/05
+2007/XX/YY
   Version ÊÞÀ56
-@ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž
-@•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒƒbƒh’†‚̃Šƒ“ƒN‚ÌURL‚̎擾ƒAƒNƒVƒ‡ƒ“‚ð’ljÁ
-@—š—ðƒŠƒXƒg‚É‚µ‚ÄEnter‚ŃXƒŒƒbƒh‚ð•\Ž¦‚·‚é‚ƃGƒ‰[‚ª•\Ž¦‚³‚ê‚é•s‹ï‡‚̏C³
-@TabŽ©“®•Û‘¶E•œŒ³‚ð—LŒø‚É‚µ‚Ä‚¢‚é‚Æ‚«‚ɁA‹N“®Žž‚Ì•œŒ³‚Å•\Ž¦‚µ‚Ä‚¢‚½ƒ^ƒu‚ðŠJ‚­‚悤‚ɏC³
-@“ü—̓AƒVƒXƒg‚̃JƒeƒSƒŠ‚̍€–Ú‚ðComboBox‰»
-@Ú×Ý’è‚Å100ƒŒƒX•\Ž¦‚̐擪•\Ž¦ƒŒƒX”‚ª–ˆ‰ñ1‚Æ•\Ž¦‚³‚ê‚é•s‹ï‡‚̏C³
-@ƒXƒNƒŠƒvƒgŒë”½‰ž‘΍ô‹@”\‚̃fƒtƒHƒ‹ƒgƒtƒ@ƒCƒ‹(replace.default)‚̍XV
-  (ƒAƒbƒvƒf[ƒg‚̏ꍇAŽè“®‚ōXV‚·‚é•K—v‚ª‚ ‚è‚Ü‚·)
-@ƒCƒ“ƒXƒg[ƒ‰‚ðInno Setup(http://www.jrsoftware.org/)‚ōì‚è’¼‚µ‚½
+  ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž
 
 2007/04/01
   Version ÊÞÀ55

--- a/res/default/replace.default
+++ b/res/default/replace.default
@@ -4,5 +4,4 @@ body onload=window\(\)
 GetSpecialFolder\(
 CodeModule\.Lines
 ms-its:mhtml:
-!exec*:*:
-$mircexe	 mircexe
\ No newline at end of file
+!exec*:*:
\ No newline at end of file