projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shorten enum/string for icons by avoiding Gtkmm2ext namespace
[ardour.git]
/
gtk2_ardour
/
editor_route_groups.h
diff --git
a/gtk2_ardour/editor_route_groups.h
b/gtk2_ardour/editor_route_groups.h
index f92e79c7cc3942eee5f5ad94005e0a01ce280a7e..65c4968d8de88daac9461e9e1991ca7b68d370f7 100644
(file)
--- a/
gtk2_ardour/editor_route_groups.h
+++ b/
gtk2_ardour/editor_route_groups.h
@@
-17,6
+17,9
@@
*/
*/
+#ifndef __gtk_ardour_editor_route_groups_h__
+#define __gtk_ardour_editor_route_groups_h__
+
#include "gtkmm2ext/stateful_button.h"
#include "editor_component.h"
#include "gtkmm2ext/stateful_button.h"
#include "editor_component.h"
@@
-32,14
+35,15
@@
public:
}
void clear ();
}
void clear ();
- Gtkmm2ext::StatefulToggleButton& all_group_active_button() { return _all_group_active_button; }
private:
struct Columns : public Gtk::TreeModel::ColumnRecord {
Columns () {
private:
struct Columns : public Gtk::TreeModel::ColumnRecord {
Columns () {
+ add (gdkcolor);
add (text);
add (text);
+ add (is_visible);
add (gain);
add (gain_relative);
add (mute);
add (gain);
add (gain_relative);
add (mute);
@@
-47,14
+51,14
@@
private:
add (record);
add (monitoring);
add (select);
add (record);
add (monitoring);
add (select);
- add (
edits
);
+ add (
active_shared
);
add (active_state);
add (active_state);
- add (is_visible);
- add (gdkcolor);
add (routegroup);
}
add (routegroup);
}
+ Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<std::string> text;
+ Gtk::TreeModelColumn<bool> is_visible;
Gtk::TreeModelColumn<bool> gain;
Gtk::TreeModelColumn<bool> gain_relative;
Gtk::TreeModelColumn<bool> mute;
Gtk::TreeModelColumn<bool> gain;
Gtk::TreeModelColumn<bool> gain_relative;
Gtk::TreeModelColumn<bool> mute;
@@
-62,10
+66,8
@@
private:
Gtk::TreeModelColumn<bool> record;
Gtk::TreeModelColumn<bool> monitoring;
Gtk::TreeModelColumn<bool> select;
Gtk::TreeModelColumn<bool> record;
Gtk::TreeModelColumn<bool> monitoring;
Gtk::TreeModelColumn<bool> select;
- Gtk::TreeModelColumn<bool>
edits
;
+ Gtk::TreeModelColumn<bool>
active_shared
;
Gtk::TreeModelColumn<bool> active_state;
Gtk::TreeModelColumn<bool> active_state;
- Gtk::TreeModelColumn<bool> is_visible;
- Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
};
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
};
@@
-80,8
+82,6
@@
private:
void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &);
void remove_selected ();
void run_new_group_dialog ();
void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &);
void remove_selected ();
void run_new_group_dialog ();
- void all_group_toggled();
- void all_group_changed (const PBD::PropertyChange&);
void row_deleted (Gtk::TreeModel::Path const &);
Glib::RefPtr<Gtk::ListStore> _model;
void row_deleted (Gtk::TreeModel::Path const &);
Glib::RefPtr<Gtk::ListStore> _model;
@@
-89,7
+89,6
@@
private:
Gtk::TreeView _display;
Gtk::ScrolledWindow _scroller;
Gtk::VBox _display_packer;
Gtk::TreeView _display;
Gtk::ScrolledWindow _scroller;
Gtk::VBox _display_packer;
- Gtkmm2ext::StatefulToggleButton _all_group_active_button;
bool _in_row_change;
bool _in_rebuild;
PBD::ScopedConnectionList _property_changed_connections;
bool _in_row_change;
bool _in_rebuild;
PBD::ScopedConnectionList _property_changed_connections;
@@
-97,4
+96,4
@@
private:
Gtk::ColorSelectionDialog color_dialog;
};
Gtk::ColorSelectionDialog color_dialog;
};
-
+#endif // __gtk_ardour_editor_route_groups_h__