From 33fb425969fdab403eac75ae6ff6b414fd338853 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 30 Oct 2016 22:47:57 +0000
Subject: [PATCH] Dicty 2.2: bigger font, no speaker Clipview 1.02: better show
 content

git-svn-id: svn://kolibrios.org@6638 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/clipview/clipview   | Bin 9471 -> 0 bytes
 programs/cmm/clipview/clipview.c |  24 +++++---
 programs/cmm/dicty/dicty.c       |  92 +++++++------------------------
 programs/cmm/dicty/speaker.ico   | Bin 7798 -> 0 bytes
 programs/cmm/dicty/speaker.raw   |   1 -
 programs/cmm/lib/gui.h           |   3 -
 6 files changed, 38 insertions(+), 82 deletions(-)
 delete mode 100644 programs/cmm/clipview/clipview
 delete mode 100644 programs/cmm/dicty/speaker.ico
 delete mode 100644 programs/cmm/dicty/speaker.raw

diff --git a/programs/cmm/clipview/clipview b/programs/cmm/clipview/clipview
deleted file mode 100644
index 7c4a771639f741e95853c649d6d7cf1fcb20f1f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9471
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

diff --git a/programs/cmm/clipview/clipview.c b/programs/cmm/clipview/clipview.c
index a661e187a8..77144c516b 100644
--- a/programs/cmm/clipview/clipview.c
+++ b/programs/cmm/clipview/clipview.c
@@ -17,7 +17,7 @@
 //                                                   //
 //===================================================//
 
-?define WINDOW_HEADER "Clipboard Viewer v1.01"
+?define WINDOW_HEADER "Clipboard Viewer v1.02"
 ?define T_DELETE_LAST_SLOT "Delete last slot"
 ?define T_DELETE_ALL_SLOTS "Delete all slots"
 ?define T_RESET_BUFFER_LOCK "Reset the lock buffer"
@@ -149,18 +149,24 @@ void DrawScroller()
 	scrollbar_v_draw(#scroll1);
 }
 
