From 3e707a6c810b1b607ecc04138b331dcfb5edd91d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 18 May 2020 10:47:08 +0000 Subject: [PATCH] Replace TxtRead by Quark in IMG git-svn-id: svn://kolibrios.org@7946 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 3 +-- data/common/File Managers/fNav/fnav.set | 2 +- data/common/File Managers/kfar.ini | 2 +- data/common/KolibriNext/settings/app_plus.ini | 1 - data/common/settings/assoc.ini | 21 ++++++++++++------- data/eng/settings/icon.ini | 4 ++-- data/et/settings/icon.ini | 4 ++-- data/it/settings/icon.ini | 4 ++-- data/rus/File Managers/kfar.ini | 2 +- data/rus/settings/icon.ini | 4 ++-- data/sp/settings/icon.ini | 4 ++-- programs/cmm/drvinst/drvinst.c | 2 +- programs/cmm/misc/calypte.c | 2 +- programs/cmm/taskbar2/appicons.ini | 2 +- 14 files changed, 30 insertions(+), 27 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 84647a221f..81af5f49f9 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -24,7 +24,6 @@ img_files = { {"KUZKINA.MID", "common/kuzkina.mid"}, {"LANG.INC", build_type .. "/lang.inc"}, {"NOTIFY3.PNG", "common/notify3.png"}, - {"TOOLBAR.PNG", PROGS .. "/cmm/txtread/toolbar.png"}, {"UNIMG", PROGS .. "/fs/unimg/unimg"}, {"VMODE", "common/vmode"}, {"3D/HOUSE.3DS", "common/3d/house.3ds"}, @@ -609,7 +608,7 @@ tup.append_table(img_files, { {"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"}, {"SYSPANEL", PROGS .. "/cmm/misc/software_widget.com"}, {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"}, - {"TXTREAD", PROGS .. "/cmm/txtread/txtread.com"}, + {"QUARK", PROGS .. "/cmm/quark/quark.com"}, {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"}, diff --git a/data/common/File Managers/fNav/fnav.set b/data/common/File Managers/fNav/fnav.set index 345dd6bd40..d112bd2b4b 100644 --- a/data/common/File Managers/fNav/fnav.set +++ b/data/common/File Managers/fNav/fnav.set @@ -1 +1 @@ -/sys/TinyPad: asm, inc, txt, mac, log, dat /sys/media/kiv: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf /sys/Network/Webview: htm, html, mht, xhtml, docx, url /sys/fb2read: fb2 /sys/develop/cObj: obj /sys/skincfg: skn, dtp /sys/rtfRead: rtf /sys/develop/t_edit: cpp, h, c, c--, pas, set, ext, ini /sys/media/mgb: mgb /sys/media/pixie: mp3 /sys/media/AC97SND: wav, xm /sys/media/MIDAMP: mid /sys/media/listplay: m3u, lap, asf /sys/shell: sh /sys/3d/view3ds: 3ds, asc /sys/graph: cvs, grf /sys/unz: zip, 7z /sys/unimg: img /sys/table: csv /kolibrios/media/updf: pdf /kolibrios/media/fplay: avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm /kolibrios/emul/zsnes: smc /kolibrios/emul/psx4all: mcr /kolibrios/emul/fceu/fceu: nes /kolibrios/emul/e80/e80: sna /kolibrios/emul/gameboy: gb, gbc /kolibrios/emul/pokemini: min /sys/develop/heed: \ No newline at end of file +/sys/TinyPad: asm, inc, mac, dat /sys/QUARK: txt, log /sys/media/kiv: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf /sys/Network/Webview: htm, html, mht, xhtml, docx, url /sys/fb2read: fb2 /sys/develop/cObj: obj /sys/skincfg: skn, dtp /sys/rtfRead: rtf /sys/develop/t_edit: cpp, h, c, c--, pas, set, ext, ini /sys/media/mgb: mgb /sys/media/pixie: mp3 /sys/media/AC97SND: wav, xm /sys/media/MIDAMP: mid /sys/media/listplay: m3u, lap, asf /sys/shell: sh /sys/3d/view3ds: 3ds, asc /sys/graph: cvs, grf /sys/unz: zip, 7z /sys/unimg: img /sys/table: csv /kolibrios/media/updf: pdf /kolibrios/media/fplay: avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm /kolibrios/emul/zsnes: smc /kolibrios/emul/psx4all: mcr /kolibrios/emul/fceu/fceu: nes /kolibrios/emul/e80/e80: sna /kolibrios/emul/gameboy: gb, gbc /kolibrios/emul/pokemini: min /sys/develop/heed: \ No newline at end of file diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini index 6e1da24a9a..6dad3795bc 100644 --- a/data/common/File Managers/kfar.ini +++ b/data/common/File Managers/kfar.ini @@ -2,7 +2,7 @@ asm=/sys/TinyPad; AsmMenu1,AsmMenu2 inc=/sys/TinyPad ini=/sys/develop/t_edit -txt=/sys/TinyPad +txt=/sys/Quark jpg=/sys/media/kiv jpeg=/sys/media/kiv jpe=/sys/media/kiv diff --git a/data/common/KolibriNext/settings/app_plus.ini b/data/common/KolibriNext/settings/app_plus.ini index 0f570d909a..c0ff67412c 100644 --- a/data/common/KolibriNext/settings/app_plus.ini +++ b/data/common/KolibriNext/settings/app_plus.ini @@ -26,7 +26,6 @@ DosBox=/k/emul/dosbox/dosbox,11 KFM=File managers/KFM,3 fNav=File managers/fNav/fNav,93 -TextReader=txtread,85 CncEditor=/k/utils/cnc_editor/cnc_editor,15 Life=/k/demos/life2,13 Calc+=/k/utils/calcplus,4 diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 491d6d4750..17df68c0e8 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -1,3 +1,8 @@ +[Quark] +exec=/sys/QUARK +icon=85 +next=$TinyPad + [TinyPad] exec=/sys/tinypad icon=9 @@ -6,12 +11,7 @@ next=$TextEditor [TextEditor] exec=/sys/develop/t_edit icon=58 -next=$Text Reader - -[TextReader] -exec=/sys/txtread -icon=85 -next=$HexEditor +next=$WebView [Run] exec=/sys/run @@ -78,10 +78,15 @@ icon=98 kf=/sys/KF_VIEW -txt=$TinyPad +txt=$Quark +log=$Quark +c=$Quark +h=$Quark +cpp=$Quark + asm=$TinyPad inc=$TinyPad -log=$TinyPad +mac=$TinyPad inf=$TinyPad conf=$TinyPad diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini index d1c747c754..fb89f1a266 100644 --- a/data/eng/settings/icon.ini +++ b/data/eng/settings/icon.ini @@ -229,8 +229,8 @@ ico=84 x=-203 y=68 [20] -name=TEXTREADER -path=/sys/txtread +name=QUARK +path=/sys/quark param= ico=85 x=136 diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini index 25d7bfcb63..e9213dd3c5 100644 --- a/data/et/settings/icon.ini +++ b/data/et/settings/icon.ini @@ -228,8 +228,8 @@ ico=84 x=-203 y=68 [20] -name=TEXTREADER -path=/sys/txtread +name=QUARK +path=/sys/quark param= ico=85 x=136 diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini index d1c747c754..fb89f1a266 100644 --- a/data/it/settings/icon.ini +++ b/data/it/settings/icon.ini @@ -229,8 +229,8 @@ ico=84 x=-203 y=68 [20] -name=TEXTREADER -path=/sys/txtread +name=QUARK +path=/sys/quark param= ico=85 x=136 diff --git a/data/rus/File Managers/kfar.ini b/data/rus/File Managers/kfar.ini index c97d208f25..c5c3cb58ae 100644 --- a/data/rus/File Managers/kfar.ini +++ b/data/rus/File Managers/kfar.ini @@ -2,7 +2,7 @@ asm=/sys/TinyPad; AsmMenu1,AsmMenu2 inc=/sys/TinyPad ini=/sys/develop/t_edit -txt=/sys/TinyPad +txt=/sys/quark jpg=/sys/media/kiv jpeg=/sys/media/kiv jpe=/sys/media/kiv diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini index e0c79b63c8..ee0df89ddf 100644 --- a/data/rus/settings/icon.ini +++ b/data/rus/settings/icon.ini @@ -229,8 +229,8 @@ ico=84 x=-203 y=68 [20] -name=TEXTREADER -path=/sys/txtread +name=QUARK +path=/sys/quark param= ico=85 x=136 diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini index d1c747c754..fb89f1a266 100644 --- a/data/sp/settings/icon.ini +++ b/data/sp/settings/icon.ini @@ -229,8 +229,8 @@ ico=84 x=-203 y=68 [20] -name=TEXTREADER -path=/sys/txtread +name=QUARK +path=/sys/quark param= ico=85 x=136 diff --git a/programs/cmm/drvinst/drvinst.c b/programs/cmm/drvinst/drvinst.c index 905d518ae2..db1ef5d4b3 100644 --- a/programs/cmm/drvinst/drvinst.c +++ b/programs/cmm/drvinst/drvinst.c @@ -234,7 +234,7 @@ void Event_AsseptRisk() void Event_ShowReadme() { - io.run("/sys/txtread", #cur_readme_path); + io.run("/sys/@open", #cur_readme_path); } void Event_RunInstall() diff --git a/programs/cmm/misc/calypte.c b/programs/cmm/misc/calypte.c index c2e823bc06..f6cd94bd2d 100644 --- a/programs/cmm/misc/calypte.c +++ b/programs/cmm/misc/calypte.c @@ -421,7 +421,7 @@ void EventMenuClick() EventOpenFileInAnotherProgram("/sys/develop/t_edit"); break; case FILE_SUBMENU_ID_TEXTREAD: - EventOpenFileInAnotherProgram("/sys/txtread"); + EventOpenFileInAnotherProgram("/sys/quark"); break; case FILE_SUBMENU_ID_WEBVIEW: EventOpenFileInAnotherProgram("/sys/network/webview"); diff --git a/programs/cmm/taskbar2/appicons.ini b/programs/cmm/taskbar2/appicons.ini index 7efc091bdd..bb25bfaea3 100644 --- a/programs/cmm/taskbar2/appicons.ini +++ b/programs/cmm/taskbar2/appicons.ini @@ -91,7 +91,7 @@ arcanii=12 tinypad=9 webview=31 t_edit=58 -txtread=85 +quark=85 zsea=46 kiv=70 font_viewer=76