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

2025-04-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Upgrade Qt dependency from Qt5 to Qt6.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-04-28 09:20:03 -04:00
parent 5950a9f7ab
commit 162aa3e483
169 changed files with 747 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rdcatch/Makefile.am
View File

@@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdcatch
## Makefile.am for rivendell/rdcatch
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2025 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
@@ -20,9 +20,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -77,7 +77,7 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\
moc_vbox.cpp
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdcatch.pro\

8
rdcatch/deckmon.cpp
View File

@@ -2,7 +2,7 @@
//
// Monitor a Rivendell RDCatch Deck
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 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
@@ -39,8 +39,8 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Generate Palettes
//
mon_red_palette=palette();
mon_red_palette.setColor(QPalette::Background,Qt::darkRed);
mon_red_palette.setColor(QPalette::Foreground,Qt::white);
mon_red_palette.setColor(QPalette::Window,Qt::darkRed);
mon_red_palette.setColor(QPalette::WindowText,Qt::white);
mon_red_stylesheet="color: white;background-color: darkRed;";
mon_dark_palette=palette();
@@ -65,7 +65,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
mon_monitor_button->setFont(subButtonFont());
mon_monitor_button->setText(tr("MON"));
mon_monitor_palette=new QPalette(QColor(BUTTON_MONITOR_FLASHING_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
if((mon_channel>128)&&(mon_channel<(MAX_DECKS+129))) {
mon_monitor_button->hide();
}

12
rdcatch/rdcatch.cpp
View File

@@ -2,7 +2,7 @@
//
// The Event Schedule Manager for Rivendell.
//
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 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
@@ -102,15 +102,15 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
BUTTON_ACTIVE_TEXT_COLOR);
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Button,
BUTTON_ACTIVE_BACKGROUND_COLOR);
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Background,
palette().color(QPalette::Background));
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Window));
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::ButtonText,
BUTTON_ACTIVE_TEXT_COLOR);
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Button,
BUTTON_ACTIVE_BACKGROUND_COLOR);
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Background,
palette().color(QPalette::Background));
catch_scroll_color[1]=QPalette(palette().color(QPalette::Background),palette().color(QPalette::Background));
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Window));
catch_scroll_color[1]=QPalette(palette().color(QPalette::Window),palette().color(QPalette::Window));
str=QString("RDCatch")+" v"+VERSION+" - "+tr("Host")+":";
setWindowTitle(str+" "+rda->config()->stationName());

6
rdcatch/recordlistmodel.cpp
View File

@@ -2,7 +2,7 @@
//
// Data model for Rivendell RDCatch events.
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2025 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
@@ -203,7 +203,7 @@ QVariant RecordListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
return d_text_colors.at(row);
case Qt::BackgroundRole:
@@ -632,7 +632,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
d_exit_codes[row]=(RDRecording::ExitCode)q->value(25).toUInt();
//
// Qt::TextColorRole
// Qt::ForegroundRole
//
if(q->value(2).toString()=="Y") {
d_text_colors[row]=QColor(EVENT_ACTIVE_TEXT_COLOR);