From 396f457354af8bfedb0675547f7f8ad5a8c7f485 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 31 Aug 2019 09:31:12 -0700 Subject: [PATCH 1/4] 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())); From 9d66a3ae21c634f017c3da7c59dceb05195e9ffd Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 31 Aug 2019 10:19:51 -0700 Subject: [PATCH 2/4] Fix typo --- rdlogmanager/edit_event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index ea6f829f..39084ce1 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -793,7 +793,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, 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) { + if(event_have_code2_box->findText(event_event->HaveCode2())!=-1) { event_have_code2_box->setCurrentText(event_event->HaveCode2()); } QColor color=event_event->color(); From f19eed120a98288896bfee556e502906c41ca251 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 31 Aug 2019 15:34:56 -0700 Subject: [PATCH 3/4] Changed empty scheduler code selection from "" to "[none]" in rdlogmanager(1) event editor. --- ChangeLog | 2 ++ rdlogmanager/edit_event.cpp | 29 ++++++++++++++++++++--------- rdlogmanager/rdlogmanager_cs.ts | 4 ++++ rdlogmanager/rdlogmanager_de.ts | 4 ++++ rdlogmanager/rdlogmanager_es.ts | 4 ++++ rdlogmanager/rdlogmanager_fr.ts | 4 ++++ rdlogmanager/rdlogmanager_nb.ts | 4 ++++ rdlogmanager/rdlogmanager_nn.ts | 4 ++++ rdlogmanager/rdlogmanager_pt_BR.ts | 4 ++++ 9 files changed, 50 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01f6bff8..88a7e89c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19047,3 +19047,5 @@ wildcards. 2019-08-31 Patrick Linstruth * Remove deleted scheduler codes from rdlogmanager(1) events. + * Changed empty scheduler code selection from "" to "[none]" in + rdlogmanager(1) event editor. diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 39084ce1..5bac0020 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -479,7 +479,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_artist_none_button=new QPushButton(this); event_artist_none_button->setGeometry(CENTER_LINE+570,383,40,20); event_artist_none_button->setFont(font); - event_artist_none_button->setText(tr("None")); + event_artist_none_button->setText(tr("none")); connect(event_artist_none_button,SIGNAL(clicked()),this,SLOT(artistData())); // Title Separation SpinBox @@ -521,8 +521,8 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Fill scheduler codes // - event_have_code_box->insertItem(""); - event_have_code2_box->insertItem(""); + event_have_code_box->insertItem("[None]"); + event_have_code2_box->insertItem("[None]"); sql2="select CODE from SCHED_CODES order by CODE"; q2=new RDSqlQuery(sql2); @@ -1480,13 +1480,24 @@ void EditEvent::Save() event_event->setSchedGroup(event_sched_group_box->currentText()); event_event->setArtistSep(event_artist_sep_spinbox->value()); event_event->setTitleSep(event_title_sep_spinbox->value()); - event_event->setHaveCode(event_have_code_box->currentText()); - if (event_have_code_box->currentText() != QString("")) { + event_event->setHaveCode(""); + event_event->setHaveCode2(""); + if(event_have_code_box->currentIndex()>0) { + event_event->setHaveCode(event_have_code_box->currentText()); + } + if(event_have_code2_box->currentIndex()>0) { event_event->setHaveCode2(event_have_code2_box->currentText()); - } else { - // save second code as first code when first code isn't defined - event_event->setHaveCode(event_have_code2_box->currentText()); - event_event->setHaveCode2(QString("")); + } + + // If both codes are the same, remove second code + if (event_event->HaveCode()==event_event->HaveCode2()) { + event_event->setHaveCode2(""); + } + + // Save second code as first code when first code isn't defined + if (event_event->HaveCode().isEmpty()) { + event_event->setHaveCode(event_event->HaveCode2()); + event_event->setHaveCode2(""); } event_preimport_list->setEventName(event_name); diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index 31294d82..b7d89188 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -599,6 +599,10 @@ Chcete ji přepsat? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index 2d06f001..f723d6e7 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -599,6 +599,10 @@ Wollen Sie es überschreiben? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index 91c15bf4..50ee14d5 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -601,6 +601,10 @@ Do you want to overwrite it? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index e18e83bf..384f14ca 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -533,6 +533,10 @@ Do you want to overwrite it? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index 63c08ebc..82443bd2 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -608,6 +608,10 @@ Vil du byta henne ut? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index 63c08ebc..82443bd2 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -608,6 +608,10 @@ Vil du byta henne ut? Artist Separation + + none + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index 6774a59b..5dc06463 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -601,6 +601,10 @@ Você quer sobreescrêve-lo? Artist Separation + + none + + EditEventLine From 9f668a3d49890337545ed908e51c2165e6b589f2 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 31 Aug 2019 15:36:52 -0700 Subject: [PATCH 4/4] Fixed capitalization of "none" --- rdlogmanager/edit_event.cpp | 2 +- rdlogmanager/rdlogmanager_cs.ts | 4 ---- rdlogmanager/rdlogmanager_de.ts | 4 ---- rdlogmanager/rdlogmanager_es.ts | 4 ---- rdlogmanager/rdlogmanager_fr.ts | 4 ---- rdlogmanager/rdlogmanager_nb.ts | 4 ---- rdlogmanager/rdlogmanager_nn.ts | 4 ---- rdlogmanager/rdlogmanager_pt_BR.ts | 4 ---- 8 files changed, 1 insertion(+), 29 deletions(-) diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 5bac0020..238bb0a4 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -479,7 +479,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_artist_none_button=new QPushButton(this); event_artist_none_button->setGeometry(CENTER_LINE+570,383,40,20); event_artist_none_button->setFont(font); - event_artist_none_button->setText(tr("none")); + event_artist_none_button->setText(tr("None")); connect(event_artist_none_button,SIGNAL(clicked()),this,SLOT(artistData())); // Title Separation SpinBox diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index b7d89188..31294d82 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -599,10 +599,6 @@ Chcete ji přepsat? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index f723d6e7..2d06f001 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -599,10 +599,6 @@ Wollen Sie es überschreiben? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index 50ee14d5..91c15bf4 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -601,10 +601,6 @@ Do you want to overwrite it? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index 384f14ca..e18e83bf 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -533,10 +533,6 @@ Do you want to overwrite it? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index 82443bd2..63c08ebc 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -608,10 +608,6 @@ Vil du byta henne ut? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index 82443bd2..63c08ebc 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -608,10 +608,6 @@ Vil du byta henne ut? Artist Separation - - none - - EditEventLine diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index 5dc06463..6774a59b 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -601,10 +601,6 @@ Você quer sobreescrêve-lo? Artist Separation - - none - - EditEventLine