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

2018-08-08 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in the 'Edit Cart' dialog in rdlibrary(1)
	that caused button legends to be misaligned.
This commit is contained in:
Fred Gleason 2018-08-08 18:28:51 -04:00
parent 3a902b2b7d
commit 8cfc9e381a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17336,3 +17336,6 @@
'QString::split()'. 'QString::split()'.
2018-08-08 Fred Gleason <fredg@paravelsystems.com> 2018-08-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed up column alignment in the cart list in rdlibrary(1). * Fixed up column alignment in the cart list in rdlibrary(1).
2018-08-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the 'Edit Cart' dialog in rdlibrary(1)
that caused button legends to be misaligned.

19
rdlibrary/audio_cart.cpp
View File

@ -36,7 +36,6 @@
#include <rdapplication.h> #include <rdapplication.h>
#include <rdcut.h> #include <rdcut.h>
#include <rdcddbrecord.h> #include <rdcddbrecord.h>
//#include <rddb.h>
#include <rdwavedata.h> #include <rdwavedata.h>
#include <rd.h> #include <rd.h>
#include <rdconf.h> #include <rdconf.h>
@ -188,15 +187,15 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path,
// //
// Record Cut Button // Record Cut Button
// //
QPixmap *pix=new QPixmap(QSize(80,50)); QPixmap *pix=new QPixmap(QSize(70,40));
QPainter *p=new QPainter(pix); QPainter *p=new QPainter(pix);
QFontMetrics *m=new QFontMetrics(button_font); QFontMetrics *m=new QFontMetrics(button_font);
p->fillRect(0,0,80,50,palette().color(QPalette::Active,QColorGroup::Button)); p->fillRect(0,0,70,40,palette().color(QPalette::Active,QColorGroup::Button));
p->setPen(QColor(system_button_text_color)); p->setPen(QColor(system_button_text_color));
p->setFont(button_font); p->setFont(button_font);
p->drawText((80-m->width(tr("Cut Info")))/2,20,tr("Cut Info")); p->drawText((70-m->width(tr("Cut Info")))/2,15,tr("Cut Info"));
p->drawLine(10,24,70,24); p->drawLine(10,19,60,19);
p->drawText((80-m->width(tr("Record")))/2,38,tr("Record")); p->drawText((70-m->width(tr("Record")))/2,33,tr("Record"));
p->end(); p->end();
QPushButton *record_cut_button=new QPushButton(this); QPushButton *record_cut_button=new QPushButton(this);
record_cut_button->setGeometry(550,0,80,50); record_cut_button->setGeometry(550,0,80,50);
@ -233,12 +232,12 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path,
// //
p=new QPainter(pix); p=new QPainter(pix);
m=new QFontMetrics(button_font); m=new QFontMetrics(button_font);
p->fillRect(0,0,80,50,palette().color(QPalette::Active,QColorGroup::Button)); p->fillRect(0,0,70,40,palette().color(QPalette::Active,QColorGroup::Button));
p->setPen(QColor(system_button_text_color)); p->setPen(QColor(system_button_text_color));
p->setFont(button_font); p->setFont(button_font);
p->drawText((80-m->width(tr("Import")))/2,20,tr("Import")); p->drawText((70-m->width(tr("Import")))/2,15,tr("Import"));
p->drawLine(10,24,70,24); p->drawLine(10,19,60,19);
p->drawText((80-m->width(tr("Export")))/2,38,tr("Export")); p->drawText((70-m->width(tr("Export")))/2,33,tr("Export"));
p->end(); p->end();
QPushButton *import_cut_button=new QPushButton(this); QPushButton *import_cut_button=new QPushButton(this);
import_cut_button->setPixmap(*pix); import_cut_button->setPixmap(*pix);