img align and languages to lang
This commit is contained in:
parent
4aed2f6dde
commit
396bd24432
2
Makefile
2
Makefile
|
@ -4,7 +4,7 @@ include config.make
|
||||||
VERTITLE := instead-$(VERSION)
|
VERTITLE := instead-$(VERSION)
|
||||||
ARCHIVE := instead_$(VERSION).tar.gz#
|
ARCHIVE := instead_$(VERSION).tar.gz#
|
||||||
|
|
||||||
SUBDIRS += src/sdl-instead stead games themes icon desktop doc languages
|
SUBDIRS += src/sdl-instead stead games themes icon desktop doc lang
|
||||||
|
|
||||||
all:
|
all:
|
||||||
@for dir in $(SUBDIRS); do \
|
@for dir in $(SUBDIRS); do \
|
||||||
|
|
|
@ -28,7 +28,7 @@ install: all
|
||||||
$(MAKE) DESTDIR=../bin/ -C games install
|
$(MAKE) DESTDIR=../bin/ -C games install
|
||||||
$(MAKE) DESTDIR=../bin/ -C stead install
|
$(MAKE) DESTDIR=../bin/ -C stead install
|
||||||
$(MAKE) DESTDIR=../bin/ -C icon install
|
$(MAKE) DESTDIR=../bin/ -C icon install
|
||||||
$(MAKE) DESTDIR=../bin/ -C languages install
|
$(MAKE) DESTDIR=../bin/ -C lang install
|
||||||
$(MAKE) DESTDIR=../bin/ -C doc install
|
$(MAKE) DESTDIR=../bin/ -C doc install
|
||||||
|
|
||||||
setup: install docs
|
setup: install docs
|
||||||
|
|
|
@ -9,7 +9,7 @@ THEMESPATH=$(DESTDIR)$(PREFIX)themes
|
||||||
GAMESPATH=$(DESTDIR)$(PREFIX)games
|
GAMESPATH=$(DESTDIR)$(PREFIX)games
|
||||||
ICONPATH=$(DESTDIR)$(PREFIX)icon
|
ICONPATH=$(DESTDIR)$(PREFIX)icon
|
||||||
DOCPATH=$(DESTDIR)$(PREFIX)doc
|
DOCPATH=$(DESTDIR)$(PREFIX)doc
|
||||||
LANGPATH=$(DESTDIR)$(PREFIX)languages
|
LANGPATH=$(DESTDIR)$(PREFIX)lang
|
||||||
MANPATH=$(DESTDIR)$(PREFIX)doc
|
MANPATH=$(DESTDIR)$(PREFIX)doc
|
||||||
|
|
||||||
ZLIB_CFLAGS=
|
ZLIB_CFLAGS=
|
||||||
|
|
|
@ -19,5 +19,5 @@ install: all
|
||||||
$(MAKE) -C games -f Makefile.windows install
|
$(MAKE) -C games -f Makefile.windows install
|
||||||
$(MAKE) -C stead -f Makefile.windows install
|
$(MAKE) -C stead -f Makefile.windows install
|
||||||
$(MAKE) -C icon -f Makefile.windows install
|
$(MAKE) -C icon -f Makefile.windows install
|
||||||
$(MAKE) -C languages -f Makefile.windows install
|
$(MAKE) -C lang -f Makefile.windows install
|
||||||
$(MAKE) -C doc -f Makefile.windows install
|
$(MAKE) -C doc -f Makefile.windows install
|
||||||
|
|
|
@ -7,7 +7,7 @@ STEADPATH=$(DATAPATH)/stead
|
||||||
THEMESPATH=$(DATAPATH)/themes
|
THEMESPATH=$(DATAPATH)/themes
|
||||||
GAMESPATH=$(DATAPATH)/games
|
GAMESPATH=$(DATAPATH)/games
|
||||||
ICONPATH=$(DATAPATH)/icon
|
ICONPATH=$(DATAPATH)/icon
|
||||||
LANGPATH=$(DATAPATH)/languages
|
LANGPATH=$(DATAPATH)/lang
|
||||||
DOCPATH=
|
DOCPATH=
|
||||||
MANPATH=
|
MANPATH=
|
||||||
SYSTEMSETUP=no
|
SYSTEMSETUP=no
|
||||||
|
|
|
@ -7,7 +7,7 @@ STEADPATH=$(DATAPATH)/stead
|
||||||
THEMESPATH=$(DATAPATH)/themes
|
THEMESPATH=$(DATAPATH)/themes
|
||||||
GAMESPATH=$(DATAPATH)/games
|
GAMESPATH=$(DATAPATH)/games
|
||||||
ICONPATH=$(DATAPATH)/icon
|
ICONPATH=$(DATAPATH)/icon
|
||||||
LANGPATH=$(DATAPATH)/languages
|
LANGPATH=$(DATAPATH)/lang
|
||||||
DOCPATH=
|
DOCPATH=
|
||||||
MANPATH=
|
MANPATH=
|
||||||
SYSTEMSETUP=no
|
SYSTEMSETUP=no
|
||||||
|
|
|
@ -9,7 +9,7 @@ THEMESPATH=$(DATAPATH)/themes
|
||||||
GAMESPATH=$(DATAPATH)/games
|
GAMESPATH=$(DATAPATH)/games
|
||||||
ICONPATH=$(DESTDIR)$(PREFIX)/share/pixmaps
|
ICONPATH=$(DESTDIR)$(PREFIX)/share/pixmaps
|
||||||
DOCPATH=$(DESTDIR)$(PREFIX)/share/doc/instead
|
DOCPATH=$(DESTDIR)$(PREFIX)/share/doc/instead
|
||||||
LANGPATH=$(DATAPATH)/languages
|
LANGPATH=$(DATAPATH)/lang
|
||||||
MANPATH=$(DESTDIR)$(PREFIX)/share/man/man6
|
MANPATH=$(DESTDIR)$(PREFIX)/share/man/man6
|
||||||
SYSTEMSETUP=yes
|
SYSTEMSETUP=yes
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ THEMESPATH=$(DESTDIR)$(PREFIX)themes
|
||||||
GAMESPATH=$(DESTDIR)$(PREFIX)games
|
GAMESPATH=$(DESTDIR)$(PREFIX)games
|
||||||
ICONPATH=$(DESTDIR)$(PREFIX)icon
|
ICONPATH=$(DESTDIR)$(PREFIX)icon
|
||||||
DOCPATH=$(DESTDIR)$(PREFIX)doc
|
DOCPATH=$(DESTDIR)$(PREFIX)doc
|
||||||
LANGPATH=$(DESTDIR)$(PREFIX)languages
|
LANGPATH=$(DESTDIR)$(PREFIX)lang
|
||||||
MANPATH=$(DESTDIR)$(PREFIX)doc
|
MANPATH=$(DESTDIR)$(PREFIX)doc
|
||||||
|
|
||||||
ZLIB_CFLAGS=-I../zlib
|
ZLIB_CFLAGS=-I../zlib
|
||||||
|
|
|
@ -9,7 +9,7 @@ STEADPATH=$(DATAPATH)/stead
|
||||||
THEMESPATH=$(DATAPATH)/themes/
|
THEMESPATH=$(DATAPATH)/themes/
|
||||||
GAMESPATH=$(DATAPATH)/games
|
GAMESPATH=$(DATAPATH)/games
|
||||||
ICONPATH=$(DATAPATH)/icon
|
ICONPATH=$(DATAPATH)/icon
|
||||||
LANGPATH=$(DATAPATH)/languages
|
LANGPATH=$(DATAPATH)/lang
|
||||||
|
|
||||||
ZLIB_CFLAGS=-I../zlib
|
ZLIB_CFLAGS=-I../zlib
|
||||||
ZLIB_LFLAGS=../zlib/libz.a
|
ZLIB_LFLAGS=../zlib/libz.a
|
||||||
|
|
|
@ -203,7 +203,7 @@ elif [ "x$ans" = "x2" ]; then
|
||||||
echo "GAMESPATH=\$(DATAPATH)/games" >> config.make
|
echo "GAMESPATH=\$(DATAPATH)/games" >> config.make
|
||||||
echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
|
echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
|
||||||
echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
|
echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
|
||||||
echo "LANGPATH=\$(DATAPATH)/languages" >> config.make
|
echo "LANGPATH=\$(DATAPATH)/lang" >> config.make
|
||||||
echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
|
echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
|
||||||
|
|
||||||
echo "Ok. We are ready to build and install. Use these commands:"
|
echo "Ok. We are ready to build and install. Use these commands:"
|
||||||
|
|
|
@ -59,8 +59,8 @@
|
||||||
".\symbian_gamedata\stead\para.lua" -"!:\data\instead\stead\para.lua"
|
".\symbian_gamedata\stead\para.lua" -"!:\data\instead\stead\para.lua"
|
||||||
".\symbian_gamedata\stead\theme.lua" -"!:\data\instead\stead\theme.lua"
|
".\symbian_gamedata\stead\theme.lua" -"!:\data\instead\stead\theme.lua"
|
||||||
".\symbian_gamedata\stead\prefs.lua" -"!:\data\instead\stead\prefs.lua"
|
".\symbian_gamedata\stead\prefs.lua" -"!:\data\instead\stead\prefs.lua"
|
||||||
".\symbian_gamedata\languages\ru.ini" -"!:\data\instead\languages\ru.ini"
|
".\symbian_gamedata\lang\ru.ini" -"!:\data\instead\lang\ru.ini"
|
||||||
".\symbian_gamedata\languages\en.ini" -"!:\data\instead\languages\en.ini"
|
".\symbian_gamedata\lang\en.ini" -"!:\data\instead\lang\en.ini"
|
||||||
".\symbian_gamedata\themes\fantasy\down.png" -"!:\data\instead\themes\fantasy\down.png"
|
".\symbian_gamedata\themes\fantasy\down.png" -"!:\data\instead\themes\fantasy\down.png"
|
||||||
".\symbian_gamedata\themes\fantasy\up.png" -"!:\data\instead\themes\fantasy\up.png"
|
".\symbian_gamedata\themes\fantasy\up.png" -"!:\data\instead\themes\fantasy\up.png"
|
||||||
".\symbian_gamedata\themes\fantasy\menu.png" -"!:\data\instead\themes\fantasy\menu.png"
|
".\symbian_gamedata\themes\fantasy\menu.png" -"!:\data\instead\themes\fantasy\menu.png"
|
||||||
|
|
7
lang/Makefile.windows
Normal file
7
lang/Makefile.windows
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
include ../Rules.make
|
||||||
|
|
||||||
|
clean:
|
||||||
|
all:
|
||||||
|
install:
|
||||||
|
if not exist ..\bin\lang mkdir ..\bin\lang
|
||||||
|
copy /Y *.ini ..\bin\lang
|
|
@ -1,7 +0,0 @@
|
||||||
include ../Rules.make
|
|
||||||
|
|
||||||
clean:
|
|
||||||
all:
|
|
||||||
install:
|
|
||||||
if not exist ..\bin\languages mkdir ..\bin\languages
|
|
||||||
copy /Y *.ini ..\bin\languages
|
|
|
@ -26,7 +26,7 @@ Source: icon\*; DestDir: {app}\icon
|
||||||
Source: doc\*; DestDir: {app}\doc
|
Source: doc\*; DestDir: {app}\doc
|
||||||
Source: doc\modules\*; DestDir: {app}\doc\modules
|
Source: doc\modules\*; DestDir: {app}\doc\modules
|
||||||
Source: stead\*; DestDir: {app}\stead
|
Source: stead\*; DestDir: {app}\stead
|
||||||
Source: languages\*; DestDir: {app}\languages
|
Source: lang\*; DestDir: {app}\lang
|
||||||
Source: themes\default\*; DestDir: {app}\themes\default
|
Source: themes\default\*; DestDir: {app}\themes\default
|
||||||
Source: themes\book\*; DestDir: {app}\themes\book
|
Source: themes\book\*; DestDir: {app}\themes\book
|
||||||
Source: themes\original\*; DestDir: {app}\themes\original
|
Source: themes\original\*; DestDir: {app}\themes\original
|
||||||
|
|
|
@ -23,7 +23,7 @@ Source: icon\*; DestDir: {app}\icon
|
||||||
Source: doc\*; DestDir: {app}\doc
|
Source: doc\*; DestDir: {app}\doc
|
||||||
Source: doc\modules\*; DestDir: {app}\doc\modules
|
Source: doc\modules\*; DestDir: {app}\doc\modules
|
||||||
Source: stead\*; DestDir: {app}\stead
|
Source: stead\*; DestDir: {app}\stead
|
||||||
Source: languages\*; DestDir: {app}\languages
|
Source: lang\*; DestDir: {app}\lang
|
||||||
Source: themes\default\*; DestDir: {app}\themes\default
|
Source: themes\default\*; DestDir: {app}\themes\default
|
||||||
Source: themes\book\*; DestDir: {app}\themes\book
|
Source: themes\book\*; DestDir: {app}\themes\book
|
||||||
Source: themes\original\*; DestDir: {app}\themes\original
|
Source: themes\original\*; DestDir: {app}\themes\original
|
||||||
|
|
|
@ -2962,11 +2962,15 @@ img_t get_img(struct layout *layout, char *p, int *al)
|
||||||
if (!p[align])
|
if (!p[align])
|
||||||
align = 0;
|
align = 0;
|
||||||
else {
|
else {
|
||||||
p[align] = 0;
|
|
||||||
if (!strcmp(p + align + 1, "left"))
|
if (!strcmp(p + align + 1, "left"))
|
||||||
*al = ALIGN_LEFT;
|
*al = ALIGN_LEFT;
|
||||||
else if (!strcmp(p + align + 1, "right"))
|
else if (!strcmp(p + align + 1, "right"))
|
||||||
*al = ALIGN_RIGHT;
|
*al = ALIGN_RIGHT;
|
||||||
|
if (*al) {
|
||||||
|
p[align] = 0;
|
||||||
|
if (align && p[align - 1] == '\\')
|
||||||
|
p[align - 1] = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
img = layout_lookup_image(layout, p);
|
img = layout_lookup_image(layout, p);
|
||||||
if (img)
|
if (img)
|
||||||
|
|
|
@ -7,5 +7,5 @@
|
||||||
#define THEMES_PATH DATAPATH"themes/"
|
#define THEMES_PATH DATAPATH"themes/"
|
||||||
#define GAMES_PATH DATAPATH"games/"
|
#define GAMES_PATH DATAPATH"games/"
|
||||||
#define ICON_PATH DATAPATH"icon/"
|
#define ICON_PATH DATAPATH"icon/"
|
||||||
#define LANG_PATH DATAPATH"languages/"
|
#define LANG_PATH DATAPATH"lang/"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -53,12 +53,12 @@ end;
|
||||||
|
|
||||||
iface.imgl = function(self, str)
|
iface.imgl = function(self, str)
|
||||||
if str == nil then return nil; end;
|
if str == nil then return nil; end;
|
||||||
return "<g:"..str.."|left>";
|
return "<g:"..str.."\\|left>";
|
||||||
end;
|
end;
|
||||||
|
|
||||||
iface.imgr = function(self, str)
|
iface.imgr = function(self, str)
|
||||||
if str == nil then return nil; end;
|
if str == nil then return nil; end;
|
||||||
return "<g:"..str.."|right>";
|
return "<g:"..str.."\\|right>";
|
||||||
end;
|
end;
|
||||||
|
|
||||||
iface.nb = function(self, str)
|
iface.nb = function(self, str)
|
||||||
|
|
Loading…
Reference in a new issue