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

2019-10-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed remaining references to 'helvetica' fonts.
This commit is contained in:
Fred Gleason
2019-10-07 18:17:59 -04:00
parent e7812d3c85
commit bbdf522fe2
22 changed files with 141 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rdmonitor/positiondialog.cpp
View File

@@ -2,7 +2,7 @@
//
// Dialog to set RDMonitor screen position.
//
// (C) Copyright 2013-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2019 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,44 +20,31 @@
#include "positiondialog.h"
PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config,
QWidget *parent)
: QDialog(parent)
PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
RDConfig *config,QWidget *parent)
: RDDialog(config,parent)
{
setModal(true);
pos_desktop_widget=dw;
pos_config=config;
pos_config=mconfig;
setWindowTitle("RDMonitor");
//
// Fonts
//
QFont button_font("helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont list_font("helvetica",12,QFont::Normal);
list_font.setPixelSize(12);
//
// Screen Number
//
pos_screen_number_box=new QComboBox(this);
pos_screen_number_box->setFont(list_font);
pos_screen_number_label=
new QLabel(pos_screen_number_box,tr("Screen")+":",this);
pos_screen_number_label->setFont(button_font);
pos_screen_number_label->setFont(labelFont());
pos_screen_number_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Position
//
pos_position_box=new QComboBox(this);
pos_position_box->setFont(list_font);
pos_position_box->setFont(list_font);
pos_position_label=
new QLabel(pos_position_box,tr("Position")+":",this);
pos_position_label->setFont(button_font);
pos_position_label->setFont(labelFont());
pos_position_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
for(int i=0;i<RDMonitorConfig::LastPosition;i++) {
pos_position_box->
@@ -68,34 +55,32 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config,
// X Offset
//
pos_x_offset_spin=new QSpinBox(this);
pos_x_offset_spin->setFont(list_font);
pos_x_offset_spin->setRange(0,99);
pos_x_offset_label=new QLabel(pos_x_offset_spin,tr("X Offset")+":",this);
pos_x_offset_label->setFont(button_font);
pos_x_offset_label->setFont(labelFont());
pos_x_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Y Offset
//
pos_y_offset_spin=new QSpinBox(this);
pos_y_offset_spin->setFont(list_font);
pos_y_offset_spin->setRange(0,99);
pos_y_offset_label=new QLabel(pos_y_offset_spin,tr("Y Offset")+":",this);
pos_y_offset_label->setFont(button_font);
pos_y_offset_label->setFont(labelFont());
pos_y_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// OK Button
//
pos_ok_button=new QPushButton(tr("OK"),this);
pos_ok_button->setFont(button_font);
pos_ok_button->setFont(buttonFont());
connect(pos_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
//
// Cancel Button
//
pos_cancel_button=new QPushButton(tr("Cancel"),this);
pos_cancel_button->setFont(button_font);
pos_cancel_button->setFont(buttonFont());
connect(pos_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
setMaximumSize(sizeHint());

9
rdmonitor/positiondialog.h
View File

@@ -2,7 +2,7 @@
//
// Dialog to set RDMonitor screen position.
//
// (C) Copyright 2013-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2019 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
@@ -23,18 +23,19 @@
#include <qcombobox.h>
#include <qdesktopwidget.h>
#include <qdialog.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <rddialog.h>
#include <rdmonitor_config.h>
class PositionDialog : public QDialog
class PositionDialog : public RDDialog
{
Q_OBJECT
public:
PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config,QWidget *parent=0);
PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,RDConfig *config,
QWidget *parent=0);
QSize sizeHint() const;
QSizePolicy sizePolicy() const;

3
rdmonitor/rdmonitor.cpp
View File

@@ -89,7 +89,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
mon_desktop_widget=new QDesktopWidget();
mon_config=new RDMonitorConfig();
mon_config->load();
mon_position_dialog=new PositionDialog(mon_desktop_widget,mon_config,this);
mon_position_dialog=new PositionDialog(mon_desktop_widget,mon_config,
mon_rdconfig,this);
mon_position_dialog->setGeometry(0,0,mon_position_dialog->sizeHint().width(),
mon_position_dialog->sizeHint().height());