← Back to branch summary

~vanvugt/nux/fix-769957

~vanvugt/nux/fix-769957

Viewing all changes in revision 347.

Committer: Sam Spilsbury
Date: 2011-05-23 14:19:27 UTC
mfrom: (345.2.3 nux)
Revision ID: sam.spilsbury@canonical.com-20110523141927-tlrddacedu735yxu

Merge

files added:
NuxCore/Math/Point2D-inl.h

NuxCore/Property-inl.h

NuxCore/Property.h

NuxCore/PropertyTraits.h

NuxCore/Size-inl.h

tests/test_properties.cpp

files removed:
Nux/TextViewGCC/TextViewFont.cpp

NuxCore/Box.cpp

NuxCore/Box.h

NuxCore/ColorFunctions.cpp

NuxCore/ColorFunctions.h

NuxCore/Math/Point2D.cpp

NuxCore/Point.cpp

NuxCore/Size.cpp

files modified:
.bzrignore

Nux/AbstractComboBox.cpp

Nux/AnimatedTextureArea.cpp

Nux/Area.cpp

Nux/BezierCurveControl2.cpp

Nux/Button.cpp

Nux/ClientArea.cpp

Nux/ColorEditor.cpp

Nux/ColorEditor.h

Nux/ColorGradient.cpp

Nux/ColorGradient.h

Nux/ColorPickerDialog.cpp

Nux/ColorPickerDialog.h

Nux/ColorPreview.cpp

Nux/ColorPreview.h

Nux/EditTextBox.cpp

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/FolderTreeItem.cpp

Nux/FunctionGraph.cpp

Nux/GroupBox2.cpp

Nux/HLayout.cpp

Nux/HSeparator.cpp

Nux/HSplitter.cpp

Nux/Histogram.cpp

Nux/HueRangeValuator.cpp

Nux/HueRangeValuator.h

Nux/InputArea.cpp

Nux/MenuPage.cpp

Nux/Painter.cpp

Nux/Painter.h

Nux/PangoText.cpp

Nux/PropertyItem/CheckBoxProperty.cpp

Nux/PropertyItem/ColorGradientPropertyItem.cpp

Nux/PropertyItem/ColorPreviewPropertyItem.cpp

Nux/PropertyItem/ColorPreviewPropertyItem.h

Nux/PropertyItem/ComboBoxListPropertyItem.cpp

Nux/PropertyItem/ComboBoxPropertyItem.cpp

Nux/PropertyItem/DoubleValuatorPropertyItem.cpp

Nux/PropertyItem/EditTextLinePropertyItem.cpp

Nux/PropertyItem/FilePropertyItem.cpp

Nux/PropertyItem/IntegerValuatorPropertyItem.cpp

Nux/PropertyItem/Matrix3PreviewPropertyItem.cpp

Nux/PropertyItem/Matrix4PreviewPropertyItem.cpp

Nux/PropertyItem/RGBAProperty.cpp

Nux/PropertyItem/RGBAProperty.h

Nux/PropertyItem/RGBProperty.cpp

Nux/PropertyItem/RGBProperty.h

Nux/PropertyItem/RangeValueIntegerPropertyItem.cpp

Nux/PropertyItem/RangeValuePropertyItem.cpp

Nux/PropertyItem/SpinBoxDoublePropertyItem.cpp

Nux/PropertyItem/SpinBoxPropertyItem.cpp

Nux/PropertyItem/SplineCurvePropertyItem.cpp

Nux/PropertyItem/Vector3ValuatorPropertyItem.cpp

Nux/PushButton.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/SplineCurveEditor.cpp

Nux/SplineCurvePreview.cpp

Nux/StaticText.cpp

Nux/TableCtrl.cpp

Nux/TableItem.cpp

Nux/TableItem.h

Nux/TextEntry.cpp

Nux/TextView/TextViewMouse.cpp

Nux/TextView/TextViewPaint.cpp

Nux/TextureArea.cpp

Nux/TimeGraph.cpp

Nux/VLayout.cpp

Nux/VSeparator.cpp

Nux/VSplitter.cpp

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

NuxCore/CMakeLists.txt

NuxCore/Color.cpp

NuxCore/Color.h

NuxCore/Colors.cpp

NuxCore/Colors.h

NuxCore/Makefile.am

NuxCore/Math/Point2D.h

NuxCore/Point.h

NuxCore/Size.h

NuxCore/Win32Dialogs/NWin32CustomDialog.cpp

NuxGraphics/FontRenderer.cpp

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_ColorPicker.h

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLSh_DrawFunction.h

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/VirtualKeyCodes.h

NuxImage/CairoGraphics.cpp

NuxImage/ImageSurface.cpp

NuxImage/ImageSurface.h

examples/Makefile.am

examples/button.cpp

examples/gridlayout.cpp

examples/layeredlayout.cpp

examples/rotate_texture_area.cpp