+replace_char(dword in_str, char from_char, to_char, int length) {
+	int i;
+	for (i=0; i<length; i++) {
+		if (ESBYTE[in_str+i] == from_char) ESBYTE[in_str+i] = to_char;
+	}
+	ESBYTE[in_str+length]=0;
+}
 
 void Draw_List()
 {
-	int i, yyy, list_last, slot_data_type_number;
-	dword text_color = 0x000000;
-	char line_text[512];
+	int i, yyy, list_last, slot_data_type_number, length;
+	dword line_text[2048];
 	dword size_kb;
+	dword text_color = 0;
 
 	list.count = clipboard.GetSlotCount();
 	list.CheckDoesValuesOkey();
 
-
 	if (list.count > list.visible) list_last = list.visible; else list_last = list.count;
 
 	for (i=0; i<list.visible; i++;) DeleteButton(list.first + i + 100);
@@ -181,11 +187,15 @@ void Draw_List()
 		DefineButton(list.x+list.w - 95, yyy, 50, list.item_h, 100+i+BT_HIDE, NULL);
 		DefineButton(list.x+list.w - 95 + 51, yyy, 40, list.item_h, 300+i+BT_HIDE, NULL);
 
-		strlcpy(#line_text, clipboard.slot_data.content, list.w-236 - 95/list.font_w-3);
+		length = list.w-236 - 95 / list.font_w - 2;
+		if (clipboard.slot_data.size-8 < length) length = clipboard.slot_data.size-8;
+		memmov(#line_text, clipboard.slot_data.content, length);
+		replace_char(#line_text, 0, 31, length); // 31 is a dot
 		WriteText(list.x+236, yyy+list.text_y, list.font_type, text_color, #line_text);
 	}
 	DrawBar(list.x,i*list.item_h+list.y, list.w, -i*list.item_h+ list.h, 0xFFFfff);
-	if (!list.count) WriteText(-strlen(T_CLIPBOARD_IS_EMPTY)*list.font_w + list.w / 2 + list.x + 1, list.h / 2 - 8 + list.y, list.font_type, 0x999999, T_CLIPBOARD_IS_EMPTY);
+	if (!list.count) WriteText(-strlen(T_CLIPBOARD_IS_EMPTY)*list.font_w + list.w / 2 + list.x + 1, 
+		list.h / 2 - 8 + list.y, list.font_type, 0x999999, T_CLIPBOARD_IS_EMPTY);
 	DrawScroller();
 }
 
diff --git a/programs/cmm/dicty/dicty.c b/programs/cmm/dicty/dicty.c
index 7fbfe0d978..52d2e9a27b 100644
--- a/programs/cmm/dicty/dicty.c
+++ b/programs/cmm/dicty/dicty.c
@@ -8,35 +8,33 @@
 #include "..\lib\gui.h"
 #include "..\lib\obj\box_lib.h"
 
-unsigned char speaker[23*40*3]= FROM "speaker.raw";
-
 #ifdef LANG_RUS
-  #define WINDOW_TITLE "足ｮ｢�爲ｪ 2.0"
+  #define WINDOW_TITLE "足ｮ｢�爲ｪ 2.2"
   #define DICTIONARY_NOT_FOUND "足ｮ｢�瑟 ｭ･ ｭ�ｩ､･ｭ"
   #define DICTIONARY_LOADED "足ｮ｢�瑟 ｧ�｣璢ｦ･ｭ"
   #define WORD_NOT_FOUND "足ｮ｢ｮ ｭ･ ｭ�ｩ､･ｭｮ ｢ 皚ｮ｢�爭"
-  #define ERROR "手ｨ｡ｪ� #"
+  #define ERROR "手ｨ｡ｪ� #%d"
 #else
-  #define WINDOW_TITLE "Dictionary v2.0"
+  #define WINDOW_TITLE "Dictionary v2.2"
   #define DICTIONARY_NOT_FOUND "Dictionary not found"
   #define DICTIONARY_LOADED "Dictionary loaded"
   #define WORD_NOT_FOUND "Word isn't found in the dictionary"
-  #define ERROR "Error #"
+  #define ERROR "Error #%d"
   #endif
 
 proc_info Form;
 char edword[256], search_word[256], translate_result[4096];
-#define PRONOUNCED_FILE "/sys/pronounced.txt"
-#define SPEECH_PATH "/kolibrios/media/speech/speech"
 #define TOPH 44
 
 #define TEXT_ENG_RUS "ENG\26RUS"
 #define TEXT_RUS_ENG "RUS\26ENG"
+#define TEXT_VOCABULARIES "ENG     RUS"
 #define ENG_RUS 0
 #define RUS_ENG 1
+#define BUTTON_CHANGE_LANGUAGE 10
 int active_dict=2;
 
-int mouse_dd, speaker_id;
+int mouse_dd;
 edit_box edit1= {200,16,16,0xffffff,0x94AECE,0xffffff,0x94AECE,0,248,#edword,#mouse_dd,100000000000010b};
 
 
@@ -62,23 +60,10 @@ void main()
 
 		case evButton:
             id=GetButtonID();               
-            if (id==01) { KillProcess(speaker_id); ExitProcess(); }
-			if (id==10) { OpenDictionary(ENG_RUS); DrawLangButtons(); }
-			if (id==11) { OpenDictionary(RUS_ENG); DrawLangButtons(); }
-			if (id==15)
-			{
-				if (GetProcessSlot(speaker_id)!=0))
-				{
-					KillProcess(speaker_id);
-					pause(50);
-				}
-				else
-				{
-					if (WriteFile(strlen(#translate_result)+1, #translate_result, PRONOUNCED_FILE)!=0) break;
-					pause(50);
-					speaker_id = RunProgram(SPEECH_PATH, PRONOUNCED_FILE);
-				}
-				SpeakerDraw();
+            if (id==01) ExitProcess();
+			if (id==BUTTON_CHANGE_LANGUAGE) { 
+				if (active_dict == ENG_RUS) OpenDictionary(RUS_ENG); else OpenDictionary(ENG_RUS);
+				DrawLangButtons();
 			}
 			break;
 
@@ -91,7 +76,7 @@ void main()
 			
          case evReDraw:
 			system.color.get();
-			DefineAndDrawWindow(215,120,400,250,0x73,system.color.work,WINDOW_TITLE);
+			DefineAndDrawWindow(215,120,500,350,0x73,system.color.work,WINDOW_TITLE);
 			GetProcessInfo(#Form, SelfInfo);
 			if (Form.status_window>2) break;
 			if (Form.height<140) { MoveSize(OLD,OLD,OLD,140); break; }
@@ -102,6 +87,7 @@ void main()
 			edit_box_draw stdcall(#edit1);
 			DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 19, 2, 0xffffff);
 			DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 20, system.color.work_graph);
+			WriteText(Form.width-120, edit1.top, 0x90, system.color.work_text, TEXT_VOCABULARIES);
 			DrawTranslation();
 			DrawLangButtons();
       }
@@ -111,34 +97,16 @@ void main()
 
 void DrawLangButtons()
 {
-	DrawCaptButton(Form.width-130, edit1.top-3, 50,19, 10, system.color.work_button, system.color.work_button_text, TEXT_ENG_RUS);
-	DrawCaptButton(Form.width-70, edit1.top-3, 50,19, 11, system.color.work_button, system.color.work_button_text, TEXT_RUS_ENG);
-	PutShadow(-active_dict*60 + Form.width-70, edit1.top-3, 50,19, 1, 2);
-	SpeakerDraw();
-}
-
-void SpeakerDraw()
-{
-	dword x, y;
-	x = Form.cwidth-38;
-	y = Form.cheight-32;
-	if (active_dict)
-	{
-		DeleteButton(15);
-		DrawBar(x,y,23,20,0xFFFFFF);
-	}
-	else
-	{
-		DefineButton(x-5, y-5, 23+10, 20+9, 15+BT_HIDE+BT_NOFRAME, 0);
-		if (GetProcessSlot(speaker_id)==0)) _PutImage(x, y, 23,20, #speaker); else _PutImage(x, y, 23,20, 23*20*3+#speaker);		
-	}
+	dword direction;
+	DefineButton(Form.width-88, edit1.top-4, 20, 20, BUTTON_CHANGE_LANGUAGE, system.color.work_button);
+	if (active_dict == ENG_RUS) direction = "\26"; else direction = "\27";
+	WriteText(Form.width-82, edit1.top-1, 10000001b, system.color.work_button_text, direction);
 }
 
 void Translate()
 {
 	dword translation_start, translation_end;
 
-	KillProcess(speaker_id);
 	sprintf(#search_word, "\10%s\13", #edword);
 	strupr(#search_word);
 
@@ -165,7 +133,6 @@ void OpenDictionary(dword dict_id)
 {
 	dword res;
 	if (dict_id==active_dict) return;
-	KillProcess(speaker_id);
 	active_dict = dict_id;
 	if (io.buffer_data) free(io.buffer_data);
 	if (active_dict==ENG_RUS) res=io.read("dictionaries/eng - rus.dict");
@@ -187,33 +154,16 @@ void OpenDictionary(dword dict_id)
 
 void DrawTranslation()
 {
-	int text_break=0;
-	char tt[4096]='';
-	
 	int y_pos=TOPH+1;
 	char draw_buf[4096];
-	strcpy(#draw_buf, #translate_result);
+	strlcpy(#draw_buf, #translate_result, sizeof(draw_buf));
 	
 	DrawBar(0, y_pos, Form.width-9, Form.cheight - y_pos, 0xFFFFFF);
 	strttl(#draw_buf);
 	WriteTextB(10+1, y_pos+8, 10000001b, 0x800080, #search_word);
-	while (draw_buf)
-	{
-		text_break= Form.width/6-6;
-		if (text_break>strlen(#draw_buf))
-		{
-			WriteText(10, y_pos+31, 0x80, 0, #draw_buf);
-			break;
-		}
-		while (draw_buf[text_break]<>' ') && (text_break>0) text_break--;
-		strcpy(#tt, #draw_buf+text_break+1);
-		draw_buf[text_break]=0x0;
-		WriteText(10, y_pos+31, 0x80, 0, #draw_buf);
-		strcpy(#draw_buf, #tt);
-		y_pos+=12;
-		if (y_pos+24+8>Form.cheight) break;
-	}
-	SpeakerDraw();
+
+	DrawTextViewArea(10, y_pos+31, Form.cwidth-20, Form.cheight-30, 15, 
+		#draw_buf, -1, 0x000000);
 }
 
 
diff --git a/programs/cmm/dicty/speaker.ico b/programs/cmm/dicty/speaker.ico
deleted file mode 100644
index 23415bdbf05575fe1d1b425969243ef4a694d7c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7798
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
Y>oP5cjO^E%kL`!jHZqpX=mF0E0bOV|AOHXW

diff --git a/programs/cmm/dicty/speaker.raw b/programs/cmm/dicty/speaker.raw
deleted file mode 100644
index b5ff4e707d..0000000000
--- a/programs/cmm/dicty/speaker.raw
+++ /dev/null
@@ -1 +0,0 @@
-������������������������������������������������������鳧頸�����������������������������������������������������������������ﾇﾄﾅﾇﾅﾇ������������������������������������俣疋;Aﾕﾒﾔ������������������ﾈﾇﾇﾇﾄﾇﾟﾞﾟ���������������������������鳬駑gkC;AC;Aﾅﾃﾄ������ﾍﾊﾍ���������ﾞﾛﾞﾇﾅﾇﾉﾇﾉ������������������������ﾈﾆﾈSJPE<BE<BE<Bﾅﾃﾅ���玻ﾟﾈﾅﾇﾌﾉﾌ���������ﾈﾆﾈﾈﾅﾇ矜�������������������摎廨?EF>DF>DF>DF>Dﾅﾃﾅ������ﾈﾅﾇﾈﾅﾇ裙�������ﾜﾜﾜﾈﾅﾇﾌﾋﾌ���聰皺ｬｭﾌﾊﾊ���壕稀?EH?EH?EH?EH?EH?Eﾆﾅﾆ������ﾙﾖﾙﾈﾇﾈﾍﾋﾋ���������ﾈﾇﾈﾈﾇﾈ���恫唔AG{ty���gafIAGIAGIAGIAGIAGIAGﾆﾄﾅ���������ﾊﾇﾈﾊﾇﾈ���������ﾊﾇﾈﾊﾇﾈ����装KBH�{����c\aKBHKBHKBHKBHKBHKBHﾈﾅﾆ���������ﾊﾇﾈﾊﾇﾈ���������ﾊﾇﾈﾊﾇﾈ���綜銑DJ�ョ���_X^LDJLDJLDJLDJLDJLDJﾈﾅﾆ���������ﾌﾊﾌﾊﾇﾊ趺�������ﾏﾎﾏﾊﾇﾊ葢苺嵩NEK�≦���bZ_NEKNEKNEKNEKNEKNEKﾈﾅﾈ���������ﾎﾌﾌﾊﾈﾊ趺�������ﾑﾎﾏﾊﾈﾊ蒿茆繭OFLポ����hafOFLOFLOFLOFLOFLOFLﾉﾅﾈ���������ﾌﾈﾊﾌﾈﾊ���������ﾌﾈﾊﾌﾈﾊ���･�｣QHN＋~���pinQHNQHNQHNQHNQHNQHNﾊﾆﾈ���������ﾌﾈﾊﾌﾈﾊ���������ﾌﾈﾊﾌﾈﾊ������裘蓴�����ｹｵｷTKQRIORIORIORIORIOﾊﾆﾉ������ﾜﾙﾛﾌﾊﾌﾐﾍﾎ���������ﾌﾊﾌﾌﾊﾌ������������������ﾓﾐﾒd\aSKQSKQSKQSKQﾊﾈﾉ������ﾍﾊﾌﾍﾊﾌ鉞�������ﾟﾝﾟﾍﾊﾌﾑﾏﾏ�������������������������y}ULRULRULRﾊﾈﾊ���矚ﾟﾍﾊﾌﾑﾏﾑ���������ﾍﾋﾍﾍﾊﾌ蒹����������������������������ｩ｣ｦWOUVNTﾋﾈﾋ���韆醢ﾋﾍ���������矜睿ﾊﾍﾎﾌﾎ���������������������������������ﾒﾎﾐ������������������������ﾐﾌﾎﾍﾌﾍ聶�������������������������������������������������������������ﾏﾌﾍﾎﾍﾍ���������������������������������������������������������������韆踈�����������������������������������������������������������������ｰｬｮﾔﾑﾓ������������������������������������������������������������ﾕﾓﾕ@8>D=C������������������������������������俣疋;Aﾕﾒﾔ������������������G>DB9?棟����������������������������鳬駑gkC;AC;Aﾅﾃﾄ���ｸｵｸTLRｽｻｼ������初垢;AJBH������������������������ﾈﾆﾈRJPD<BD<BD<Bﾅﾃﾅ���舞疋<BSLQ������韈鍜@ED<B囎�������������������摎廨?EF>DF>DF>DF>Dﾅﾃﾅ���ﾙﾖﾗF>DF>Dｦ｢･������延宇>DVNT���矜皹ｬｭﾌﾊﾊ���壕季?EG?EG?EG?EG?EG?Eﾆﾅﾆ�������y~G?ESLQ������ﾀｾﾀG?EG?E���恬僮@F{sx���g_dI@FI@FI@FI@FI@FI@Fﾆﾄﾅ������ﾌﾊﾌI@FI@F聰����ﾝﾚﾜI@FI@Fﾘﾖﾖ桝弼BH�{����c\aJBHJBHJBHJBHJBHJBHﾆﾅﾆ��������鵯BHJBHﾆﾂﾅ������KCIJBHｼｹｼ糟銑CI�≦���_W]LCILCILCILCILCILCIﾈﾅﾆ���������ULRLCIｪ､ｨ������`X]LCI｢泯武溺EK�≦���bZ_MEKMEKMEKMEKMEKMEKﾈﾅﾈ���������VNTMEKｪ･ｩ������bZ_MEK｣�｢尠唹FLポ����hafOFLOFLOFLOFLOFLOFLﾉﾅﾈ���������OFLOFLﾇﾅﾆ������PGMOFLｿｼｾ､�｣PHN�{~���oinPHNPHNPHNPHNPHNPHNﾊﾆﾈ������ﾎﾌﾎPHNPHN蒹����ﾝﾝﾝPHNPHNﾚﾘﾘ���裘蓴�����ｹｵｷTKQRIORIORIORIORIOﾊﾆﾉ�������≦RIO]U[������ﾃﾀﾂRIORIO������������������ﾓﾏﾒd[`SJPSJPSJPSJPﾊﾆﾉ���ﾝﾛﾜSJPSJPｬｦｪ������注心JPbY_�������������������������y}ULRULRULRﾊﾈﾊ���撫廼LRbZ_��������鷙OUULR｢擇���������������������������ｩ｣ｦWNTVMSﾋﾈﾋ���ｭｩｬZQWｾｺｼ������摎啖MS\SY���������������������������������ﾐﾎﾐо����������������������\TZWOU撕����������������������������������������������������������ﾋﾉﾊYPV]TZ���������������������������������������������������������������ｭｧｫﾍﾊﾌ���������
\ No newline at end of file
diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h
index 63e6a50318..32f989bdc9 100644
--- a/programs/cmm/lib/gui.h
+++ b/programs/cmm/lib/gui.h
@@ -291,9 +291,6 @@ TODO: scroll
 	buf_end = strlen(buf_start) + buf_start;
 	label_length_max  = w / 8; // 8 big font char width
 
-	//DrawRectangle(x-2, y-2, w+4, h+4, system.color.work_graph);
-	//DrawRectangle3D(x-1, y-1, w+2, h+2, 0xDDDddd, 0xffffff);
-
 	loop() 
 	{
 		if (bg_col!=-1) DrawBar(x, y, w+1, line_h, bg_col);