2018-08-07 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions

View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/rdselect
##
## (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2012,2016-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
@@ -20,8 +18,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
@@ -38,8 +36,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdselect_*.qm
all:
@QT_BIN@/lupdate rdselect.pro
@QT_BIN@/lrelease rdselect.pro
lupdate-qt4 rdselect.pro
lrelease-qt4 rdselect.pro
bin_PROGRAMS = rdselect
@@ -47,7 +45,7 @@ dist_rdselect_SOURCES = rdselect.cpp rdselect.h
nodist_rdselect_SOURCES = moc_rdselect.cpp
rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdselect.pro\
rdselect_cs.ts\

View File

@@ -33,6 +33,10 @@
#include <qtextcodec.h>
#include <qtranslator.h>
#include <qdir.h>
#include <qdesktopwidget.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <QPixmap>
#include <rd.h>
#include <rdconf.h>
@@ -139,7 +143,7 @@ MainWidget::MainWidget(QWidget *parent)
config_dir.setFilter(QDir::Files|QDir::Readable);
config_dir.setNameFilter("*.conf");
select_filenames=config_dir.entryList();
for(unsigned i=0;i<select_filenames.size();i++) {
for(int i=0;i<select_filenames.size();i++) {
select_filenames[i]=
QString(RD_DEFAULT_RDSELECT_DIR)+"/"+select_filenames[i];
if(select_filenames[i]==target) {
@@ -156,15 +160,15 @@ MainWidget::MainWidget(QWidget *parent)
//
select_current_label=new QLabel(this);
select_current_label->setFont(label_font);
select_current_label->setAlignment(AlignCenter);
select_current_label->setAlignment(Qt::AlignCenter);
//
// Selector Box
//
select_box=new QListBox(this);
select_box=new Q3ListBox(this);
select_box->setFont(default_font);
connect(select_box,SIGNAL(doubleClicked(QListBoxItem *)),
this,SLOT(doubleClickedData(QListBoxItem *)));
connect(select_box,SIGNAL(doubleClicked(Q3ListBoxItem *)),
this,SLOT(doubleClickedData(Q3ListBoxItem *)));
for(unsigned i=0;i<select_configs.size();i++) {
select_box->insertItem(select_configs[i]->label());
}
@@ -216,7 +220,7 @@ QSizePolicy MainWidget::sizePolicy() const
}
void MainWidget::doubleClickedData(QListBoxItem *item)
void MainWidget::doubleClickedData(Q3ListBoxItem *item)
{
okData();
}
@@ -237,7 +241,7 @@ void MainWidget::okData()
SetSystem(-1);
QMessageBox::warning(this,tr("RDSelect"),
tr("Unable to shutdown current configuration")+
"\n["+strerror(errno)+"].");
"\n["+QString(strerror(errno))+"].");
return;
}
if(!Startup(select_box->currentItem())) {
@@ -353,7 +357,7 @@ int main(int argc,char *argv[])
// Load Translations
//
QTranslator qt(0);
qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),
qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),
".");
a.installTranslator(&qt);

View File

@@ -26,11 +26,13 @@
#include <qwidget.h>
#include <qsize.h>
#include <qsizepolicy.h>
#include <qlistbox.h>
#include <q3listbox.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qstringlist.h>
#include <qpixmap.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <rdconfig.h>
#include <rdmonitor_config.h>
@@ -44,7 +46,7 @@ class MainWidget : public QWidget
QSizePolicy sizePolicy() const;
private slots:
void doubleClickedData(QListBoxItem *item);
void doubleClickedData(Q3ListBoxItem *item);
void okData();
void cancelData();
@@ -62,7 +64,7 @@ class MainWidget : public QWidget
int select_current_id;
QLabel *select_current_label;
QLabel *select_label;
QListBox *select_box;
Q3ListBox *select_box;
QPixmap *login_rivendell_map;
QPushButton *ok_button;
QPushButton *cancel_button;

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>