2022-09-30 Fred Gleason <fredg@paravelsystems.com>

* Updated various dialogs in rdcatch(1) to use new 'pretty text'
	styling for cart and cut objects.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -23439,3 +23439,6 @@
 	* Added 'RDCut::prettyText()' methods.
 	* Fixed a bug in rdcatch(1) that caused the 'Edit Upload' dialog
 	to fail to be completely cleared when creating a new event.
+2022-09-30 Fred Gleason <fredg@paravelsystems.com>
+	* Updated various dialogs in rdcatch(1) to use new 'pretty text'
+	styling for cart and cut objects.

lib/rdrecording.h

@@ -2,7 +2,7 @@
 //
 // Abstract a Rivendell RDCatch Event
 //
-//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -18,8 +18,7 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qsqldatabase.h>
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include <rdsettings.h>
 

rdcatch/add_recording.cpp

@@ -157,7 +157,7 @@ int AddRecording::exec(unsigned *rec_id,RDRecording::Type *type)
 
 void AddRecording::recordingData()
 {
-  *add_record_id=AddRecord(0);
+  *add_record_id=AddRecord(RDRecording::Recording,0);
 
   if(!catch_editrecording_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -171,7 +171,7 @@ void AddRecording::recordingData()
 
 void AddRecording::playoutData()
 {
-  *add_record_id=AddRecord(128);
+  *add_record_id=AddRecord(RDRecording::Playout,128);
 
   if(!catch_editplayout_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -185,7 +185,7 @@ void AddRecording::playoutData()
 
 void AddRecording::downloadData()
 {
-  *add_record_id=AddRecord(0);
+  *add_record_id=AddRecord(RDRecording::Download,0);
 
   if(!catch_editdownload_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -199,7 +199,7 @@ void AddRecording::downloadData()
 
 void AddRecording::uploadData()
 {
-  *add_record_id=AddRecord(0);
+  *add_record_id=AddRecord(RDRecording::Upload,0);
 
   if(!catch_editupload_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -213,7 +213,7 @@ void AddRecording::uploadData()
 
 void AddRecording::macroData()
 {
-  *add_record_id=AddRecord(0);
+  *add_record_id=AddRecord(RDRecording::MacroEvent,0);
 
   if(!catch_editcartevent_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -227,7 +227,7 @@ void AddRecording::macroData()
 
 void AddRecording::switchData()
 {
-  *add_record_id=AddRecord(0);
+  *add_record_id=AddRecord(RDRecording::SwitchEvent,0);
 
   if(!catch_editswitchevent_dialog->exec(*add_record_id,NULL)) {
     DeleteRecord();
@@ -280,14 +280,38 @@ void AddRecording::closeEvent(QCloseEvent *e)
 }
 
 
-unsigned AddRecording::AddRecord(unsigned chan) const
+unsigned AddRecording::AddRecord(RDRecording::Type type,unsigned chan) const
 {
   QString sql;
 
   sql=QString("insert into `RECORDINGS` set ")+
     "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+
+    QString::asprintf("`TYPE`=%u,",type)+
     QString::asprintf("`CHANNEL`=%u,",chan)+
     "`CUT_NAME`=''";
+  switch(type) {
+  case RDRecording::Recording:
+    break;
+
+  case RDRecording::Playout:
+    break;
+
+  case RDRecording::Download:
+    break;
+
+  case RDRecording::Upload:
+    break;
+
+  case RDRecording::MacroEvent:
+    break;
+
+  case RDRecording::SwitchEvent:
+    sql+=",`DESCRIPTION`='"+RDEscapeString(tr("[new switch event]"))+"'";
+    break;
+
+  case RDRecording::LastType:
+    break;
+  }
   return RDSqlQuery::run(sql).toUInt();
 }
 

rdcatch/add_recording.h

@@ -50,7 +50,7 @@ class AddRecording : public RDDialog
   void closeEvent(QCloseEvent *e);
   
  private: 
-  unsigned AddRecord(unsigned chan) const;
+  unsigned AddRecord(RDRecording::Type type,unsigned chan) const;
   void DeleteRecord();
   unsigned *add_record_id;
   RDRecording::Type *add_type;

rdcatch/edit_cartevent.cpp

@@ -164,8 +164,7 @@ int EditCartEvent::exec(int id,std::vector<int> *adds)
   edit_event_widget->fromRecording(edit_recording->id());
   edit_description_edit->setText(edit_recording->description());
   if(edit_cart!=NULL) {
-    edit_destination_edit->
-      setText(QString::asprintf("%06d",edit_cart->number()));
+    edit_destination_edit->setText(RDCart::prettyText(edit_cart->number()));
   }
   edit_dow_selector->fromRecording(edit_recording->id());
   edit_oneshot_box->setChecked(edit_recording->oneShot());
@@ -191,7 +190,7 @@ void EditCartEvent::selectCartData()
       delete edit_cart;
     }
     edit_cart=new RDCart(cartnum);
-    edit_destination_edit->setText(QString::asprintf("%d",cartnum));
+    edit_destination_edit->setText(RDCart::prettyText(cartnum));
     edit_description_edit->setText(edit_cart->title());
   }
 }

rdcatch/edit_download.cpp

@@ -271,7 +271,12 @@ int EditDownload::exec(int record_id,std::vector<int> *adds)
   edit_password_edit->setText(edit_recording->urlPassword());
   edit_use_id_file_check->setChecked(edit_recording->urlUseIdFile());
   edit_cutname=edit_recording->cutName();
-  edit_destination_edit->setText("Cut "+edit_cutname);
+  if(edit_cutname.isEmpty()) {
+    edit_destination_edit->clear();
+  }
+  else {
+    edit_destination_edit->setText("Cut "+RDCut::prettyText(edit_cutname));
+  }
   edit_channels_box->setCurrentIndex(edit_recording->channels()-1);
   if(edit_recording->trimThreshold()>0) {
     edit_autotrim_box->setChecked(true);
@@ -345,7 +350,13 @@ void EditDownload::selectCartData()
 {
   if(catch_cut_dialog->exec(&edit_cutname)) {
     edit_description_edit->setText(RDCutPath(edit_cutname));
-    edit_destination_edit->setText(tr("Cut")+" "+edit_cutname);
+    if(edit_cutname.isEmpty()) {
+      edit_destination_edit->clear();
+    }
+    else {
+      edit_destination_edit->
+	setText(tr("Cut")+" "+RDCut::prettyText(edit_cutname));
+    }
   }
 }
 
@@ -532,7 +543,7 @@ bool EditDownload::CheckEvent(bool include_myself)
     "(`START_TIME`='"+RDEscapeString(edit_event_widget->startTime().
 				    toString("hh:mm:ss"))+"')&&"+
     "(`URL`='"+RDEscapeString(edit_url_edit->text())+"')&&"+
-    "(`CUT_NAME`='"+RDEscapeString(edit_destination_edit->text().right(10))+"')";
+    "(`CUT_NAME`='"+RDEscapeString(edit_cutname)+"')";
   if(edit_dow_selector->dayOfWeekEnabled(7)) {
     sql+="&&(`SUN`='Y')";
   }

rdcatch/edit_playout.cpp

@@ -164,7 +164,13 @@ int EditPlayout::exec(int id,std::vector<int> *adds)
   edit_event_widget->fromRecording(edit_recording->id());
   edit_description_edit->setText(edit_recording->description());
   edit_cutname=edit_recording->cutName();
-  edit_destination_edit->setText(RDCutPath(edit_cutname));
+  if(edit_cutname.isEmpty()) {
+    edit_destination_edit->clear();
+  }
+  else {
+    edit_destination_edit->
+      setText(tr("Cut")+" "+RDCut::prettyText(edit_cutname));
+  }
   edit_dow_selector->fromRecording(edit_recording->id());
   edit_oneshot_box->setChecked(edit_recording->oneShot());
   locationChangedData(edit_event_widget->stationName(),
@@ -186,8 +192,15 @@ void EditPlayout::locationChangedData(const QString &station,int decknum)
 void EditPlayout::selectCutData()
 {
   if(edit_cut_dialog->exec(&edit_cutname)) {
-    edit_destination_edit->setText(edit_cutname);
-    edit_description_edit->setText(RDCutPath(edit_cutname));
+    if(edit_cutname.isEmpty()) {
+      edit_destination_edit->clear();
+      edit_description_edit->clear();
+    }
+    else {
+      edit_destination_edit->
+	setText(tr("Cut")+" "+RDCut::prettyText(edit_cutname));
+      edit_description_edit->setText(RDCutPath(edit_cutname));
+    }
   }
 }
 

rdcatch/edit_recording.cpp

@@ -29,7 +29,6 @@
 #include "edit_recording.h"
 #include "globals.h"
 
-//EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
 EditRecording::EditRecording(QString *filter,QWidget *parent)
   : RDDialog(parent)
 {
@@ -313,101 +312,6 @@ EditRecording::EditRecording(QString *filter,QWidget *parent)
   edit_cancel_button->setFont(buttonFont());
   edit_cancel_button->setText(tr("Cancel"));
   connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
-
-  //
-  // Populate Data
-  //
-  /*
-  edit_event_widget->fromRecording(edit_recording->id());
-  edit_starttime_edit->setTime(edit_recording->startTime());
-  edit_description_edit->setText(edit_recording->description());
-  edit_starttype_group->button((int)edit_recording->startType())->
-    setChecked(true);
-  switch((RDRecording::StartType)edit_starttype_group->checkedId()) {
-  case RDRecording::HardStart:
-    edit_starttime_edit->setTime(edit_recording->startTime());
-    break;
-
-  case RDRecording::GpiStart:
-    edit_start_startwindow_edit->setTime(edit_recording->startTime());
-    edit_start_endwindow_edit->
-      setTime(edit_start_startwindow_edit->time().
-	      addMSecs(edit_recording->startLength()));
-    edit_startmatrix_spin->setValue(edit_recording->startMatrix());
-    edit_startline_spin->setValue(edit_recording->startLine());
-    edit_startoffset_edit->
-      setTime(QTime(0,0,0).addMSecs(edit_recording->startOffset()));
-    edit_multirec_box->
-      setChecked(edit_recording->allowMultipleRecordings());
-    break;
-  }
-  startTypeClickedData(edit_starttype_group->checkedId());
-  edit_endtype_group->button((int)edit_recording->endType())->setChecked(true);
-  switch((RDRecording::EndType)edit_endtype_group->checkedId()) {
-  case RDRecording::LengthEnd:
-    edit_endlength_edit->
-      setTime(QTime(0,0,0).addMSecs(edit_recording->length()));
-    break;
-
-  case RDRecording::HardEnd:
-    edit_endtime_edit->setTime(edit_recording->endTime());
-    break;
-
-  case RDRecording::GpiEnd:
-    edit_end_startwindow_edit->setTime(edit_recording->endTime());
-    edit_end_endwindow_edit->
-      setTime(edit_end_startwindow_edit->time().
-	      addMSecs(edit_recording->endLength()));
-    edit_endmatrix_spin->setValue(edit_recording->endMatrix());
-    edit_endline_spin->setValue(edit_recording->endLine());
-    break;
-  }
-  edit_maxlength_edit->
-    setTime(QTime(0,0,0).addMSecs(edit_recording->maxGpiRecordingLength()));
-  endTypeClickedData(edit_endtype_group->checkedId());
-
-  edit_cutname=edit_recording->cutName();
-  edit_destination_edit->setText(RDCutPath(edit_cutname));
-  edit_dow_selector->fromRecording(edit_recording->id());
-  edit_startoffset_box->setValue(edit_recording->startdateOffset());
-  edit_endoffset_box->setValue(edit_recording->enddateOffset());
-  locationChangedData(edit_event_widget->stationName(),
-		      edit_event_widget->deckNumber());
-
-  QString source=GetSourceName(edit_recording->switchSource());
-  for(int i=0;i<edit_source_box->count();i++) {
-    if(edit_source_box->itemData(i).toString()==source) {
-      edit_source_box->setCurrentIndex(i);
-    }
-  }
-  if(edit_recording->trimThreshold()>0) {
-    edit_autotrim_box->setChecked(true);
-    edit_autotrim_spin->setValue(-(edit_recording->trimThreshold()/100));
-  }
-  else {
-    edit_autotrim_box->setChecked(false);
-    edit_autotrim_spin->setValue(rda->libraryConf()->trimThreshold()/100);
-  }
-  autotrimToggledData(edit_autotrim_box->isChecked());
-  if(edit_recording->normalizationLevel()<0) {
-    edit_normalize_box->setChecked(true);
-    edit_normalize_spin->setValue(edit_recording->normalizationLevel()/100);
-  }
-  else {
-    edit_normalize_box->setChecked(false);
-    edit_normalize_spin->setValue(rda->libraryConf()->ripperLevel()/100);
-  }
-  normalizeToggledData(edit_normalize_box->isChecked());
-  // Populate number of channels; if creating a new recording entry and a valid
-  // deck exists, use the deck default for num. channels.  Otherwise use the
-  // previously entered (or DB default) recording num. channels.
-  if( (edit_recording->station().length() == 0) && (edit_deck!=NULL) ) {
-    edit_channels_box->setCurrentIndex(edit_deck->defaultChannels()-1);
-  } else {
-    edit_channels_box->setCurrentIndex(edit_recording->channels()-1);
-  }
-  edit_oneshot_box->setChecked(edit_recording->oneShot());
-  */
 }
 
 
@@ -497,7 +401,13 @@ int EditRecording::exec(int id,std::vector<int> *adds)
   endTypeClickedData(edit_endtype_group->checkedId());
 
   edit_cutname=edit_recording->cutName();
-  edit_destination_edit->setText(RDCutPath(edit_cutname));
+  if(edit_cutname.isEmpty()) {
+    edit_destination_edit->clear();
+  }
+  else {
+    edit_destination_edit->
+      setText(tr("Cut")+" "+RDCut::prettyText(edit_cutname));
+  }
   edit_dow_selector->fromRecording(edit_recording->id());
   edit_startoffset_box->setValue(edit_recording->startdateOffset());
   edit_endoffset_box->setValue(edit_recording->enddateOffset());
@@ -638,12 +548,15 @@ void EditRecording::endTypeClickedData(int id)
 
 void EditRecording::selectCutData()
 {
-  QString str;
-
   if(catch_cut_dialog->exec(&edit_cutname)) {
     edit_description_edit->setText(RDCutPath(edit_cutname));
-    str=QString(tr("Cut"));
-    edit_destination_edit->setText(tr("Cut")+" "+edit_cutname);
+    if(edit_cutname.isEmpty()) {
+      edit_destination_edit->clear();
+    }
+    else {
+      edit_destination_edit->
+	setText(tr("Cut")+" "+RDCut::prettyText(edit_cutname));
+    }
   }
 }