mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-12-21 08:01:16 +01:00
Master (#6)
* Fixed bug where wrong ID was used for local maintenance * Updated ChangeLog * Added ability to run macros from cart list with "Run Macro" button * Updated ChangeLog * Updated translations * 2018-10-18 Fred Gleason <fredg@paravelsystems.com> * Tweaked the position of buttons on the bottom row of the main screen of rdlibrary(1). * Changed the minimum size of the main screen of rdlibrary to 850x600. * 2018-10-18 Fred Gleason <fredg@paravelsystems.com> * Fixed a regression in rdmaint(8) that broke cut rehashing. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Added code in the %post and %preun rules in 'rivendell.spec.in' to enable and disable the 'rivendell' service. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Modified rdservice(8) to log errors to syslog. * Added an rdservice(8) man page. * Modified 'systemd/rivendell.service.in' to enable automatic start retries. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Fixed a typo that broke generation of the rmlsend(1) man page. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Removed 'build_win32.bat'. * Removed all conditional compilation based on 'WIN32'. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Removed check for Win32 installer from 'configure.ac'. * Removed win32 clauses from '.pro' files.
This commit is contained in:
committed by
GitHub
parent
48bbe8ee67
commit
4a3106c8dc
@@ -18,12 +18,11 @@
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
//
|
||||
|
||||
#ifndef WIN32
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qwindowsstyle.h>
|
||||
#include <qwidget.h>
|
||||
@@ -105,17 +104,8 @@ MainWidget::MainWidget(QWidget *parent)
|
||||
//
|
||||
// RIPC Connection
|
||||
//
|
||||
#ifndef WIN32
|
||||
connect(rda,SIGNAL(userChanged()),this,SLOT(userChangedData()));
|
||||
rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
|
||||
#endif // WIN32
|
||||
|
||||
//
|
||||
// User
|
||||
//
|
||||
#ifdef WIN32
|
||||
rda->user()->setName(RD_USER_LOGIN_NAME);
|
||||
#endif // WIN32
|
||||
|
||||
//
|
||||
// Create Fonts
|
||||
@@ -333,15 +323,9 @@ int main(int argc,char *argv[])
|
||||
//
|
||||
QString tr_path;
|
||||
QString qt_path;
|
||||
#ifdef WIN32
|
||||
QSettings settings;
|
||||
settings.insertSearchPath(QSettings::Windows,"/SalemRadioLabs");
|
||||
tr_path=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);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# The rdcastmanager/ QMake project file for Rivendell
|
||||
#
|
||||
# (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com>
|
||||
# (C) Copyright 2003-2018 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
|
||||
@@ -17,18 +17,12 @@
|
||||
# License along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
TEMPLATE = app
|
||||
|
||||
TARGET = rdlogmanager
|
||||
|
||||
win32 {
|
||||
DEFINES += WIN32
|
||||
DEFINES += VERSION=\"$$[VERSION]\"
|
||||
DEFINES += PACKAGE=\"rivendell\"
|
||||
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
|
||||
DEFINES += PACKAGE_NAME=\"rivendell\"
|
||||
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
|
||||
}
|
||||
#
|
||||
# Maintainer's Note
|
||||
#
|
||||
# We don't use Qt's 'Qmake' build system, so the entries in here are
|
||||
# purely for the sake of i18n support.
|
||||
#
|
||||
|
||||
SOURCES += rdcastmanager.cpp
|
||||
SOURCES += edit_cast.cpp
|
||||
@@ -40,14 +34,6 @@ HEADERS += edit_cast.h
|
||||
HEADERS += list_casts.h
|
||||
HEADERS += pick_report_dates.h
|
||||
|
||||
RES_FILE += ..\icons\rivendell.res
|
||||
|
||||
INCLUDEPATH += ..\lib
|
||||
|
||||
LIBS = -lqui -L..\lib -llib
|
||||
|
||||
CONFIG += qt
|
||||
|
||||
TRANSLATIONS += rdcastmanager_cs.ts
|
||||
TRANSLATIONS += rdcastmanager_de.ts
|
||||
TRANSLATIONS += rdcastmanager_es.ts
|
||||
|
||||
Reference in New Issue
Block a user