Use currently selected timeformat (in SelectionBar) as default for Label dialog

src/LabelDialog.cpp

@@ -94,7 +94,8 @@ LabelDialog::LabelDialog(wxWindow *parent,
                          DirManager *dirmanager,
                          TrackList *tracks,
                          ViewInfo &viewinfo,
-                         double rate)
+                         double rate,
+                         const wxString & format)
 : wxDialog(parent,
            wxID_ANY,
            _("Edit Labels"),
@@ -104,7 +105,8 @@ LabelDialog::LabelDialog(wxWindow *parent,
   mDirManager(dirmanager),
   mTracks(tracks),
   mViewInfo(&viewinfo),
-  mRate(rate)
+  mRate(rate),
+  mFormat(format)
 {
    // Create the main sizer
    wxBoxSizer *vs = new wxBoxSizer(wxVERTICAL);

src/LabelDialog.h

@@ -37,7 +37,8 @@ class LabelDialog:public wxDialog
                DirManager *dirmanager,
                TrackList *tracks,
                ViewInfo &viewinfo,
-               double rate);
+               double rate,
+               const wxString & format);
    ~LabelDialog();
 
     virtual bool Show(bool show = true);

src/Menus.cpp

@@ -5413,8 +5413,11 @@ void AudacityProject::OnAddLabelPlaying()
 
 void AudacityProject::OnEditLabels()
 {
-   LabelDialog dlg(this, mDirManager, mTracks, mViewInfo, mRate);
-   
+   wxString format;
+   gPrefs->Read(wxT("/SelectionFormat"), &format);
+
+   LabelDialog dlg(this, mDirManager, mTracks, mViewInfo, mRate, format);
+
    if (dlg.ShowModal() == wxID_OK) {
       PushState(_("Edited labels"), _("Label"));
       RedrawProject();