[niepce: 6/12] Merge branch 'master' into import-dialog

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

commit aed465c7ebc78bcf80f4255e7cb36405ca4a9932
Merge: a04a976 adc1fc1
Author: Hubert Figuière <hub figuiere net>
Date:   Thu Oct 15 23:34:04 2015 -0400

    Merge branch 'master' into import-dialog

 .clang-format                                     |   57 +++++++++
 README                                            |    2 +-
 camerawire/src/cwapplication.hpp                  |    4 +-
 camerawire/src/cwwindow.hpp                       |    2 +-
 configure.ac                                      |    4 +-
 doc/style-guide                                   |   61 ++++++++++
 magellan/src/mgapplication.hpp                    |    4 +-
 magellan/src/mgwindow.hpp                         |    2 +-
 po/pl.po                                          |  132 ++++++++++----------
 src/engine/db/filebundle.cpp                      |   12 +-
 src/engine/db/filebundle.hpp                      |    2 +-
 src/engine/db/libfile.cpp                         |   10 +-
 src/engine/db/libfile.hpp                         |   12 +-
 src/engine/db/libfolder.hpp                       |   12 +-
 src/engine/db/library.cpp                         |   15 ++-
 src/engine/db/library.hpp                         |   38 +++---
 src/engine/library/commands.cpp                   |   32 +++---
 src/engine/library/thumbnailcache.hpp             |    2 +-
 src/ext/libview/header.cc                         |    6 +-
 src/ext/libview/header.hh                         |    6 +-
 src/fwk/base/geometry.cpp                         |    2 +-
 src/fwk/base/map.hpp                              |    6 +-
 src/fwk/base/propertybag.hpp                      |   13 ++-
 src/fwk/toolkit/appframe.hpp                      |    2 +-
 src/fwk/toolkit/application.hpp                   |    2 +-
 src/fwk/toolkit/command.hpp                       |   10 +-
 src/fwk/toolkit/configdatabinder.hpp              |    2 +-
 src/fwk/toolkit/controller.cpp                    |    9 +-
 src/fwk/toolkit/dialog.hpp                        |    2 +-
 src/fwk/toolkit/mapcontroller.hpp                 |    2 +-
 src/fwk/toolkit/metadatawidget.cpp                |   24 ++--
 src/fwk/toolkit/metadatawidget.hpp                |   20 ++--
 src/fwk/toolkit/widgets/editablehscale.hpp        |    2 +-
 src/fwk/toolkit/widgets/imagegridview.hpp         |    2 +-
 src/fwk/toolkit/widgets/ratinglabel.hpp           |   12 +-
 src/fwk/utils/db/iconnectiondriver.hpp            |   20 ++--
 src/fwk/utils/db/insertstatement.hpp              |    2 +-
 src/fwk/utils/db/sqlite/sqlitecnxdrv.cpp          |   24 ++--
 src/fwk/utils/db/sqlite/sqlitecnxdrv.hpp          |   36 +++---
 src/fwk/utils/db/sqlite/sqlitecnxmgrdrv.hpp       |    2 +-
 src/fwk/utils/db/sqlstatement.cpp                 |    4 +-
 src/fwk/utils/exception.hpp                       |    2 +-
 src/fwk/utils/files.hpp                           |    8 +-
 src/fwk/utils/modulemanager.cpp                   |   12 +-
 src/fwk/utils/pathutils.cpp                       |   26 ++--
 src/fwk/utils/worker.hpp                          |    2 +-
 src/libraryclient/libraryclient.hpp               |    2 +-
 src/libraryclient/locallibraryserver.cpp          |   13 +--
 src/libraryclient/locallibraryserver.hpp          |   42 +++----
 src/ncr/image.cpp                                 |   28 +++--
 src/ncr/image.hpp                                 |   14 +-
 src/niepce/modules/darkroom/darkroommodule.cpp    |    4 +-
 src/niepce/modules/darkroom/darkroommodule.hpp    |    8 +-
 src/niepce/modules/darkroom/imagecanvas.cpp       |   10 +-
 src/niepce/modules/darkroom/imagecanvas.hpp       |   18 ++--
 src/niepce/modules/darkroom/toolboxcontroller.hpp |    2 +-
 src/niepce/modules/map/mapmodule.cpp              |    2 +-
 src/niepce/modules/map/mapmodule.hpp              |    8 +-
 src/niepce/ui/dialogs/editlabels.hpp              |    2 +-
 src/niepce/ui/dialogs/importdialog.hpp            |    2 +-
 src/niepce/ui/dialogs/preferencesdialog.hpp       |    2 +-
 src/niepce/ui/filmstripcontroller.cpp             |    2 +-
 src/niepce/ui/filmstripcontroller.hpp             |    8 +-
 src/niepce/ui/gridviewmodule.cpp                  |    6 +-
 src/niepce/ui/gridviewmodule.hpp                  |   14 +-
 src/niepce/ui/imageliststore.cpp                  |    8 +-
 src/niepce/ui/librarycellrenderer.cpp             |    8 +-
 src/niepce/ui/librarycellrenderer.hpp             |    8 +-
 src/niepce/ui/metadatapanecontroller.cpp          |   42 ++++----
 src/niepce/ui/metadatapanecontroller.hpp          |    2 +-
 src/niepce/ui/moduleshell.hpp                     |    8 +-
 src/niepce/ui/niepceapplication.hpp               |    8 +-
 src/niepce/ui/niepcewindow.cpp                    |    8 +-
 src/niepce/ui/niepcewindow.hpp                    |    4 +-
 src/niepce/ui/selectioncontroller.hpp             |    2 +-
 src/niepce/ui/thumb-view/eog-thumb-nav.cpp        |   33 +++---
 src/niepce/ui/thumb-view/eog-thumb-nav.hpp        |   12 +-
 src/niepce/ui/thumbstripview.cpp                  |   10 +-
 src/niepce/ui/thumbstripview.hpp                  |    2 +-
 src/niepce/ui/workspacecontroller.cpp             |   26 ++--
 src/niepce/ui/workspacecontroller.hpp             |    4 +-
 81 files changed, 577 insertions(+), 458 deletions(-)
