diff options
| -rw-r--r-- | common/xmlparser.h | 33 | ||||
| -rw-r--r-- | gui/theme.h | 2 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 43279 -> 43280 bytes | |||
| -rw-r--r-- | gui/themes/scummclassic/THEMERC | 2 | ||||
| -rw-r--r-- | gui/themes/scummclassic/classic_gfx.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout_320.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummmodern.zip | bin | 143581 -> 143567 bytes | |||
| -rw-r--r-- | gui/themes/scummmodern/THEMERC | 2 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummodern_gfx.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummodern_layout.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummodern_layout_320.stx | 48 | ||||
| -rw-r--r-- | gui/themes/scummtheme.py | 2 |
13 files changed, 166 insertions, 163 deletions
diff --git a/common/xmlparser.h b/common/xmlparser.h index 89df048395..f7a3c664e9 100644 --- a/common/xmlparser.h +++ b/common/xmlparser.h @@ -349,32 +349,35 @@ protected: * or to change the commenting syntax. */ virtual bool skipComments() { - char endComment1 = 0, endComment2 = 0; - - if (_char == '/') { + if (_char == '<') { _char = _stream->readByte(); - if (_char != '*') { + if (_char != '!') { _stream->seek(-1, SEEK_CUR); - _char = '/'; + _char = '<'; return false; } + if (_stream->readByte() != '-' || _stream->readByte() != '-') + return parserError("Malformed comment syntax."); + _char = _stream->readByte(); + bool dash = false; while (_char) { - endComment1 = endComment2; - endComment2 = _char; + if (_char == '-') { + if (dash && _stream->readByte() == '>') { + _char = _stream->readByte(); + return true; + } + + dash = !dash; + } + _char = _stream->readByte(); - - if (endComment1 == '*' && endComment2 == '/') - break; - - if (_char == 0) - return parserError("Comment has no closure."); } - _char = _stream->readByte(); - return true; + + return parserError("Comment has no closure."); } return false; diff --git a/gui/theme.h b/gui/theme.h index 6b3f51085f..3d114ae207 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -35,7 +35,7 @@ #include "graphics/fontman.h" #define THEME_VERSION 24 -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_THEME_V23" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.2" namespace GUI { diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 010e465fcc..2df5573a4e 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index df6c0508b2..96f0528ddb 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_THEME_V23:ScummVM Classic Theme:No Author]
\ No newline at end of file +[SCUMMVM_STX0.2:ScummVM Classic Theme:No Author]
\ No newline at end of file diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx index d9189743d3..a566e83e45 100644 --- a/gui/themes/scummclassic/classic_gfx.stx +++ b/gui/themes/scummclassic/classic_gfx.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <render_info> <palette> diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 75e8448be7..fec2632119 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <layout_info resolution = '-320xY, -256x240'> <globals> diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx index 7870a0df78..792f54e45e 100644 --- a/gui/themes/scummclassic/classic_layout_320.stx +++ b/gui/themes/scummclassic/classic_layout_320.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <layout_info resolution = "320xY, 256x240"> <globals> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 86222f5ca7..d1700259db 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index d11c959867..66e46315a9 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_THEME_V23:ScummVM Modern Theme:No Author]
\ No newline at end of file +[SCUMMVM_STX0.2:ScummVM Modern Theme:No Author]
\ No newline at end of file diff --git a/gui/themes/scummmodern/scummodern_gfx.stx b/gui/themes/scummmodern/scummodern_gfx.stx index b8eff77aa1..148f1cb522 100644 --- a/gui/themes/scummmodern/scummodern_gfx.stx +++ b/gui/themes/scummmodern/scummodern_gfx.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <render_info> <palette> diff --git a/gui/themes/scummmodern/scummodern_layout.stx b/gui/themes/scummmodern/scummodern_layout.stx index 656f828c48..92de9dda46 100644 --- a/gui/themes/scummmodern/scummodern_layout.stx +++ b/gui/themes/scummmodern/scummodern_layout.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <layout_info resolution = '-320xY, -256x240'> <globals> diff --git a/gui/themes/scummmodern/scummodern_layout_320.stx b/gui/themes/scummmodern/scummodern_layout_320.stx index 398fa59d31..8c755b4ca2 100644 --- a/gui/themes/scummmodern/scummodern_layout_320.stx +++ b/gui/themes/scummmodern/scummodern_layout_320.stx @@ -1,27 +1,27 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ +<!-- ScummVM - Graphic Adventure Engine + - + - ScummVM is the legal property of its developers, whose names + - are too numerous to list here. Please refer to the COPYRIGHT + - file distributed with this source distribution. + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License + - as published by the Free Software Foundation; either version 2 + - of the License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + - + - $URL$ + - $Id$ + - + --> <layout_info resolution = "320xY, 256x240"> <globals> diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py index 6199289e66..e88f8c1f9c 100644 --- a/gui/themes/scummtheme.py +++ b/gui/themes/scummtheme.py @@ -34,7 +34,7 @@ def buildAllThemes(): buildTheme(f) def parseSTX(theme_file, def_file): - comm = re.compile("\/\*(.*?)\*\/", re.DOTALL) + comm = re.compile("<!--(.*?)-->", re.DOTALL) output = "" for line in theme_file: |