mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-11 15:16:07 +01:00
2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed 'build_win32.bat'. * Removed all conditional compilation based on 'WIN32'.
This commit is contained in:
@@ -170,7 +170,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
QString sql;
|
||||
RDSqlQuery *q;
|
||||
event_player = NULL;
|
||||
#ifndef WIN32
|
||||
sql=QString("select ")+
|
||||
"OUTPUT_CARD,"+ // 00
|
||||
"OUTPUT_PORT,"+ // 01
|
||||
@@ -189,7 +188,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_player->stopButton()->setOnColor(Qt::red);
|
||||
}
|
||||
delete q;
|
||||
#endif // WIN32
|
||||
|
||||
//
|
||||
// Remarks
|
||||
@@ -841,14 +839,12 @@ void EditEvent::filterClickedData(int id)
|
||||
|
||||
void EditEvent::cartClickedData(Q3ListViewItem *item)
|
||||
{
|
||||
#ifndef WIN32
|
||||
if (!event_player) return;
|
||||
if(item==NULL) {
|
||||
event_player->setCart(0);
|
||||
return;
|
||||
}
|
||||
event_player->setCart(item->text(1).toUInt());
|
||||
#endif // WIN32
|
||||
}
|
||||
|
||||
|
||||
@@ -1224,22 +1220,19 @@ void EditEvent::colorData()
|
||||
void EditEvent::okData()
|
||||
{
|
||||
Save();
|
||||
#ifndef WIN32
|
||||
if (event_player){
|
||||
event_player->stop();
|
||||
}
|
||||
#endif // WIN32
|
||||
|
||||
done(0);
|
||||
}
|
||||
|
||||
|
||||
void EditEvent::cancelData()
|
||||
{
|
||||
#ifndef WIN32
|
||||
if (event_player){
|
||||
event_player->stop();
|
||||
}
|
||||
#endif // WIN32
|
||||
if(event_saved) {
|
||||
done(-1);
|
||||
}
|
||||
|
||||
@@ -199,17 +199,10 @@ void PickReportDates::generateData()
|
||||
delete report;
|
||||
return;
|
||||
}
|
||||
#ifdef WIN32
|
||||
QString filename=
|
||||
RDDateDecode(report->exportPath(RDReport::Windows),
|
||||
edit_startdate_edit->date(),rda->station(),rda->config(),
|
||||
edit_svcname);
|
||||
#else
|
||||
QString filename=
|
||||
RDDateDecode(report->exportPath(RDReport::Linux),
|
||||
edit_startdate_edit->date(),rda->station(),rda->config(),
|
||||
edit_svcname);
|
||||
#endif
|
||||
QFile file(filename);
|
||||
if(file.exists()) {
|
||||
if(QMessageBox::question(this,"File Exists",
|
||||
|
||||
@@ -18,13 +18,12 @@
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
//
|
||||
|
||||
#ifndef WIN32
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#endif // WIN32
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qwindowsstyle.h>
|
||||
#include <qwidget.h>
|
||||
@@ -96,9 +95,7 @@ MainWidget::MainWidget(QWidget *parent)
|
||||
//
|
||||
// CAE Connection
|
||||
//
|
||||
#ifndef WIN32
|
||||
rda->cae()->connectHost();
|
||||
#endif // WIN32
|
||||
|
||||
//
|
||||
// RIPC Connection
|
||||
@@ -285,17 +282,9 @@ int gui_main(int argc,char *argv[])
|
||||
//
|
||||
QString tr_path;
|
||||
QString qt_path;
|
||||
#ifdef WIN32
|
||||
QSettings settings;
|
||||
settings.insertSearchPath(QSettings::Windows,"/SalemRadioLabs");
|
||||
tr_path=QString().sprintf("%s\\",
|
||||
(const char *)settings.
|
||||
readEntry("/Rivendell/InstallDir"));
|
||||
qt_path=tr_path;
|
||||
#else
|
||||
tr_path=QString(PREFIX)+QString("/share/rivendell/");
|
||||
qt_path=QString("/usr/share/qt4/translation/");
|
||||
#endif // WIN32
|
||||
|
||||
QTranslator qt(0);
|
||||
qt.load(qt_path+QString("qt_")+QTextCodec::locale(),".");
|
||||
a.installTranslator(&qt);
|
||||
|
||||
@@ -72,10 +72,8 @@ SvcRecDialog::SvcRecDialog(const QString &svcname,QWidget *parent)
|
||||
date_delete_button->setFont(font);
|
||||
date_delete_button->setText(tr("&Purge\nData"));
|
||||
connect(date_delete_button,SIGNAL(clicked()),this,SLOT(deleteData()));
|
||||
#ifndef WIN32
|
||||
date_delete_button->setEnabled(rda->user()->deleteRec()&&
|
||||
date_picker->dayActive(date_picker->date().day()));
|
||||
#endif // WIN32
|
||||
|
||||
//
|
||||
// Close Button
|
||||
@@ -109,13 +107,8 @@ QSizePolicy SvcRecDialog::sizePolicy() const
|
||||
|
||||
void SvcRecDialog::dateSelectedData(const QDate &,bool active)
|
||||
{
|
||||
#ifdef WIN32
|
||||
date_delete_button->
|
||||
setEnabled(date_picker->dayActive(date_picker->date().day()));
|
||||
#else
|
||||
date_delete_button->setEnabled(rda->user()->deleteRec()&&
|
||||
date_picker->dayActive(date_picker->date().day()));
|
||||
#endif // WIN32
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user