First hacks on OOBE help.

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 41a18f4b4a6bfaa3fec493d0fa3fdbb526884750..681761f19b63b8d89121ed2c58157b90adca0480 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -28,6 +28,7 @@
 #include "image_sequence_dialog.h"
 #include "film_viewer.h"
 #include "dcpomatic_button.h"
+#include "wx_help.h"
 #include "lib/audio_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
@@ -69,7 +70,10 @@ public:
        LimitedSplitter (wxWindow* parent)
                : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
        {
-
+               /* This value doesn't really mean much but we just want to stop double-click on the
+                  divider from shrinking the bottom panel (#1601).
+               */
+               SetMinimumPaneSize (64);
        }
 
        bool OnSashPositionChange (int new_position)
@@ -89,6 +93,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
        , _film_viewer (viewer)
        , _generally_sensitive (true)
        , _ignore_deselect (false)
+       , _no_check_selection (false)
 {
        for (int i = 0; i < TEXT_COUNT; ++i) {
                _text_panel[i] = 0;
@@ -124,6 +129,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
                _add_folder = new Button (top, _("Add folder..."));
                _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
                b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+               HelpGUI::instance()->landmark (_add_folder, HelpGUI::ADD_FOLDER_BUTTON);
 
                _add_dcp = new Button (top, _("Add DCP..."));
                _add_dcp->SetToolTip (_("Add a DCP."));
@@ -296,15 +302,10 @@ ContentPanel::item_selected ()
 void
 ContentPanel::check_selection ()
 {
-       if (_last_selected == selected()) {
-               /* This was triggered by a re-build of the view but the selection
-                  did not really change.
-               */
+       if (_no_check_selection) {
                return;
        }
 
-       _last_selected = selected ();
-
        setup_sensitivity ();
 
        BOOST_FOREACH (ContentSubPanel* i, panels()) {
@@ -662,6 +663,8 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 void
 ContentPanel::set_selection (ContentList cl)
 {
+       _no_check_selection = true;
+
        ContentList content = _film->content ();
        for (size_t i = 0; i < content.size(); ++i) {
                if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
@@ -670,6 +673,9 @@ ContentPanel::set_selection (ContentList cl)
                        _content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
                }
        }
+
+       _no_check_selection = false;
+       check_selection ();
 }
 
 void