Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-13 14:13:34 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogedit(1) that broke searching for 'ALL'
	services.
	* Fixed a regression in rdlibrary(1) that broke searching for 'ALL'
	groups.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-25 08:32:39 -05:00
parent f8cb274627
commit 819af91cbe
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -21193,3 +21193,8 @@
groups. groups.
2021-02-25 Fred Gleason <fredg@paravelsystems.com> 2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogin(1) that broke account logout. * Fixed a regression in rdlogin(1) that broke account logout.
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogedit(1) that broke searching for 'ALL'
services.
* Fixed a regression in rdlibrary(1) that broke searching for 'ALL'
groups.

2
lib/rdcartfilter.cpp
View File

@@ -432,7 +432,7 @@ void RDCartFilter::setFilterText(const QString &str)
void RDCartFilter::setSelectedGroup(const QString &grpname) void RDCartFilter::setSelectedGroup(const QString &grpname)
{ {
for(int i=0;i<d_group_box->count();i++) { for(int i=0;i<d_group_box->count();i++) {
if(d_group_box->itemData(i).toString()==grpname) { if(d_group_box->itemText(i)==grpname) {
d_group_box->setCurrentIndex(i); d_group_box->setCurrentIndex(i);
groupChangedData(d_group_box->currentText()); groupChangedData(d_group_box->currentText());
} }

4
lib/rdcombobox.cpp
View File

@@ -57,7 +57,7 @@ void RDComboBox::addIgnoredKey(int key)
bool RDComboBox::setCurrentText(const QString &str) bool RDComboBox::setCurrentText(const QString &str)
{ {
for(int i=0;i<count();i++) { for(int i=0;i<count();i++) {
if(itemData(i).toString()==str) { if(itemText(i)==str) {
setCurrentIndex(i); setCurrentIndex(i);
return true; return true;
} }
@@ -92,7 +92,7 @@ void RDComboBox::keyPressEvent(QKeyEvent *e)
bool RDComboBox::IsItemUnique(const QString &str) bool RDComboBox::IsItemUnique(const QString &str)
{ {
for(int i=0;i<count();i++) { for(int i=0;i<count();i++) {
if(str==itemData(i).toString()) { if(str==itemText(i)) {
return false; return false;
} }
} }

2
lib/rdexport_settings_dialog.cpp
View File

@@ -2,7 +2,7 @@
// //
// Edit Audio Export Settings // Edit Audio Export Settings
// //
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as

2
lib/rdlogfilter.cpp
View File

@@ -134,7 +134,7 @@ QString RDLogFilter::whereSql() const
else { else {
sql+="&&("; sql+="&&(";
for(int i=1;i<filter_service_box->count();i++) { for(int i=1;i<filter_service_box->count();i++) {
sql+="(SERVICE=\""+RDEscapeString(filter_service_box->itemData(i).toString())+"\")||"; sql+="(SERVICE=\""+RDEscapeString(filter_service_box->itemText(i))+"\")||";
} }
sql=sql.left(sql.length()-2); sql=sql.left(sql.length()-2);
sql+=")"; sql+=")";

2
rdlogedit/edit_log.cpp
View File

@@ -1045,7 +1045,7 @@ void EditLog::saveasData()
edit_log=new RDLog(logname); edit_log=new RDLog(logname);
edit_log_model->setLogName(logname); edit_log_model->setLogName(logname);
for(int i=0;i<edit_service_box->count();i++) { for(int i=0;i<edit_service_box->count();i++) {
if(edit_service_box->itemData(i).toString()==svcname) { if(edit_service_box->itemText(i)==svcname) {
edit_service_box->setCurrentIndex(i); edit_service_box->setCurrentIndex(i);
} }
} }