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

2019-01-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'View Credits' button to the 'System Information' dialog
	in rdadmin(1).
This commit is contained in:
Fred Gleason 2019-01-15 19:34:56 -05:00
parent c694ec78b9
commit ee77ff599b
23 changed files with 121 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -61,6 +61,7 @@ importers/rivendell_filter
importers/sas_filter
importers/wings_filter
install-sh
lib/credits.cpp
lib/rdpaths.h
libtool
ltmain.sh

4
AUTHORS
View File

@ -1,4 +1,4 @@
The following folks have contributed to Rivendell:
The following people have contributed to the Rivendell codebase:
Todd Baker <bakert@rfa.org>
C client binding for the Rivendell Web API [rivwebcapi].
@ -29,7 +29,7 @@ Fred Gleason <fredg@paravelsystems.com>
Patrick Linstruth <patrick@deltecent.com>
General Bugfixes
rddbconfig(8) Utility
TuneIn RLM
TuneIn and IceCast2 PyPAD scripts
Dan Mills <dmills@spamblock.demon.co.uk>
General Bughunter Extrordinaire

3
ChangeLog
View File

@ -18388,3 +18388,6 @@
* Updated 'INSTALL'.
2019-01-15 Fred Gleason <fredg@paravelsystems.com>
* Updated copyright notices.
2019-01-15 Fred Gleason <fredg@paravelsystems.com>
* Added a 'View Credits' button to the 'System Information' dialog
in rdadmin(1).

2
helpers/cwrap.cpp
View File

@ -115,7 +115,7 @@ int main(int argc,char *argv[])
for(int i=0;i<(stat.st_size/LINE_LENGTH+1);i++) {
n=read(input_fd,line,LINE_LENGTH);
for(int j=0;j<n;j++) {
fprintf(output_desc,"%d,",line[j]);
fprintf(output_desc,"%d,",0xFF&line[j]);
count++;
}
if(n>0) {

11
lib/Makefile.am
View File

@ -28,9 +28,11 @@ CWRAP = ../helpers/cwrap
moc_%.cpp: %.h
$(MOC) $< -o $@
# The cwrap dependency
# The cwrap dependencies
html_%.cpp: %.html
$(CWRAP) -o $@ $<
credits.cpp:
$(CWRAP) -o $@ ../AUTHORS
instdir = @LOCAL_PREFIX@/lib
@ -61,7 +63,6 @@ dist_librd_la_SOURCES = dbversion.h\
export_spincount.cpp\
export_technical.cpp\
export_textlog.cpp\
html_gpl2.cpp\
rdadd_cart.cpp rdadd_cart.h\
rdadd_log.cpp rdadd_log.h\
rdairplay_conf.cpp rdairplay_conf.h\
@ -247,7 +248,9 @@ dist_librd_la_SOURCES = dbversion.h\
schedcartlist.cpp schedcartlist.h
nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
nodist_librd_la_SOURCES = credits.cpp\
html_gpl2.cpp\
moc_rdadd_cart.cpp\
moc_rdadd_log.cpp\
moc_rdapplication.cpp\
moc_rdaudioconvert.cpp\
@ -356,6 +359,8 @@ EXTRA_DIST = gpl2.html\
rdpaths.h.in
CLEANFILES = *~\
credits.cpp\
html_gpl2.cpp\
moc_*\
*.lib\
*.obj\

4
lib/librd_cs.ts
View File

@ -2163,6 +2163,10 @@ Bitte Kofiguration prüfen und erneut versuchen.</translation>
<source>GNU Public License v2</source>
<translation>GNU Public License v2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_de.ts
View File

@ -2150,6 +2150,10 @@ Bitte Kofiguration prüfen und erneut versuchen.</translation>
<source>GNU Public License v2</source>
<translation>GNU Public License v2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_es.ts
View File

@ -2156,6 +2156,10 @@ Do you still want to proceed?</source>
<source>GNU Public License v2</source>
<translation>Licencia Pública GNU v2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_fr.ts
View File

@ -1905,6 +1905,10 @@ Do you want to overwrite it?</source>
<source>GNU Public License v2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_nb.ts
View File

@ -2152,6 +2152,10 @@ Sjekk eksportoppsettet ditt og prøv att.</translation>
<source>GNU Public License v2</source>
<translation>GNU Public-lisensen, versjon 2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_nn.ts
View File

@ -2152,6 +2152,10 @@ Sjekk eksportoppsettet ditt og prøv att.</translation>
<source>GNU Public License v2</source>
<translation>GNU Public-lisensen, versjon 2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

4
lib/librd_pt_BR.ts
View File

@ -2154,6 +2154,10 @@ Por Favor, cheque suas configurações e tenbte outra vez.</translation>
<source>GNU Public License v2</source>
<translation>GNU Public License v2</translation>
</message>
<message>
<source>Rivendell Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDListGroups</name>

27
lib/rdlicense.cpp
View File

@ -2,7 +2,7 @@
//
// Display License Text.
//
// (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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 Library General Public License
@ -23,10 +23,11 @@
#include <rdlicense.h>
#include <html_gpl2.cpp>
#include "credits.cpp"
#include "html_gpl2.cpp"
RDLicense::RDLicense(QWidget *parent)
: QDialog(parent,"",true)
: QDialog(parent)
{
//
// Fix the Window Size
@ -42,10 +43,9 @@ RDLicense::RDLicense(QWidget *parent)
QFont button_font=QFont("Helvetica",14,QFont::Bold);
button_font.setPixelSize(14);
license_edit=new Q3TextEdit(this,"license_edit");
license_edit=new QTextEdit(this);
license_edit->
setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-70);
license_edit->setTextFormat(Qt::RichText);
setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80);
license_edit->setReadOnly(true);
//
@ -74,10 +74,17 @@ QSizePolicy RDLicense::sizePolicy() const
void RDLicense::exec(RDLicense::License lic)
{
switch(lic) {
case RDLicense::GplV2:
license_edit->setText((const char *)html_gpl2);
setCaption(tr("GNU Public License v2"));
break;
case RDLicense::Credits:
license_edit->setTextFormat(Qt::PlainText);
license_edit->setText(QString::fromUtf8((const char *)credits));
setWindowTitle(tr("Rivendell Credits"));
break;
case RDLicense::GplV2:
license_edit->setTextFormat(Qt::RichText);
license_edit->setText((const char *)html_gpl2);
setWindowTitle(tr("GNU Public License v2"));
break;
}
QDialog::exec();
}

8
lib/rdlicense.h
View File

@ -2,7 +2,7 @@
//
// Display License Text.
//
// (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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 Library General Public License
@ -23,13 +23,13 @@
#define RDLICENSE_H
#include <qdialog.h>
#include <q3textedit.h>
#include <qtextedit.h>
class RDLicense : public QDialog
{
Q_OBJECT
public:
enum License {GplV2=0};
enum License {GplV2=0,Credits=1};
RDLicense(QWidget *parent=0);
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@ -41,7 +41,7 @@ class RDLicense : public QDialog
void closeData();
private:
Q3TextEdit *license_edit;
QTextEdit *license_edit;
};

25
rdadmin/info_dialog.cpp
View File

@ -38,15 +38,15 @@
#include <rd.h>
#include <dbversion.h>
#include <info_dialog.h>
#include "info_dialog.h"
//
// This is a kludge, but apparently needed to get the bitmap data
// for the info banners, as Automake refuses to process the cwrap
// dependency correctly.
//
#include <xpm_info_banner1.cpp>
#include <xpm_info_banner2.cpp>
#include "xpm_info_banner1.cpp"
#include "xpm_info_banner2.cpp"
InfoDialog::InfoDialog(QWidget *parent)
: QDialog(parent)
@ -140,9 +140,18 @@ InfoDialog::InfoDialog(QWidget *parent)
label->setText(tr("This program is free software, and comes with ABSOLUTELY NO WARRANTY,\nnot even the implied warranties of MERCHANTIBILITY or FITNESS FOR A\nPARTICULAR PURPOSE. Touch the \"View License\" button for details."));
//
// License Button
// Credits Button
//
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()/2-145,174,80,50);
button->setFont(button_font);
button->setText(tr("View\n&Credits"));
connect(button,SIGNAL(clicked()),this,SLOT(viewCreditsData()));
//
// License Button
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()/2-45,174,80,50);
button->setFont(button_font);
button->setText(tr("View\n&License"));
@ -173,6 +182,14 @@ QSizePolicy InfoDialog::sizePolicy() const
}
void InfoDialog::viewCreditsData()
{
RDLicense *lic=new RDLicense(this);
lic->exec(RDLicense::Credits);
delete lic;
}
void InfoDialog::viewLicenseData()
{
RDLicense *lic=new RDLicense(this);

1
rdadmin/info_dialog.h
View File

@ -45,6 +45,7 @@ class InfoDialog : public QDialog
QSizePolicy sizePolicy() const;
private slots:
void viewCreditsData();
void viewLicenseData();
void closeData();
};

