Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-04 14:39:09 +02:00
Code Issues Projects Releases Wiki Activity

2021-07-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the layout code of the 'RDCardSelector' widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-30 18:09:46 -04:00
parent 60f39a8c17
commit 0636ff068d
17 changed files with 189 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -22126,3 +22126,5 @@
2021-07-29 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in rdimport(1) and the WebGet service
that threw 500 errors when connecting to WebGet.
2021-07-30 Fred Gleason <fredg@paravelsystems.com>
* Refactored the layout code of the 'RDCardSelector' widget.

4
lib/librd_cs.ts
View File

@ -1225,6 +1225,10 @@ barvu</translation>
<source>Port:</source>
<translation>Přípojka:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

4
lib/librd_de.ts
View File

@ -1221,6 +1221,10 @@ setzen</translation>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

4
lib/librd_es.ts
View File

@ -1214,6 +1214,10 @@ Color</translation>
<source>Port:</source>
<translation>Puerto:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

4
lib/librd_fr.ts
View File

@ -1132,6 +1132,10 @@ La Couleur</translation>
<source>Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCartDialog</name>

4
lib/librd_nb.ts
View File

@ -1221,6 +1221,10 @@ farge</translation>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

4
lib/librd_nn.ts
View File

@ -1221,6 +1221,10 @@ farge</translation>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

4
lib/librd_pt_BR.ts
View File

@ -1222,6 +1222,10 @@ Cor</translation>
<source>Port:</source>
<translation>Porta:</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDCart</name>

51
lib/rdcardselector.cpp
View File

@ -2,7 +2,7 @@
//
// Audio channel assignments widget for Rivendell
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 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
@ -26,49 +26,36 @@ RDCardSelector::RDCardSelector(QWidget *parent)
card_id=-1;
yoffset=0;
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
yoffset=0;
//
// Title
//
card_title=new QLabel(this);
card_title->setGeometry(0,0,geometry().width(),19);
card_title->setAlignment(Qt::AlignHCenter);
card_title->setAlignment(Qt::AlignCenter);
card_title->hide();
//
// Card
//
card_card_box=new QSpinBox(this);
card_card_box->setGeometry(60,yoffset,50,19);
card_card_box->setSpecialValueText("None");
card_card_box->setSpecialValueText(tr("None"));
card_card_box->setMinimum(-1);
card_card_box->setMaximum(RD_MAX_CARDS-1);
card_card_box->setValue(-1);
connect(card_card_box,SIGNAL(valueChanged(int)),this,SLOT(cardData(int)));
card_card_label=new QLabel(tr("Card:"),this);
card_card_label->setGeometry(0,yoffset+2,55,19);
card_card_label->setAlignment(Qt::AlignRight);
card_card_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Port
//
card_port_box=new QSpinBox(this);
card_port_box->setGeometry(60,yoffset+22,50,19);
card_port_box->setSpecialValueText("None");
card_port_box->setMinimum(-1);
card_port_box->setMaximum(RD_MAX_PORTS-1);
card_port_box->setValue(-1);
connect(card_port_box,SIGNAL(valueChanged(int)),this,SLOT(portData(int)));
card_port_label=new QLabel(tr("Port:"),this);
card_port_label->setGeometry(0,yoffset+24,55,19);
card_port_label->setAlignment(Qt::AlignRight);
card_port_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
for(int i=0;i<RD_MAX_CARDS;i++) {
card_max_ports[i] = 0;
cardData(i);
@ -87,7 +74,7 @@ RDCardSelector::~RDCardSelector()
QSize RDCardSelector::sizeHint() const
{
return QSize(110,41+yoffset);
return QSize(90,40+yoffset);
}
@ -225,3 +212,29 @@ void RDCardSelector::portData(int port)
emit portChanged(port);
emit settingsChanged(card_id,card_card_box->value(),port);
}
void RDCardSelector::resizeEvent(QResizeEvent *e)
{
int label_width=defaultFontMetrics()->width(tr("Card:"));
if(defaultFontMetrics()->width(tr("Port:")>label_width)) {
label_width=defaultFontMetrics()->width(tr("Port:"));
}
card_title->setGeometry(0,0,width(),19);
card_card_label->setGeometry(0,
yoffset,
label_width+5,
19);
card_card_box->setGeometry(label_width+10,
yoffset,
width()-label_width-10,
19);
card_port_label->setGeometry(0,
yoffset+21,
label_width+5,
19);
card_port_box->setGeometry(label_width+10,
yoffset+21,
width()-label_width-10,
19);
}

