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

2017-09-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs that broke the build under Windows.
This commit is contained in:
Fred Gleason 2017-09-21 08:16:18 -04:00
parent ac84b6879d
commit 69896ee0c1
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16064,3 +16064,5 @@
when rendering logs longer than 44:30.
2017-09-21 Fred Gleason <fredg@paravelsystems.com>
* Updated the rdrender(1) man page.
2017-09-21 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs that broke the build under Windows.

8
rdlogedit/edit_log.cpp
View File

@ -132,7 +132,9 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
//
// Dialogs
//
#ifndef WIN32
edit_render_dialog=new RenderDialog(rdstation_conf,rdsystem,log_config,this);
#endif // WIN32
//
// Text Validator
@ -468,10 +470,12 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
//
// Render Button
//
#ifndef WIN32
edit_renderas_button=new QPushButton(this);
edit_renderas_button->setFont(button_font);
edit_renderas_button->setText(tr("Render"));
connect(edit_renderas_button,SIGNAL(clicked()),this,SLOT(renderasData()));
#endif // WIN32
//
// Reports Button
@ -1142,6 +1146,7 @@ ORIGIN_DATETIME=NOW(),LINK_DATETIME=NOW(),SERVICE=\"%s\"",
void EditLog::renderasData()
{
#ifndef WIN32
int first_line=-1;
int last_line=-1;
@ -1163,6 +1168,7 @@ void EditLog::renderasData()
else {
edit_render_dialog->exec(rduser,edit_log_event,first_line,last_line+1);
}
#endif // WIN32
}
@ -1299,9 +1305,9 @@ void EditLog::resizeEvent(QResizeEvent *e)
setGeometry(size().width()-100,size().height()-125,80,50);
edit_save_button->setGeometry(10,size().height()-60,80,50);
edit_saveas_button->setGeometry(100,size().height()-60,80,50);
edit_renderas_button->setGeometry(190,size().height()-60,80,50);
edit_reports_button->setGeometry(300,size().height()-60,80,50);
#ifndef WIN32
edit_renderas_button->setGeometry(190,size().height()-60,80,50);
edit_player->playButton()->setGeometry(410,size().height()-60,80,50);
edit_player->stopButton()->setGeometry(500,size().height()-60,80,50);
#endif // WIN32

6
rdlogedit/edit_log.h
View File

@ -42,7 +42,9 @@
#include "drop_listview.h"
#include "list_reports.h"
#ifndef WIN32
#include "render_dialog.h"
#endif // WIN32
//
// Widget Settings
@ -164,7 +166,6 @@ class EditLog : public QDialog
QPushButton *edit_paste_button;
QPushButton *edit_save_button;
QPushButton *edit_saveas_button;
QPushButton *edit_renderas_button;
QPushButton *edit_reports_button;
RDTransportButton *edit_play_button;
RDTransportButton *edit_stop_button;
@ -186,7 +187,10 @@ class EditLog : public QDialog
QLabel *edit_purgedate_label;
QDateEdit *edit_purgedate_edit;
QPushButton *edit_purgedate_button;
#ifndef WIN32
QPushButton *edit_renderas_button;
RenderDialog *edit_render_dialog;
#endif // WIN32
};

2
rdlogedit/rdlogedit.pro
View File

@ -42,6 +42,7 @@ SOURCES += list_logs.cpp
SOURCES += list_reports.cpp
SOURCES += rdlogedit.cpp
x11 {
SOURCES += render_dialog.cpp
SOURCES += voice_tracker.cpp
}
@ -58,6 +59,7 @@ HEADERS += list_logs.h
HEADERS += list_reports.h
HEADERS += rdlogedit.h
x11 {
HEADERS += render_dialog.h
HEADERS += voice_tracker.h
}