From 396f457354af8bfedb0675547f7f8ad5a8c7f485 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 31 Aug 2019 09:31:12 -0700 Subject: [PATCH] Remove deleted scheduler codes from rdlogmanager(1) events. --- ChangeLog | 2 ++ rdlogmanager/edit_event.cpp | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96eef83c..01f6bff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19045,3 +19045,5 @@ 2019-08-28 Fred Gleason * Added the '%l' wildcard (unpadded month 1-12) to the filepath wildcards. +2019-08-31 Patrick Linstruth + * Remove deleted scheduler codes from rdlogmanager(1) events. diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 40d692ac..ea6f829f 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -500,7 +500,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_title_none_button->setText(tr("None")); connect(event_title_none_button,SIGNAL(clicked()),this,SLOT(titleData())); -// Must have code.. + // Must have code.. event_have_code_label=new QLabel(tr("Must have code"),this); event_have_code_label->setFont(bold_font); @@ -508,13 +508,6 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_have_code_box=new QComboBox(this); event_have_code_box->setGeometry(CENTER_LINE+510,427,100,20); - event_have_code_box->insertItem(""); - sql2="select CODE from SCHED_CODES order by CODE"; - q2=new RDSqlQuery(sql2); - while(q2->next()) { - event_have_code_box->insertItem(q2->value(0).toString()); - } - delete q2; // And code @@ -524,10 +517,17 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_have_code2_box=new QComboBox(this); event_have_code2_box->setGeometry(CENTER_LINE+510,448,100,20); + + // + // Fill scheduler codes + // + event_have_code_box->insertItem(""); event_have_code2_box->insertItem(""); + sql2="select CODE from SCHED_CODES order by CODE"; q2=new RDSqlQuery(sql2); while(q2->next()) { + event_have_code_box->insertItem(q2->value(0).toString()); event_have_code2_box->insertItem(q2->value(0).toString()); } delete q2; @@ -790,8 +790,12 @@ EditEvent::EditEvent(QString eventname,bool new_event, } event_artist_sep_spinbox->setValue(event_event->artistSep()); event_title_sep_spinbox->setValue(event_event->titleSep()); - event_have_code_box->setCurrentText(event_event->HaveCode()); - event_have_code2_box->setCurrentText(event_event->HaveCode2()); + if(event_have_code_box->findText(event_event->HaveCode())!=-1) { + event_have_code_box->setCurrentText(event_event->HaveCode()); + } + if(event_have_code_box->findText(event_event->HaveCode2())!=-1) { + event_have_code2_box->setCurrentText(event_event->HaveCode2()); + } QColor color=event_event->color(); if(color.isValid()) { event_color_button->setPalette(QPalette(color,backgroundColor()));