80
lib/rdcardselector.h
View File

@ -2,7 +2,7 @@
//
// Audio Channel Assignments Widget for Rivendell
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 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
@ -21,8 +21,8 @@
#ifndef RDCARDSELECTOR_H
#define RDCARDSELECTOR_H
#include <qspinbox.h>
#include <qlabel.h>
#include <QLabel>
#include <QSpinBox>
#include <rd.h>
#include <rdwidget.h>
@ -30,45 +30,47 @@
class RDCardSelector : public RDWidget
{
Q_OBJECT
public:
RDCardSelector(QWidget *parent=0);
~RDCardSelector();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
bool isDisabled() const;
int id() const;
void setId(int id);
QString title() const;
void setTitle(QString title);
int card() const;
void setCard(int card);
int port() const;
void setPort(int port);
int maxCards() const;
void setMaxCards(int num);
int maxPorts(int card) const;
void setMaxPorts(int card,int num);
public:
RDCardSelector(QWidget *parent=0);
~RDCardSelector();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
bool isDisabled() const;
int id() const;
void setId(int id);
QString title() const;
void setTitle(QString title);
int card() const;
void setCard(int card);
int port() const;
void setPort(int port);
int maxCards() const;
void setMaxCards(int num);
int maxPorts(int card) const;
void setMaxPorts(int card,int num);
signals:
void settingsChanged(int id,int card,int port);
void cardChanged(int card);
void portChanged(int port);
signals:
void settingsChanged(int id,int card,int port);
void cardChanged(int card);
void portChanged(int port);
private slots:
void cardData(int);
void portData(int);
private slots:
void cardData(int);
void portData(int);
private:
QLabel *card_card_label;
QSpinBox *card_card_box;
QLabel *card_port_label;
QSpinBox *card_port_box;
QLabel *card_title;
int yoffset;
int card_max_ports[RD_MAX_CARDS];
int card_id;
protected:
void resizeEvent(QResizeEvent *e);
private:
QLabel *card_card_label;
QSpinBox *card_card_box;
QLabel *card_port_label;
QSpinBox *card_port_box;
QLabel *card_title;
int yoffset;
int card_max_ports[RD_MAX_CARDS];
int card_id;
};
#endif
#endif // RDCARDSELECTOR_H

12
rdadmin/edit_cartslots.cpp
View File

