libufo-commits Mailing List for UFO: Universal Form Objects (Page 6)
Status: Beta
Brought to you by:
schmidtjf
Menu
▾
▴
libufo-commits — commit messages from cvs
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(78) |
Oct
(69) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:15:32
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22137/include/ufo/xml Modified Files: uxul.hpp Log Message: Added action map to UXul to automatically connect slots to sigActivated signals. Fixed setting size via XUL and CSS commands. Index: uxul.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/xml/uxul.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** uxul.hpp 21 May 2005 15:33:23 -0000 1.1 --- uxul.hpp 15 Sep 2005 10:15:23 -0000 1.2 *************** *** 32,35 **** --- 32,36 ---- #include "../util/urectangle.hpp" + #include "../signals/ufo_signals.hpp" #include <map> *************** *** 60,65 **** --- 61,68 ---- UXul(); UXul(const std::string & guiFile); + UXul(const std::string & guiFile, std::map<std::string, UActionSlot> map); virtual ~UXul(); void load(const std::string & guiFile); + void setActionMap(std::map<std::string, UActionSlot> map); /** Creates a root pane with widgets created according * the previous loaded XUL file. *************** *** 78,81 **** --- 81,85 ---- std::string m_title; std::map<std::string, UWidget*> m_map; + std::map<std::string, UActionSlot> m_actionMap; }; |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:14:03
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/src/ux Modified Files: uxframe.cpp Log Message: Make context current on setVisible(true) Index: uxframe.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxframe.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** uxframe.cpp 21 Jun 2005 09:27:59 -0000 1.7 --- uxframe.cpp 15 Sep 2005 10:13:47 -0000 1.8 *************** *** 76,79 **** --- 76,80 ---- m_videoDevice->show(); m_isVisible = true; + UToolkit::getToolkit()->makeContextCurrent(m_context); } else { m_isVisible = false; |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:13:31
|
Update of /cvsroot/libufo/ufo-0.5/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21681/src/widgets Modified Files: ulistbox.cpp Log Message: Added support for keyboard events to UListBox. Index: ulistbox.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ulistbox.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ulistbox.cpp 12 Jul 2005 13:32:55 -0000 1.21 --- ulistbox.cpp 15 Sep 2005 10:13:21 -0000 1.22 *************** *** 30,33 **** --- 30,34 ---- #include "ufo/widgets/uitem.hpp" #include "ufo/events/umouseevent.hpp" + #include "ufo/events/ukeyevent.hpp" *************** *** 214,233 **** void ! UListBox::addedToHierarchy() { ! UWidget::addedToHierarchy(); ! for (std::vector<UItem*>::const_iterator iter = m_items.begin(); ! iter != m_items.end(); ! ++iter) { ! (*iter)->install(this); } } void ! UListBox::removedFromHierarchy() { ! UWidget::removedFromHierarchy(); ! for (std::vector<UItem*>::const_iterator iter = m_items.begin(); ! iter != m_items.end(); ! ++iter) { ! (*iter)->uninstall(this); } } --- 215,257 ---- void ! UListBox::processKeyEvent(UKeyEvent * e) { ! if (e->isConsumed()) { ! UWidget::processKeyEvent(e); ! return; ! } ! ! int cur = getSelectedIndex(); ! if (e->getType() == UEvent::KeyPressed) { ! switch (e->getKeyCode()) { ! case UKey::UK_KP_DOWN: ! case UKey::UK_DOWN: ! setSelectedIndex(cur + 1); ! e->consume(); ! break; ! case UKey::UK_KP_UP: ! case UKey::UK_UP: { ! setSelectedIndex((cur) ? cur - 1 : 0); ! e->consume(); ! } ! break; ! } } + UWidget::processKeyEvent(e); } void ! UListBox::processWidgetEvent(UWidgetEvent * e) { ! if (e->getType() == UEvent::WidgetAdded) { ! for (std::vector<UItem*>::const_iterator iter = m_items.begin(); ! iter != m_items.end(); ! ++iter) { ! (*iter)->install(this); ! } ! } else if (e->getType() == UEvent::WidgetAdded) { ! for (std::vector<UItem*>::const_iterator iter = m_items.begin(); ! iter != m_items.end(); ! ++iter) { ! (*iter)->uninstall(this); ! } } } |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:13:31
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21681/include/ufo/widgets Modified Files: ulistbox.hpp Log Message: Added support for keyboard events to UListBox. Index: ulistbox.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/widgets/ulistbox.hpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ulistbox.hpp 21 May 2005 15:20:25 -0000 1.14 --- ulistbox.hpp 15 Sep 2005 10:13:21 -0000 1.15 *************** *** 130,135 **** virtual UDimension getContentsSize(const UDimension & maxSize) const; virtual void processMouseEvent(UMouseEvent * e); ! virtual void addedToHierarchy(); ! virtual void removedFromHierarchy(); public: // Public signals --- 130,135 ---- virtual UDimension getContentsSize(const UDimension & maxSize) const; virtual void processMouseEvent(UMouseEvent * e); ! virtual void processKeyEvent(UKeyEvent * e); ! virtual void processWidgetEvent(UWidgetEvent * e); public: // Public signals |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:12:14
|
Update of /cvsroot/libufo/ufo-0.5/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21489/src/widgets Modified Files: ulabel.cpp Log Message: Added label constructor with buddy argument. Index: ulabel.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ulabel.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ulabel.cpp 5 Jul 2005 11:22:29 -0000 1.13 --- ulabel.cpp 15 Sep 2005 10:12:05 -0000 1.14 *************** *** 62,65 **** --- 62,79 ---- } + ULabel::ULabel(const std::string & text, UWidget * buddy) + : UCompound(text) + , m_buddy(buddy) + { + setCssType("label"); + } + + ULabel::ULabel(const std::string & text, UIcon * icon, UWidget * buddy) + : UCompound(text, icon) + , m_buddy(buddy) + { + setCssType("label"); + } + void ULabel::setBuddy(UWidget * buddy) { |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:12:14
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21489/include/ufo/widgets Modified Files: ulabel.hpp Log Message: Added label constructor with buddy argument. Index: ulabel.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/widgets/ulabel.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ulabel.hpp 5 Jul 2005 11:22:29 -0000 1.11 --- ulabel.hpp 15 Sep 2005 10:12:05 -0000 1.12 *************** *** 50,55 **** --- 50,69 ---- ULabel(UIcon * icon); ULabel(const std::string & text, UIcon * icon = NULL); + /** Creates a label with given text and sets @p buddy as buddy widget. + * @see setBuddy + */ + ULabel(const std::string & text, UWidget * buddy); + /** Creates a label with given text and icon and + * sets @p buddy as buddy widget. + * @see setBuddy + */ + ULabel(const std::string & text, UIcon * icon, UWidget * buddy); + /** Sets the buddy or control widget. If the shortcut mnemonic of this + * label is pressed, the buddy is focused and if it is a button control, + * it will be activated. + */ void setBuddy(UWidget * buddy); + /** @see setBuddy */ UWidget * getBuddy() const; |
|
From: Johannes S. <sch...@us...> - 2005-09-15 10:10:56
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21153/include/ufo/util Modified Files: urectangle.hpp Log Message: Fixed URectangle::intersect which fixes clip bounds and the UListBox bug. Index: urectangle.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/util/urectangle.hpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** urectangle.hpp 22 Jun 2005 12:26:43 -0000 1.16 --- urectangle.hpp 15 Sep 2005 10:10:42 -0000 1.17 *************** *** 274,278 **** int y2 = std::min(y + h, rect.y + rect.h); ! setBounds(x1, y1, x2 - x1 + 1, y2 - y1 + 1); w = std::max(w, 0); h = std::max(h, 0); --- 274,278 ---- int y2 = std::min(y + h, rect.y + rect.h); ! setBounds(x1, y1, x2 - x1, y2 - y1); w = std::max(w, 0); h = std::max(h, 0); |
|
From: Johannes S. <sch...@us...> - 2005-09-04 14:59:54
|
Update of /cvsroot/libufo/ufo-0.5/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21224/src/widgets Modified Files: uspinbox.cpp Log Message: Fixed setRange to set correct max value. Index: uspinbox.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uspinbox.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** uspinbox.cpp 21 May 2005 15:46:13 -0000 1.1 --- uspinbox.cpp 4 Sep 2005 14:59:41 -0000 1.2 *************** *** 111,115 **** USpinBox::setRange(float min, float max) { setMinimum(min); ! setMaximum(min); } --- 111,115 ---- USpinBox::setRange(float min, float max) { setMinimum(min); ! setMaximum(max); } |
|
From: Johannes S. <sch...@us...> - 2005-09-04 14:52:21
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19771/include/ufo/gl Modified Files: ugl_builtinfontrenderer.hpp Log Message: Bug fix for gcc-4 Index: ugl_builtinfontrenderer.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/gl/ugl_builtinfontrenderer.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ugl_builtinfontrenderer.hpp 21 May 2005 15:17:23 -0000 1.6 --- ugl_builtinfontrenderer.hpp 4 Sep 2005 14:52:12 -0000 1.7 *************** *** 43,46 **** --- 43,47 ---- class UFontPlugin; class UPluginBase; + class UGL_BuiltinFontMetrics; // damn ms vc6 |
|
From: Johannes S. <sch...@us...> - 2005-09-04 13:15:07
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30324/include/ufo Modified Files: uversioninfo.hpp Log Message: Bumped version info to 0.8.1. Index: uversioninfo.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/uversioninfo.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** uversioninfo.hpp 21 May 2005 15:16:23 -0000 1.9 --- uversioninfo.hpp 4 Sep 2005 13:14:59 -0000 1.10 *************** *** 38,42 **** #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 0 namespace ufo { --- 38,42 ---- #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 1 namespace ufo { |
|
From: Johannes S. <sch...@us...> - 2005-09-04 13:14:35
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30255 Modified Files: configure.ac Log Message: Bumped version info to 0.8.1. Updated copyright information for 2005. Index: configure.ac =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/configure.ac,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** configure.ac 12 Jul 2005 13:41:49 -0000 1.31 --- configure.ac 4 Sep 2005 13:14:27 -0000 1.32 *************** *** 21,27 **** UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=0 ! UFO_INTERFACE_AGE=0 ! UFO_BINARY_AGE=0 UFO_VERSION=$UFO_MAJOR_VERSION.$UFO_MINOR_VERSION.$UFO_MICRO_VERSION VERSION=$UFO_VERSION --- 21,27 ---- UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=1 ! UFO_INTERFACE_AGE=1 ! UFO_BINARY_AGE=1 UFO_VERSION=$UFO_MAJOR_VERSION.$UFO_MINOR_VERSION.$UFO_MICRO_VERSION VERSION=$UFO_VERSION *************** *** 487,491 **** $UFO_PACKAGE $UFO_VERSION configured ! Copyright: (C) 2001 - 2004 by Johannes Schmidt email: schmidtjf at users.sourceforge.net --- 487,491 ---- $UFO_PACKAGE $UFO_VERSION configured ! Copyright: (C) 2001 - 2005 by Johannes Schmidt email: schmidtjf at users.sourceforge.net |
|
From: Johannes S. <sch...@us...> - 2005-09-03 12:15:29
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20630 Modified Files: Makefile.am Log Message: Added msvc project file for css example. Index: Makefile.am =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 2 Sep 2005 13:28:08 -0000 1.9 --- Makefile.am 3 Sep 2005 12:14:53 -0000 1.10 *************** *** 26,29 **** --- 26,30 ---- msvc/test/buttons.dsp \ msvc/test/combo.dsp \ + msvc/test/css.dsp \ msvc/test/gltest.dsp \ msvc/test/internalframe.dsp \ |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:23:57
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32521/test Modified Files: Makefile.am Added Files: smilie.tga Log Message: Added example image smilie.tga Index: Makefile.am =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 21 May 2005 15:23:29 -0000 1.5 --- Makefile.am 3 Sep 2005 10:23:49 -0000 1.6 *************** *** 53,55 **** EXTRA_DIST = \ gui.css \ ! gui.xul --- 53,56 ---- EXTRA_DIST = \ gui.css \ ! gui.xul \ ! smilie.tga --- NEW FILE: smilie.tga --- (This appears to be a binary file; contents omitted.) |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:23:28
|
Update of /cvsroot/libufo/ufo-0.5/msvc/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32395/msvc/test Modified Files: test.dsw Added Files: css.dsp Log Message: Added msvc project files for css example. Index: test.dsw =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/msvc/test/test.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test.dsw 2 Sep 2005 13:27:16 -0000 1.3 --- test.dsw 3 Sep 2005 10:23:08 -0000 1.4 *************** *** 40,43 **** --- 40,55 ---- ############################################################################### + Project: "css"=".\css.dsp" - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "gltest"=".\gltest.dsp" - Package Owner=<4> --- NEW FILE: css.dsp --- # Microsoft Developer Studio Project File - Name="css" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=css - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "css.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "css.mak" CFG="css - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "css - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "css - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "css - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 ufo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/css.exe" !ELSEIF "$(CFG)" == "css - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Win32_Debug" # PROP BASE Intermediate_Dir "Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 ufo_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/css.exe" /pdbtype:sept !ENDIF # Begin Target # Name "css - Win32 Release" # Name "css - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\test\css.cpp # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:08:01
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29652/test Modified Files: gui.css gui.xul Log Message: Index: gui.css =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/gui.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gui.css 2 Sep 2005 14:13:25 -0000 1.2 --- gui.css 3 Sep 2005 10:07:52 -0000 1.3 *************** *** 15,19 **** /* top right bottom left */ margin: 10px 10px 10px 10px; ! list-style-image: url('if_default.pnm'); } --- 15,20 ---- /* top right bottom left */ margin: 10px 10px 10px 10px; ! /* It's not ugly, it's art (and I'm in such a hurry) */ ! list-style-image: url('smilie.tga'); } Index: gui.xul =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/gui.xul,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gui.xul 2 Sep 2005 13:28:43 -0000 1.2 --- gui.xul 3 Sep 2005 10:07:52 -0000 1.3 *************** *** 6,10 **** <window id="findfile-window" ! title="Testing Xul frames" orient="vertical" pack="start" --- 6,10 ---- <window id="findfile-window" ! title="Testing Xul frames (see gui.xul)" orient="vertical" pack="start" |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:07:41
|
Update of /cvsroot/libufo/ufo-0.5/src/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29612/src/xml Modified Files: uxul.cpp Log Message: Fixed setting of window title. Index: uxul.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/xml/uxul.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** uxul.cpp 2 Sep 2005 13:24:07 -0000 1.5 --- uxul.cpp 3 Sep 2005 10:07:30 -0000 1.6 *************** *** 564,567 **** --- 564,568 ---- UXFrame * frame = static_cast<UXDisplay*>(UXDisplay::getDefault())->createFrame(); + createRootPane(); // some base values if (m_title != "") { *************** *** 570,574 **** frame->setTitle("XUL frame"); } - createRootPane(); //frame->setBounds(0, 0, 1, 1); UDimension dim = m_root->getPreferredSize(); --- 571,574 ---- |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:06:58
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29484/src/ui Modified Files: ubasicstyle.cpp Log Message: Removed unused variable. Index: ubasicstyle.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ubasicstyle.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ubasicstyle.cpp 15 Jul 2005 10:12:57 -0000 1.5 --- ubasicstyle.cpp 3 Sep 2005 10:06:50 -0000 1.6 *************** *** 1304,1308 **** int range = sliderModel->maximum - sliderModel->minimum; int sliderlen = (sliderModel->blockIncrement * maxlen) / (range + sliderModel->blockIncrement); - int pos; int sliderstart = width + basicstyle_sliderModelToView( sliderModel->minimum, --- 1304,1307 ---- |
|
From: Johannes S. <sch...@us...> - 2005-09-03 10:06:14
|
Update of /cvsroot/libufo/ufo-0.5/msvc/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29307/msvc/test Modified Files: gltest.dsp Log Message: Added missing gl libs to release configuration. Index: gltest.dsp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/msvc/test/gltest.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gltest.dsp 17 Aug 2004 14:37:46 -0000 1.1 --- gltest.dsp 3 Sep 2005 10:05:48 -0000 1.2 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 ufo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/gltest.exe" !ELSEIF "$(CFG)" == "gltest - Win32 Debug" --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 ufo.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/gltest.exe" !ELSEIF "$(CFG)" == "gltest - Win32 Debug" |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:34:15
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30746/src/ui Modified Files: ustylemanager.cpp Log Message: Fixed copying in putStyleHints. Index: ustylemanager.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ustylemanager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ustylemanager.cpp 2 Sep 2005 14:28:38 -0000 1.2 --- ustylemanager.cpp 2 Sep 2005 14:34:05 -0000 1.3 *************** *** 219,223 **** void UStyleManager::putStyleHints(const std::string & classid, UStyleHints * styleHints) { ! m_hints[classid] = styleHints; } --- 219,225 ---- void UStyleManager::putStyleHints(const std::string & classid, UStyleHints * styleHints) { ! if (styleHints) { ! m_hints[classid] = styleHints->clone();; ! } } *************** *** 228,232 **** const std::string & name, UStyleHints * styleHints) { ! m_hints[concat(type, classId, name)] = styleHints; } --- 230,236 ---- const std::string & name, UStyleHints * styleHints) { ! if (styleHints) { ! m_hints[concat(type, classId, name)] = styleHints->clone();; ! } } *************** *** 253,257 **** // have we CSS style? if (m_hints[concat("", classId, "")]) { - // FIXME: mem leak hints = hints->clone(); hints->transcribe(m_hints[concat("", classId, "")]); --- 257,260 ---- |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:28:47
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29427/include/ufo/ui Modified Files: ustylemanager.hpp Log Message: Fixed memory leak of created style hints and styles. Index: ustylemanager.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ui/ustylemanager.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ustylemanager.hpp 21 May 2005 15:28:38 -0000 1.1 --- ustylemanager.hpp 2 Sep 2005 14:28:38 -0000 1.2 *************** *** 52,55 **** --- 52,57 ---- UStyleManager(UStyle * style, std::map<std::string, UStyleHints*> hints); + /** Deletes all style hints objects created by this style manager. */ + virtual ~UStyleManager(); /** @return The style object used for painting. */ *************** *** 75,78 **** --- 77,81 ---- void loadStyleSheet(const std::string & fileName); + /** Puts a copy of the given style hints in the cache. */ void putStyleHints(const std::string & classid, UStyleHints * styleHints); void putStyleHints( |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:28:46
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29427/src/ui Modified Files: ustylemanager.cpp Log Message: Fixed memory leak of created style hints and styles. Index: ustylemanager.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ustylemanager.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ustylemanager.cpp 21 May 2005 15:32:12 -0000 1.1 --- ustylemanager.cpp 2 Sep 2005 14:28:38 -0000 1.2 *************** *** 84,96 **** hints->opacity = 1.0f; hints->background = NULL; - m_hints["default"] = hints; - // FIXME: mem leak UStyleHints * widget = new UStyleHints(); m_hints["widget"] = widget; - // FIXME: mem leak UStyleHints * buttons = new UStyleHints(); buttons->border->borderType = StyleBorder; --- 84,93 ---- *************** *** 100,104 **** m_hints["button"] = buttons; - // FIXME: mem leak UStyleHints * menuitem = new UStyleHints(); menuitem->margin = UInsets(2, 2, 2, 2); --- 97,100 ---- *************** *** 107,123 **** m_hints["menuitem"] = menuitem; - // FIXME: mem leak UStyleHints * separator = new UStyleHints(); m_hints["separator"] = separator; - // FIXME: mem leak UStyleHints * menubar = new UStyleHints(); menubar->border->borderType = BottomLineBorder; menubar->border->color[0] = UColor(0.53f, 0.53f, 0.50f); - m_hints["menubar"] = menubar; - - // FIXME: mem leak UStyleHints * popup = new UStyleHints(); popup->border->borderType = LineBorder; --- 103,114 ---- *************** *** 126,136 **** m_hints["popupmenu"] = popup; - // FIXME: mem leak - UStyleHints * iframe = new UStyleHints(); iframe->border->borderType = StyleBorder; m_hints["internalframe"] = iframe; - // FIXME: mem leak UStyleHints * textedit = new UStyleHints(); textedit->border->borderType = LineBorder; --- 117,124 ---- *************** *** 138,142 **** m_hints["textedit"] = textedit; ! m_hints["listbox"] = textedit; } --- 126,130 ---- m_hints["textedit"] = textedit; ! m_hints["listbox"] = textedit->clone(); } *************** *** 148,151 **** --- 136,153 ---- } + UStyleManager::~UStyleManager() { + for (std::map<std::string, UStyleHints*>::iterator iter = m_hints.begin(); + iter != m_hints.end(); + ++iter) { + if ((*iter).second) { + delete ((*iter).second); + } + } + m_hints.clear(); + if (m_style) { + m_style->unreference(); + } + } + UStyle * *************** *** 270,275 **** m_hints[(*iter).first]->transcribe((*iter).second); } else { ! (*iter).second->update(getStyleHints((*iter).first)); ! m_hints[(*iter).first] = (*iter).second; } } --- 272,278 ---- m_hints[(*iter).first]->transcribe((*iter).second); } else { ! UStyleHints * hints = ((*iter).second)->clone(); ! hints->update(getStyleHints((*iter).first)); ! m_hints[(*iter).first] = hints; } } |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:26:23
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28822/include/ufo/ui Modified Files: ucss.hpp Log Message: Fixed memory leak of created style hints. Removed unused variable. Index: ucss.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ui/ucss.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ucss.hpp 21 May 2005 15:28:38 -0000 1.1 --- ucss.hpp 2 Sep 2005 14:26:13 -0000 1.2 *************** *** 33,36 **** --- 33,38 ---- UCss(); UCss(const std::string & filename); + /** Deletes all style hints created by this object. */ + virtual ~UCss(); void load(const std::string & filename); |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:26:23
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28822/src/ui Modified Files: ucss.cpp Log Message: Fixed memory leak of created style hints. Removed unused variable. Index: ucss.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ucss.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ucss.cpp 2 Sep 2005 14:13:24 -0000 1.4 --- ucss.cpp 2 Sep 2005 14:26:13 -0000 1.5 *************** *** 47,50 **** --- 47,61 ---- } + UCss::~UCss() { + for (std::map<std::string, UStyleHints*>::iterator iter = m_hints.begin(); + iter != m_hints.end(); + ++iter) { + if ((*iter).second) { + delete ((*iter).second); + } + } + m_hints.clear(); + } + void UCss::load(const std::string & filename) { *************** *** 76,80 **** char comment2; bool comment_eaten = false; - std::string comment; ufo_css_eatWhitespaces(stream); --- 87,90 ---- |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:13:34
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25428/src/ui Modified Files: ucss.cpp Log Message: Fixed ufo_css_eatComments. Index: ucss.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ucss.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ucss.cpp 12 Jul 2005 13:41:09 -0000 1.3 --- ucss.cpp 2 Sep 2005 14:13:24 -0000 1.4 *************** *** 68,77 **** } ! // eats comment lines and empty lines ! // returns the comment ! void ! ufo_css_eatComments(std::istream & stream) { char comment1; char comment2; ufo_css_eatWhitespaces(stream); --- 68,80 ---- } ! // Checks whether a comment is following. ! // If yes, eats it and returns true. ! // Otherwise false. ! bool ! ufo_css_eatComment(std::istream & stream) { char comment1; char comment2; + bool comment_eaten = false; + std::string comment; ufo_css_eatWhitespaces(stream); *************** *** 83,88 **** comment1 = 0; comment2 = 0; do { ! if (stream) stream >> comment1; if (stream) stream >> comment2; } while (comment1 != '*' && comment2 != '/' && stream); --- 86,94 ---- comment1 = 0; comment2 = 0; + comment_eaten = true; do { ! do { ! if (stream) stream >> comment1; ! } while (comment1 != '*' && stream); if (stream) stream >> comment2; } while (comment1 != '*' && comment2 != '/' && stream); *************** *** 93,96 **** --- 99,112 ---- stream.putback(comment1); } + return comment_eaten; + } + + // eats comment lines and empty lines + void + ufo_css_eatComments(std::istream & stream) { + bool eat_comment = true; + while(eat_comment) { + eat_comment = ufo_css_eatComment(stream); + } } |
|
From: Johannes S. <sch...@us...> - 2005-09-02 14:13:33
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25428/test Modified Files: gui.css Log Message: Fixed ufo_css_eatComments. Index: gui.css =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/gui.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gui.css 21 May 2005 16:04:27 -0000 1.1 --- gui.css 2 Sep 2005 14:13:25 -0000 1.2 *************** *** 2,5 **** --- 2,21 ---- + /* general changes to the style */ + + /* this is a change to all button widgets */ + /* + button { + font-family: serif; + font-size: 14px; + } + */ + /* this is a change to all label widgets */ + label { + /* top right bottom left */ + margin: 10px 10px 10px 10px; + list-style-image: url('if_default.pnm'); + } + /* CSS class ids */ *************** *** 30,40 **** opacity: 0; } - - - /* general changes to the style */ - - label { - /* top right bottom left */ - margin: 10px 10px 10px 10px; - list-style-image: url('if_default.pnm'); - } --- 46,47 ---- |