From 5e946ad5ea22bc88e6b2cfd7783f320f099594ed Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 20 May 2025 20:20:50 +0100 Subject: [PATCH] system/taskbar: Post-SVN clean up - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. --- data/Tupfile.lua | 4 ++-- programs/build_all.bat | 2 +- programs/system/taskbar/{trunk => }/KEYMAP.KEY | Bin programs/system/taskbar/{trunk => }/LANG.INI | 0 programs/system/taskbar/{trunk => }/MOI.INC | 0 .../system/taskbar/{trunk => }/TASKBAR.ASM | 17 +++++++++++------ .../system/taskbar/{trunk => }/Tupfile.lua | 2 +- .../system/taskbar/{trunk => }/build_en.bat | 0 .../system/taskbar/{trunk => }/build_et.bat | 0 .../system/taskbar/{trunk => }/build_ru.bat | 0 .../system/taskbar/{trunk => }/ctx_menu.asm | 0 .../system/taskbar/{trunk => }/drawappl.inc | 0 .../system/taskbar/{trunk => }/drawbutt.inc | 0 .../system/taskbar/{trunk => }/drawtray.inc | 0 .../system/taskbar/{trunk => }/drawwind.inc | 0 programs/system/taskbar/{trunk => }/i_data.inc | 0 programs/system/taskbar/{trunk => }/libini.inc | 0 programs/system/taskbar/{trunk => }/makefile | 0 programs/system/taskbar/{trunk => }/readme.txt | 0 .../system/taskbar/{trunk => }/taskbar.ini | 0 programs/system/taskbar/{trunk => }/u_data.inc | 0 21 files changed, 15 insertions(+), 10 deletions(-) rename programs/system/taskbar/{trunk => }/KEYMAP.KEY (100%) rename programs/system/taskbar/{trunk => }/LANG.INI (100%) rename programs/system/taskbar/{trunk => }/MOI.INC (100%) rename programs/system/taskbar/{trunk => }/TASKBAR.ASM (99%) rename programs/system/taskbar/{trunk => }/Tupfile.lua (79%) rename programs/system/taskbar/{trunk => }/build_en.bat (100%) rename programs/system/taskbar/{trunk => }/build_et.bat (100%) rename programs/system/taskbar/{trunk => }/build_ru.bat (100%) rename programs/system/taskbar/{trunk => }/ctx_menu.asm (100%) rename programs/system/taskbar/{trunk => }/drawappl.inc (100%) rename programs/system/taskbar/{trunk => }/drawbutt.inc (100%) rename programs/system/taskbar/{trunk => }/drawtray.inc (100%) rename programs/system/taskbar/{trunk => }/drawwind.inc (100%) rename programs/system/taskbar/{trunk => }/i_data.inc (100%) rename programs/system/taskbar/{trunk => }/libini.inc (100%) rename programs/system/taskbar/{trunk => }/makefile (100%) rename programs/system/taskbar/{trunk => }/readme.txt (100%) rename programs/system/taskbar/{trunk => }/taskbar.ini (100%) rename programs/system/taskbar/{trunk => }/u_data.inc (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 7638742e1..e34467b1d 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -61,7 +61,7 @@ img_files = { {"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"}, {"SETTINGS/HA.CFG", SRC_PROGS .. "/other/ha/SETTINGS/HA.CFG"}, {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"}, - {"SETTINGS/KEYMAP.KEY", SRC_PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"}, + {"SETTINGS/KEYMAP.KEY", SRC_PROGS .. "/system/taskbar/KEYMAP.KEY"}, {"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"}, {"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"}, {"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"}, @@ -403,7 +403,7 @@ tup.append_table(img_files, { {"@MENU", VAR_PROGS .. "/system/menu/menu"}, {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"}, {"@OPEN", VAR_PROGS .. "/system/open/open"}, - {"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"}, + {"@TASKBAR", VAR_PROGS .. "/system/taskbar/TASKBAR"}, {"@SS", VAR_PROGS .. "/system/scrsaver/scrsaver"}, {"@VOLUME", VAR_PROGS .. "/media/volume/volume"}, {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 1da5d0119..2424c5672 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -71,7 +71,7 @@ fasm system\launcher\launcher.asm %BIN%\launcher fasm system\menu\menu.asm %BIN%\@menu fasm system\mgb\trunk\mgb.asm %BIN%\mgb fasm system\mousemul\mousemul.asm %BIN%\mousemul -fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR +fasm system\PANEL\@TASKBAR.ASM %BIN%\@TASKBAR fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev fasm system\RB\trunk\@RB.ASM %BIN%\@RB fasm system\rdsave\rdsave.asm %BIN%\rdsave diff --git a/programs/system/taskbar/trunk/KEYMAP.KEY b/programs/system/taskbar/KEYMAP.KEY similarity index 100% rename from programs/system/taskbar/trunk/KEYMAP.KEY rename to programs/system/taskbar/KEYMAP.KEY diff --git a/programs/system/taskbar/trunk/LANG.INI b/programs/system/taskbar/LANG.INI similarity index 100% rename from programs/system/taskbar/trunk/LANG.INI rename to programs/system/taskbar/LANG.INI diff --git a/programs/system/taskbar/trunk/MOI.INC b/programs/system/taskbar/MOI.INC similarity index 100% rename from programs/system/taskbar/trunk/MOI.INC rename to programs/system/taskbar/MOI.INC diff --git a/programs/system/taskbar/trunk/TASKBAR.ASM b/programs/system/taskbar/TASKBAR.ASM similarity index 99% rename from programs/system/taskbar/trunk/TASKBAR.ASM rename to programs/system/taskbar/TASKBAR.ASM index e4fe7f936..c878cc2fe 100644 --- a/programs/system/taskbar/trunk/TASKBAR.ASM +++ b/programs/system/taskbar/TASKBAR.ASM @@ -1,3 +1,8 @@ +; SPDX-License-Identifier: NOASSERTION +; + +; Text encoded with Code Page 866 - Cyrillic + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; ; ; TASK PANEL for KolibriOS - Compile with fasm ; @@ -74,11 +79,11 @@ format binary as "" dd path ; application pach ;------------------------------------------------------------------------------ include 'lang.inc' -include '../../../macros.inc' -include '../../../proc32.inc' -;include '../../../debug.inc' -include 'MOI.INC' ;раскладки клавиатуры -include '../../../develop/libraries/box_lib/load_lib.mac' +include '../../macros.inc' +include '../../proc32.inc' +;include '../../debug.inc' +include 'MOI.INC' ; keyboard layouts +include '../../develop/libraries/box_lib/load_lib.mac' @use_library ;use load lib macros ;------------------------------------------------------------------------------ caps_lock_check fix 1 @@ -1156,7 +1161,7 @@ no_full: ;------------------------------------------------------------------------------ include 'libini.inc' ;------------------------------------------------------------------------------ -include '../../../dll.inc' +include '../../dll.inc' ;------------------------------------------------------------------------------ include 'drawappl.inc' ;------------------------------------------------------------------------------ diff --git a/programs/system/taskbar/trunk/Tupfile.lua b/programs/system/taskbar/Tupfile.lua similarity index 79% rename from programs/system/taskbar/trunk/Tupfile.lua rename to programs/system/taskbar/Tupfile.lua index 3eaede86c..cbc92de24 100644 --- a/programs/system/taskbar/trunk/Tupfile.lua +++ b/programs/system/taskbar/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/system/taskbar/trunk/build_en.bat b/programs/system/taskbar/build_en.bat similarity index 100% rename from programs/system/taskbar/trunk/build_en.bat rename to programs/system/taskbar/build_en.bat diff --git a/programs/system/taskbar/trunk/build_et.bat b/programs/system/taskbar/build_et.bat similarity index 100% rename from programs/system/taskbar/trunk/build_et.bat rename to programs/system/taskbar/build_et.bat diff --git a/programs/system/taskbar/trunk/build_ru.bat b/programs/system/taskbar/build_ru.bat similarity index 100% rename from programs/system/taskbar/trunk/build_ru.bat rename to programs/system/taskbar/build_ru.bat diff --git a/programs/system/taskbar/trunk/ctx_menu.asm b/programs/system/taskbar/ctx_menu.asm similarity index 100% rename from programs/system/taskbar/trunk/ctx_menu.asm rename to programs/system/taskbar/ctx_menu.asm diff --git a/programs/system/taskbar/trunk/drawappl.inc b/programs/system/taskbar/drawappl.inc similarity index 100% rename from programs/system/taskbar/trunk/drawappl.inc rename to programs/system/taskbar/drawappl.inc diff --git a/programs/system/taskbar/trunk/drawbutt.inc b/programs/system/taskbar/drawbutt.inc similarity index 100% rename from programs/system/taskbar/trunk/drawbutt.inc rename to programs/system/taskbar/drawbutt.inc diff --git a/programs/system/taskbar/trunk/drawtray.inc b/programs/system/taskbar/drawtray.inc similarity index 100% rename from programs/system/taskbar/trunk/drawtray.inc rename to programs/system/taskbar/drawtray.inc diff --git a/programs/system/taskbar/trunk/drawwind.inc b/programs/system/taskbar/drawwind.inc similarity index 100% rename from programs/system/taskbar/trunk/drawwind.inc rename to programs/system/taskbar/drawwind.inc diff --git a/programs/system/taskbar/trunk/i_data.inc b/programs/system/taskbar/i_data.inc similarity index 100% rename from programs/system/taskbar/trunk/i_data.inc rename to programs/system/taskbar/i_data.inc diff --git a/programs/system/taskbar/trunk/libini.inc b/programs/system/taskbar/libini.inc similarity index 100% rename from programs/system/taskbar/trunk/libini.inc rename to programs/system/taskbar/libini.inc diff --git a/programs/system/taskbar/trunk/makefile b/programs/system/taskbar/makefile similarity index 100% rename from programs/system/taskbar/trunk/makefile rename to programs/system/taskbar/makefile diff --git a/programs/system/taskbar/trunk/readme.txt b/programs/system/taskbar/readme.txt similarity index 100% rename from programs/system/taskbar/trunk/readme.txt rename to programs/system/taskbar/readme.txt diff --git a/programs/system/taskbar/trunk/taskbar.ini b/programs/system/taskbar/taskbar.ini similarity index 100% rename from programs/system/taskbar/trunk/taskbar.ini rename to programs/system/taskbar/taskbar.ini diff --git a/programs/system/taskbar/trunk/u_data.inc b/programs/system/taskbar/u_data.inc similarity index 100% rename from programs/system/taskbar/trunk/u_data.inc rename to programs/system/taskbar/u_data.inc