@ -41,10 +41,8 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
setWindowTitle("RDAdmin - "+tr("Edit CartSlots"));
@ -110,7 +108,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
// Card Selector
//
edit_card_spin=new QSpinBox(this);
edit_card_spin->setGeometry(127,145,50,20);
edit_card_spin->setGeometry(127,145,55,20);
edit_card_spin->setRange(-1,cae_station->cards()-1);
edit_card_spin->setSpecialValueText(tr("None"));
connect(edit_card_spin,SIGNAL(valueChanged(int)),
@ -124,7 +122,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
// Input Port Selector
//
edit_input_spin=new QSpinBox(this);
edit_input_spin->setGeometry(127,167,50,20);
edit_input_spin->setGeometry(127,167,55,20);
edit_input_spin->setRange(-1,RD_MAX_PORTS-1);
edit_input_spin->setSpecialValueText(tr("None"));
label=new QLabel(tr("Input Port:"),this);
@ -136,7 +134,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
// Output Port Selector
//
edit_output_spin=new QSpinBox(this);
edit_output_spin->setGeometry(127,189,50,20);
edit_output_spin->setGeometry(127,189,55,20);
edit_output_spin->setRange(-1,RD_MAX_PORTS-1);
edit_output_spin->setSpecialValueText(tr("None"));
label=new QLabel(tr("Output Port:"),this);

14
rdadmin/edit_decks.cpp
View File

@ -76,7 +76,9 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
// Card Selector
//
edit_record_selector=new RDCardSelector(this);
edit_record_selector->setGeometry(67,68,120,65);
edit_record_selector->
setGeometry(67,68,edit_record_selector->sizeHint().width(),
edit_record_selector->sizeHint().height());
connect(edit_record_selector,SIGNAL(cardChanged(int)),
this,SLOT(recordCardChangedData(int)));
@ -84,7 +86,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
// Monitor Port Selector
//
edit_monitor_box=new QSpinBox(this);
edit_monitor_box->setGeometry(127,112,50,19);
edit_monitor_box->setGeometry(125,112,55,19);
edit_monitor_box->setRange(-1,RD_MAX_PORTS-1);
edit_monitor_box->setSpecialValueText(tr("None"));
connect(edit_monitor_box,SIGNAL(valueChanged(int)),
@ -95,12 +97,12 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_monitor_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_default_on_box=new QComboBox(this);
edit_default_on_box->setGeometry(305,112,60,19);
edit_default_on_box->setGeometry(315,112,50,19);
edit_default_on_box->insertItem(0,tr("Off"));
edit_default_on_box->insertItem(1,tr("On"));
edit_default_on_label=new QLabel(tr("Monitor defaults to"),this);
edit_default_on_label->setFont(labelFont());
edit_default_on_label->setGeometry(195,112,105,19);
edit_default_on_label->setGeometry(185,112,125,19);
edit_default_on_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -244,7 +246,9 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
// Play Deck Card Selector
//
edit_play_selector=new RDCardSelector(this);
edit_play_selector->setGeometry(392,37,120,10);
edit_play_selector->
setGeometry(392,37,edit_play_selector->sizeHint().width(),
edit_play_selector->sizeHint().height());
connect(edit_play_selector,SIGNAL(settingsChanged(int,int,int)),
this,SLOT(playSettingsChangedData(int,int,int)));

38
rdadmin/edit_rdairplay.cpp
View File

@ -84,7 +84,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(25,32,200,16);
air_card_sel[0]=new RDCardSelector(this);
air_card_sel[0]->setId(0);
air_card_sel[0]->setGeometry(20,50,120,117);
air_card_sel[0]->setGeometry(20,50,air_card_sel[0]->sizeHint().width(),
air_card_sel[0]->sizeHint().height());
air_start_rml_edit[0]=new QLineEdit(this);
air_start_rml_edit[0]->setGeometry(210,50,95,19);
air_start_rml_edit[0]->setValidator(validator);
@ -116,7 +117,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(25,100,200,16);
air_card_sel[1]=new RDCardSelector(this);
air_card_sel[1]->setId(1);
air_card_sel[1]->setGeometry(20,118,120,117);
air_card_sel[1]->setGeometry(20,118,air_card_sel[1]->sizeHint().width(),
air_card_sel[1]->sizeHint().height());
air_start_rml_edit[1]=new QLineEdit(this);
air_start_rml_edit[1]->setGeometry(210,118,95,19);
air_start_rml_edit[1]->setValidator(validator);
@ -149,7 +151,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(25,168,200,16);
air_card_sel[4]=new RDCardSelector(this);
air_card_sel[4]->setId(4);
air_card_sel[4]->setGeometry(20,186,120,117);
air_card_sel[4]->setGeometry(20,186,air_card_sel[4]->sizeHint().width(),
air_card_sel[4]->sizeHint().height());
air_start_rml_edit[4]=new QLineEdit(this);
air_start_rml_edit[4]->setGeometry(210,186,95,19);
air_start_rml_edit[4]->setValidator(validator);
@ -182,7 +185,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(25,236,200,16);
air_card_sel[5]=new RDCardSelector(this);
air_card_sel[5]->setId(5);
air_card_sel[5]->setGeometry(20,254,120,117);
air_card_sel[5]->setGeometry(20,254,air_card_sel[5]->sizeHint().width(),
air_card_sel[5]->sizeHint().height());
air_start_rml_edit[5]=new QLineEdit(this);
air_start_rml_edit[5]->setGeometry(210,254,95,19);
air_start_rml_edit[5]->setValidator(validator);
@ -227,7 +231,9 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setGeometry(165,309,100,20);
air_virtual_card_sel=new RDCardSelector(this);
air_virtual_card_sel->setGeometry(20,332,120,117);
air_virtual_card_sel->
setGeometry(20,332,air_virtual_card_sel->sizeHint().width(),
air_virtual_card_sel->sizeHint().height());
air_virtual_start_rml_edit=new QLineEdit(this);
air_virtual_start_rml_edit->setGeometry(210,332,95,19);
air_virtual_start_rml_edit->setValidator(validator);
@ -249,7 +255,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
//
air_card_sel[3]=new RDCardSelector(this);
air_card_sel[3]->setId(3);
air_card_sel[3]->setGeometry(20,322,120,117);
air_card_sel[3]->setGeometry(20,322,air_card_sel[3]->sizeHint().width(),
air_card_sel[3]->sizeHint().height());
air_start_rml_edit[3]=new QLineEdit(this);
air_start_rml_edit[3]->setGeometry(210,322,160,19);
air_start_rml_edit[3]->setValidator(validator);
@ -294,7 +301,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(395,32,300,16);
air_card_sel[2]=new RDCardSelector(this);
air_card_sel[2]->setId(2);
air_card_sel[2]->setGeometry(390,50,120,117);
air_card_sel[2]->setGeometry(390,50,air_card_sel[2]->sizeHint().width(),
air_card_sel[2]->sizeHint().height());
air_start_rml_edit[2]=new QLineEdit(this);
air_start_rml_edit[2]->setGeometry(580,50,95,19);
air_start_rml_edit[2]->setValidator(validator);
@ -326,7 +334,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(395,100,300,16);
air_card_sel[6]=new RDCardSelector(this);
air_card_sel[6]->setId(6);
air_card_sel[6]->setGeometry(390,118,120,117);
air_card_sel[6]->setGeometry(390,118,air_card_sel[6]->sizeHint().width(),
air_card_sel[6]->sizeHint().height());
air_start_rml_edit[6]=new QLineEdit(this);
air_start_rml_edit[6]->setGeometry(580,118,95,19);
air_start_rml_edit[6]->setValidator(validator);
@ -358,7 +367,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(395,168,300,16);
air_card_sel[7]=new RDCardSelector(this);
air_card_sel[7]->setId(7);
air_card_sel[7]->setGeometry(390,186,120,117);
air_card_sel[7]->setGeometry(390,186,air_card_sel[7]->sizeHint().width(),
air_card_sel[7]->sizeHint().height());
air_start_rml_edit[7]=new QLineEdit(this);
air_start_rml_edit[7]->setGeometry(580,186,95,19);
air_start_rml_edit[7]->setValidator(validator);
@ -390,7 +400,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(395,236,300,16);
air_card_sel[8]=new RDCardSelector(this);
air_card_sel[8]->setId(8);
air_card_sel[8]->setGeometry(390,254,120,117);
air_card_sel[8]->setGeometry(390,254,air_card_sel[8]->sizeHint().width(),
air_card_sel[8]->sizeHint().height());
air_start_rml_edit[8]=new QLineEdit(this);
air_start_rml_edit[8]->setGeometry(580,254,95,19);
air_start_rml_edit[8]->setValidator(validator);
@ -422,7 +433,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(395,304,300,16);
air_card_sel[9]=new RDCardSelector(this);
air_card_sel[9]->setId(9);
air_card_sel[9]->setGeometry(390,322,120,117);
air_card_sel[9]->setGeometry(390,322,air_card_sel[9]->sizeHint().width(),
air_card_sel[9]->sizeHint().height());
air_start_rml_edit[9]=new QLineEdit(this);
air_start_rml_edit[9]->setGeometry(580,322,95,19);
air_start_rml_edit[9]->setValidator(validator);
@ -794,7 +806,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QPushButton *button=new QPushButton(tr("Select"),this);
button->setFont(subButtonFont());
button->setGeometry(745,400,50,25);
button->setGeometry(740,400,50,25);
connect(button,SIGNAL(clicked()),this,SLOT(selectSkinData()));
//
@ -834,7 +846,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
air_description_template_edit->setGeometry(555,491,180,20);
label=new QLabel(tr("Description Template:"),this);
label->setFont(subLabelFont());
label->setGeometry(430,491,120,20);
label->setGeometry(425,491,125,20);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//

9
rdadmin/edit_rdlibrary.cpp
View File

@ -53,7 +53,9 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
// Input Configuration
//
lib_input_card=new RDCardSelector(this);
lib_input_card->setGeometry(sizeHint().width()/5,29,120,117);
lib_input_card->
setGeometry(sizeHint().width()/5,29,lib_input_card->sizeHint().width(),
lib_input_card->sizeHint().height());
QLabel *label=new QLabel(tr("Input"),this);
label->setGeometry(sizeHint().width()/5,10,120,19);
label->setFont(sectionLabelFont());
@ -63,7 +65,10 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
// Output Configuration
//
lib_output_card=new RDCardSelector(this);
lib_output_card->setGeometry(4*sizeHint().width()/5-120,29,120,87);
lib_output_card->
setGeometry(4*sizeHint().width()/5-120,29,
lib_output_card->sizeHint().width(),
lib_output_card->sizeHint().height());
label=new QLabel(tr("Output"),this);
label->setGeometry(4*sizeHint().width()/5-120,10,110,19);
label->setFont(sectionLabelFont());

9
rdadmin/edit_rdlogedit.cpp
View File

@ -53,7 +53,9 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station,
// Input Configuration
//
lib_input_card=new RDCardSelector(this);
lib_input_card->setGeometry(sizeHint().width()/5,29,120,117);
lib_input_card->
setGeometry(sizeHint().width()/5,29,lib_input_card->sizeHint().width(),
lib_input_card->sizeHint().height());
QLabel *label=new QLabel(tr("Input"),this);
label->setGeometry(sizeHint().width()/5,10,120,19);
label->setFont(sectionLabelFont());
@ -63,7 +65,10 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station,
// Output Configuration
//
lib_output_card=new RDCardSelector(this);
lib_output_card->setGeometry(4*sizeHint().width()/5-120,29,120,87);
lib_output_card->
setGeometry(4*sizeHint().width()/5-120,29,
lib_output_card->sizeHint().width(),
lib_output_card->sizeHint().height());
label=new QLabel(tr("Output"),this);
label->setGeometry(4*sizeHint().width()/5-120,10,120,19);
label->setFont(sectionLabelFont());

18
rdadmin/edit_rdpanel.cpp
View File

@ -70,7 +70,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,32,300,16);
air_card_sel[0]=new RDCardSelector(this);
air_card_sel[0]->setGeometry(15,50,120,117);
air_card_sel[0]->setGeometry(15,50,air_card_sel[0]->sizeHint().width(),
air_card_sel[0]->sizeHint().height());
air_start_rml_edit[0]=new QLineEdit(this);
air_start_rml_edit[0]->setGeometry(205,50,160,19);
air_start_rml_edit[0]->setValidator(validator);
@ -93,7 +94,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,100,300,16);
air_card_sel[1]=new RDCardSelector(this);
air_card_sel[1]->setGeometry(15,118,120,117);
air_card_sel[1]->setGeometry(15,118,air_card_sel[1]->sizeHint().width(),
air_card_sel[1]->sizeHint().height());
air_start_rml_edit[1]=new QLineEdit(this);
air_start_rml_edit[1]->setGeometry(205,118,160,19);
air_start_rml_edit[1]->setValidator(validator);
@ -116,7 +118,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,168,300,16);
air_card_sel[2]=new RDCardSelector(this);
air_card_sel[2]->setGeometry(15,186,120,117);
air_card_sel[2]->setGeometry(15,186,air_card_sel[2]->sizeHint().width(),
air_card_sel[2]->sizeHint().height());
air_start_rml_edit[2]=new QLineEdit(this);
air_start_rml_edit[2]->setGeometry(205,186,160,19);
air_start_rml_edit[2]->setValidator(validator);
@ -139,7 +142,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,236,300,16);
air_card_sel[3]=new RDCardSelector(this);
air_card_sel[3]->setGeometry(15,254,120,117);
air_card_sel[3]->setGeometry(15,254,air_card_sel[3]->sizeHint().width(),
air_card_sel[3]->sizeHint().height());
air_start_rml_edit[3]=new QLineEdit(this);
air_start_rml_edit[3]->setGeometry(205,254,160,19);
air_start_rml_edit[3]->setValidator(validator);
@ -162,7 +166,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,304,300,16);
air_card_sel[4]=new RDCardSelector(this);
air_card_sel[4]->setGeometry(15,322,120,117);
air_card_sel[4]->setGeometry(15,322,air_card_sel[4]->sizeHint().width(),
air_card_sel[4]->sizeHint().height());
air_start_rml_edit[4]=new QLineEdit(this);
air_start_rml_edit[4]->setGeometry(205,322,160,19);
air_start_rml_edit[4]->setValidator(validator);
@ -185,7 +190,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
label->setFont(labelFont());
label->setGeometry(20,372,300,16);
air_card_sel[5]=new RDCardSelector(this);
air_card_sel[5]->setGeometry(15,390,120,117);
air_card_sel[5]->setGeometry(15,390,air_card_sel[5]->sizeHint().width(),
air_card_sel[5]->sizeHint().height());
air_start_rml_edit[5]=new QLineEdit(this);
air_start_rml_edit[5]->setGeometry(205,390,160,19);
air_start_rml_edit[5]->setValidator(validator);

