projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Editor Summary: fix direction of scroll zoom to match other conventions
[ardour.git]
/
gtk2_ardour
/
editor_regions.cc
diff --git
a/gtk2_ardour/editor_regions.cc
b/gtk2_ardour/editor_regions.cc
index 5ed8fe64c7a80be48e0f7ae44d8a1382f135ec25..0372e1f3d89220c35179f11c9ec0b4dfb7078599 100644
(file)
--- a/
gtk2_ardour/editor_regions.cc
+++ b/
gtk2_ardour/editor_regions.cc
@@
-33,10
+33,12
@@
#include "ardour/session.h"
#include "ardour/profile.h"
#include "ardour/session.h"
#include "ardour/profile.h"
-#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/treeutils.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/treeutils.h"
#include "gtkmm2ext/utils.h"
+#include "widgets/choice.h"
+#include "widgets/tooltips.h"
+
#include "audio_clock.h"
#include "editor.h"
#include "editing.h"
#include "audio_clock.h"
#include "editor.h"
#include "editing.h"
@@
-50,13
+52,13
@@
#include "editor_regions.h"
#include "editor_drag.h"
#include "main_clock.h"
#include "editor_regions.h"
#include "editor_drag.h"
#include "main_clock.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
#include "ui_config.h"
#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
+using namespace ArdourWidgets;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
@@
-65,9
+67,9
@@
using namespace Editing;
using Gtkmm2ext::Keyboard;
struct ColumnInfo {
using Gtkmm2ext::Keyboard;
struct ColumnInfo {
- int index;
- const char* label;
- const char* tooltip;
+
int index;
+
const char* label;
+
const char* tooltip;
};
EditorRegions::EditorRegions (Editor* e)
};
EditorRegions::EditorRegions (Editor* e)
@@
-495,13
+497,13
@@
EditorRegions::remove_unused_regions ()
return;
}
return;
}
- prompt
= _("Do you really want to remove unused regions?"
-
"\n(This is destructive and cannot be undone)");
+ prompt = _("Do you really want to remove unused regions?"
+ "\n(This is destructive and cannot be undone)");
choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove."));
choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove."));
-
Gtkmm2ext
::Choice prompter (_("Remove unused regions"), prompt, choices);
+
ArdourWidgets
::Choice prompter (_("Remove unused regions"), prompt, choices);
if (prompter.run () == 1) {
_no_redisplay = true;
if (prompter.run () == 1) {
_no_redisplay = true;
@@
-1031,7
+1033,7
@@
EditorRegions::populate_row_name (boost::shared_ptr<Region> region, TreeModel::R
void
EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
void
EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
-
if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
+ if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name());
} else {
row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name());
} else {
row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
@@
-1056,10
+1058,10
@@
EditorRegions::set_full (bool f)
{
if (f) {
_display.expand_all ();
{
if (f) {
_display.expand_all ();
-
expanded = true;
+ expanded = true;
} else {
_display.collapse_all ();
} else {
_display.collapse_all ();
-
expanded = false;
+ expanded = false;
}
}
}
}
@@
-1303,9
+1305,9
@@
EditorRegions::selection_mapover (sigc::slot<void,boost::shared_ptr<Region> > sl
void
EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
void
EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
- int x, int y,
- const SelectionData& data,
- guint info, guint time)
+
int x, int y,
+
const SelectionData& data,
+
guint info, guint time)
{
vector<string> paths;
{
vector<string> paths;