diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 393e8b130..5219601c4 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -484,7 +484,6 @@ tup.append_table(img_files, { {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"}, {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"}, - {"DEVELOP/EXAMPLES/USE_MB", VAR_PROGS .. "/demos/use_mb/use_mb"}, {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"}, {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"}, {"LOD", VAR_PROGS .. "/fs/lod/lod"}, @@ -636,7 +635,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, { {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"}, {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, }) else tup.append_table(img_files, { - {"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, + {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, }) end if build_type == "ru_RU" then tup.append_table(extra_files, { @@ -673,7 +672,6 @@ tup.append_table(img_files, { {"DEVELOP/PIPET", VAR_PROGS .. "/cmm/misc/pipet.com"}, {"File Managers/EOLITE", VAR_PROGS .. "/cmm/eolite/Eolite.com"}, {"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"}, - {"KF_VIEW", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"}, {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/clicks.com"}, {"GAMES/MBLOCKS", VAR_PROGS .. "/cmm/misc/mblocks.com"}, @@ -696,6 +694,7 @@ tup.append_table(extra_files, { {"kolibrios/utils/notes", VAR_PROGS .. "/cmm/notes/notes.com"}, {"kolibrios/utils/osupdate", VAR_PROGS .. "/cmm/misc/osupdate.com"}, {"kolibrios/utils/quark", VAR_PROGS .. "/cmm/quark/quark.com"}, + {"kolibrios/utils/kf_view", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, }) end -- tup.getconfig('NO_CMM') ~= 'full' diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index d3050e06c..9308faeb9 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -79,7 +79,7 @@ next=$TextEditor [Assoc] /=/sys/file managers/eolite -kf=/sys/KF_VIEW +kf=/kolibrios/utils/kf_view txt=$CodeEdit log=$CodeEdit diff --git a/data/en_US/docs/Hot_Keys.txt b/data/en_US/docs/Hot_Keys.txt index 618fb62ad..0b798a2d3 100644 --- a/data/en_US/docs/Hot_Keys.txt +++ b/data/en_US/docs/Hot_Keys.txt @@ -1,14 +1,16 @@ The following "hot" shortcut keys are used in the system: (Indexing on time of appearance in the system) 1) Ctrl + Alt + Del start of the application CPU (the manager of processes), is a sole combination maintained on a level of a kernel, all rest "hot" key is realized at the expense of the application @TASKBAR. -2) Ctrl + Shift - switching of keyboard layout. -3) Win - start of the application MENU. -4) Alt + Ctrl + F12 - start of the application END. -5) Alt + F4 - terminate the active application. -6) Alt + Tab - switch to the next (in the window stack) window -7) Alt + Shift + Tab - switch to the previous (in the window stack) window +2) Ctrl + Shift - switching of keyboard layout +3) Win - start of the application MENU +4) Alt + Ctrl + F12 - start of the application END +5) Alt + F4 - terminate the active application +6) Alt + Tab - switch to the next window +7) Alt + Shift + Tab - switch to the previous window 8) Alt + Shift + NumLock - start of the application MOUSEMUL, which emulates mouse with numpad, when NumLock is on. 9) Alt + 1...7 - fast switching to the selected keyboard layout (even if absent for Ctrl + Shift) -10) Win + D - minimize/restore all windows (cleaning of desktop) +10) Win + D - minimize/restore all windows 11) Win + R - start of the application RUN -12) Ctrl + PrintScreen - start of the application SCRSHOOT. Just do a screen shot and the user is offered to specify (with OpenDialog) where to save the BMP image. +12) Ctrl + PrintScreen - start of the application SCRSHOOT +13) Ctrl + Alt + Left / Right - change sound volume + Ctrl + Alt + Up / Down - mute and unmute sound diff --git a/data/es_ES/docs/Hot_Keys.txt b/data/es_ES/docs/Hot_Keys.txt index 618fb62ad..daba06186 100644 --- a/data/es_ES/docs/Hot_Keys.txt +++ b/data/es_ES/docs/Hot_Keys.txt @@ -1,14 +1,16 @@ The following "hot" shortcut keys are used in the system: (Indexing on time of appearance in the system) 1) Ctrl + Alt + Del start of the application CPU (the manager of processes), is a sole combination maintained on a level of a kernel, all rest "hot" key is realized at the expense of the application @TASKBAR. -2) Ctrl + Shift - switching of keyboard layout. -3) Win - start of the application MENU. -4) Alt + Ctrl + F12 - start of the application END. -5) Alt + F4 - terminate the active application. -6) Alt + Tab - switch to the next (in the window stack) window -7) Alt + Shift + Tab - switch to the previous (in the window stack) window +2) Ctrl + Shift - switching of keyboard layout +3) Win - start of the application MENU +4) Alt + Ctrl + F12 - start of the application END +5) Alt + F4 - terminate the active application +6) Alt + Tab - switch to the next window +7) Alt + Shift + Tab - switch to the previous window 8) Alt + Shift + NumLock - start of the application MOUSEMUL, which emulates mouse with numpad, when NumLock is on. 9) Alt + 1...7 - fast switching to the selected keyboard layout (even if absent for Ctrl + Shift) -10) Win + D - minimize/restore all windows (cleaning of desktop) +10) Win + D - minimize/restore all windows 11) Win + R - start of the application RUN -12) Ctrl + PrintScreen - start of the application SCRSHOOT. Just do a screen shot and the user is offered to specify (with OpenDialog) where to save the BMP image. +12) Ctrl + PrintScreen - start of the application SCRSHOOT +13) Ctrl + Alt + Left / Right - change sound volume + Ctrl + Alt + Up / Down - mute and unmute sound \ No newline at end of file diff --git a/data/ru_RU/docs/Hot_Keys.txt b/data/ru_RU/docs/Hot_Keys.txt index 4136faf6e..b7b8ddd0f 100644 --- a/data/ru_RU/docs/Hot_Keys.txt +++ b/data/ru_RU/docs/Hot_Keys.txt @@ -1,14 +1,16 @@ Следующие "горячие" комбинации клавиш используются в системе: (Нумерация по времени появления в системе) 1) Ctrl + Alt + Del запуск приложения CPU (диспетчер процессов), это единственная комбинация поддержанная на уровне ядра, все остальное реализовано за счет приложения @TASKBAR. -2) Ctrl + Shift - переключение раскладки клавиатуры. -3) Win - запуск приложения MENU. -4) Alt + Ctrl + F12 - запуск приложения END. -5) Alt + F4 - завершение активного приложения. -6) Alt + Tab - переключение на следующее (в оконном стеке) окно -7) Alt + Shift + Tab - переключение на предыдущее (в оконном стеке) окно +2) Ctrl + Shift - переключение раскладки клавиатуры +3) Win - запуск приложения MENU +4) Alt + Ctrl + F12 - запуск приложения END +5) Alt + F4 - завершение активного приложения +6) Alt + Tab - переключение на следующее окно +7) Alt + Shift + Tab - переключение на предыдущее окно 8) Alt + Shift + NumLock - запуск приложения MOUSEMUL, эмулирующего при включённом NumLock мышь клавишами нумпада 9) Alt + 1...7 - быстрое переключение на выбранную раскладку клавиатуры (даже если отсутствует по Ctrl + Shift) -10) Win + D - свернуть/развернуть все окна (очистка рабочего стола) +10) Win + D - свернуть/развернуть все окна 11) Win + R - запуск приложения RUN -12) Ctrl + PrintScreen - запуск приложения SCRSHOOT. Сразу делается снимок экрана и пользователю предлагается указать, с помощью OpenDialog, куда сохранить снимок в формате BMP. +12) Ctrl + PrintScreen - запуск приложения SCRSHOOT +13) Ctrl + Alt + Left / Right - изменить громкость + Ctrl + Alt + Up / Down - выключить/включить звук diff --git a/programs/cmm/barscfg/bars_8b.raw b/programs/cmm/barscfg/bars_8b.raw new file mode 100644 index 000000000..c3ac00bca Binary files /dev/null and b/programs/cmm/barscfg/bars_8b.raw differ diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c index 7033be52d..68f275264 100644 --- a/programs/cmm/barscfg/barscfg.c +++ b/programs/cmm/barscfg/barscfg.c @@ -55,9 +55,15 @@ _ini taskbar_vars_ini = { #taskbar_ini_path, "Variables" }; _ini docky_ini = { "/sys/settings/docky.ini", "@" }; -unsigned char panels_img_data[] = FROM "bars.raw"; #define PIMG_W 37 #define PIMG_H 27 //27*5 +unsigned char panels_img_data[] = FROM "bars_8b.raw"; +dword panels_img_pal[] = { + 0x00405D74,0x0084FC84,0x00FAFAFA,0x0000B400, + 0x00E4E4E4,0x008C9B9C,0x000212FD,0x00D8DEDF, + 0x00585C5D,0x0085B7E0,0x009EC6E7,0x0094C0E5, + 0x00CB8800,0x00CE3D9E,0x00D20404,0x00485966 +}; proc_info Form; @@ -137,7 +143,7 @@ void main() void DrawPanelsImage(dword y, n) { - PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data); + PutPaletteImage(n * PIMG_W * PIMG_H + #panels_img_data, PIMG_W, PIMG_H, 22, y, 8, #panels_img_pal); } void SetDisabledMode()