---
diff --cc src/niepce/ui/dialogs/importdialog.hpp
index e3ed25e,e1a50bf..548d5d8
--- a/src/niepce/ui/dialogs/importdialog.hpp
+++ b/src/niepce/ui/dialogs/importdialog.hpp
@@@ -58,49 -48,32 +58,49 @@@ class ImportDialo
  public:
      typedef std::shared_ptr<ImportDialog> Ptr;
  
 -      ImportDialog();
 -
 -      virtual void setup_widget() override;
 -
 -//    const std::list<std::string> & to_import() const
 -//            { return m_list_to_import; }
 -    const Glib::ustring & path_to_import() const
 +    class PreviewGridModel
 +        : public Gtk::TreeModel::ColumnRecord
 +    {
 +    public:
 +        Gtk::TreeModelColumn<Glib::ustring> filename;
 +        Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> pixbuf;
 +        Gtk::TreeModelColumn<eng::ImportedFile::Ptr> file;
 +        PreviewGridModel()
 +            { add(filename); add(pixbuf); add(file); }
 +    };
 +
 +    ImportDialog();
 +    virtual ~ImportDialog();
 +
-     void setup_widget() override;
++    virtual void setup_widget() override;
 +
 +//  const std::list<std::string> & to_import() const
 +//      { return m_list_to_import; }
 +    const Glib::ustring & pathToImport() const
          { return m_folder_path_to_import; }
 -      void set_to_import(const Glib::ustring & f);
 +    void setToImport(const Glib::ustring & f);
  
  private:
 -      class ImportParam;
 +    class ImportParam;
 +
 +    void doSelectDirectories();
  
 -      void do_select_directories();
 -      
 -  Glib::ustring m_folder_path_to_import;
 -//    std::list<std::string> m_list_to_import;
 +    eng::IImporter *m_importer;
 +    Glib::ustring m_folder_path_to_import;
  
 -      Gtk::ComboBox *m_date_tz_combo;
 -      Gtk::CheckButton *m_ufraw_import_check;
 -      Gtk::CheckButton *m_rawstudio_import_check;
 -      Gtk::Label *m_directory_name;
 +    Gtk::ComboBox *m_date_tz_combo;
 +    Gtk::CheckButton *m_ufraw_import_check;
 +    Gtk::CheckButton *m_rawstudio_import_check;
 +    Gtk::Label *m_directory_name;
      Gtk::Entry *m_destinationFolder;
 -      Gtk::TreeView *m_imagesList;
 -    fwk::TextModelRecord m_imagesListModelRecord;
 -    Glib::RefPtr<Gtk::ListStore> m_imagesListModel;
 +    Gtk::ScrolledWindow *m_attributesScrolled;
 +    Gtk::ScrolledWindow *m_images_list_scrolled;
 +    PreviewGridModel m_grid_columns;
 +    Glib::RefPtr<Gtk::ListStore> m_images_list_model;
 +
 +    Gtk::IconView *m_gridview;
 +
 +    MetaDataPaneController::Ptr m_metadata_pane;
  };
  
  }