forked from KolibriOS/kolibrios
notes: code clean
cmm: update build.bat files to use /D=LANG_XXX instead of creating lang.h-- git-svn-id: svn://kolibrios.org@8954 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
956739a5ad
commit
30c1f25537
@ -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("app_plus.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com")
|
||||
tup.rule("app_plus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com")
|
||||
|
@ -8,10 +8,6 @@
|
||||
#include "..\lib\patterns\restart_process.h"
|
||||
#include "added_sysdir.c"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// DATA //
|
||||
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@del app_plus
|
||||
cls
|
||||
@c-- app_plus.c
|
||||
@rename app_plus.com app_plus
|
||||
@c-- /D=LANG=ENG app_plus.c
|
||||
@del *.
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
||||
|
||||
|
@ -1,10 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@del app_plus
|
||||
cls
|
||||
@c-- app_plus.c
|
||||
@rename app_plus.com app_plus
|
||||
@c-- /D=LANG=RUS app_plus.c
|
||||
@del *.
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
||||
|
@ -1,10 +1,6 @@
|
||||
//11.03.12 - start!
|
||||
//ver 2.31
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
?include "lang.h--"
|
||||
#endif
|
||||
|
||||
#define MEMSIZE 200*1024
|
||||
#include "../lib/mem.h"
|
||||
#include "../lib/strings.h"
|
||||
|
@ -1,9 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@C-- appearance.c
|
||||
@del appearance
|
||||
@rename appearance.com appearance
|
||||
@c-- /D=LANG_ENG appearance.c
|
||||
@del *.
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -1,9 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@C-- appearance.c
|
||||
@del appearance
|
||||
@rename appearance.com appearance
|
||||
@c-- /D=LANG_RUS appearance.c
|
||||
@del *.
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -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("barscfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com")
|
||||
tup.rule("barscfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com")
|
||||
|
@ -1,7 +1,3 @@
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
#define MEMSIZE 0x23E80
|
||||
#include "..\lib\kolibri.h"
|
||||
#include "..\lib\strings.h"
|
||||
|
@ -1,11 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@del barscfg
|
||||
cls
|
||||
@c-- barscfg.c
|
||||
@c-- /D=LANG_ENG barscfg.c
|
||||
@pause
|
||||
@echo off
|
||||
@rename barscfg.com barscfg
|
||||
@del barscfg
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@del barscfg
|
||||
cls
|
||||
@c-- barscfg.c
|
||||
@c-- /D=LANG_RUS barscfg.c
|
||||
@pause
|
||||
@rename barscfg.com barscfg
|
||||
@del barscfg
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
|
@ -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("WebView.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "WebView.com")
|
||||
tup.rule("WebView.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "WebView.com")
|
||||
|
@ -1,10 +1,6 @@
|
||||
//Copyright 2007-2020 by Veliant & Leency
|
||||
//Asper, lev, Lrz, Barsuk, Nable, hidnplayr...
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// LIB //
|
||||
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@c-- WebView.c
|
||||
@c-- /D=LANG_ENG WebView.c
|
||||
@del WebView
|
||||
@rename WebView.com WebView
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if not exist WebView ( @pause )
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@c-- WebView.c
|
||||
@c-- /D=LANG_RUS WebView.c
|
||||
@del WebView
|
||||
@rename WebView.com WebView
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if not exist WebView ( @pause )
|
@ -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("clipview.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clipview.com")
|
||||
tup.rule("clipview.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clipview.com")
|
||||
|
@ -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("dicty.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dicty.com")
|
||||
tup.rule("dicty.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dicty.com")
|
||||
|
@ -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("diff.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "diff.com")
|
||||
tup.rule("diff.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "diff.com")
|
||||
|
@ -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("dl.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dl.com")
|
||||
tup.rule("dl.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dl.com")
|
||||
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@c-- dl.c
|
||||
@c-- /D=LANG_ENG dl.c
|
||||
@del dl
|
||||
@rename dl.com dl
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if not exist dl ( @pause )
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@c-- dl.c
|
||||
@c-- /D=LANG_RUS dl.c
|
||||
@del dl
|
||||
@rename dl.com dl
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if not exist dl ( @pause )
|
@ -1,9 +1,5 @@
|
||||
//Copyright 2020 by Leency
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
#ifdef LANG_RUS
|
||||
#define DL_WINDOW_HEADER "Œ¥¥¤¦¥à § £à㧮ª"
|
||||
#define T_DOWNLOAD "‘ª ç âì"
|
||||
|
@ -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("drvinst.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com")
|
||||
tup.rule("drvinst.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com")
|
||||
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@c-- /D=LANG_RUS drvinst.c
|
||||
@del *.kex
|
||||
@c-- drvinst.c
|
||||
@rename *.com *.kex
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
@pause
|
@ -1,10 +1,6 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@c-- /D=LANG_RUS drvinst.c
|
||||
@del *.kex
|
||||
@c-- drvinst.c
|
||||
@rename *.com *.kex
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
@pause
|
@ -1,9 +1,5 @@
|
||||
#define MEMSIZE 4096*20
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// LIB //
|
||||
|
@ -3,10 +3,10 @@ if tup.getconfig("LANG") == "ru"
|
||||
then C_LANG = "LANG_RUS"
|
||||
else C_LANG = "LANG_ENG" -- this includes default case without config
|
||||
end
|
||||
tup.rule("window.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "window.com")
|
||||
tup.rule("collections.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com")
|
||||
tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
|
||||
tup.rule("rgb.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com")
|
||||
tup.rule("console.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com")
|
||||
tup.rule("pigex.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com")
|
||||
tup.rule("math.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com")
|
||||
tup.rule("window.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "window.com")
|
||||
tup.rule("collections.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com")
|
||||
tup.rule("menu.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
|
||||
tup.rule("rgb.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com")
|
||||
tup.rule("console.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com")
|
||||
tup.rule("pigex.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com")
|
||||
tup.rule("math.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com")
|
||||
|
@ -1,6 +1,6 @@
|
||||
@del *.kex
|
||||
|
||||
For /R %%i In (*.c) Do c-- "%%i"
|
||||
For /R %%i In (*.c) Do c-- /D=LANG_ENG "%%i"
|
||||
|
||||
@rename *.com *.kex
|
||||
@mkdir bin
|
||||
|
@ -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("iconedit.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com")
|
||||
tup.rule("iconedit.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com")
|
||||
|
@ -1,12 +1,7 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
@c-- /D=LANG_ENG iconedit.c
|
||||
@del iconedit
|
||||
cls
|
||||
|
||||
@c-- iconedit.c
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if exist iconedit (
|
||||
"C:\Program Files (x86)\WinImage\winimage.exe" "D:\Kolibri\Desktop\kolibri.img" /H /Q /I iconedit
|
||||
|
@ -1,12 +1,7 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
@c-- /D=LANG_ENG iconedit.c
|
||||
@del iconedit
|
||||
cls
|
||||
|
||||
@c-- iconedit.c
|
||||
@rename *.com *.
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
||||
if exist iconedit (
|
||||
"C:\Program Files (x86)\WinImage\winimage.exe" "D:\Kolibri\Desktop\kolibri.img" /H /Q /I iconedit
|
||||
|
@ -21,10 +21,6 @@
|
||||
|
||||
#include "colors_mas.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// DATA //
|
||||
|
@ -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("font_viewer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com")
|
||||
tup.rule("font_viewer.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com")
|
||||
|
@ -1,5 +1,5 @@
|
||||
@del "kf_view"
|
||||
@C-- "font_viewer.c"
|
||||
@rename "font_viewer.com" "kf_view"
|
||||
@del kf_view
|
||||
@C-- font_viewer.c
|
||||
@rename font_viewer.com kf_view
|
||||
@del warning.txt
|
||||
@pause
|
@ -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("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
|
||||
tup.rule("menu.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
|
||||
|
@ -1,8 +1,6 @@
|
||||
@echo off
|
||||
|
||||
echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
For /R %%i In (*.c) Do c-- "%%i"
|
||||
For /R %%i In (*.c) Do c-- /D=LANG_ENG "%%i"
|
||||
|
||||
mkdir bin
|
||||
del bin\*.* /Q
|
||||
@ -14,6 +12,5 @@ rename software_widget syspanel
|
||||
cd ..
|
||||
|
||||
del warning.txt
|
||||
del lang.h--
|
||||
|
||||
pause
|
@ -8,10 +8,6 @@
|
||||
#include "../lib/obj/box_lib.h"
|
||||
#include "../lib/obj/proc_lib.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
/* === TRANSLATIONS === */
|
||||
|
||||
#ifdef LANG_RUS
|
||||
|
@ -9,10 +9,6 @@
|
||||
|
||||
#include "../lib/patterns/restart_process.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
char logo[] = "
|
||||
ÛÛÛÛ ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛ ÛÛÛÛ ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛÛ
|
||||
ÛÛÛÛ ÛÛ ÛÛÛ ÛÛÛ ÛÛÛ ÛÛ ÛÛÛ ÛÛ
|
||||
|
@ -12,10 +12,6 @@
|
||||
|
||||
#include "..\lib\obj\libimg.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
#define BTN_CLOSED 0
|
||||
#define BTN_PRESSED 1
|
||||
#define BTN_OPEN 2
|
||||
|
@ -10,10 +10,6 @@
|
||||
|
||||
#include "../lib/patterns/restart_process.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
bool install_complete = false;
|
||||
_http http;
|
||||
|
||||
|
@ -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("mousecfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com")
|
||||
tup.rule("mousecfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com")
|
||||
|
@ -1,11 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@c-- /D=LANG_ENG mousecfg.c
|
||||
@del mousecfg
|
||||
cls
|
||||
@c-- mousecfg.c
|
||||
@rename mousecfg.com mousecfg
|
||||
@kpack mousecfg
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -1,11 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@c-- /D=LANG_ENG mousecfg.c
|
||||
@del mousecfg
|
||||
cls
|
||||
@c-- mousecfg.c
|
||||
@rename mousecfg.com mousecfg
|
||||
@kpack mousecfg
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -1,9 +1,5 @@
|
||||
// Mouse Configuration Utility ver 1.62
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
#define MEMSIZE 4096*11
|
||||
|
||||
#include "..\lib\strings.h"
|
||||
|
@ -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("notes.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notes.com")
|
||||
tup.rule("notes.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notes.com")
|
||||
|
@ -1,9 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
C-- notes.c
|
||||
C-- /D=LANG_RUS notes.c
|
||||
@del notes
|
||||
@rename notes.com notes
|
||||
@pause
|
||||
@del lang.h--
|
||||
@del warning.txt
|
||||
|
@ -1,4 +1,4 @@
|
||||
#define MAX_LINE_CHARS 256
|
||||
#define MAX_LINE_CHARS 128
|
||||
|
||||
#define CHBOX 12
|
||||
#define CHECKBOX_ID 50
|
||||
@ -35,7 +35,7 @@ void NOTE_LINE::Delete()
|
||||
|
||||
struct NOTES : llist {
|
||||
char txt_path[4096];
|
||||
char txt_data[MAX_LINE_CHARS*LINES_COUNT];
|
||||
char txt_data[MAX_LINE_CHARS+4*LINES_COUNT+30];
|
||||
bool txt_file_exists;
|
||||
|
||||
NOTE_LINE lines[LINES_COUNT];
|
||||
|
@ -1,6 +1,8 @@
|
||||
// Notes v1.1
|
||||
|
||||
#define MEMSIZE 0xDAE80
|
||||
#define MEMSIZE 1024*40
|
||||
#define ENTRY_POINT #main
|
||||
|
||||
#include "..\lib\kolibri.h"
|
||||
|
||||
#include "..\lib\obj\box_lib.h"
|
||||
@ -13,10 +15,6 @@
|
||||
// //
|
||||
//===================================================//
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
#ifdef LANG_RUS
|
||||
?define WINDOW_CAPTION "‡ ¬¥âª¨"
|
||||
?define DELETE_TEXT "“¤ «¨âì";
|
||||
@ -39,18 +37,19 @@ unsigned char edge[sizeof(file "img/edge.raw")]= FROM "img/edge.raw"; //292x6
|
||||
#define DELETE_BTN 4;
|
||||
#define DELETE_W sizeof(DELETE_TEXT)+2*6
|
||||
|
||||
proc_info Form;
|
||||
|
||||
#include "engine.h"
|
||||
#include "ini.h"
|
||||
|
||||
edit_box notebox = {NULL,NULL,NULL,COL_BG_ACTIVE,0x94AECE,COL_BG_ACTIVE,0xffffff,0,
|
||||
proc_info Form;
|
||||
|
||||
edit_box notebox = {WIN_W-RED_LINE_X-6,RED_LINE_X+5,RED_LINE_X,
|
||||
COL_BG_ACTIVE, 0x94AECE,COL_BG_ACTIVE,0xffffff,0,
|
||||
MAX_LINE_CHARS-1, NULL,0,ed_always_focus+ed_focus};
|
||||
dword lists[] = { 0xEAEAEA, 0xCDCDCD, 0xF0F0F0, 0xD8D8D8, 0 };
|
||||
|
||||
bool delete_active = false;
|
||||
bool window_dragable = true;
|
||||
block delBtn;
|
||||
block delBtn = { WIN_W-DELETE_W-1, NULL, DELETE_W, RED_LINE_X};
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
@ -61,7 +60,6 @@ block delBtn;
|
||||
void main()
|
||||
{
|
||||
bool first_redraw=true;
|
||||
dword cur_line_offset;
|
||||
load_dll(boxlib, #box_lib_init,0);
|
||||
|
||||
if (GetCpuFrequency()/1000000>=1000) window_dragable=true; else window_dragable=false;
|
||||
@ -70,7 +68,6 @@ void main()
|
||||
|
||||
@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
|
||||
LoadIniSettings();
|
||||
|
||||
loop() switch(@WaitEvent())
|
||||
{
|
||||
case evMouse:
|
||||
@ -115,7 +112,7 @@ void main()
|
||||
break;
|
||||
|
||||
case evKey:
|
||||
GetKeys();
|
||||
@GetKeys();
|
||||
if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL)
|
||||
{
|
||||
if (key_scancode == SCAN_CODE_SPACE)
|
||||
@ -184,19 +181,6 @@ void draw_window()
|
||||
EventListRedraw();
|
||||
}
|
||||
|
||||
void DrawEditBoxN()
|
||||
{
|
||||
notebox.width = notes.w-notes.x-8;
|
||||
notebox.left = notes.x+5;
|
||||
notebox.offset = notebox.shift = notebox.shift_old = 0;
|
||||
notebox.cl_curs_x = notebox.cl_curs_y = 0;
|
||||
notebox.size = strlen(notebox.text);
|
||||
notebox.flags = ed_always_focus+ed_focus;
|
||||
if (notebox.pos > notebox.size) notebox.pos = notebox.size;
|
||||
notebox.top = notes.cur_y*notes.item_h+4+notes.y;
|
||||
edit_box_draw stdcall(#notebox);
|
||||
}
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// EVENTS //
|
||||
@ -209,7 +193,13 @@ void EventActivateLine(int line_n)
|
||||
notes.cur_y = line_n;
|
||||
notebox.text = notes.DrawLine(notes.cur_y, notes.item_h);
|
||||
EventListRedraw();
|
||||
DrawEditBoxN();
|
||||
|
||||
notebox.size = strlen(notebox.text);
|
||||
notebox.offset = notebox.shift = notebox.shift_old = 0;
|
||||
notebox.cl_curs_x = notebox.cl_curs_y = 0;
|
||||
if (notebox.pos > notebox.size) notebox.pos = notebox.size;
|
||||
notebox.top = notes.cur_y*notes.item_h+4+notes.y;
|
||||
edit_box_draw stdcall(#notebox);
|
||||
}
|
||||
|
||||
void EventExitApp()
|
||||
@ -222,7 +212,7 @@ void EventExitApp()
|
||||
void EventDrawDeleteButton()
|
||||
{
|
||||
notes.DrawLine(notes.cur_y, notes.item_h);
|
||||
delBtn.set_size(WIN_W-DELETE_W-1, notes.cur_y*notes.item_h+notes.y, DELETE_W, notes.item_h-1);
|
||||
delBtn.y = notes.cur_y*notes.item_h+notes.y;
|
||||
DefineButton(delBtn.x, delBtn.y, delBtn.w, delBtn.h, DELETE_BTN, 0xFF0000);
|
||||
WriteText(delBtn.x+10, delBtn.h/2-3 + delBtn.y, 0x80, 0xFFFfff, DELETE_TEXT);
|
||||
notebox.top=-20;
|
||||
|
@ -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("pixie.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pixie.com")
|
||||
tup.rule("pixie.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pixie.com")
|
||||
|
@ -1,10 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@C-- pixie.c
|
||||
@C-- /D=LANG_ENG pixie.c
|
||||
@del pixie
|
||||
@kpack pixie.com
|
||||
@rename pixie.com pixie
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -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("quark.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com")
|
||||
tup.rule("quark.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com")
|
||||
|
@ -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("search.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "search.com")
|
||||
tup.rule("search.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "search.com")
|
||||
|
@ -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("sysmon.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com")
|
||||
tup.rule("sysmon.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com")
|
||||
|
@ -1,9 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@del sysmon
|
||||
@del /D=LANG_ENG sysmon
|
||||
@c-- sysmon.c
|
||||
@rename sysmon.com sysmon
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -1,9 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@del sysmon
|
||||
@del /D=LANG_RUS sysmon
|
||||
@c-- sysmon.c
|
||||
@rename sysmon.com sysmon
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
@ -6,10 +6,6 @@
|
||||
|
||||
#define MEMSIZE 4096*30
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
//===================================================//
|
||||
// //
|
||||
// LIB //
|
||||
|
@ -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("the_bus.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com")
|
||||
tup.rule("the_bus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com")
|
||||
|
@ -1,10 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@del the_bus
|
||||
@cls
|
||||
@c-- the_bus.c
|
||||
@c-- /D=LANG_ENG the_bus.c
|
||||
@pause
|
||||
@rename the_bus.com the_bus
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
@ -1,10 +1,5 @@
|
||||
@del lang.h--
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@del the_bus
|
||||
@cls
|
||||
@c-- the_bus.c
|
||||
@c-- /D=LANG_RUS the_bus.c
|
||||
@pause
|
||||
@rename the_bus.com the_bus
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
|
@ -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("tmpdisk.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com")
|
||||
tup.rule("tmpdisk.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com")
|
||||
|
@ -1,8 +1,5 @@
|
||||
@echo #define LANG_ENG 1 >lang.h--
|
||||
|
||||
@C-- tmpdisk.c
|
||||
@C-- /D=LANG_ENG tmpdisk.c
|
||||
@del tmpdisk
|
||||
@rename tmpdisk.com tmpdisk
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
||||
|
@ -1,8 +1,5 @@
|
||||
@echo #define LANG_RUS 1 >lang.h--
|
||||
|
||||
@C-- tmpdisk.c
|
||||
@C-- /D=LANG_RUS tmpdisk.c
|
||||
@del tmpdisk
|
||||
@rename tmpdisk.com tmpdisk
|
||||
@del warning.txt
|
||||
@del lang.h--
|
||||
@pause
|
||||
|
@ -4,10 +4,6 @@
|
||||
#include "..\lib\strings.h"
|
||||
#include "..\lib\fs.h"
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////// Program data ////////////////////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
Loading…
Reference in New Issue
Block a user