[niepce: 16/17] Now require Gtk

[Hubert FiguiÃre <hub src gnome org>]

commit 69a0d1f0e197fb86719cb417d41c2ce0eaac154f
Merge: ff3b954 c058875
Author: Hub Figuiere <hub figuiere net>
Date:   Wed Feb 1 20:12:20 2012 -0800

    Now require Gtk
    
    Merge branch 'gtk3'
    
    Conflicts:
    	src/fwk/toolkit/Makefile.am
    	src/niepce/ui/gridviewmodule.cpp

 camerawire/configure.ac                     |    7 +-
 camerawire/src/Makefile.am                  |    4 +-
 configure.ac                                |   12 +-
 data/themes/Makefile.am                     |    3 -
 data/themes/niepce-dark.gtkrc               |   38 ----
 src/engine/library/thumbnailcache.cpp       |    1 +
 src/ext/libview/header.cc                   |    6 +-
 src/ext/libview/header.hh                   |    2 +-
 src/fwk/toolkit/Makefile.am                 |    3 +-
 src/fwk/toolkit/application.cpp             |   56 ++-----
 src/fwk/toolkit/application.hpp             |   12 +-
 src/fwk/toolkit/configuration.cpp           |   78 ++++-----
 src/fwk/toolkit/configuration.hpp           |   27 ++--
 src/fwk/toolkit/dialog.cpp                  |    2 +-
 src/fwk/toolkit/frame.cpp                   |    4 +-
 src/fwk/toolkit/gdkutils.cpp                |    2 +
 src/fwk/toolkit/widgets/editablehscale.cpp  |   12 +-
 src/fwk/toolkit/widgets/editablehscale.hpp  |    6 +-
 src/fwk/toolkit/widgets/imagegridview.cpp   |   55 ++++++
 src/fwk/toolkit/widgets/imagegridview.hpp   |   83 +++++++++
 src/fwk/toolkit/widgets/ratinglabel.cpp     |   28 ++--
 src/fwk/toolkit/widgets/ratinglabel.hpp     |    7 +-
 src/fwk/utils/files.cpp                     |    1 +
 src/niepce/Makefile.am                      |    4 +-
 src/niepce/modules/darkroom/Makefile.am     |    1 -
 src/niepce/modules/darkroom/imagecanvas.cpp |    5 +-
 src/niepce/stock.cpp                        |    4 +-
 src/niepce/ui/Makefile.am                   |    1 -
 src/niepce/ui/dialogs/editlabels.ui         |  176 ++++++++++++-------
 src/niepce/ui/dialogs/importdialog.glade    |  244 ---------------------------
 src/niepce/ui/dialogs/importdialog.ui       |  171 ++++++++++++-------
 src/niepce/ui/dialogs/preferences.glade     |  146 ----------------
 src/niepce/ui/dialogs/preferences.ui        |  128 +++++++-------
 src/niepce/ui/dialogs/preferencesdialog.cpp |   36 ++---
 src/niepce/ui/filmstripcontroller.cpp       |    2 +-
 src/niepce/ui/gridviewmodule.cpp            |   68 +++++---
 src/niepce/ui/gridviewmodule.hpp            |    4 +-
 src/niepce/ui/librarycellrenderer.cpp       |   78 ++++------
 src/niepce/ui/librarycellrenderer.hpp       |   25 ++--
 src/niepce/ui/moduleshell.cpp               |    4 +-
 src/niepce/ui/niepceapplication.cpp         |    4 -
 src/niepce/ui/thumb-view/eog-thumb-nav.cpp  |   16 +-
 src/niepce/ui/thumbstripview.cpp            |   20 +--
 43 files changed, 662 insertions(+), 924 deletions(-)
---
diff --cc src/fwk/toolkit/Makefile.am
index bcea3f0,e75180e..707d80d
--- a/src/fwk/toolkit/Makefile.am
+++ b/src/fwk/toolkit/Makefile.am
@@@ -36,7 -36,7 +36,8 @@@ libniepceframework_a_SOURCES = configur
  	widgets/editablehscale.hpp widgets/editablehscale.cpp \
  	widgets/dock.cpp widgets/dock.hpp \
  	widgets/notabtextview.hpp widgets/notabtextview.cpp \
 +	widgets/tokentextview.hpp widgets/tokentextview.cpp \
+ 	widgets/imagegridview.hpp widgets/imagegridview.cpp \
  	dockable.hpp dockable.cpp \
  	metadatawidget.hpp metadatawidget.cpp \
  	undo.hpp undo.cpp \
diff --cc src/niepce/ui/filmstripcontroller.cpp
index f0b764e,0f052f9..e72e68a
--- a/src/niepce/ui/filmstripcontroller.cpp
+++ b/src/niepce/ui/filmstripcontroller.cpp
@@@ -58,9 -58,9 +58,9 @@@ Gtk::IconView * FilmStripController::im
  
  eng::library_id_t FilmStripController::get_selected()
  {
 -	eng::library_id_t id = 0;
 +    eng::library_id_t id = 0;
      DBG_OUT("get selected in filmstrip");
-     Gtk::IconView::ArrayHandle_TreePaths paths = m_thumbview->get_selected_items();
+     std::vector<Gtk::TreePath> paths = m_thumbview->get_selected_items();
      if(!paths.empty()) {
          Gtk::TreePath path(*(paths.begin()));
          DBG_OUT("found path %s", path.to_string().c_str());
diff --cc src/niepce/ui/gridviewmodule.cpp
index ee40d0d,6f7fe89..93e4b0c
--- a/src/niepce/ui/gridviewmodule.cpp
+++ b/src/niepce/ui/gridviewmodule.cpp
@@@ -157,10 -159,10 +159,10 @@@ Gtk::IconView * GridViewModule::image_l
  
  eng::library_id_t GridViewModule::get_selected()
  {
 -	eng::library_id_t id = 0;
 +    eng::library_id_t id = 0;
      Glib::RefPtr<Gtk::TreeSelection> selection;
  
-     Gtk::IconView::ArrayHandle_TreePaths paths = m_librarylistview.get_selected_items();
+     std::vector<Gtk::TreePath> paths = m_librarylistview->get_selected_items();
      if(!paths.empty()) {
          Gtk::TreePath path(*(paths.begin()));
          DBG_OUT("found path %s", path.to_string().c_str());
@@@ -182,11 -184,10 +184,11 @@@ void GridViewModule::select_image(eng::
      DBG_OUT("library select %Ld", id);
      Gtk::TreePath path = m_model->get_path_from_id(id);
      if(path) {
-         m_librarylistview.scroll_to_path(path, false, 0, 0);
-         m_librarylistview.select_path(path);
 -      m_librarylistview->select_path(path);
++        m_librarylistview->scroll_to_path(path, false, 0, 0);
++        m_librarylistview->select_path(path);
      }
      else {
-         m_librarylistview.unselect_all();
 -      m_librarylistview->unselect_all();
++        m_librarylistview->unselect_all();
      }
  }