From 66df1356e8534e33800ac52f6cec8d901c720bbf Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Sat, 7 Mar 2015 18:11:31 +0000 Subject: [PATCH] C-- programm: small fix git-svn-id: svn://kolibrios.org@5506 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/appearance/appearance.c | 2 +- programs/cmm/dicty/dicty.c | 2 +- programs/cmm/downloader/Downloader.c | 2 +- programs/cmm/eolite/Eolite.c | 6 +++--- programs/cmm/liza/liza.c | 2 +- programs/cmm/panels_cfg/panels_cfg.c | 24 ++++++++++++++---------- programs/cmm/tmpdisk/t_gui.c | 2 +- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index c0397055da..dd449e8501 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -165,7 +165,7 @@ void main() mem_Init(); SetEventMask(0x27); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("'Fatal Error: library doesn't exists /rd/1/lib/box_obj' -E"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("'Fatal Error: library doesn't exists /rd/1/lib/box_lib.obj' -E"); list[SKINS].current = list[WALLPAPERS].current = -1; list[SKINS].first = list[WALLPAPERS].first = 0; TabClick(WALLPAPERS); diff --git a/programs/cmm/dicty/dicty.c b/programs/cmm/dicty/dicty.c index cc0ab929e6..685ff0075f 100644 --- a/programs/cmm/dicty/dicty.c +++ b/programs/cmm/dicty/dicty.c @@ -35,7 +35,7 @@ void main() { int id, key; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/boxobj"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/box_lib.obj"); dict_folder = abspath(DICT_DIRECROTY); OpenDictionary(0); diff --git a/programs/cmm/downloader/Downloader.c b/programs/cmm/downloader/Downloader.c index fd95c50941..83fb470516 100644 --- a/programs/cmm/downloader/Downloader.c +++ b/programs/cmm/downloader/Downloader.c @@ -49,7 +49,7 @@ void main() char notify_message[4296]; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_obj"); ExitProcess();} + if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_lib.obj"); ExitProcess();} if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify("Error: library doesn't exists - http"); if (!URL) strcpy(#URL, "http://builds.kolibrios.org/eng/latest-iso.7z"); diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 38dc25db80..220f5a42c3 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -38,7 +38,7 @@ ?define WAIT_DELETING_FOLDER "Удаляется папка. Подожите..." ?define NOT_CREATE_FOLDER "Не удалось создать папку." ?define NOT_CREATE_FILE "Не удалось создать файл." - ?define ERROR_1 "Ошибка при загрузке библиотеки /rd/1/lib/box_obj" + ?define ERROR_1 "Ошибка при загрузке библиотеки /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW "Копирую..." ?define T_PASTE_WINDOW_TEXT "Копируется файл:" ?define T_CANCEL_PASTE "Копирование прекращено. Папка скопирована не полностью." @@ -56,7 +56,7 @@ ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define NOT_CREATE_FOLDER "Kataloogi ei saa luua." ?define NOT_CREATE_FILE "Faili ei saa luua." - ?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_obj" + ?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW "Kopeerin..." ?define T_PASTE_WINDOW_TEXT "Kopeerin faili:" ?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely." @@ -74,7 +74,7 @@ ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define NOT_CREATE_FOLDER "Folder can not be created." ?define NOT_CREATE_FILE "File can not be created." - ?define ERROR_1 "Error while loading library /rd/1/lib/box_obj" + ?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW "Copying..." ?define T_PASTE_WINDOW_TEXT "Copying file:" ?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely." diff --git a/programs/cmm/liza/liza.c b/programs/cmm/liza/liza.c index 535eccb92e..82d369b402 100644 --- a/programs/cmm/liza/liza.c +++ b/programs/cmm/liza/liza.c @@ -102,7 +102,7 @@ char version[]=" WebView 0.1"; void main() { mem_Init(); CursorPointer.Load(#CursorFile); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library - box_obj"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library - box_lib.obj"); if (load_dll2(network_lib, #network_lib_init,0)!=0) notify("Error while loading library - network.obj"); if (load_dll2(netcode_lib, #base64_encode,0)!=0) notify("Error while loading library - netcode.obj"); if (load_dll2(iconv_lib, #iconv_open,0)!=0) { notify("Error while loading library - iconv.obj"); use_iconv=2; } diff --git a/programs/cmm/panels_cfg/panels_cfg.c b/programs/cmm/panels_cfg/panels_cfg.c index aceeafe9e2..3c5d844c1a 100644 --- a/programs/cmm/panels_cfg/panels_cfg.c +++ b/programs/cmm/panels_cfg/panels_cfg.c @@ -16,9 +16,10 @@ #include "..\lib\patterns\libimg_load_skin.h" -#define WINDOW_TITLE "Taskbar and Docky configuration" - #ifdef LANG_RUS + ?define WINDOW_TITLE "Настройки панели задач и Дока" + ?define TASK_FRAME_T " Панель задач " + ?define DOCK_FRAME_T " Док " ?define MIN_LEFT_BUTTON "Кнопка скрытия слева" ?define MIN_RIGHT_BUTTON "Кнопка скрытия справа" ?define SOFTEN_UP "Сглаживание сверху" @@ -33,9 +34,12 @@ ?define FSIZE "Режим панели" ?define ASHOW "Не скрывать" ?define CHANGE_POS "Нажмите на изображение для смены позиции" - ?define ERROR_1 "Ошибка при загрузке библиотеки /rd/1/lib/box_lib.obj" - ?define ERROR_2 "Ошибка при загрузке библиотеки /rd/1/lib/libini.obj" + ?define BOX_LIB_LOAD_ERR "Ошибка при загрузке библиотеки /rd/1/lib/box_lib.obj" + ?define LIBINI_LOAD_ERR "Ошибка при загрузке библиотеки /rd/1/lib/libini.obj" #else + ?define WINDOW_TITLE "Taskbar and Docky configuration" + ?define TASK_FRAME_T " Taskbar " + ?define DOCK_FRAME_T " Docky " ?define MIN_LEFT_BUTTON "Min Left Button" ?define MIN_RIGHT_BUTTON "Min Right Button" ?define SOFTEN_UP "Soften Up" @@ -50,13 +54,13 @@ ?define FSIZE "Full width" ?define ASHOW "Always show" ?define CHANGE_POS "Click on image to change position" - ?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj" - ?define ERROR_2 "Error while loading library /rd/1/lib/libini.obj" + ?define BOX_LIB_LOAD_ERR "Error while loading library /rd/1/lib/box_lib.obj" + ?define LIBINI_LOAD_ERR "Error while loading library /rd/1/lib/libini.obj" #endif -frame taskbar_frame = { 0, 000, 10, 188, 14, 0x000111, 0xFFFfff, 1, " Taskbar ", 0, 0, 6, 0x000111, 0xCCCccc }; -frame docky_frame = { 0, 000, 10, 73, 217, 0x000111, 0xFFFfff, 1, " Docky ", 0, 0, 6, 0x000111, 0xCCCccc }; +frame taskbar_frame = { 0, 000, 10, 188, 14, 0x000111, 0xFFFfff, 1, TASK_FRAME_T, 0, 0, 6, 0x000111, 0xCCCccc }; +frame docky_frame = { 0, 000, 10, 73, 217, 0x000111, 0xFFFfff, 1, DOCK_FRAME_T, 0, 0, 6, 0x000111, 0xCCCccc }; char taskbar_ini_path[] = "/sys/settings/taskbar.ini"; char taskbar_c_flags[] = "Flags"; @@ -92,8 +96,8 @@ void main() dword id, key; mem_Init(); - if (load_dll2(libini, #lib_init,1)!=0) notify(ERROR_2); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(ERROR_1); + if (load_dll2(libini, #lib_init,1)!=0) notify(LIBINI_LOAD_ERR); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); LoadCfg(); diff --git a/programs/cmm/tmpdisk/t_gui.c b/programs/cmm/tmpdisk/t_gui.c index d846059cbe..bbb6715e1d 100644 --- a/programs/cmm/tmpdisk/t_gui.c +++ b/programs/cmm/tmpdisk/t_gui.c @@ -62,7 +62,7 @@ void Main_Window() int i, x; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Eror: library doesn't exists - boxlib"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Eror: library doesn't exists - box_lib"); GetSizeDisk(); edit_disk_size.left = strlen(INTRO_TEXT_4)*6 + 10; SetEventMask(0x27);