13
0

NO-OP: clang-indent

This commit is contained in:
Robin Gareus 2021-04-08 03:17:45 +02:00
parent f0cb8e54c3
commit 08b169f17b
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 133 additions and 140 deletions

View File

@ -33,19 +33,16 @@
using namespace ARDOUR;
ExportFilenameSelector::ExportFilenameSelector () :
include_label ("", Gtk::ALIGN_LEFT),
label_label (_("Label:"), Gtk::ALIGN_LEFT),
timespan_checkbox (_("Timespan Name")),
revision_checkbox (_("Revision:")),
path_label (_("Folder:"), Gtk::ALIGN_LEFT),
browse_button (_("Browse")),
open_button (_("Open Folder")),
example_filename_label ("", Gtk::ALIGN_LEFT),
_require_timespan (false)
ExportFilenameSelector::ExportFilenameSelector ()
: include_label ("", Gtk::ALIGN_LEFT)
, label_label (_("Label:"), Gtk::ALIGN_LEFT)
, timespan_checkbox (_("Timespan Name"))
, revision_checkbox (_("Revision:"))
, path_label (_("Folder:"), Gtk::ALIGN_LEFT)
, browse_button (_("Browse"))
, open_button (_("Open Folder"))
, example_filename_label ("", Gtk::ALIGN_LEFT)
, _require_timespan (false)
{
include_label.set_markup (_("Build filename(s) from these components:"));
@ -122,7 +119,6 @@ ExportFilenameSelector::ExportFilenameSelector () :
ExportFilenameSelector::~ExportFilenameSelector ()
{
}
void
@ -225,7 +221,6 @@ ExportFilenameSelector::set_state (ARDOUR::ExportProfileManager::FilenameStatePt
/* Load state */
load_state ();
}
void
@ -270,8 +265,9 @@ ExportFilenameSelector::check_folder ()
}
if (!Glib::file_test (path_entry.get_text (), Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) {
Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n\
The filename will be chosen from the information just above the folder selector."), path_entry.get_text()));
Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n"
"The filename will be chosen from the information just above the folder selector."),
path_entry.get_text ()));
msg.run ();
path_entry.set_text (Glib::path_get_dirname (path_entry.get_text ()));
filename->set_folder (path_entry.get_text ());
@ -315,14 +311,7 @@ ExportFilenameSelector::update_timespan_sensitivity ()
{
bool implicit = _require_timespan;
if (!implicit
&& !filename->include_session
&& !filename->include_label
&& !filename->include_revision
&& !filename->include_channel_config
&& !filename->include_channel
&& !filename->include_date
&& !filename->include_format_name) {
if (!implicit && !filename->include_session && !filename->include_label && !filename->include_revision && !filename->include_channel_config && !filename->include_channel && !filename->include_date && !filename->include_format_name) {
implicit = true;
}
@ -330,12 +319,10 @@ ExportFilenameSelector::update_timespan_sensitivity ()
if (implicit && !timespan_checkbox.get_inconsistent ()) {
timespan_checkbox.set_inconsistent (true);
filename->include_timespan = true;
}
else if (!implicit && timespan_checkbox.get_inconsistent()) {
} else if (!implicit && timespan_checkbox.get_inconsistent ()) {
filename->include_timespan = timespan_checkbox.get_active ();
timespan_checkbox.set_inconsistent (false);
}
}
void
@ -431,8 +418,9 @@ ExportFilenameSelector::open_browse_dialog ()
std::string filename = dialog.get_filename ();
if (!Glib::file_test (filename, Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) {
Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n\
The filename will be chosen from the information just above the folder selector."), filename));
Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n"
"The filename will be chosen from the information just above the folder selector."),
filename));
msg.run ();
continue;
}

View File

@ -33,8 +33,8 @@
#include <gtkmm/spinbutton.h>
#include <gtkmm/treemodel.h>
#include "ardour/export_profile_manager.h"
#include "ardour/export_filename.h"
#include "ardour/export_profile_manager.h"
#include "ardour/session_handle.h"
class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
@ -54,7 +54,6 @@ public:
sigc::signal<void> CriticalSelectionChanged;
private:
void load_state ();
void update_label ();
@ -101,13 +100,16 @@ private:
typedef ARDOUR::ExportFilename::DateFormat DateFormat;
struct DateFormatCols : public Gtk::TreeModelColumnRecord
{
struct DateFormatCols : public Gtk::TreeModelColumnRecord {
public:
Gtk::TreeModelColumn<DateFormat> format;
Gtk::TreeModelColumn<std::string> label;
DateFormatCols () { add(format); add(label); }
DateFormatCols ()
{
add (format);
add (label);
}
};
DateFormatCols date_format_cols;
Glib::RefPtr<Gtk::ListStore> date_format_list;
@ -117,13 +119,16 @@ private:
typedef ARDOUR::ExportFilename::TimeFormat TimeFormat;
struct TimeFormatCols : public Gtk::TreeModelColumnRecord
{
struct TimeFormatCols : public Gtk::TreeModelColumnRecord {
public:
Gtk::TreeModelColumn<TimeFormat> format;
Gtk::TreeModelColumn<std::string> label;
TimeFormatCols () { add(format); add(label); }
TimeFormatCols ()
{
add (format);
add (label);
}
};
TimeFormatCols time_format_cols;
Glib::RefPtr<Gtk::ListStore> time_format_list;