--- gigedit/trunk/src/gigedit/mainwindow.cpp 2019/10/24 11:16:26 3635 +++ gigedit/trunk/src/gigedit/mainwindow.cpp 2019/10/24 12:06:18 3636 @@ -1484,7 +1484,7 @@ sigc::mem_fun(*this, &MainWindow::file_changed)); instrumentProps.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); - propDialog.signal_changed().connect( + fileProps.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); midiRules.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); @@ -2603,8 +2603,8 @@ void MainWindow::on_action_file_properties() { - propDialog.show(); - propDialog.deiconify(); + fileProps.show(); + fileProps.deiconify(); } void MainWindow::on_action_warn_user_on_extensions() { @@ -2675,7 +2675,7 @@ dialog.run(); } -PropDialog::PropDialog() +FilePropDialog::FilePropDialog() : eFileFormat(_("File Format")), eName(_("Name")), eCreationDate(_("Creation date")), @@ -2709,7 +2709,7 @@ set_title(_("File Properties")); eName.set_width_chars(50); - connect(eFileFormat, &PropDialog::set_FileFormat); + connect(eFileFormat, &FilePropDialog::set_FileFormat); connect(eName, &DLS::Info::Name); connect(eCreationDate, &DLS::Info::CreationDate); connect(eComments, &DLS::Info::Comments); @@ -2770,7 +2770,7 @@ quitButton.set_can_default(); quitButton.grab_focus(); quitButton.signal_clicked().connect( - sigc::mem_fun(*this, &PropDialog::hide)); + sigc::mem_fun(*this, &FilePropDialog::hide)); quitButton.show(); vbox.show(); @@ -2779,7 +2779,7 @@ #endif } -void PropDialog::set_file(gig::File* file) +void FilePropDialog::set_file(gig::File* file) { m_file = file; update(file->pInfo); @@ -2805,7 +2805,7 @@ update_model--; } -void PropDialog::set_FileFormat(int value) +void FilePropDialog::set_FileFormat(int value) { m_file->pVersion->major = value; } @@ -3155,7 +3155,7 @@ file_has_name = filename; file_is_changed = false; - propDialog.set_file(gig); + fileProps.set_file(gig); instrument_name_connection.block(); int index = 0;