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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-23 15:21:34 -04:00
commit f754a7417c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18686,3 +18686,6 @@
found in map file.
2019-05-23 Patrick Linstruth <patrick@deltecent.com>
* Updated fonts in rmlsend(1) to match other applications.
2019-05-23 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression with "State" label overlapping "Date" field
in rdgpimon(1).

6
utils/rdgpimon/rdgpimon.cpp
View File

@ -216,7 +216,7 @@ MainWidget::MainWidget(QWidget *parent)
label->setGeometry(110,423,sizeHint().width()-220,30);
gpi_events_date_edit=new Q3DateEdit(this);
gpi_events_date_edit->setGeometry(155,453,90,20);
gpi_events_date_edit->setGeometry(155,453,100,20);
gpi_events_date_edit->setDate(QDate::currentDate());
connect(gpi_events_date_edit,SIGNAL(valueChanged(const QDate &)),
this,SLOT(eventsDateChangedData(const QDate &)));
@ -226,14 +226,14 @@ MainWidget::MainWidget(QWidget *parent)
gpi_events_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
gpi_events_state_box=new QComboBox(this);
gpi_events_state_box->setGeometry(280,453,55,20);
gpi_events_state_box->setGeometry(330,453,55,20);
gpi_events_state_box->insertItem(tr("On"));
gpi_events_state_box->insertItem(tr("Off"));
gpi_events_state_box->insertItem(tr("Both"));
connect(gpi_events_state_box,SIGNAL(activated(int)),
this,SLOT(eventsStateChangedData(int)));
gpi_events_state_label=new QLabel(gpi_events_state_box,tr("State")+":",this);
gpi_events_state_label->setGeometry(225,453,50,20);
gpi_events_state_label->setGeometry(275,453,50,20);
gpi_events_state_label->setFont(main_font);
gpi_events_state_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);