Fixed Cron and Mail text strings for consistency.
Fixed configuration dialog width to eliminate scrolling.
This partially resolves bug report 336.
(cherry picked from commit 2d75f12d50)
v3.5.13-sru
Darrell Anderson
parent
3689183f2c
commit
176b50575b
@ -1,7 +0,0 @@
|
|||||||
INCLUDES = -I$(top_srcdir)/ksystemlog/src -I$(top_builddir)/ksystemlog/src/config $(all_includes)
|
|
||||||
METASOURCES = AUTO
|
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libksystemlog_postfix.la
|
|
||||||
libksystemlog_postfix_la_LDFLAGS = $(all_libraries)
|
|
||||||
libksystemlog_postfix_la_SOURCES = postfixOptions.cpp
|
|
||||||
noinst_HEADERS = postfixOptions.h
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Nicolas Ternisien *
|
|
||||||
* nicolas.ternisien@gmail.com *
|
|
||||||
* *
|
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
|
||||||
* it under the terms of the GNU General Public License as published by *
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or *
|
|
||||||
* (at your option) any later version. *
|
|
||||||
* *
|
|
||||||
* This program is distributed in the hope that it will be useful, *
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
||||||
* GNU General Public License for more details. *
|
|
||||||
* *
|
|
||||||
* You should have received a copy of the GNU General Public License *
|
|
||||||
* along with this program; if not, write to the *
|
|
||||||
* Free Software Foundation, Inc., *
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
//TQt includes
|
|
||||||
#include <tqlayout.h>
|
|
||||||
#include <tqvgroupbox.h>
|
|
||||||
#include <tqbuttongroup.h>
|
|
||||||
#include <tqlabel.h>
|
|
||||||
#include <tqpushbutton.h>
|
|
||||||
#include <tqvbox.h>
|
|
||||||
#include <tqhbox.h>
|
|
||||||
|
|
||||||
//KDE includes
|
|
||||||
#include <klocale.h>
|
|
||||||
#include <kactioncollection.h>
|
|
||||||
#include <kbuttonbox.h>
|
|
||||||
#include <klistbox.h>
|
|
||||||
#include <kfiledialog.h>
|
|
||||||
#include <kurl.h>
|
|
||||||
#include <kmessagebox.h>
|
|
||||||
#include <kiconloader.h>
|
|
||||||
|
|
||||||
#include <kdebug.h>
|
|
||||||
|
|
||||||
//Project includes
|
|
||||||
#include "postfixOptions.h"
|
|
||||||
#include "ksystemlogConfig.h"
|
|
||||||
|
|
||||||
PostfixOptions::PostfixOptions(TQWidget *parent) :
|
|
||||||
TQWidget(parent)
|
|
||||||
{
|
|
||||||
|
|
||||||
TQHBoxLayout *layout = new TQHBoxLayout(this);
|
|
||||||
layout->setAutoAdd(true);
|
|
||||||
|
|
||||||
TQString description= i18n("<qt><p>These files will be analyzed to display <b>Postfix Logs</b>. This list also determine the order in which the files are read.</p></qt>");
|
|
||||||
fileList=new SpecificFileList(this, description);
|
|
||||||
|
|
||||||
connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
|
|
||||||
|
|
||||||
readConfig();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
PostfixOptions::~PostfixOptions() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PostfixOptions::isValid() {
|
|
||||||
if (fileList->count()>0)
|
|
||||||
return(true);
|
|
||||||
else
|
|
||||||
return(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PostfixOptions::slotFileListChanged(int itemLeft) {
|
|
||||||
if (itemLeft==0)
|
|
||||||
emit optionsChanged(false);
|
|
||||||
else
|
|
||||||
emit optionsChanged(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PostfixOptions::saveConfig() {
|
|
||||||
kdDebug() << "Saving config from Daemon Options..." << endl;
|
|
||||||
|
|
||||||
TQStringList stringList;
|
|
||||||
TQValueList<int> valueList;
|
|
||||||
|
|
||||||
fileList->saveConfig(stringList, valueList);
|
|
||||||
|
|
||||||
KSystemLogConfig::setPostfixPaths(stringList);
|
|
||||||
KSystemLogConfig::setPostfixLevels(valueList);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PostfixOptions::readConfig() {
|
|
||||||
TQStringList stringList=KSystemLogConfig::postfixPaths();
|
|
||||||
TQValueList<int> valueList=KSystemLogConfig::postfixLevels();
|
|
||||||
|
|
||||||
fileList->readConfig(stringList, valueList);
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "postfixOptions.moc"
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Nicolas Ternisien *
|
|
||||||
* nicolas.ternisien@gmail.com *
|
|
||||||
* *
|
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
|
||||||
* it under the terms of the GNU General Public License as published by *
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or *
|
|
||||||
* (at your option) any later version. *
|
|
||||||
* *
|
|
||||||
* This program is distributed in the hope that it will be useful, *
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
||||||
* GNU General Public License for more details. *
|
|
||||||
* *
|
|
||||||
* You should have received a copy of the GNU General Public License *
|
|
||||||
* along with this program; if not, write to the *
|
|
||||||
* Free Software Foundation, Inc., *
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#ifndef _POSTFIX_OPTIONS_H_
|
|
||||||
#define _POSTFIX_OPTIONS_H_
|
|
||||||
|
|
||||||
#include <tqframe.h>
|
|
||||||
#include <tqspinbox.h>
|
|
||||||
|
|
||||||
#include <kpopupmenu.h>
|
|
||||||
#include <kconfig.h>
|
|
||||||
#include <kdialogbase.h>
|
|
||||||
#include <kurlrequester.h>
|
|
||||||
#include <kurl.h>
|
|
||||||
#include <kaction.h>
|
|
||||||
|
|
||||||
#include "globals.h"
|
|
||||||
#include "specificFileList.h"
|
|
||||||
#include "logLevel.h"
|
|
||||||
|
|
||||||
class PostfixOptions : public TQWidget {
|
|
||||||
Q_OBJECT
|
|
||||||
TQ_OBJECT
|
|
||||||
public:
|
|
||||||
PostfixOptions(TQWidget *parent = 0);
|
|
||||||
~PostfixOptions();
|
|
||||||
|
|
||||||
bool isValid();
|
|
||||||
public slots:
|
|
||||||
void saveConfig();
|
|
||||||
void readConfig();
|
|
||||||
|
|
||||||
void slotFileListChanged(int itemLeft);
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void optionsChanged(bool valid);
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
SpecificFileList* fileList;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in new issue