Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-23 16:11:41 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Cleaned up compiler warnings in 'rdmonitor/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-26 17:52:45 -04:00
parent faadea8f60
commit c978b45c4f
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25000,3 +25000,5 @@
* Cleaned up compiler warnings in 'rdlogin/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'rdlogmanager/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'rdmonitor/'.

6
rdmonitor/positiondialog.cpp
View File

@ -2,7 +2,7 @@
//
// Dialog to set RDMonitor screen position.
//
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-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
@ -18,6 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QGuiApplication>
#include "positiondialog.h"
PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
@ -101,7 +103,7 @@ QSizePolicy PositionDialog::sizePolicy() const
int PositionDialog::exec()
{
pos_screen_number_box->clear();
for(int i=0;i<pos_desktop_widget->numScreens();i++) {
for(int i=0;i<QGuiApplication::screens().size();i++) {
pos_screen_number_box->insertItem(i,QString::asprintf("%d",i));
if(i==pos_config->screenNumber()) {
pos_screen_number_box->setCurrentIndex(i);

20
rdmonitor/rdmonitor.cpp
View File

@ -2,7 +2,7 @@
//
// System Monitor for Rivendell
//
// (C) Copyright 2012-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-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
@ -22,9 +22,11 @@
#include <QApplication>
#include <QDir>
#include <QGuiApplication>
#include <QMessageBox>
#include <QPainter>
#include <QProcess>
#include <QScreen>
#include <QTranslator>
#include <dbversion.h>
@ -59,7 +61,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
mon_rdselect_x=0;
mon_rdselect_y=0;
rdt=new RDTranslator("rdmonitor",this); // Load translations
rdt=new RDTranslator("rdmonitor",true,this); // Load translations
//
// Read Command Options
@ -289,8 +291,16 @@ void MainWidget::SetSummaryState(bool state)
void MainWidget::SetPosition()
{
int width=mon_metrics->width(mon_name_label->text())+40;
QRect geo=mon_desktop_widget->screenGeometry(mon_config->screenNumber());
int width=mon_metrics->horizontalAdvance(mon_name_label->text())+40;
// QRect geo=mon_desktop_widget->screenGeometry(mon_config->screenNumber());
QRect geo;
QList<QScreen *> screens=QGuiApplication::screens();
if(screens.size()>mon_config->screenNumber()) {
geo=screens.at(mon_config->screenNumber())->geometry();
}
else {
geo=screens.at(0)->geometry();
}
QRect main_geo=mon_desktop_widget->geometry();
int x=0;
int dx=mon_config->xOffset();
@ -435,7 +445,7 @@ void MainWidget::SetStatusPosition()
{
QFontMetrics *fm=new QFontMetrics(mon_status_label->font());
int h=10+fm->height();
int w=10+fm->width(mon_status_label->text());
int w=10+fm->horizontalAdvance(mon_status_label->text());
QRect g=geometry();
switch(mon_config->position()) {