ace-dent/kolibrios-gitea
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite: fix bug with duplicated definitions

Browse Source 
git-svn-id: svn://kolibrios.org@5457 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-02-24 00:01:08 +00:00
parent 9190814ff0
commit ee427c7da3
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
programs/cmm/eolite/include/properties.h
View File

@ -1,51 +1,51 @@
#ifdef LANG_RUS #ifdef LANG_RUS
?define WINDOW_TITLE_PROPERTIES "<EFBFBD>〓<EFBFBD>癶<EFBFBD>" ?define WINDOW_TITLE_PROPERTIES "<EFBFBD>〓<EFBFBD>癶<EFBFBD>"
?define BTN_CLOSE "<EFBFBD><EFBFBD><EFBFBD>謔<EFBFBD>" ?define BTN_CLOSE "<EFBFBD><EFBFBD><EFBFBD>謔<EFBFBD>"
?define T_NAME "ˆ¬ï:" ?define PR_T_NAME "ˆ¬ï:"
?define T_DEST "<EFBFBD> á¯®«®¦¥­¨¥:" ?define PR_T_DEST "<EFBFBD> á¯®«®¦¥­¨¥:"
?define T_SIZE "<EFBFBD> §¬¥à:" ?define PR_T_SIZE "<EFBFBD> §¬¥à:"
?define SET_3 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" ?define SET_3 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define SET_4 "<EFBFBD><EFBFBD>謔" ?define SET_4 "<EFBFBD><EFBFBD>謔"
?define SET_5 "<EFBFBD>Кキキ" ?define SET_5 "<EFBFBD>Кキキ"
?define SET_6 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: " ?define SET_6 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
?define SET_7 " <20><><EFBFBD><EFBFBD>: " ?define SET_7 " <20><><EFBFBD><EFBFBD>: "
?define T_CONTAINS "‘®¤¥à¦¨â: " ?define PR_T_CONTAINS "‘®¤¥à¦¨â: "
?define FLAGS " <20>矜爬＜硅 " ?define FLAGS " <20>矜爬＜硅 "
?define T_HIDDEN "‘ªàëâë©" ?define PR_T_HIDDEN "‘ªàëâë©"
?define T_SYSTEM "‘¨á⥬­ë©" ?define PR_T_SYSTEM "‘¨á⥬­ë©"
?define T_ONLY_READ "’®«ìª® ç⥭¨¥" ?define PR_T_ONLY_READ "’®«ìª® ç⥭¨¥"
#elif LANG_EST #elif LANG_EST
?define WINDOW_TITLE_PROPERTIES "<EFBFBD>〓<EFBFBD>癶<EFBFBD>" ?define WINDOW_TITLE_PROPERTIES "<EFBFBD>〓<EFBFBD>癶<EFBFBD>"
?define BTN_CLOSE "<EFBFBD><EFBFBD><EFBFBD>謔<EFBFBD>" ?define BTN_CLOSE "<EFBFBD><EFBFBD><EFBFBD>謔<EFBFBD>"
?define T_NAME "ˆ¬ï:" ?define PR_T_NAME "ˆ¬ï:"
?define T_DEST "<EFBFBD> á¯®«®¦¥­¨¥:" ?define PR_T_DEST "<EFBFBD> á¯®«®¦¥­¨¥:"
?define T_SIZE "<EFBFBD> §¬¥à:" ?define PR_T_SIZE "<EFBFBD> §¬¥à:"
?define SET_3 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" ?define SET_3 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define SET_4 "<EFBFBD><EFBFBD>謔" ?define SET_4 "<EFBFBD><EFBFBD>謔"
?define SET_5 "<EFBFBD>Кキキ" ?define SET_5 "<EFBFBD>Кキキ"
?define SET_6 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: " ?define SET_6 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
?define SET_7 " <20><><EFBFBD><EFBFBD>: " ?define SET_7 " <20><><EFBFBD><EFBFBD>: "
?define T_CONTAINS "‘®¤¥à¦¨â: " ?define PR_T_CONTAINS "‘®¤¥à¦¨â: "
?define FLAGS " <20>矜爬＜硅 " ?define FLAGS " <20>矜爬＜硅 "
?define T_HIDDEN "‘ªàëâë©" ?define PR_T_HIDDEN "‘ªàëâë©"
?define T_SYSTEM "‘¨á⥬­ë©" ?define PR_T_SYSTEM "‘¨á⥬­ë©"
?define T_ONLY_READ "’®«ìª® ç⥭¨¥" ?define PR_T_ONLY_READ "’®«ìª® ç⥭¨¥"
#else #else
?define WINDOW_TITLE_PROPERTIES "Properties" ?define WINDOW_TITLE_PROPERTIES "Properties"
?define BTN_CLOSE "Close" ?define BTN_CLOSE "Close"
?define T_NAME "Name:" ?define PR_T_NAME "Name:"
?define T_DEST "Destination:" ?define PR_T_DEST "Destination:"
?define T_SIZE "Size:" ?define PR_T_SIZE "Size:"
?define SET_3 "Created" ?define SET_3 "Created"
?define SET_4 "Opened" ?define SET_4 "Opened"
?define SET_5 "Modified" ?define SET_5 "Modified"
?define SET_6 "Files: " ?define SET_6 "Files: "
?define SET_7 " Folders: " ?define SET_7 " Folders: "
?define T_CONTAINS "Contains: " ?define PR_T_CONTAINS "Contains: "
?define FLAGS " Attributes " ?define FLAGS " Attributes "
?define T_HIDDEN "Hidden" ?define PR_T_HIDDEN "Hidden"
?define T_SYSTEM "System" ?define PR_T_SYSTEM "System"
?define T_ONLY_READ "Read-only" ?define PR_T_ONLY_READ "Read-only"
#endif #endif
dword mouse_ddd2; dword mouse_ddd2;
@ -55,9 +55,9 @@ edit_box file_name_ed = {150,50,25,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#f
edit_box path_to_file_ed = {150,100,46,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#path_to_file,#mouse_ddd2, 1000000000000000b,2,2}; edit_box path_to_file_ed = {150,100,46,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#path_to_file,#mouse_ddd2, 1000000000000000b,2,2};
frame flags_frame = { 0, 180, 10, 80, 106, 0x000111, 0xFFFfff, 1, FLAGS, 0, 0, 6, 0x000111, 0xCCCccc }; frame flags_frame = { 0, 180, 10, 80, 106, 0x000111, 0xFFFfff, 1, FLAGS, 0, 0, 6, 0x000111, 0xCCCccc };
checkbox2 HIDDEN_chb = {22*65536+15, 120*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_HIDDEN, CH_FLAG_MIDDLE, 0}; checkbox2 HIDDEN_chb = {22*65536+15, 120*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, PR_T_HIDDEN, CH_FLAG_MIDDLE, 0};
checkbox2 SYSTEM_chb = {22*65536+15, 140*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_SYSTEM, CH_FLAG_MIDDLE, 0}; checkbox2 SYSTEM_chb = {22*65536+15, 140*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, PR_T_SYSTEM, CH_FLAG_MIDDLE, 0};
checkbox2 ONLY_READ_chb = {22*65536+15, 160*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_ONLY_READ, CH_FLAG_MIDDLE, 0}; checkbox2 ONLY_READ_chb = {22*65536+15, 160*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, PR_T_ONLY_READ, CH_FLAG_MIDDLE, 0};
int file_count, dir_count, size_dir; int file_count, dir_count, size_dir;
char folder_info[200]; char folder_info[200];
@ -142,10 +142,10 @@ void properties_dialog()
else else
Put_icon("<DIR>", 18, 20, 0xFFFfff, 0); Put_icon("<DIR>", 18, 20, 0xFFFfff, 0);
WriteText(50, 13, 0x80, 0x000000, T_NAME); WriteText(50, 13, 0x80, 0x000000, PR_T_NAME);
edit_box_draw stdcall (#file_name_ed); edit_box_draw stdcall (#file_name_ed);
WriteText(10, 50, 0x80, 0x000000, T_DEST); WriteText(10, 50, 0x80, 0x000000, PR_T_DEST);
edit_box_draw stdcall (#path_to_file_ed); edit_box_draw stdcall (#path_to_file_ed);
/*WriteText(10, 63, 0x80, 0x000000, SET_3); /*WriteText(10, 63, 0x80, 0x000000, SET_3);
@ -154,14 +154,14 @@ void properties_dialog()
WriteText(10, 78, 0x80, 0x000000, SET_4); WriteText(10, 78, 0x80, 0x000000, SET_4);
WriteText(10, 93, 0x80, 0x000000, SET_5); WriteText(10, 93, 0x80, 0x000000, SET_5);
}*/ }*/
WriteText(10, 65, 0x80, 0x000000, T_SIZE); WriteText(10, 65, 0x80, 0x000000, PR_T_SIZE);
if (!itdir) if (!itdir)
{ {
WriteText(100, 65, 0x80, 0x000000, ConvertSize(file_info.sizelo)); WriteText(100, 65, 0x80, 0x000000, ConvertSize(file_info.sizelo));
} }
else else
{ {
WriteText(10, 80, 0x80, 0x000000, T_CONTAINS); WriteText(10, 80, 0x80, 0x000000, PR_T_CONTAINS);
strcpy(#folder_info, SET_6); strcpy(#folder_info, SET_6);
strcat(#folder_info, itoa(file_count)); strcat(#folder_info, itoa(file_count));
strcat(#folder_info, SET_7); strcat(#folder_info, SET_7);