41
rdadmin/edit_station.cpp
View File

@ -903,7 +903,8 @@ void EditStation::resizeEvent(QResizeEvent *e)
station_startup_cart_label->setGeometry(10,212,100,19);
station_startup_select_button->setGeometry(180,211,50,22);
station_cue_sel->setGeometry(90,243,110,117);
station_cue_sel->setGeometry(115,243,station_cue_sel->sizeHint().width(),
station_cue_sel->sizeHint().height());
station_cue_sel_label->setGeometry(10,243,100,19);
station_start_cart_edit->setGeometry(290,243,60,20);
@ -937,41 +938,41 @@ void EditStation::resizeEvent(QResizeEvent *e)
station_panel_enforce_box->setGeometry(25,374,15,15);
station_panel_enforce_label->setGeometry(45,374,size().width()-55,20);
station_systemservices_groupbox->setGeometry(10,395,size().width()-20,60);
station_systemservices_groupbox->setGeometry(10,395,size().width()-20,68);
station_http_station_box->setGeometry(145,410,size().width()-165,19);
station_http_station_label->setGeometry(11,408,130,19);
station_http_station_box->setGeometry(145,418,size().width()-165,19);
station_http_station_label->setGeometry(11,416,130,19);
station_cae_station_box->setGeometry(145,431,size().width()-165,19);
station_cae_station_label->setGeometry(11,431,130,19);
station_cae_station_box->setGeometry(145,439,size().width()-165,19);
station_cae_station_label->setGeometry(11,439,130,19);
station_rdlibrary_button->setGeometry(30,461,80,50);
station_rdlibrary_button->setGeometry(30,469,80,50);
station_rdcatch_button->setGeometry(120,461,80,50);
station_rdcatch_button->setGeometry(120,469,80,50);
station_rdairplay_button->setGeometry(210,461,80,50);
station_rdairplay_button->setGeometry(210,469,80,50);
station_rdpanel_button->setGeometry(300,461,80,50);
station_rdpanel_button->setGeometry(300,469,80,50);
station_rdlogedit_button->setGeometry(30,519,80,50);
station_rdlogedit_button->setGeometry(30,527,80,50);
station_rdcartslots_button->setGeometry(120,519,80,50);
station_rdcartslots_button->setGeometry(120,527,80,50);
station_dropboxes_button->setGeometry(210,519,80,50);
station_dropboxes_button->setGeometry(210,527,80,50);
station_switchers_button->setGeometry(300,519,80,50);
station_switchers_button->setGeometry(300,527,80,50);
station_hostvars_button->setGeometry(30,577,80,50);
station_hostvars_button->setGeometry(30,585,80,50);
station_audioports_button->setGeometry(120,577,80,50);
station_audioports_button->setGeometry(120,585,80,50);
station_ttys_button->setGeometry(210,577,80,50);
station_ttys_button->setGeometry(210,585,80,50);
station_adapters_button->setGeometry(300,577,80,50);
station_adapters_button->setGeometry(300,585,80,50);
station_jack_button->setGeometry(120,635,80,50);
station_jack_button->setGeometry(120,643,80,50);
station_pypad_button->setGeometry(210,635,80,50);
station_pypad_button->setGeometry(210,643,80,50);
station_ok_button->setGeometry(size().width()-180,size().height()-60,80,50);
station_cancel_button->