[adobe-source-commits] sandbox/adobe-source/adobe/future/widgets/headers image_t.hpp,NONE,1.1 client_assembler.hpp,1.10,1.11 factory.hpp,1.6,1.7 ui_core.hpp,1.9,1.10

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8667/adobe/future/widgets/headers

Modified Files:
	client_assembler.hpp factory.hpp ui_core.hpp 
Added Files:
	image_t.hpp 
Log Message:
image_t (icons and pictures) support for Mac and Win32, along with a GIL image factory and a (sample) Targa file format importing module for that factory. Also added alert.adm/eve as a sample for the icon support. Added the notion of a working directory to the modal dialog interface to reference external resources. Also added an alert API that leverages modal_dialog_interface. Other misc. bug fixes and changes.

Index: factory.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/factory.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** factory.hpp	3 Feb 2006 18:33:36 -0000	1.6
--- factory.hpp	27 Feb 2006 20:41:58 -0000	1.7
***************
*** 22,25 ****
--- 22,27 ----
  #include <adobe/eve_parser.hpp>
  
+ #include <boost/filesystem/path.hpp>
+ 
  /*************************************************************************************************/
  //
***************
*** 83,95 ****
  struct factory_token_t
  {
!     factory_token_t(display_t&                      display,
!                     sheet_t&                        sheet,
!                     eve_client::eve_client_holder&  client_holder,
!                     eve_client::button_notifier_t   notifier
                      ) :
          display_m(display),
          sheet_m(sheet),
          client_holder_m(client_holder),
!         notifier_m(notifier)
      {}
      
--- 85,99 ----
  struct factory_token_t
  {
!     factory_token_t(display_t&                     display,
!                     sheet_t&                       sheet,
!                     eve_client::eve_client_holder& client_holder,
!                     eve_client::button_notifier_t  notifier,
!                     const boost::filesystem::path& working_directory
                      ) :
          display_m(display),
          sheet_m(sheet),
          client_holder_m(client_holder),
!         notifier_m(notifier),
!         working_directory_m(working_directory)
      {}
      
***************
*** 165,168 ****
--- 169,179 ----
      //
      eve_client::button_notifier_t notifier_m;
+ 
+     //
+     /// The working directory is the location that widgets must start at if they
+     /// are to attempt fetching any external resources (pictures or icons or the
+     /// like)
+     //
+     boost::filesystem::path working_directory_m;
  };
  

--- NEW FILE: image_t.hpp ---
/*
    Copyright 2005-2006 Adobe Systems Incorporated
    Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
    or a copy at http://opensource.adobe.com/licenses.html)
*/

/****************************************************************************************************/

#ifndef ADOBE_WIDGET_IMAGE_T_HPP
#define ADOBE_WIDGET_IMAGE_T_HPP

/****************************************************************************************************/

#include <adobe/config.hpp>
#include <adobe/source/swap.hpp>

#include <boost/operators.hpp>

#include <adobe/gil/core/image_view_factory.hpp>
#include <adobe/gil/core/algorithm.hpp>

#include <adobe/extents.hpp>

/****************************************************************************************************/

namespace adobe {

/****************************************************************************************************/

class image_t : boost::equality_comparable<image_t>
{
public:
    image_t(GIL::rgba8_image& image);

#if !defined(ADOBE_NO_DOCUMENTATION)
    image_t(const image_t& rhs);

    ~image_t();

    image_t& operator= (const image_t& rhs);
#endif

    extents_t   measure();

    void        place(const point_2d_t& position, const extents_t& extents);

    void        enable(bool make_enabled);

    void        set(GIL::rgba8_image& image);

    friend bool operator== (const adobe::image_t& x, const adobe::image_t& y);

    friend inline void swap(adobe::image_t& x, adobe::image_t& y)
        { adobe::adl_swap(x.object_m, y.object_m); }

#if !defined(ADOBE_NO_DOCUMENTATION)
    struct implementation_t;

private:
    implementation_t* object_m;

public:
    implementation_t&       implementation();
    const implementation_t& implementation() const;
#endif

};

/****************************************************************************************************/

} // namespace adobe

/****************************************************************************************************/

#endif // ADOBE_DISPLAY_HPP

/****************************************************************************************************/

Index: client_assembler.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/client_assembler.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** client_assembler.hpp	23 Feb 2006 23:28:55 -0000	1.10
--- client_assembler.hpp	27 Feb 2006 20:41:58 -0000	1.11
***************
*** 309,319 ****
  /*************************************************************************************************/
  
! adobe::auto_ptr<eve_client_holder> make_view(   adobe::name_t                                   file_name,
!                                                 const adobe::line_position_t::getline_proc_t&   getline_proc,
!                                                 std::istream&                               stream,
!                                                 adobe::sheet_t&                             sheet,
!                                                 const button_notifier_t&                    notifier,
!                                                 size_enum_t                                 dialog_size,
!                                                 adobe::widget_factory_proc_t                factory);
  
  /*************************************************************************************************/
--- 309,320 ----
  /*************************************************************************************************/
  
! adobe::auto_ptr<eve_client_holder> make_view(   adobe::name_t                                 file_name,
!                                                 const adobe::line_position_t::getline_proc_t& getline_proc,
!                                                 std::istream&                                 stream,
!                                                 adobe::sheet_t&                               sheet,
!                                                 const button_notifier_t&                      notifier,
!                                                 size_enum_t                                   dialog_size,
!                                                 adobe::widget_factory_proc_t                  factory,
!                                                 const boost::filesystem::path&                working_directory);
  
  /*************************************************************************************************/

Index: ui_core.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/ui_core.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ui_core.hpp	23 Feb 2006 23:28:55 -0000	1.9
--- ui_core.hpp	27 Feb 2006 20:41:58 -0000	1.10
***************
*** 23,26 ****
--- 23,28 ----
  #include <adobe/future/enum_ops.hpp>
  
+ #include <adobe/gil/extension/conceptspace/any_standard_image.hpp>
+ 
  /****************************************************************************************************/
  
***************
*** 1227,1230 ****
--- 1229,1234 ----
  } // namespace adobe
  
+ /****************************************************************************************************/
+ 
  ADOBE_DEFINE_BITSET_OPS(adobe::modifiers_t)
  ADOBE_DEFINE_BITSET_OPS(adobe::window_attributes_t)