smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix Clip listing (include all shortcuts, update colors)

Browse source 
* GTK fills in the snapshots in the background (using background threads
  to test files).
* Actual colors may only available after the widget is realized (not
  directly after ensure_style)
This commit is contained in:
Robin Gareus 2022-10-13 04:01:09 +02:00
parent 8d866f58a2
commit 4d4da13d55
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/trigger_clip_picker.cc
View file

@ -89,6 +89,7 @@ TriggerClipPicker::TriggerClipPicker ()
_fcd.add_button (Stock::OPEN, RESPONSE_OK); _fcd.add_button (Stock::OPEN, RESPONSE_OK);
refill_dropdown (); refill_dropdown ();
Glib::signal_idle ().connect (sigc::mem_fun (*this, &TriggerClipPicker::refill_dropdown));
/* Audition */ /* Audition */
_autoplay_btn.set_active (UIConfiguration::instance ().get_autoplay_clips ()); _autoplay_btn.set_active (UIConfiguration::instance ().get_autoplay_clips ());
@ -179,14 +180,15 @@ TriggerClipPicker::TriggerClipPicker ()
_view.set_headers_visible (false); //TODO: show headers when we have size/tags/etc _view.set_headers_visible (false); //TODO: show headers when we have size/tags/etc
_view.set_reorderable (false); _view.set_reorderable (false);
_view.get_selection ()->set_mode (SELECTION_MULTIPLE); _view.get_selection ()->set_mode (SELECTION_MULTIPLE);
_view.signal_realize().connect (mem_fun (this, &TriggerClipPicker::on_theme_changed));
_view.ensure_style ();
on_theme_changed ();
Gtk::TreeViewColumn* name_col = _view.get_column (0); Gtk::TreeViewColumn* name_col = _view.get_column (0);
Gtk::CellRendererText* renderer = dynamic_cast<Gtk::CellRendererText*> (_view.get_column_cell_renderer (0)); Gtk::CellRendererText* renderer = dynamic_cast<Gtk::CellRendererText*> (_view.get_column_cell_renderer (0));
name_col->add_attribute (renderer->property_foreground_gdk (), _columns.color); name_col->add_attribute (renderer->property_foreground_gdk (), _columns.color);
_view.ensure_style ();
on_theme_changed ();
/* DnD source */ /* DnD source */
std::vector<TargetEntry> dnd; std::vector<TargetEntry> dnd;
dnd.push_back (TargetEntry ("text/uri-list")); dnd.push_back (TargetEntry ("text/uri-list"));
@ -283,7 +285,7 @@ TriggerClipPicker::edit_path ()
Config->set_sample_lib_path (pd.get_serialized_paths ()); Config->set_sample_lib_path (pd.get_serialized_paths ());
} }
void bool
TriggerClipPicker::refill_dropdown () TriggerClipPicker::refill_dropdown ()
{ {
_clip_dir_menu.clear_items (); _clip_dir_menu.clear_items ();
@ -320,6 +322,7 @@ TriggerClipPicker::refill_dropdown ()
_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Edit..."), sigc::mem_fun (*this, &TriggerClipPicker::edit_path))); _clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Edit..."), sigc::mem_fun (*this, &TriggerClipPicker::edit_path)));
_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Other..."), sigc::mem_fun (*this, &TriggerClipPicker::open_dir))); _clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Other..."), sigc::mem_fun (*this, &TriggerClipPicker::open_dir)));
_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Download..."), sigc::mem_fun (*this, &TriggerClipPicker::open_downloader))); _clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Download..."), sigc::mem_fun (*this, &TriggerClipPicker::open_downloader)));
return false;
} }
static bool static bool
@ -388,7 +391,7 @@ display_name (std::string const& dir) {
bool bool
TriggerClipPicker::maybe_add_dir (std::string const& dir) TriggerClipPicker::maybe_add_dir (std::string const& dir)
{ {
if (dir.empty () || !Glib::file_test (dir, Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) { if (dir.empty () || dir == "." || !Glib::file_test (dir, Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) {
return false; return false;
} }
@ -924,6 +927,9 @@ TriggerClipPicker::mark_auditioned (TreeModel::iterator i)
if (!UIConfiguration::instance ().get_highlight_auditioned_clips()) { if (!UIConfiguration::instance ().get_highlight_auditioned_clips()) {
return; return;
} }
if (!(*i)[_columns.file]) {
return;
}
(*i)[_columns.color] = _color_auditioned; (*i)[_columns.color] = _color_auditioned;
(*i)[_columns.auditioned] = true; (*i)[_columns.auditioned] = true;
} }

2
gtk2_ardour/trigger_clip_picker.h
View file

@ -58,7 +58,7 @@ private:
void open_dir (); void open_dir ();
void open_downloader (); void open_downloader ();
void edit_path (); void edit_path ();
void refill_dropdown (); bool refill_dropdown ();
void parameter_changed (std::string const&); void parameter_changed (std::string const&);
void clip_added (std::string const&, void*); void clip_added (std::string const&, void*);
void row_selected (); void row_selected ();