[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src Makefile.am,1.80.2.34,1.80.2.35 j
From: |
VENNIN Joel <address@hidden> |
Subject: |
[Adonthell-commits] CVS: adonthell/src Makefile.am,1.80.2.34,1.80.2.35 joltest.cc,1.1.2.10,1.1.2.11 |
Date: |
Tue, 02 Jul 2002 03:20:32 -0400 |
Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv6040
Modified Files:
Tag: Branch_road_to_0-4
Makefile.am joltest.cc
Log Message:
Add gui namespace
Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.80.2.34
retrieving revision 1.80.2.35
diff -C2 -r1.80.2.34 -r1.80.2.35
*** Makefile.am 1 Jul 2002 19:46:49 -0000 1.80.2.34
--- Makefile.am 2 Jul 2002 07:20:29 -0000 1.80.2.35
***************
*** 1,5 ****
## Process this file with automake to produce Makefile.in
! MODULES_SUBDIRS = gfx input audio python lmap
if BUILD_TOOLS
--- 1,5 ----
## Process this file with automake to produce Makefile.in
! MODULES_SUBDIRS = gfx input audio python lmap gui
if BUILD_TOOLS
***************
*** 21,25 ****
CPPFLAGS += $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS)
$(FT2_CFLAGS)
! noinst_LIBRARIES = libbase.a libgui.a
CLEANFILES = $(moddata_SCRIPTS)
--- 21,25 ----
CPPFLAGS += $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS)
$(FT2_CFLAGS)
! noinst_LIBRARIES = libbase.a
CLEANFILES = $(moddata_SCRIPTS)
***************
*** 71,88 ****
libpython_LDADD = $(PY_LIBS)
! libgui_a_SOURCES = atk_box.cc atk_misc.cc atk_container.cc atk_label.cc \
! atk_font.cc atk_widget.cc atk_fixed.cc \
! atk_bin.cc atk_window.cc atk_manager.cc atk_border_template.cc \
! atk_border_ui.cc atk_theme.cc atk_background_template.cc \
! atk_button_template.cc atk_button.cc atk_button_ui.cc \
! atk_background_ui.cc \
! callback_sig.cc \
! atk_box.h atk_misc.h atk_container.h atk_label.h \
! atk_font.h atk_widget.h atk_fixed.h \
! atk_bin.h atk_window.h atk_manager.h atk_border_template.h \
! atk_border_ui.h atk_theme.h atk_background_template.h \
! atk_button_template.h atk_button.h atk_button_ui.h \
! atk_background_ui.h \
! callback_sig.h callback_slot.h
libgui_LDADD = $(FT2_LIBS)
--- 71,88 ----
libpython_LDADD = $(PY_LIBS)
! #libgui_a_SOURCES = atk_box.cc atk_misc.cc atk_container.cc atk_label.cc \
! # atk_font.cc atk_widget.cc atk_fixed.cc \
! # atk_bin.cc atk_window.cc atk_manager.cc atk_border_template.cc \
! # atk_border_ui.cc atk_theme.cc atk_background_template.cc \
! # atk_button_template.cc atk_button.cc atk_button_ui.cc \
! # atk_background_ui.cc \
! # callback_sig.cc \
! # atk_box.h atk_misc.h atk_container.h atk_label.h \
! # atk_font.h atk_widget.h atk_fixed.h \
! # atk_bin.h atk_window.h atk_manager.h atk_border_template.h \
! # atk_border_ui.h atk_theme.h atk_background_template.h \
! # atk_button_template.h atk_button.h atk_button_ui.h \
! # atk_background_ui.h \
! # callback_sig.h callback_slot.h
libgui_LDADD = $(FT2_LIBS)
***************
*** 107,111 ****
schedtest_SOURCES = schedtest.cc
! joltest_LDADD = libgui.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD) $(libgui_LDADD)
alextest_LDADD = lmap/libmap.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD)
--- 107,111 ----
schedtest_SOURCES = schedtest.cc
! joltest_LDADD = gui/libgui.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD) $(libgui_LDADD)
alextest_LDADD = lmap/libmap.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD)
Index: joltest.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/joltest.cc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -r1.1.2.10 -r1.1.2.11
*** joltest.cc 30 Jun 2002 19:01:01 -0000 1.1.2.10
--- joltest.cc 2 Jul 2002 07:20:29 -0000 1.1.2.11
***************
*** 4,21 ****
#include "gfx/image.h"
#include "gfx/screen.h"
! #include "atk_font.h"
! #include "atk_widget.h"
! #include "atk_box.h"
! #include "atk_fixed.h"
! #include "atk_manager.h"
! #include "atk_window.h"
! #include "atk_button_template.h"
! #include "atk_border_template.h"
! #include "atk_background_template.h"
! #include "atk_theme.h"
! #include "atk_button.h"
#include "gametime.h"
int main (int argc, char * argv[])
--- 4,22 ----
#include "gfx/image.h"
#include "gfx/screen.h"
! #include "gui/font.h"
! #include "gui/widget.h"
! #include "gui/box.h"
! #include "gui/fixed.h"
! #include "gui/manager.h"
! #include "gui/window.h"
! #include "gui/button_template.h"
! #include "gui/border_template.h"
! #include "gui/background_template.h"
! #include "gui/theme.h"
! #include "gui/button.h"
#include "gametime.h"
+ using namespace gui;
int main (int argc, char * argv[])
***************
*** 35,39 ****
* Font
*/
! atk_font font;
if (!font.load (argv[1]))
{
--- 36,40 ----
* Font
*/
! gui::font font;
if (!font.load (argv[1]))
{
***************
*** 45,86 ****
! atk_theme theme;
theme.load ("adontest/original.theme");
! atk_manager manager;
/**
CREATE BUTTON
*/
! atk_border_template * bd_press = new atk_border_template;
bd_press->set_name ("pressed");
! bd_press->set (atk_border_template::B_TOP,
"widgets/button_pressed_top.pnm");
! bd_press->set (atk_border_template::B_RIGHT,
"widgets/button_pressed_right.pnm");
! bd_press->set (atk_border_template::B_LEFT,
"widgets/button_pressed_left.pnm");
! bd_press->set (atk_border_template::B_BOTTOM,
"widgets/button_pressed_bot.pnm");
! bd_press->set (atk_border_template::C_TL,
"widgets/button_pressed_tl.pnm");
! bd_press->set (atk_border_template::C_TR,
"widgets/button_pressed_tr.pnm");
! bd_press->set (atk_border_template::C_BL,
"widgets/button_pressed_bl.pnm");
! bd_press->set (atk_border_template::C_BR,
"widgets/button_pressed_br.pnm");
bd_press->build();
! atk_border_template * bd_released = new atk_border_template;
bd_released->set_name ("released");
! bd_released->set (atk_border_template::B_TOP, "widgets/button_top.pnm");
! bd_released->set (atk_border_template::B_RIGHT,
"widgets/button_right.pnm");
! bd_released->set (atk_border_template::B_LEFT, "widgets/button_left.pnm");
! bd_released->set (atk_border_template::B_BOTTOM,
"widgets/button_bot.pnm");
! bd_released->set (atk_border_template::C_TL, "widgets/button_tl.pnm");
! bd_released->set (atk_border_template::C_TR, "widgets/button_tr.pnm");
! bd_released->set (atk_border_template::C_BL, "widgets/button_bl.pnm");
! bd_released->set (atk_border_template::C_BR, "widgets/button_br.pnm");
bd_released->build();
! atk_background_template * ba_tmp = new atk_background_template();
ba_tmp->set_color (192, 165, 57);
! atk_button_template bt_tmp;
bt_tmp.set_released (bd_released);
bt_tmp.set_pressed (bd_press);
--- 46,87 ----
! gui::theme theme;
theme.load ("adontest/original.theme");
! gui::manager manager;
/**
CREATE BUTTON
*/
! gui::border_template * bd_press = new gui::border_template;
bd_press->set_name ("pressed");
! bd_press->set (border_template::B_TOP, "widgets/button_pressed_top.pnm");
! bd_press->set (border_template::B_RIGHT,
"widgets/button_pressed_right.pnm");
! bd_press->set (border_template::B_LEFT,
"widgets/button_pressed_left.pnm");
! bd_press->set (border_template::B_BOTTOM,
"widgets/button_pressed_bot.pnm");
! bd_press->set (border_template::C_TL, "widgets/button_pressed_tl.pnm");
! bd_press->set (border_template::C_TR, "widgets/button_pressed_tr.pnm");
! bd_press->set (border_template::C_BL, "widgets/button_pressed_bl.pnm");
! bd_press->set (border_template::C_BR, "widgets/button_pressed_br.pnm");
bd_press->build();
! gui::border_template * bd_released = new gui::border_template;
bd_released->set_name ("released");
! bd_released->set (border_template::B_TOP, "widgets/button_top.pnm");
! bd_released->set (border_template::B_RIGHT, "widgets/button_right.pnm");
! bd_released->set (border_template::B_LEFT, "widgets/button_left.pnm");
! bd_released->set (border_template::B_BOTTOM, "widgets/button_bot.pnm");
! bd_released->set (border_template::C_TL, "widgets/button_tl.pnm");
! bd_released->set (border_template::C_TR, "widgets/button_tr.pnm");
! bd_released->set (border_template::C_BL, "widgets/button_bl.pnm");
! bd_released->set (border_template::C_BR, "widgets/button_br.pnm");
bd_released->build();
! gui::background_template * ba_tmp = new gui::background_template();
ba_tmp->set_color (192, 165, 57);
! button_template bt_tmp;
bt_tmp.set_released (bd_released);
bt_tmp.set_pressed (bd_press);
***************
*** 90,94 ****
! atk_window * wnd = new atk_window;
--- 91,95 ----
! gui::window * wnd = new gui::window;
***************
*** 96,105 ****
wnd->set_position (20, 40);
wnd->set_size (350, 200);
! wnd->on_delete.connect (new callback_slot (makeFunctor (manager,
&atk_manager::shutdown)));
wnd->set_border_ui (theme.get_border("normal"));
! atk_box * box = new atk_box;
box->set_border_width (10);
box->set_spacing (3);
--- 97,106 ----
wnd->set_position (20, 40);
wnd->set_size (350, 200);
! wnd->on_delete.connect (new callback_slot (makeFunctor (manager,
&manager::shutdown)));
wnd->set_border_ui (theme.get_border("normal"));
! gui::box * box = new gui::box;
box->set_border_width (10);
box->set_spacing (3);
***************
*** 107,116 ****
box->set_size (200, 60);
box->set_position (50, 50);
! box->set_geometry (atk_box::VERTICAL);
box->set_border_ui (theme.get_border("mini"));
! atk_widget * wid;
! wid = new atk_widget;
wid->set_size (30, 50);
wid->set_visible (true);
--- 108,117 ----
box->set_size (200, 60);
box->set_position (50, 50);
! box->set_geometry (box::VERTICAL);
box->set_border_ui (theme.get_border("mini"));
! gui::widget * wid;
! wid = new gui::widget;
wid->set_size (30, 50);
wid->set_visible (true);
***************
*** 119,123 ****
! /*wid = new atk_widget;
wid->set_size (30, 20);
wid->set_visible (true);
--- 120,124 ----
! /*wid = new widget;
wid->set_size (30, 20);
wid->set_visible (true);
***************
*** 125,130 ****
box->add_start (wid, true, true, 0);
*/
! atk_button * but;
! but = new atk_button;
but->set_size (30, 20);
but->set_visible (true);
--- 126,131 ----
box->add_start (wid, true, true, 0);
*/
! gui::button * but;
! but = new gui::button;
but->set_size (30, 20);
but->set_visible (true);
***************
*** 134,138 ****
box->add_start (but, true, true, 0);
! wid = new atk_widget;
wid->set_size (10, 50);
wid->set_visible (true);
--- 135,139 ----
box->add_start (but, true, true, 0);
! wid = new gui::widget;
wid->set_size (10, 50);
wid->set_visible (true);
***************
*** 172,205 ****
*/
/*
! atk_theme theme;
theme.set_name ("silverleaf");
! atk_border_template * border;
! border = new atk_border_template;
border->set_name ("mini");
! border->set (atk_border_template::B_TOP, "silverleaf/mini/h_border.pnm");
! border->set (atk_border_template::B_BOTTOM,
"silverleaf/mini/h_border.pnm");
! border->set (atk_border_template::B_LEFT, "silverleaf/mini/v_border.pnm");
! border->set (atk_border_template::B_RIGHT,
"silverleaf/mini/v_border.pnm");
! border->set (atk_border_template::C_TL,
"silverleaf/mini/corner_top_left.pnm");
! border->set (atk_border_template::C_TR,
"silverleaf/mini/corner_top_right.pnm");
! border->set (atk_border_template::C_BL,
"silverleaf/mini/corner_bottom_left.pnm");
! border->set (atk_border_template::C_BR,
"silverleaf/mini/corner_bottom_right.pnm");
! border->set (atk_border_template::C_EXIT,
"silverleaf/mini/corner_top_left.pnm");
! border->set (atk_border_template::C_RESIZE,
"silverleaf/mini/corner_bottom_right.pnm");
theme.add_border (border);
! border = new atk_border_template;
border->set_name ("normal");
! border->set (atk_border_template::B_TOP,
"silverleaf/normal/h_border.pnm");
! border->set (atk_border_template::B_BOTTOM,
"silverleaf/normal/h_border.pnm");
! border->set (atk_border_template::B_LEFT,
"silverleaf/normal/v_border.pnm");
! border->set (atk_border_template::B_RIGHT,
"silverleaf/normal/v_border.pnm");
! border->set (atk_border_template::C_TL,
"silverleaf/normal/corner_top_left.pnm");
! border->set (atk_border_template::C_TR,
"silverleaf/normal/corner_top_right.pnm");
! border->set (atk_border_template::C_BL,
"silverleaf/normal/corner_bottom_left.pnm");
! border->set (atk_border_template::C_BR,
"silverleaf/normal/corner_bottom_right.pnm");
! border->set (atk_border_template::C_EXIT,
"silverleaf/normal/corner_top_left.pnm");
! border->set (atk_border_template::C_RESIZE,
"silverleaf/normal/corner_bottom_right.pnm");
theme.add_border (border);
--- 173,206 ----
*/
/*
! theme theme;
theme.set_name ("silverleaf");
! border_template * border;
! border = new border_template;
border->set_name ("mini");
! border->set (border_template::B_TOP, "silverleaf/mini/h_border.pnm");
! border->set (border_template::B_BOTTOM, "silverleaf/mini/h_border.pnm");
! border->set (border_template::B_LEFT, "silverleaf/mini/v_border.pnm");
! border->set (border_template::B_RIGHT, "silverleaf/mini/v_border.pnm");
! border->set (border_template::C_TL,
"silverleaf/mini/corner_top_left.pnm");
! border->set (border_template::C_TR,
"silverleaf/mini/corner_top_right.pnm");
! border->set (border_template::C_BL,
"silverleaf/mini/corner_bottom_left.pnm");
! border->set (border_template::C_BR,
"silverleaf/mini/corner_bottom_right.pnm");
! border->set (border_template::C_EXIT,
"silverleaf/mini/corner_top_left.pnm");
! border->set (border_template::C_RESIZE,
"silverleaf/mini/corner_bottom_right.pnm");
theme.add_border (border);
! border = new border_template;
border->set_name ("normal");
! border->set (border_template::B_TOP, "silverleaf/normal/h_border.pnm");
! border->set (border_template::B_BOTTOM, "silverleaf/normal/h_border.pnm");
! border->set (border_template::B_LEFT, "silverleaf/normal/v_border.pnm");
! border->set (border_template::B_RIGHT, "silverleaf/normal/v_border.pnm");
! border->set (border_template::C_TL,
"silverleaf/normal/corner_top_left.pnm");
! border->set (border_template::C_TR,
"silverleaf/normal/corner_top_right.pnm");
! border->set (border_template::C_BL,
"silverleaf/normal/corner_bottom_left.pnm");
! border->set (border_template::C_BR,
"silverleaf/normal/corner_bottom_right.pnm");
! border->set (border_template::C_EXIT,
"silverleaf/normal/corner_top_left.pnm");
! border->set (border_template::C_RESIZE,
"silverleaf/normal/corner_bottom_right.pnm");
theme.add_border (border);
***************
*** 216,220 ****
**/
/*
! atk_theme theme;
theme.load ("adontest/original.theme");
--- 217,221 ----
**/
/*
! theme theme;
theme.load ("adontest/original.theme");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src Makefile.am,1.80.2.34,1.80.2.35 joltest.cc,1.1.2.10,1.1.2.11,
VENNIN Joel <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: adonthell/src/gui - New directory
- Next by Date:
[Adonthell-commits] CVS: adonthell/src/gui Makefile.am,NONE,1.1.2.1 background_template.cc,NONE,1.1.2.1 background_template.h,NONE,1.1.2.1 background_ui.cc,NONE,1.1.2.1 background_ui.h,NONE,1.1.2.1 bin.cc,NONE,1.1.2.1 bin.h,NONE,1.1.2.1 border.cc,NONE,1.1.2.1 border.h,NONE,1.1.2.1 border_template.cc,NONE,1.1.2.1 border_template.h,NONE,1.1.2.1 border_ui.cc,NONE,1.1.2.1 border_ui.h,NONE,1.1.2.1 box.cc,NONE,1.1.2.1 box.h,NONE,1.1.2.1 button.cc,NONE,1.1.2.1 button.h,NONE,1.1.2.1 button_template.cc,NONE,1.1.2.1 button_template.h,NONE,1.1.2.1 button_ui.cc,NONE,1.1.2.1 button_ui.h,NONE,1.1.2.1 container.cc,NONE,1.1.2.1 container.h,NONE,1.1.2.1 fixed.cc,NONE,1.1.2.1 fixed.h,NONE,1.1.2.1 font.cc,NONE,1.1.2.1 font.h,NONE,1.1.2.1 label.cc,NONE,1.1.2.1 label.h,NONE,1.1.2.1 manager.cc,NONE,1.1.2.1 manager.h,NONE,1.1.2.1 misc.cc,NONE,1.1.2.1 misc.h,NONE,1.1.2.1 object_ui.h,NONE,1.1.2.1 table.h,NONE,1.1.2.1 theme.cc,NONE,1.1.2.1 theme.h,NONE,1.1.2.1 widget.cc,NONE,1.1.2.1 widget.h,NONE,1.1.2.1 window.cc,NONE,1.1.2.1 window.h,NONE,1.1.2.1
- Previous by thread:
[Adonthell-commits] CVS: adonthell/src/gui - New directory
- Next by thread:
[Adonthell-commits] CVS: adonthell/src/gui Makefile.am,NONE,1.1.2.1 background_template.cc,NONE,1.1.2.1 background_template.h,NONE,1.1.2.1 background_ui.cc,NONE,1.1.2.1 background_ui.h,NONE,1.1.2.1 bin.cc,NONE,1.1.2.1 bin.h,NONE,1.1.2.1 border.cc,NONE,1.1.2.1 border.h,NONE,1.1.2.1 border_template.cc,NONE,1.1.2.1 border_template.h,NONE,1.1.2.1 border_ui.cc,NONE,1.1.2.1 border_ui.h,NONE,1.1.2.1 box.cc,NONE,1.1.2.1 box.h,NONE,1.1.2.1 button.cc,NONE,1.1.2.1 button.h,NONE,1.1.2.1 button_template.cc,NONE,1.1.2.1 button_template.h,NONE,1.1.2.1 button_ui.cc,NONE,1.1.2.1 button_ui.h,NONE,1.1.2.1 container.cc,NONE,1.1.2.1 container.h,NONE,1.1.2.1 fixed.cc,NONE,1.1.2.1 fixed.h,NONE,1.1.2.1 font.cc,NONE,1.1.2.1 font.h,NONE,1.1.2.1 label.cc,NONE,1.1.2.1 label.h,NONE,1.1.2.1 manager.cc,NONE,1.1.2.1 manager.h,NONE,1.1.2.1 misc.cc,NONE,1.1.2.1 misc.h,NONE,1.1.2.1 object_ui.h,NONE,1.1.2.1 table.h,NONE,1.1.2.1 theme.cc,NONE,1.1.2.1 theme.h,NONE,1.1.2.1 widget.cc,NONE,1.1.2.1 widget.h,NONE,1.1.2.1 window.cc,NONE,1.1.2.1 window.h,NONE,1.1.2.1
- Index(es):