5
rdadmin/rdadmin_cs.ts
View File

@ -4517,6 +4517,11 @@ GNU Library General Public License. Klepněte na tlačítko pro zobrazení povol
<source>Copyright 2002-2019</source>
<translation type="obsolete">Autorské právo 2002-2019</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>

5
rdadmin/rdadmin_de.ts
View File

@ -4401,6 +4401,11 @@ anzeigen</translation>
<source>Copyright 2002-2019</source>
<translation type="obsolete">Copyright 2002-2019</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>

5
rdadmin/rdadmin_es.ts
View File

@ -4484,6 +4484,11 @@ PARA UN PROPÓSITO PARTICULAR. Oprima el botón &quot;Ver licencia&quot; para d
<source>Copyright 2002-2019</source>
<translation type="obsolete">Copyright 2002-2019</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>

5
rdadmin/rdadmin_fr.ts
View File

@ -3671,6 +3671,11 @@ PARTICULAR PURPOSE. Touch the &quot;View License&quot; button for details.</sou
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListDropboxes</name>

5
rdadmin/rdadmin_nb.ts
View File

@ -4306,6 +4306,11 @@ Klikk på &quot;Lisens&quot;-knappen for fleire opplysningar.</translation>
<source>Copyright 2002-2019</source>
<translation type="obsolete">Copyright 2002-2019</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>

5
rdadmin/rdadmin_nn.ts
View File

@ -4306,6 +4306,11 @@ Klikk på &quot;Lisens&quot;-knappen for fleire opplysningar.</translation>
<source>Copyright 2002-2019</source>
<translation type="obsolete">Copyright 2002-2019</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>

5
rdadmin/rdadmin_pt_BR.ts
View File

@ -4381,6 +4381,11 @@ FINALIDADE PARTICULAR. Aperte o botão VER LICENÇA para mais detalhes.</transl
<source>Copyright 2002-2019</source>
<translation type="obsolete">Copyright 2002-2009 {2002-2019?}</translation>
</message>
<message>
<source>View
&amp;Credits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ListAuxFields</name>