examples/scrollview.cpp

examples/tab_view.cpp

gputests/framebufferobject.cpp

gputests/quad_2texmod.cpp

gputests/texture_blur.cpp

gputests/texture_copy_blur.cpp

tests/Makefile.am

Show diffs side-by-side

added added

removed removed

Nux/AbstractComboBox.cpp

Nux/AnimatedTextureArea.cpp

Nux/BezierCurveControl2.cpp

Nux/ClientArea.cpp

Nux/ColorEditor.cpp

Nux/ColorEditor.h

Nux/ColorGradient.cpp

Nux/ColorGradient.h

Nux/ColorPickerDialog.cpp

Nux/ColorPickerDialog.h

Nux/ColorPreview.cpp

Nux/ColorPreview.h

Nux/EditTextBox.cpp

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/FolderTreeItem.cpp

Nux/FunctionGraph.cpp

Nux/GroupBox2.cpp

Nux/HLayout.cpp

Nux/HSeparator.cpp

Nux/HSplitter.cpp

Nux/Histogram.cpp

Nux/HueRangeValuator.cpp

Nux/HueRangeValuator.h

Nux/InputArea.cpp

Nux/MenuPage.cpp

Nux/Painter.cpp

Nux/PangoText.cpp

Nux/PropertyItem/CheckBoxProperty.cpp

Nux/PropertyItem/ColorGradientPropertyItem.cpp

Nux/PropertyItem/ColorPreviewPropertyItem.cpp

Nux/PropertyItem/ColorPreviewPropertyItem.h

Nux/PropertyItem/ComboBoxListPropertyItem.cpp

Nux/PropertyItem/ComboBoxPropertyItem.cpp

Nux/PropertyItem/DoubleValuatorPropertyItem.cpp

Nux/PropertyItem/EditTextLinePropertyItem.cpp

Nux/PropertyItem/FilePropertyItem.cpp

Nux/PropertyItem/IntegerValuatorPropertyItem.cpp

Nux/PropertyItem/Matrix3PreviewPropertyItem.cpp

Nux/PropertyItem/Matrix4PreviewPropertyItem.cpp

Nux/PropertyItem/RGBAProperty.cpp

Nux/PropertyItem/RGBAProperty.h

Nux/PropertyItem/RGBProperty.cpp

Nux/PropertyItem/RGBProperty.h

Nux/PropertyItem/RangeValueIntegerPropertyItem.cpp

Nux/PropertyItem/RangeValuePropertyItem.cpp

Nux/PropertyItem/SpinBoxDoublePropertyItem.cpp

Nux/PropertyItem/SpinBoxPropertyItem.cpp

Nux/PropertyItem/SplineCurvePropertyItem.cpp

Nux/PropertyItem/Vector3ValuatorPropertyItem.cpp

Nux/PushButton.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/SplineCurveEditor.cpp

Nux/SplineCurvePreview.cpp

Nux/StaticText.cpp

Nux/TableCtrl.cpp

Nux/TableItem.cpp

Nux/TableItem.h

Nux/TextEntry.cpp

Nux/TextView/TextViewMouse.cpp

Nux/TextView/TextViewPaint.cpp

Nux/TextViewGCC/TextViewFont.cpp

Nux/TextureArea.cpp

Nux/TimeGraph.cpp

Nux/VLayout.cpp

Nux/VSeparator.cpp

Nux/VSplitter.cpp

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

NuxCore/Box.cpp

NuxCore/CMakeLists.txt

NuxCore/Color.cpp

NuxCore/Color.h

NuxCore/ColorFunctions.cpp

NuxCore/ColorFunctions.h

NuxCore/Colors.cpp

NuxCore/Colors.h

NuxCore/Makefile.am

NuxCore/Math/Point2D-inl.h

NuxCore/Math/Point2D.cpp

NuxCore/Math/Point2D.h

NuxCore/Point.cpp

NuxCore/Point.h

NuxCore/Property-inl.h

NuxCore/Property.h

NuxCore/PropertyTraits.h

NuxCore/Size-inl.h

NuxCore/Size.cpp

NuxCore/Win32Dialogs/NWin32CustomDialog.cpp

NuxGraphics/FontRenderer.cpp

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_ColorPicker.h

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLSh_DrawFunction.h

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/VirtualKeyCodes.h

NuxImage/CairoGraphics.cpp

NuxImage/ImageSurface.cpp

NuxImage/ImageSurface.h

examples/Makefile.am

examples/button.cpp

examples/gridlayout.cpp

examples/layeredlayout.cpp

examples/rotate_texture_area.cpp

examples/scrollview.cpp

examples/tab_view.cpp

gputests/framebufferobject.cpp

gputests/quad_2texmod.cpp

gputests/texture_blur.cpp

gputests/texture_copy_blur.cpp

tests/Makefile.am

tests/test_properties.cpp

Older »