diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e8045338c6..73642cd025 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -236,7 +236,7 @@ tup.append_table(img_files, { {"KERNEL.MNT", "../kernel/trunk/kernel.mnt"}, {"@MENU", PROGS .. "/system/menu/trunk/menu"}, {"@VOLUME", PROGS .. "/media/volume/volume"}, - {"@PANEL", PROGS .. "/system/panel/trunk/PANEL"}, + {"@TASKBAR", PROGS .. "/system/panel/trunk/TASKBAR"}, {"@DOCKY", PROGS .. "/system/docky/trunk/docky"}, {"@OPEN", PROGS .. "/system/open/open"}, {"@NOTIFY", PROGS .. "/system/notify3/notify"}, diff --git a/data/eng/docs/HOT_KEYS.TXT b/data/eng/docs/HOT_KEYS.TXT index e846bad16d..8fc7fcf242 100644 --- a/data/eng/docs/HOT_KEYS.TXT +++ b/data/eng/docs/HOT_KEYS.TXT @@ -1,6 +1,6 @@ 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 @PANEL. +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. diff --git a/data/eng/settings/autorun.dat b/data/eng/settings/autorun.dat index 61b6e24b87..cd7dec55a2 100644 --- a/data/eng/settings/autorun.dat +++ b/data/eng/settings/autorun.dat @@ -12,7 +12,7 @@ /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 # SET BG /SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@PANEL "" 1 # Start panel +/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@DOCKY "" 1 # Start docky /SYS/SETUP BOOT 1 # Load device settings /SYS/@ICON "" 1 # Multithread icon diff --git a/data/et/docs/HOT_KEYS.TXT b/data/et/docs/HOT_KEYS.TXT index e846bad16d..8fc7fcf242 100644 --- a/data/et/docs/HOT_KEYS.TXT +++ b/data/et/docs/HOT_KEYS.TXT @@ -1,6 +1,6 @@ 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 @PANEL. +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. diff --git a/data/et/settings/autorun.dat b/data/et/settings/autorun.dat index 60618c0607..7cb2751e26 100644 --- a/data/et/settings/autorun.dat +++ b/data/et/settings/autorun.dat @@ -12,7 +12,7 @@ /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 # SET BG /SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@PANEL "" 1 # Start panel +/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@DOCKY "" 1 # Start docky /SYS/SETUP BOOT 1 # Load device settings /SYS/@ICON "" 1 # Multithread icon diff --git a/data/it/docs/HOT_KEYS.TXT b/data/it/docs/HOT_KEYS.TXT index 4d4b52f812..5a8d5b10d3 100644 --- a/data/it/docs/HOT_KEYS.TXT +++ b/data/it/docs/HOT_KEYS.TXT @@ -1,6 +1,6 @@ Le seguenti scorciatoie di tasiera sono valide in tutto il sistema 1) Ctrl + Alt + Del avvia il gestore dei processi mostranod i consumi del sistema -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 @PANEL. +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 cambia lingua della tastiera 3) Win Apre il MENU 4) Alt + Ctrl + F12 Fa partire l'applicazione END- start of the application END. diff --git a/data/it/settings/autorun.dat b/data/it/settings/autorun.dat index e1ca5287dd..4b47aea8a3 100644 --- a/data/it/settings/autorun.dat +++ b/data/it/settings/autorun.dat @@ -12,7 +12,7 @@ /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 # SET BG /SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@PANEL "" 1 # Start panel +/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@DOCKY "" 1 # Start docky /SYS/SETUP BOOT 1 # Load device settings /SYS/@ICON "" 1 # Multithread icon diff --git a/data/rus/docs/HISTORY.TXT b/data/rus/docs/HISTORY.TXT index c67f01a6cc..2297126c15 100644 --- a/data/rus/docs/HISTORY.TXT +++ b/data/rus/docs/HISTORY.TXT @@ -111,7 +111,7 @@ ᮮ⢥饥 ਫ MENU - 筨 (Diamond), ࠢ 訡: ᫥ ୥ Esc 뫮 ᭮ - @PANEL - 筨 (Diamond), Alt+F4 ਡ ணࠬ + @TASKBAR - 筨 (Diamond), Alt+F4 ਡ ணࠬ ᫮, 뫠 ᮮ饭 ⨨, ४ 室. ᫨ ணࠬ ॠ, ᥣ Ctrl+Alt+Del @@ -270,7 +270,7 @@ ࠭ । ⨥ 堨 类 (mike.dld), প ᨪ 誨 kaitz, ⮭᪮ ॢ - @PANEL - Rus, ⥪⭮ "" + @TASKBAR - Rus, ⥪⭮ "" Alver, "ᢥ" ⥪⭮ "ᢥ ", "ࠧ ", "४ ﭨ " Diamond, "ࠧ" ⥪⭮ @@ -395,7 +395,7 @@ 묮᪨ (Heavyiron), ᪮७ ᮢ ਫ ⮢ (Leency), ࠦ MTDBG - 筨 (Diamond), প syscall sysenter - @PANEL - 筨 (Diamond), প Alt+Tab/Alt+Shift+Tab; + @TASKBAR - 筨 (Diamond), প Alt+Tab/Alt+Shift+Tab; 뢠 ⮪, ᮧ SPraid, Alt+F4 㡨 ᠬ CPUID - ࣥ 쬨 (Wildwest), 묮᪨ (Heavyiron), @@ -518,7 +518,7 @@ ஥ kaitz, ॢ ᮮ饭 ⮭᪨ VNCCLIENT - hidnplayr, VNC - @PANEL, CPU, END, DESKTOP, SETUP, CALENDAR - kaitz, + @TASKBAR, CPU, END, DESKTOP, SETUP, CALENDAR - kaitz, ॢ ⮭᪨ FREE3D04 - ࣥ 񭮢 (Serge), ⨬ 묮᪨ (Heavyiron), ᯮ짮 ᪨ @@ -848,7 +848,7 @@ * ਫ: KFAR - Diamond, 䠩, ࠡ騩 १ 70 㭪. ᬮ ᮤন ᪮ ਫ. - @PANEL - Diamond, ࠡ⠭ ࠡ 66/4 66/5, ⥯ "稥" + @TASKBAR - Diamond, ࠡ⠭ ࠡ 66/4 66/5, ⥯ "稥" 樨 ࠡ뢠 ᥣ. @NUMCALC - Diamond, १⭮ ਫ, ᪠ NumLock. @@ -970,7 +970,7 @@ ਫﬨ ந ᫥騥 ࠡ⪨ ࠢ: - @PANEL - ﭮ (Mario79), ⠭ ᯨ᪠ 뢮 ਫ. + @TASKBAR - ﭮ (Mario79), ⠭ ᯨ᪠ 뢮 ਫ. 堨 类 (mike.dld), ⠭ ࠡ祩 ࠭ ४⭠ ࠡ ᯮ짮 VRR. ३  (halyavin), ࠭ 訡 @@ -1122,7 +1122,7 @@  . ந ᫨ﭨ ਫ ICONMNGR. - @PANEL - ३ 誨 (Willow), ࠡ⠭ ࠡ ICON2. + @TASKBAR - ३ 誨 (Willow), ࠡ⠭ ࠡ ICON2. BOARD - ३ 誨 (Willow), ࠧ ⮪ ᮮ饭 짮⥫᪨ 拉, ४祭 @@ -1254,7 +1254,7 @@ SETUP - ⠡ ᨬ 뢮 ALT ࠢ ᭮ ⠡ ᨬ ᪮ ᪫. - @PANEL - প "" 権 : + @TASKBAR - প "" 権 : ALT+F4 - 襭 ⨢ ਫ. AC97WAV - ࠡ⠭ ࠡ ⥪騬 ஬. ( ३) @@ -1335,7 +1335,7 @@ ( 㭪 18 sysfuncs.txt sysfuncr.txt) 4) ⪫祭 㪠 ᯨ ਫ ⥬, ࠢ १ - @PANEL. + @TASKBAR. ( 㭪 18 sysfuncs.txt sysfuncr.txt) 5) ࠭  "᫥ 㡨⮣ ਫ" - ࠭  @@ -1368,7 +1368,7 @@ 12) ࠡ⪠ ࠩ - 㭪 2 뢮 樨 Alt, ᨬ 㡫 㭪樨 18/12. - ࠡ⠭ ਫ @PANEL. + ࠡ⠭ ਫ @TASKBAR. ( 㭪 18 sysfuncs.txt sysfuncr.txt) ਫﬨ ந ᫥騥 ࠡ⪨ ࠢ: @@ -1378,7 +1378,7 @@ ⥭ ICON, ᪥ ਫ. ࠡ⠫ Mario79. - @PANEL - প 権 : Alt+Win - + @TASKBAR - প 権 : Alt+Win - ਫ MENU, Alt+Ctrl+F12 - ਫ END. SETUP - ஢ ࠧ HD, CD - ᮣ᭮ ⠡ ன @@ -1435,7 +1435,7 @@ ४ ।஢ DAT 䠩 ⨬ ⥪⮢ ।஬. ⮬ 砥 㦭 ਬ TINYPAD2. ᮢ⨬ ᯮ짮 権 - ( ਫ @PANEL) ࠡ⠭ ᨬ, + ( ਫ @TASKBAR) ࠡ⠭ ᨬ, ஢ ᨬ 㫥 祭, ਬ Alt. @@ -1520,7 +1520,7 @@ 60- ᨬ ( 30) ࠢ , ஬ "~" "^". - @PANEL - "" - , 窠 ᯨ + @TASKBAR - "" - , 窠 ᯨ ⪫祭, ४祭 ᪫ - 饫箪 (ᨭ 㡨 En) Ctrl+Shift ( , 㦭 ࠧ 3 , ⠪ ४⭮ @@ -1534,7 +1534,7 @@ ICONMNGR - ࠡ⠭ ICON, ⮤ ਬ ⠫ , ࠧ, ⥯ ⮧㧪 யᠭ ᠬ ICON. - SETUP - ࠡ⠭ ४祭 ᪫ 맮 @PANEL, + SETUP - ࠡ⠭ ४祭 ᪫ 맮 @TASKBAR, ਭ ᪮ , ⮫쪮 த. ᪥ 2 ࠡ⠭: 祭 ᪥ 㭪樥 26, ⠭ 롮 㯠 LBA PCI. @@ -1587,7 +1587,7 @@ * 㯠騪 MXP: - AC97WAV,FREE3D04,SDLFIRE,3DCUBE,@PANEL,BMPVIEW,C4,CALC,CDP,CMD,COLORREF, + AC97WAV,FREE3D04,SDLFIRE,3DCUBE,@TASKBAR,BMPVIEW,C4,CALC,CDP,CMD,COLORREF, CROWNSCR,EXAMPLE2,FS,HDREAD,HEED,HTTPS,ICONEDIT,ICONMNGR,INFO,LC,MBLOCKS, MFAR,MHC,MP3S,NNTPC,PCIDEV,PIC4,PONG3,POPC,SB,SMTPS,STACKCFG,SYSTREE,TETRIS, VRR,XPAINT28,YM, PHENIX, 3DTCUB10, 3DETX59B, CPUID903, CPUID904,FREECELL. diff --git a/data/rus/docs/HOT_KEYS.TXT b/data/rus/docs/HOT_KEYS.TXT index 47b89974ef..e7af1634e7 100644 --- a/data/rus/docs/HOT_KEYS.TXT +++ b/data/rus/docs/HOT_KEYS.TXT @@ -1,6 +1,6 @@ 騥 "稥" 樨 ᯮ ⥬: (㬥 ६  ⥬) -1) Ctrl + Alt + Del ਫ CPU (ᯥ ᮢ), ⢥ ঠ ஢ , ⠫쭮 ॠ ਫ @PANEL. +1) Ctrl + Alt + Del ਫ CPU (ᯥ ᮢ), ⢥ ঠ ஢ , ⠫쭮 ॠ ਫ @TASKBAR. 2) Ctrl + Shift - ४祭 ᪫ . 3) Win - ਫ MENU. 4) Alt + Ctrl + F12 - ਫ END. diff --git a/data/rus/settings/autorun.dat b/data/rus/settings/autorun.dat index e1ca5287dd..4b47aea8a3 100644 --- a/data/rus/settings/autorun.dat +++ b/data/rus/settings/autorun.dat @@ -12,7 +12,7 @@ /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 # SET BG /SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@PANEL "" 1 # Start panel +/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@DOCKY "" 1 # Start docky /SYS/SETUP BOOT 1 # Load device settings /SYS/@ICON "" 1 # Multithread icon diff --git a/data/sp/docs/HOT_KEYS.TXT b/data/sp/docs/HOT_KEYS.TXT index e846bad16d..8fc7fcf242 100644 --- a/data/sp/docs/HOT_KEYS.TXT +++ b/data/sp/docs/HOT_KEYS.TXT @@ -1,6 +1,6 @@ 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 @PANEL. +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. diff --git a/data/sp/settings/autorun.dat b/data/sp/settings/autorun.dat index e1ca5287dd..4b47aea8a3 100644 --- a/data/sp/settings/autorun.dat +++ b/data/sp/settings/autorun.dat @@ -12,7 +12,7 @@ /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 # SET BG /SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@PANEL "" 1 # Start panel +/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@DOCKY "" 1 # Start docky /SYS/SETUP BOOT 1 # Load device settings /SYS/@ICON "" 1 # Multithread icon diff --git a/kernel/trunk/docs/sysfuncr.txt b/kernel/trunk/docs/sysfuncr.txt index 2503e339bc..5a9d50056c 100644 --- a/kernel/trunk/docs/sysfuncr.txt +++ b/kernel/trunk/docs/sysfuncr.txt @@ -835,7 +835,7 @@ сворачивание окна осуществляется системой при нажатии на кнопку минимизации (которая для окон со скином определяется автоматически функцией 0, для окон без скина её можно определить функцией 8), - восстановление - приложением @panel. + восстановление - приложением @taskbar. ====================================================================== ====================== Функция 18, подфункция 11 ===================== @@ -1212,9 +1212,9 @@ dd 1675 * Получить раскладки и идентификатор страны можно с помощью подфункции 2 функции 26. * Идентификатор страны - глобальная системная переменная, которая - самим ядром не используется; однако приложение @panel отображает + самим ядром не используется; однако приложение @taskbar отображает соответствующую текущей стране иконку. - * Приложение @panel переключает раскладки по запросу пользователя. + * Приложение @taskbar переключает раскладки по запросу пользователя. ====================================================================== ========= Функция 21, подфункция 5 - установить язык системы. ======== @@ -1227,7 +1227,7 @@ dd 1675 * eax = 0 Замечания: * Язык системы - глобальная системная переменная, никак - не используемая самим ядром, однако приложение @panel рисует + не используемая самим ядром, однако приложение @taskbar рисует соответствующую иконку. * Проверок на корректность не делается, поскольку ядро эту переменную не использует. @@ -1426,10 +1426,10 @@ dd 1675 * Установить раскладки и идентификатор страны можно с помощью подфункции 2 функции 21. * Идентификатор страны - глобальная системная переменная, которая - самим ядром не используется; однако приложение @panel отображает + самим ядром не используется; однако приложение @taskbar отображает соответствующую текущей стране иконку (используя описываемую функцию). - * Приложение @panel переключает раскладки по запросу пользователя. + * Приложение @taskbar переключает раскладки по запросу пользователя. ====================================================================== ========== Функция 26, подфункция 5 - получить язык системы. ========= @@ -1441,7 +1441,7 @@ dd 1675 * eax = язык системы (1=eng, 2=fi, 3=ger, 4=rus) Замечания: * Язык системы - глобальная системная переменная, никак - не используемая самим ядром, однако приложение @panel рисует + не используемая самим ядром, однако приложение @taskbar рисует соответствующую иконку (используя описываемую функцию). * Установить язык системы можно вызовом подфункции 5 функции 21. @@ -2006,7 +2006,7 @@ dword-значение цвета 0x00RRGGBB * Рабочая область экрана определяет положение и координаты максимизированного окна. * Рабочая область экрана при нормальной работе есть весь экран - за вычетом панели (@panel). + за вычетом панели (@taskbar). * (left,top) - координаты левого верхнего угла, (right,bottom) - координаты правого нижнего. Таким образом, размер рабочей области по оси x определяется @@ -2028,7 +2028,7 @@ dword-значение цвета 0x00RRGGBB Замечания: * Рабочая область экрана определяет положение и координаты максимизированного окна. - * Эта функция используется только приложением @panel, + * Эта функция используется только приложением @taskbar, устанавливающим рабочей областью весь экран за вычетом панели. * (left,top) - координаты левого верхнего угла, (right,bottom) - координаты правого нижнего. diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt index 0d0f71b5a4..d43225b6a5 100644 --- a/kernel/trunk/docs/sysfuncs.txt +++ b/kernel/trunk/docs/sysfuncs.txt @@ -836,7 +836,7 @@ Remarks: at pressing the minimization button (for skinned windows it is defined automatically by function 0, for other windows it can be defined manually by function 8), - restore of a window is done by the application '@panel'. + restore of a window is done by the application '@taskbar'. ====================================================================== Function 18, subfunction 11 - get information on the disk subsystem. @@ -861,8 +861,8 @@ Format of the table: short version: * 5 = 2.88Mb, 3.5'' (such drives are not used anymore) For example, for the standard configuration from one 1.44-drive here will be 40h, and for the case 1.2Mb on A: and 1.44Mb on B: - the value is 24h. - + the value is 24h. + First IDE controller: * +1: byte: information about hard disks and CD-drives, AABBCCDD, where AA corresponds to the controller IDE0, ..., DD - IDE3: @@ -872,29 +872,29 @@ Format of the table: short version: For example, in the case HD on IDE0 and CD on IDE2 this field contains 48h. * +2: 4 db: number of the retrieved partitions on hard disks - at accordingly IDE0,...,IDE3. - - Second IDE controller: - * +6: byte: information about hard disks and CD-drives, AABBCCDD, - where AA corresponds to the controller IDE4, ..., DD - IDE7: - * 0 = device not found - * 1 = hard drive - * 2 = CD-drive - For example, in the case HD on IDE4 and CD on IDE6 - this field contains 48h. - * +7: 4 db: number of the retrieved partitions on hard disks - at accordingly IDE4,...,IDE7. - - Third IDE controller: - * +11: byte: information about hard disks and CD-drives, AABBCCDD, - where AA corresponds to the controller IDE8, ..., DD - IDE11: - * 0 = device not found - * 1 = hard drive - * 2 = CD-drive - For example, in the case HD on IDE8 and CD on IDE10 - this field contains 48h. - * +12: 4 db: number of the retrieved partitions on hard disks - at accordingly IDE8,...,IDE11. + at accordingly IDE0,...,IDE3. + + Second IDE controller: + * +6: byte: information about hard disks and CD-drives, AABBCCDD, + where AA corresponds to the controller IDE4, ..., DD - IDE7: + * 0 = device not found + * 1 = hard drive + * 2 = CD-drive + For example, in the case HD on IDE4 and CD on IDE6 + this field contains 48h. + * +7: 4 db: number of the retrieved partitions on hard disks + at accordingly IDE4,...,IDE7. + + Third IDE controller: + * +11: byte: information about hard disks and CD-drives, AABBCCDD, + where AA corresponds to the controller IDE8, ..., DD - IDE11: + * 0 = device not found + * 1 = hard drive + * 2 = CD-drive + For example, in the case HD on IDE8 and CD on IDE10 + this field contains 48h. + * +12: 4 db: number of the retrieved partitions on hard disks + at accordingly IDE8,...,IDE11. If the hard disk on IDEx is absent, appropriate byte is zero, otherwise it shows number of the recognized partitions, which @@ -1213,9 +1213,9 @@ Remarks: * To get layout and country identifier use subfunction 2 of function 26. * Country identifier is global system variable, which is not used - by the kernel itself; however the application '@panel' displays + by the kernel itself; however the application '@taskbar' displays the corresponding icon. - * The application @panel switches layouts on user request. + * The application @taskbar switches layouts on user request. ====================================================================== ========== Function 21, subfunction 5 - set system language. ========= @@ -1228,7 +1228,7 @@ Returned value: * eax = 0 Remarks: * System language is global system variable and is not used - by the kernel itself, however application @panel draws the + by the kernel itself, however application @taskbar draws the appropriate icon. * Function does not check for correctness, as the kernel does not use this variable. @@ -1422,9 +1422,9 @@ Remarks: * To set layout and country identifier use subfunction 2 of function 21. * Country identifier is global system variable, which is not used - by the kernel itself; however the application '@panel' displays + by the kernel itself; however the application '@taskbar' displays the corresponding icon (using this function). - * The application @panel switches layouts on user request. + * The application @taskbar switches layouts on user request. ====================================================================== ========== Function 26, subfunction 5 - get system language. ========= @@ -1436,7 +1436,7 @@ Returned value: * eax = system language (1=eng, 2=fi, 3=ger, 4=rus) Remarks: * System language is global system variable and is not used - by the kernel itself, however application @panel draws the + by the kernel itself, however application @taskbar draws the appropriate icon (using this function). * To set system language use subfunction 5 of function 21. @@ -1996,7 +1996,7 @@ Remarks: * The screen working area defines position and coordinates of a maximized window. * The screen working area in view of normal work is all screen - without system panel (the application '@panel'). + without taskbar ('@taskbar' application). * (left,top) are coordinates of the left upper corner, (right,bottom) are coordinates of the right lower one. Thus the size of working area on x axis can be calculated by @@ -2018,8 +2018,8 @@ Returned value: Remarks: * The screen working area defines position and coordinates of a maximized window. - * This function is used only by the application '@panel', - which set working area to all screen without system panel. + * This function is used only by the application '@taskbar', + which set working area to all screen without taskbar. * (left,top) are coordinates of the left upper corner, (right,bottom) are coordinates of the right lower one. Thus the size of working area on x axis can be calculated by diff --git a/kernel/trunk/sec_loader/trunk/startos.ini b/kernel/trunk/sec_loader/trunk/startos.ini index 9de8796b09..66e6a6bdde 100644 --- a/kernel/trunk/sec_loader/trunk/startos.ini +++ b/kernel/trunk/sec_loader/trunk/startos.ini @@ -68,8 +68,8 @@ RamdiskSize=1440K LoaderRamImage=kolibri.img RamdiskPATH=/kolibri/ RamdiskFile=@menu,@menu -RamdiskFile=@PANEL,@PANEL -RamdiskFile=@RB,@PANEL +RamdiskFile=@TASKBAR,@TASKBAR +RamdiskFile=@RB,@TASKBAR [legacy_kolibri] name="KolibriOS" @@ -81,7 +81,7 @@ RamdiskCluster=1 RamdiskSize=1440K RamdiskPATH=/kolibri/ RamdiskFile=@menu,@menu -RamdiskFile=@PANEL,@PANEL +RamdiskFile=@TASKBAR,@TASKBAR RamdiskFile=@RB,@RB RamdiskFile=@rcher,@rcher RamdiskFile=@ss,@ss diff --git a/programs/build_all.bat b/programs/build_all.bat index d7703accb0..39bfb91ae3 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -71,7 +71,7 @@ fasm system\launcher\trunk\launcher.asm %BIN%\launcher fasm system\menu\trunk\menu.asm %BIN%\@menu fasm system\mgb\trunk\mgb.asm %BIN%\mgb fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul -fasm system\PANEL\trunk\@PANEL.ASM %BIN%\@PANEL +fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev fasm system\RB\trunk\@RB.ASM %BIN%\@RB fasm system\rdsave\trunk\rdsave.asm %BIN%\rdsave @@ -284,7 +284,7 @@ kpack %BIN%\kbd kpack %BIN%\launcher kpack %BIN%\menu kpack %BIN%\mgb -kpack %BIN%\@PANEL +kpack %BIN%\@TASKBAR kpack %BIN%\pcidev kpack %BIN%\@RB kpack %BIN%\rdsave diff --git a/programs/develop/SPForth/meforth_samples/autorun2.f b/programs/develop/SPForth/meforth_samples/autorun2.f index 288ebeb31b..aab27b5237 100644 --- a/programs/develop/SPForth/meforth_samples/autorun2.f +++ b/programs/develop/SPForth/meforth_samples/autorun2.f @@ -8,7 +8,7 @@ S" /RD/1/GRSCREEN" >path 99 exec S" /RD/1/@RB" >path 30 exec S" /RD/1/@SS" >path 30 exec -S" /RD/1/@PANEL" >path 30 exec +S" /RD/1/@TASKBAR" >path 30 exec S" /RD/1/SETUP" >path S" BOOT" >param 30 exec S" /RD/1/ICON2" >path S" BOOT" >param 10 exec S" /RD/1/board" >path 25 exec diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index 0f329b90fd..3ed3ae919f 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -346,7 +346,7 @@ align 4 button: ; BUTTON HANDLER mcall 17 ; get id ; dunkaist[ - test eax,0xfffffe00 ; is it system close button? (close signal from @panel) + test eax,0xfffffe00 ; is it system close button? (close signal from @taskbar) setz byte[close_now] ; set (or not set) close_recursive flag jz close ; if so,close all menus ; dunkaist] diff --git a/programs/system/panel/trunk/KEYMAP.KEY b/programs/system/taskbar/trunk/KEYMAP.KEY similarity index 100% rename from programs/system/panel/trunk/KEYMAP.KEY rename to programs/system/taskbar/trunk/KEYMAP.KEY diff --git a/programs/system/panel/trunk/LANG.INI b/programs/system/taskbar/trunk/LANG.INI similarity index 100% rename from programs/system/panel/trunk/LANG.INI rename to programs/system/taskbar/trunk/LANG.INI diff --git a/programs/system/panel/trunk/MOI.INC b/programs/system/taskbar/trunk/MOI.INC similarity index 100% rename from programs/system/panel/trunk/MOI.INC rename to programs/system/taskbar/trunk/MOI.INC diff --git a/programs/system/panel/trunk/PANEL.ASM b/programs/system/taskbar/trunk/TASKBAR.ASM similarity index 94% rename from programs/system/panel/trunk/PANEL.ASM rename to programs/system/taskbar/trunk/TASKBAR.ASM index 94e518d606..2894c80a4f 100644 --- a/programs/system/panel/trunk/PANEL.ASM +++ b/programs/system/taskbar/trunk/TASKBAR.ASM @@ -844,8 +844,8 @@ align 4 align 4 button: mcall 17 - test eax,0xfffffe00 ; is it close button? (signal from @panel) - jz still ; if so - wait for another event, because @panel shouldn't be closed + test eax,0xfffffe00 ; is it close button? (signal from @taskbar) + jz still ; if so - wait for another event, because @taskbar shouldn't be closed cmp al, 0 jnz right_mouse diff --git a/programs/system/panel/trunk/Tupfile.lua b/programs/system/taskbar/trunk/Tupfile.lua similarity index 61% rename from programs/system/panel/trunk/Tupfile.lua rename to programs/system/taskbar/trunk/Tupfile.lua index 1fea131976..cedf830391 100644 --- a/programs/system/panel/trunk/Tupfile.lua +++ b/programs/system/taskbar/trunk/Tupfile.lua @@ -1,3 +1,3 @@ if tup.getconfig("NO_FASM") ~= "" then return end tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"PANEL.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "PANEL") +tup.rule({"TASKBAR.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "TASKBAR") diff --git a/programs/system/panel/trunk/build_en.bat b/programs/system/taskbar/trunk/build_en.bat similarity index 62% rename from programs/system/panel/trunk/build_en.bat rename to programs/system/taskbar/trunk/build_en.bat index 0e11918373..ed8bdf9d02 100644 --- a/programs/system/panel/trunk/build_en.bat +++ b/programs/system/taskbar/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix en >lang.inc -@fasm -m 16384 panel.asm panel +@fasm -m 16384 taskbar.asm panel @erase lang.inc @kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/build_et.bat b/programs/system/taskbar/trunk/build_et.bat similarity index 62% rename from programs/system/panel/trunk/build_et.bat rename to programs/system/taskbar/trunk/build_et.bat index dab642ba1f..a31ef246c0 100644 --- a/programs/system/panel/trunk/build_et.bat +++ b/programs/system/taskbar/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix et >lang.inc -@fasm -m 16384 panel.asm panel +@fasm -m 16384 taskbar.asm panel @erase lang.inc @kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/build_ru.bat b/programs/system/taskbar/trunk/build_ru.bat similarity index 62% rename from programs/system/panel/trunk/build_ru.bat rename to programs/system/taskbar/trunk/build_ru.bat index 6ac0105ba5..e67adda469 100644 --- a/programs/system/panel/trunk/build_ru.bat +++ b/programs/system/taskbar/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc -@fasm -m 16384 panel.asm panel +@fasm -m 16384 taskbar.asm panel @erase lang.inc @kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/ctx_menu.asm b/programs/system/taskbar/trunk/ctx_menu.asm similarity index 100% rename from programs/system/panel/trunk/ctx_menu.asm rename to programs/system/taskbar/trunk/ctx_menu.asm diff --git a/programs/system/panel/trunk/drawappl.inc b/programs/system/taskbar/trunk/drawappl.inc similarity index 100% rename from programs/system/panel/trunk/drawappl.inc rename to programs/system/taskbar/trunk/drawappl.inc diff --git a/programs/system/panel/trunk/drawbutt.inc b/programs/system/taskbar/trunk/drawbutt.inc similarity index 100% rename from programs/system/panel/trunk/drawbutt.inc rename to programs/system/taskbar/trunk/drawbutt.inc diff --git a/programs/system/panel/trunk/drawtray.inc b/programs/system/taskbar/trunk/drawtray.inc similarity index 100% rename from programs/system/panel/trunk/drawtray.inc rename to programs/system/taskbar/trunk/drawtray.inc diff --git a/programs/system/panel/trunk/drawwind.inc b/programs/system/taskbar/trunk/drawwind.inc similarity index 100% rename from programs/system/panel/trunk/drawwind.inc rename to programs/system/taskbar/trunk/drawwind.inc diff --git a/programs/system/panel/trunk/i_data.inc b/programs/system/taskbar/trunk/i_data.inc similarity index 100% rename from programs/system/panel/trunk/i_data.inc rename to programs/system/taskbar/trunk/i_data.inc diff --git a/programs/system/panel/trunk/libini.inc b/programs/system/taskbar/trunk/libini.inc similarity index 95% rename from programs/system/panel/trunk/libini.inc rename to programs/system/taskbar/trunk/libini.inc index 37f8e15c86..769dd21578 100644 --- a/programs/system/panel/trunk/libini.inc +++ b/programs/system/taskbar/trunk/libini.inc @@ -7,7 +7,7 @@ Get_ini: mov edi,library_path call copy_file_path ;------------------------------------------------------------------------------ -; Get panel variables +; Get taskbar variables ;------------------------------------------------------------------------------ invoke ini_get_int,library_path,aVariables,aPanelHeight,20 cmp eax,100 @@ -61,7 +61,7 @@ Get_ini: .button_bottom_offset: mov [button_bottom_offset],eax ;------------------------------------------------------------------------------ -; Get panel flags +; Get taskbar flags ;------------------------------------------------------------------------------ invoke ini_get_int,library_path,aFlags,aSoftenUp,1 cmp eax,2 diff --git a/programs/system/panel/trunk/makefile b/programs/system/taskbar/trunk/makefile similarity index 100% rename from programs/system/panel/trunk/makefile rename to programs/system/taskbar/trunk/makefile diff --git a/programs/system/panel/trunk/readme.txt b/programs/system/taskbar/trunk/readme.txt similarity index 100% rename from programs/system/panel/trunk/readme.txt rename to programs/system/taskbar/trunk/readme.txt diff --git a/programs/system/panel/trunk/panel.ini b/programs/system/taskbar/trunk/taskbar.ini similarity index 100% rename from programs/system/panel/trunk/panel.ini rename to programs/system/taskbar/trunk/taskbar.ini diff --git a/programs/system/panel/trunk/u_data.inc b/programs/system/taskbar/trunk/u_data.inc similarity index 100% rename from programs/system/panel/trunk/u_data.inc rename to programs/system/taskbar/trunk/u_data.inc