From ab4eef43aff8eee0eff4a06c3f9aafe05d51432c Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 24 Nov 2016 10:27:53 +0000 Subject: [PATCH] rename mouse_cfg to mousecfg to fit into 8.3, better compress mouse_image git-svn-id: svn://kolibrios.org@6754 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/settings/syspanel.ini | 2 +- programs/cmm/mouse_cfg/mouse_image.png | Bin 3986 -> 0 bytes programs/cmm/{mouse_cfg => mousecfg}/Tupfile.lua | 2 +- .../cmm/{mouse_cfg => mousecfg}/compile_en.bat | 8 ++++---- .../cmm/{mouse_cfg => mousecfg}/compile_ru.bat | 8 ++++---- programs/cmm/mousecfg/mouse_image.png | Bin 0 -> 1175 bytes .../cmm/{mouse_cfg => mousecfg}/mouse_image.raw | 2 +- .../mouse_cfg.c => mousecfg/mousecfg.c} | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 programs/cmm/mouse_cfg/mouse_image.png rename programs/cmm/{mouse_cfg => mousecfg}/Tupfile.lua (61%) rename programs/cmm/{mouse_cfg => mousecfg}/compile_en.bat (50%) rename programs/cmm/{mouse_cfg => mousecfg}/compile_ru.bat (50%) create mode 100644 programs/cmm/mousecfg/mouse_image.png rename programs/cmm/{mouse_cfg => mousecfg}/mouse_image.raw (83%) rename programs/cmm/{mouse_cfg/mouse_cfg.c => mousecfg/mousecfg.c} (96%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index fbd5101248..2314389751 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -544,7 +544,7 @@ tup.append_table(img_files, { {"GAMES/flood-it", PROGS .. "/games/flood-it/trunk/flood-it.com"}, {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"}, {"MEDIA/PIXIE/PIXIE", PROGS .. "/cmm/pixie/pixie.com"}, - {"MOUSE_CFG", PROGS .. "/cmm/mouse_cfg/mouse_cfg.com"}, + {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"}, {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"}, {"TEXTREADER", PROGS .. "/cmm/textreader/textreader.com"}, diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index f1286b0614..a5abb7da68 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -15,7 +15,7 @@ Background=/sys/media/palitra,61 SkinConfig=skincfg,80 Volume=@VOLUME,64 Panels=panels_cfg,63 -Mouse=/sys/mouse_cfg,54 +Mouse=mousecfg,54 DriverInstall=/kolibrios/drivers/drvinst.kex,71 [Monitoring] diff --git a/programs/cmm/mouse_cfg/mouse_image.png b/programs/cmm/mouse_cfg/mouse_image.png deleted file mode 100644 index 899e9c008f6ceb8faa6d81f48bada1d781d9c5dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3986 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 c=g;hI{eopSt)V!Z diff --git a/programs/cmm/mouse_cfg/Tupfile.lua b/programs/cmm/mousecfg/Tupfile.lua similarity index 61% rename from programs/cmm/mouse_cfg/Tupfile.lua rename to programs/cmm/mousecfg/Tupfile.lua index 1d1ffd3fdd..aa86d41816 100644 --- a/programs/cmm/mouse_cfg/Tupfile.lua +++ b/programs/cmm/mousecfg/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("mouse_cfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mouse_cfg.com") +tup.rule("mousecfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com") diff --git a/programs/cmm/mouse_cfg/compile_en.bat b/programs/cmm/mousecfg/compile_en.bat similarity index 50% rename from programs/cmm/mouse_cfg/compile_en.bat rename to programs/cmm/mousecfg/compile_en.bat index 493ce16f5d..323c153821 100644 --- a/programs/cmm/mouse_cfg/compile_en.bat +++ b/programs/cmm/mousecfg/compile_en.bat @@ -1,11 +1,11 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -@del mouse_cfg +@del mousecfg cls -@c-- mouse_cfg.c -@rename mouse_cfg.com mouse_cfg -@kpack mouse_cfg +@c-- mousecfg.c +@rename mousecfg.com mousecfg +@kpack mousecfg @del warning.txt @del lang.h-- @pause \ No newline at end of file diff --git a/programs/cmm/mouse_cfg/compile_ru.bat b/programs/cmm/mousecfg/compile_ru.bat similarity index 50% rename from programs/cmm/mouse_cfg/compile_ru.bat rename to programs/cmm/mousecfg/compile_ru.bat index 46fa601a11..2ee98cf785 100644 --- a/programs/cmm/mouse_cfg/compile_ru.bat +++ b/programs/cmm/mousecfg/compile_ru.bat @@ -1,11 +1,11 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -@del mouse_cfg +@del mousecfg cls -@c-- mouse_cfg.c -@rename mouse_cfg.com mouse_cfg -@kpack mouse_cfg +@c-- mousecfg.c +@rename mousecfg.com mousecfg +@kpack mousecfg @del warning.txt @del lang.h-- @pause \ No newline at end of file diff --git a/programs/cmm/mousecfg/mouse_image.png b/programs/cmm/mousecfg/mouse_image.png new file mode 100644 index 0000000000000000000000000000000000000000..e7efa10c4711bf86cc99e19fccd12c2284165373 GIT binary patch literal 1175 zcmZvcYgCd49L8T$%8BJ^mMe5C2tdCQ@1H1me8z)O(kff!n$m0D91 zUCuaWo@%cmU}A)t>AZv~UP3`kEmP*JSGYUBl#fP4$F3LUTHh$2AiwYK^=3 z#yD>RrF4Zgjd<}aCzJnk=Ri~&eC1-XVz<*8Bw);!`=e#RP}rUgNn!+W+NzMczBL;; zdyR*+NTUFpXk%%|qEN-jUso%Q6RMpRd}Ka{Jz{B{^`Sh86s4%V#%dQIQ;`iKrGV%}%@Fk092pmr^UG>A6HWfoW!z01wD^%h z4eo0xYRp7=<211mDQX#xUf7)TZOvqKWvcDnNm*V0KkBPZTQ*)F7Ohq#j@Av%SzDon z5u^{4R%wSn&I*ZI;0pLLdXlxn=jDKrKZ_ZkJXMO+YDMtx?xen{G9lz9 zNhv0@f`3koTM*5{EWse@bzE^rM&}#7w4mq?oj5$YGA_S@M&^N?9u@F|`_+)iQ+l`3=~$LN<@X8qgVJ&@Zg7XR5fJ{!%yf=t#_8 ze1Xn9#LO0s;xc{X?drcNuYa0|VCM>APl|NJ-HsPsiFa z!iEuPxiymIBALrnC;GfQ7&LW{F*?>bu$pwZUU>YWiTw%9-7#!5)@|qBUeX@PWX(d2 z@ww#KR^ZXzbg9p6c~BsM8|et`gH9{Yc7f|gcd%7*?rhf^kZHO>^#X1PyzBu5J+Ozu z>hstjvt7DukUlENghdR3?Gp`0?oj3eGQ$;~(3tW;^HD;B5CessEoia{01qWxwudZ| z;=Le?ZOKAijvG$pLH@*QoX;zAmLzGNkrvAAPTgmm(;}ytrAz}`JJLXAq_SkY`74nW z_RQ*sCG{jNM@}T9gRNhHeymaVzRhc14W9@mInBY4gr{72A-7#p>~`fsPbV~()l{`Pm8ShF{kJN}0qY&jy*koVHz}m|!7fnq7og83q%)>X8+EeJ zBQ{dYB<<1}=E)0o6oUSjeLH0E;R0q&>I}FZqEa7A(cU6`YG3`8GijVJ`iS0NhY`}d zOBmC9PA`1ms3x})q*~bIvWZsWAME}c!g-M1P-1~sGD9=YFghwob(-Ao1foqh6yxaq n31r4}%>Oi-4zAnw!g?b~T&&OAS7Lj^GXd~{p#eO2) break; SetFrameColors();