From c78bc9e5136aeedd712467e0c67588f20528aab5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 24 Dec 2021 20:07:57 +0000 Subject: [PATCH] appearance: - working screensaver tab - add "auto" type of wallpapper set various fixes git-svn-id: svn://kolibrios.org@9465 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/icons16.png | Bin 11935 -> 11929 bytes .../{Gradient Pink.png => Dawn.png} | Bin .../wallpapers/{deink.png => Deink.png} | Bin .../{in_the_wind.png => In the wind.png} | Bin data/common/wallpapers/{sand.png => Sand.png} | Bin ...slands3c.png => T Brick house islands.png} | Bin data/common/wallpapers/T Dashed squares.png | Bin 0 -> 194 bytes .../wallpapers/{home.png => T Home.png} | Bin data/common/wallpapers/T Small dots.png | Bin 0 -> 92 bytes data/common/wallpapers/copyright.txt | 2 +- programs/cmm/appearance/appearance.c | 192 +++++++++++------- programs/cmm/appearance/const.h | 16 +- programs/cmm/lib/gui/checkbox.h | 3 +- programs/system/taskbar/trunk/ctx_menu.asm | 4 +- skins/ConLenov/Guzel_magic/default.dtp.asm | 4 +- 16 files changed, 135 insertions(+), 88 deletions(-) rename data/common/wallpapers/{Gradient Pink.png => Dawn.png} (100%) rename data/common/wallpapers/{deink.png => Deink.png} (100%) rename data/common/wallpapers/{in_the_wind.png => In the wind.png} (100%) rename data/common/wallpapers/{sand.png => Sand.png} (100%) rename data/common/wallpapers/{t__brickhouseislands3c.png => T Brick house islands.png} (100%) create mode 100644 data/common/wallpapers/T Dashed squares.png rename data/common/wallpapers/{home.png => T Home.png} (100%) create mode 100644 data/common/wallpapers/T Small dots.png diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 545bbaf4b6..d627e04c3d 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -17,7 +17,7 @@ img_files = { {"STRUCT.INC", PROGS .. "/struct.inc"}, {"FB2READ", "common/fb2read"}, {"ALLGAMES", "common/allgames"}, - {"HOME.PNG", "common/wallpapers/home.png"}, + {"HOME.PNG", "common/wallpapers/T home.png"}, {"ICONS32.PNG", "common/icons32.png"}, {"ICONS16.PNG", "common/icons16.png"}, {"INDEX.HTM", "common/index_htm"}, diff --git a/data/common/icons16.png b/data/common/icons16.png index 9556a299a5981a1577e9d8640a70452b72609f53..af6a8a803ba1141eafdb8f5ec934c2e048bdd883 100644 GIT binary patch delta 9319 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 literal 0 HcmV?d00001 diff --git a/data/common/wallpapers/home.png b/data/common/wallpapers/T Home.png similarity index 100% rename from data/common/wallpapers/home.png rename to data/common/wallpapers/T Home.png diff --git a/data/common/wallpapers/T Small dots.png b/data/common/wallpapers/T Small dots.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7daea4b9c322ba31176f7866b9221469c0e6ec GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1SHiab7}%9WltB!5RRG20l`xzO%P~MNDDJd pW0Oc|3aHr=!*Oo;`TGqj3?BPftgYM^B?6T*c)I$ztaD0e0svU^7W4oB literal 0 HcmV?d00001 diff --git a/data/common/wallpapers/copyright.txt b/data/common/wallpapers/copyright.txt index b6ebed3fe8..33479aa828 100644 --- a/data/common/wallpapers/copyright.txt +++ b/data/common/wallpapers/copyright.txt @@ -6,7 +6,7 @@ Home Rand and Robyn Miller Based on the game "Cosmic Free Yourself Jonathan Besler https://interfacelift.com/user/86064/jonathan_besler.html Unsplash Alexander Popov https://unsplash.com/@5tep5 KolibriOS Tan Viktorya Sidorova -brickhouseislands3c Mrmo Tarius https://pixeljoint.com/pixelart/85317.htm +Brick house islands Mrmo Tarius https://pixeljoint.com/pixelart/85317.htm =====Icons==== diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 59bf893307..0a677509fd 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -1,7 +1,7 @@ //11.03.12 - start! //ver 2.31 -#define MEMSIZE 200*1024 +#define MEMSIZE 1024*70 #include "../lib/mem.h" #include "../lib/strings.h" #include "../lib/io.h" @@ -34,21 +34,20 @@ enum { char folder_path[4096]; char cur_file_path[4096]; char cur_skin_path[4096]; -int files_mas[400]; +char ss_available[200]; + +int screensaver_timeout; _tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver)-3*8+WIN_W - TAB_PADDING / 2, LP, NULL, BASE_TAB_BUTTON_ID }; checkbox update_docky = { T_UPDATE_DOCK, false }; -checkbox optionbox_stretch = { T_CHECKBOX_STRETCH, true }; +checkbox optionbox_stretch = { T_CHECKBOX_STRETCH, false }; checkbox optionbox_tiled = { T_CHECKBOX_TILED, false }; +checkbox optionbox_auto = { T_CHECKBOX_AUTO, true }; -struct SCREENSAVER_SETTINGS { - int timeout; - char program[60]; - char available[200]; -} ss_settings; +collection list; //===================================================// // // @@ -70,6 +69,8 @@ void main() tabs.add(#t_screensaver, #EventTabScreensaverClick); tabs.draw_active_tab(); + GetScreensaverIniSettings(); + SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER); loop() switch(WaitEvent()) { @@ -80,13 +81,21 @@ void main() case evButton: id=GetButtonID(); if (id==1) EventExit(); - if (id==BTN_SELECT_WALLP_FOLDER) EventSelectWallpFolder(); tabs.click(id); - checkbox1.click(id); - spinbox1.click(id); - if (update_docky.click(id)) EventUpdateDocky(); - if (!optionbox_stretch.checked) && (optionbox_stretch.click(id)) EventSetWallpMode_Stretch(); - if (!optionbox_tiled.checked) && (optionbox_tiled.click(id)) EventSetWallpMode_Tiled(); + if (tabs.active_tab == TAB_SKINS) { + checkbox1.click(id); + spinbox1.click(id); + if (update_docky.click(id)) EventUpdateDocky(); + } + if (tabs.active_tab == TAB_WALLPAPERS) { + if (id==BTN_SELECT_WALLP_FOLDER) EventSelectWallpFolder(); + if (optionbox_stretch.click(id)) EventSetWallpMode(1,0,0); + if (optionbox_tiled.click(id)) EventSetWallpMode(0,1,0); + if (optionbox_auto.click(id)) EventSetWallpMode(0,0,1); + } + if (tabs.active_tab == TAB_SCREENSAVERS) { + if (id==BTN_TEST_SCREENSAVER) EventOpenFile(); + } break; case evKey: @@ -98,14 +107,13 @@ void main() id = tabs.active_tab+1; if(id==3)id=0; tabs.click(id + tabs.base_id); - DrawWindowContent(); break; } if (! edit_cmm.flags & ed_focus) && (! edit_st.flags & ed_focus) for (i=select_list.cur_y+1; iselect_list.visible) select_list.first=select_list.cur_y; + select_list.CheckDoesValuesOkey(); + if (LIST_W) draw_window(); } void Sort_by_Name(int a, b) // for the first call: a = 0, b = sizeof(mas) - 1 @@ -227,21 +251,30 @@ void SelectList_DrawLine(dword i) { int draw_y = i*SELECT_LIST_ITEMH+PANEL_H; int i_abs = select_list.first + i; - char filename[4096]; + char filename_buf[4096]; + char* filename = #filename_buf; - strcpy(#filename, io.dir.position(files_mas[i_abs])); - EAX = math.min(strrchr(#filename,'.')-1, LIST_W - 24 / 8); - filename[EAX] = '\0'; + strcpy(filename, list.get(i_abs)); + EAX = math.min(strrchr(filename,'.')-1, LIST_W - 24 / 8); + filename_buf[EAX] = '\0'; + if (EAX = strrchr(filename,'/')) filename += EAX; + + //save current item for tab change + switch(tabs.active_tab) { + CASE TAB_SKINS: active_skin = select_list.cur_y; BREAK; + CASE TAB_WALLPAPERS: active_wallpaper = select_list.cur_y; BREAK; + CASE TAB_SCREENSAVERS: active_screensaver = select_list.cur_y; + } if (select_list.cur_y == i_abs) { DrawBar(select_list.x, draw_y, LIST_W, SELECT_LIST_ITEMH, sc.button); - WriteText(select_list.x+12,draw_y+select_list.text_y,select_list.font_type,sc.button_text, #filename); + WriteText(select_list.x+12,draw_y+select_list.text_y,select_list.font_type,sc.button_text, filename); } else { DrawBar(select_list.x,draw_y,LIST_W, SELECT_LIST_ITEMH, 0xFFFfff); - WriteText(select_list.x+12,draw_y+select_list.text_y,select_list.font_type,0, #filename); + WriteText(select_list.x+12,draw_y+select_list.text_y,select_list.font_type,0, filename); } } @@ -250,17 +283,6 @@ void SelectList_LineChanged() EventApply(); } -void ActivateTab(int _id) -{ - select_list.ClearList(); - Open_Dir(); - if (!select_list.count) notify(T_NO_FILES); - select_list.cur_y = _id; - if (select_list.cur_y>select_list.visible) select_list.first=select_list.cur_y; - select_list.CheckDoesValuesOkey(); - if (LIST_W) DrawWindowContent(); -} - dword GetRealKolibriosPath() { char real_kolibrios_path[4096]; @@ -269,6 +291,13 @@ dword GetRealKolibriosPath() return #real_kolibrios_path; } +void GetScreensaverIniSettings() +{ + ini.section = "screensaver"; + screensaver_timeout = ini.GetInt("timeout", 10); + ini.GetString("available", #ss_available, sizeof(ss_available), 0); +} + //===================================================// // // // EVENTS // @@ -277,68 +306,69 @@ dword GetRealKolibriosPath() void EventTabSkinsClick() { - active_wallpaper = select_list.cur_y; miniprintf(#folder_path, "%s/res/skins", GetRealKolibriosPath()); - ActivateTab(active_skin); + Open_Dir(); } void EventTabWallpappersClick() { - active_skin = select_list.cur_y; if (opendir_path) { strcpy(#folder_path, #opendir_path); } else { miniprintf(#folder_path, "%s/res/wallpapers", GetRealKolibriosPath()); } - ActivateTab(active_wallpaper); + Open_Dir(); } void EventTabScreensaverClick() { - ini.section = "screensaver"; - ss_settings.timeout = ini.GetInt("timeout", 10); - ini.GetString("title", #ss_settings.program, sizeof(ss_settings.program), 0); - ini.GetString("available", #ss_settings.available, sizeof(ss_settings.available), 0); - ActivateTab(active_screensaver); + dword j; + char ssmas[sizeof(ss_available)]; + list.drop(); + select_list.ClearList(); + + strcpy(#ssmas, #ss_available); + do { + j = strrchr(#ss_available, '|'); + miniprintf(#param, "/sys/%s", #ss_available + j); + list.add(#param); + ESBYTE[#ss_available + j - 1] = '\0'; + select_list.count++; + } while (j); + + if (LIST_W) draw_window(); } void EventDeleteFile() { - io.del(#cur_file_path); + DeleteFile(#cur_file_path); Open_Dir(); EventApply(); } -void EventSetNewCurrent() -{ - miniprintf(#cur_file_path,"%s/",#folder_path); - strcat(#cur_file_path, io.dir.position(files_mas[calc(select_list.cur_y)])); -} - void EventSelectWallpFolder() { OpenDialog_start stdcall (#o_dialog); if (o_dialog.status) EventTabWallpappersClick(); } -void EventSetWallpMode_Stretch() +void EventSetWallpMode(dword _stretch, _titled, _auto) { - optionbox_tiled.checked = false; + optionbox_stretch.checked = _stretch; + optionbox_tiled.checked = _titled; + optionbox_auto.checked = _auto; optionbox_tiled.redraw(); - EventApply(); -} - -void EventSetWallpMode_Tiled() -{ - optionbox_stretch.checked = false; optionbox_stretch.redraw(); + optionbox_auto.redraw(); EventApply(); } void EventApply() { - char kivpath[4096+10]; - EventSetNewCurrent(); + char kivparam[4096+10]; + dword file_name = list.get(select_list.cur_y); + miniprintf(#cur_file_path,"%s/",#folder_path); + strcat(#cur_file_path, list.get(select_list.cur_y)); if (tabs.active_tab==TAB_SKINS) { SetSystemSkin(#cur_file_path); @@ -349,9 +379,18 @@ void EventApply() if (tabs.active_tab==TAB_WALLPAPERS) { SelectList_Draw(); - if (optionbox_stretch.checked) miniprintf(#kivpath, "\\S__%s", #cur_file_path); - if (optionbox_tiled.checked) miniprintf(#kivpath, "\\T__%s", #cur_file_path); - RunProgram("/sys/media/kiv", #kivpath); + miniprintf(#kivparam, "\\S__%s", #cur_file_path); + if (optionbox_tiled.checked) kivparam[1]='T'; + if (optionbox_auto.checked) { + if (ESBYTE[file_name+1] == ' ') && (ESBYTE[file_name] == 'T') { + kivparam[1]='T'; + } + } + RunProgram("/sys/media/kiv", #kivparam); + } + if (tabs.active_tab==TAB_SCREENSAVERS) + { + SelectList_Draw(); } } @@ -368,6 +407,7 @@ void EventOpenFile() { if (tabs.active_tab==TAB_SKINS) RunProgram("/sys/skincfg", #cur_file_path); if (tabs.active_tab==TAB_WALLPAPERS) RunProgram("/sys/media/kiv", #cur_file_path); + if (tabs.active_tab==TAB_SCREENSAVERS) RunProgram(list.get(select_list.cur_y), "@ss"); } void EventExit() diff --git a/programs/cmm/appearance/const.h b/programs/cmm/appearance/const.h index 5c6cf12b8f..b806bf71aa 100644 --- a/programs/cmm/appearance/const.h +++ b/programs/cmm/appearance/const.h @@ -1,27 +1,31 @@ #ifdef LANG_RUS + char t_skins[] = " Стиль окон"; + char t_wallpapers[] = " Обои"; + char t_screensaver[] = " Скринсейвер"; ?define WINDOW_HEADER "Настройки оформления" ?define T_SELECT_FOLDER "Выбрать папку" ?define T_PICTURE_MODE " Положение картинки " ?define T_CHECKBOX_STRETCH "Растянуть" ?define T_CHECKBOX_TILED "Замостить" + ?define T_CHECKBOX_AUTO "Автоматически" ?define T_UPDATE_DOCK "Обновлять Dock-панель" ?define T_NO_FILES "'Поддерживаемые файлы не найдены' -E" ?define T_UI_PREVIEW " Пример компонентов " - char t_skins[] = " Стиль окон"; - char t_wallpapers[] = " Обои"; - char t_screensaver[] = " Скринсейвер"; + ?define T_SCREENSAVER_PREVIEW "Просмотр" #else + char t_skins[] = " Skins"; + char t_wallpapers[] = " Wallpapers"; + char t_screensaver[] = " Screensaver"; ?define WINDOW_HEADER "Appearance" ?define T_SELECT_FOLDER "Select folder" ?define T_PICTURE_MODE " Picture Mode " ?define T_CHECKBOX_STRETCH "Stretch" ?define T_CHECKBOX_TILED "Tiled" + ?define T_CHECKBOX_AUTO "Auto" ?define T_UPDATE_DOCK "Update Dock" ?define T_NO_FILES "'No supported files were found' -E" ?define T_UI_PREVIEW " Components Preview " - char t_skins[] = " Skins"; - char t_wallpapers[] = " Wallpapers"; - char t_screensaver[] = " Screensaver"; + ?define T_SCREENSAVER_PREVIEW "Preview" #endif #define WIN_W 600 diff --git a/programs/cmm/lib/gui/checkbox.h b/programs/cmm/lib/gui/checkbox.h index f29d518229..6454b7d33d 100644 --- a/programs/cmm/lib/gui/checkbox.h +++ b/programs/cmm/lib/gui/checkbox.h @@ -31,7 +31,8 @@ struct checkbox if (!id) id = GetFreeButtonId(); x=_x; y=_y; - DefineButton(x-1, y-1, strlen(text)*8 + SIZE + 17, SIZE+2, id+BT_HIDE+BT_NOFRAME, 0); + DefineHiddenButton(x-1, y-1, strlen(text)*8 + SIZE + 17, SIZE+2, id+BT_NOFRAME); + UnsafeDefineButton(x, y, SIZE, SIZE, id, 0); DrawRectangle(x, y, SIZE, SIZE, sc.work_graph); if (disabled) { diff --git a/programs/system/taskbar/trunk/ctx_menu.asm b/programs/system/taskbar/trunk/ctx_menu.asm index aca7dde552..4e3b2b49c6 100644 --- a/programs/system/taskbar/trunk/ctx_menu.asm +++ b/programs/system/taskbar/trunk/ctx_menu.asm @@ -118,7 +118,9 @@ draw_ctx_menu: add ebx, 1 * 65536 mcall - mcall ,<4,28>,0x80000000,ctx_menu_text + mov ecx, [system_colours + 32] ; sc.work_text + or ecx, 0x80000000 + mcall ,<4,28>,,ctx_menu_text mov edx, ctx_menu_text2 diff --git a/skins/ConLenov/Guzel_magic/default.dtp.asm b/skins/ConLenov/Guzel_magic/default.dtp.asm index 11c54f9402..3c5588cae2 100644 --- a/skins/ConLenov/Guzel_magic/default.dtp.asm +++ b/skins/ConLenov/Guzel_magic/default.dtp.asm @@ -2,8 +2,8 @@ struc system_colors { .unused1 dd 0x006393 .unused2 dd 0x0077b0 -.work_dark dd 0x8D8D8D -.work_light dd 0x8D8D8D +.work_dark dd 0x070808 +.work_light dd 0x484D5A .title_text dd 0xFFFFFF .work dd 0x161925 .work_button dd 0x184053