more qt4 port

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@411 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 477 insertions, 448 deletions

diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 68b6fcd19..fd01b5830 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -1,458 +1,487 @@
-//
-//   File : logviewmdiwindow.cpp
-//   Creation date : Tue Apr 23 2002 18:08:22 by Juanjo �varez
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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 opinion) 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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-
-#include "logviewmdiwindow.h"
-#include "logviewwidget.h"
-#include "kvi_iconmanager.h"
-#include "kvi_locale.h"
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_ircview.h"
-#include "kvi_qstring.h"
-#include "kvi_app.h"
-#include "kvi_fileutils.h"
-
-#include <qaccel.h>
-#include <qpixmap.h>
-#include <qsplitter.h>
-#include <qtoolbutton.h>
-#include "kvi_tal_listview.h"
-#include <qfileinfo.h>
-#include <qdir.h>
-#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qprogressdialog.h> 
-
-#ifdef COMPILE_ZLIB_SUPPORT
-	#include <zlib.h>
-#endif
-#include <qtextcodec.h>
-#include "kvi_styled_controls.h"
-#include <qdatetimeedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-
-extern KviLogViewMDIWindow * g_pLogViewWindow;
-
-KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
-{
-	g_pLogViewWindow = this;
-//	m_pLogViewWidget = new KviLogViewWidget(this);
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
-	
-	m_pTabWidget = new QTabWidget(m_pSplitter);
-	
-	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->insertTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));
-	m_pListView = new KviTalListView(m_pIndexTab);
-	m_pListView->addColumn(__tr2qs_ctx("Log File","logview"),135);
-	m_pListView->setColumnWidthMode(0,KviTalListView::Maximum);
-	m_pListView->setAllColumnsShowFocus(true);
-	m_pListView->setMultiSelection(false);
-	m_pListView->setShowSortIndicator(true);
-	m_pListView->setRootIsDecorated(true);
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemSelected(KviTalListViewItem *)));
-	connect(m_pListView,SIGNAL(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )));
-	
-	m_pSearchTab  = new QWidget(m_pTabWidget);
-	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
-
-	QGridLayout *layout = new QGridLayout(m_pSearchTab,10,2,3,5);
-	
-	m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
-	m_pShowChannelsCheck->setChecked(true);
-	layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
-	
-	m_pShowQueryesCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);
-	m_pShowQueryesCheck->setChecked(true);
-	layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
-	
-	m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);
-	m_pShowConsolesCheck->setChecked(true);
-	layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
-
-	m_pShowDccChatCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);
-	m_pShowDccChatCheck->setChecked(true);
-	layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
-	
-	m_pShowOtherCheck   = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);
-	m_pShowOtherCheck->setChecked(true);
-	layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
-	
-	QLabel *l;
-	l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
-	layout->addMultiCellWidget(l,5,5,0,1);
-
-	l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
-	m_pFileNameMask = new QLineEdit(m_pSearchTab);
-	connect(m_pFileNameMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
-	layout->addWidget(l,6,0);
-	layout->addWidget(m_pFileNameMask,6,1);
-
-	l = new QLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
-	m_pContentsMask = new QLineEdit(m_pSearchTab);
-	connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
-	layout->addWidget(l,7,0);
-	layout->addWidget(m_pContentsMask,7,1);
-
-	m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
-	m_pFromDateEdit = new QDateEdit(m_pSearchTab);
-	m_pFromDateEdit->setDate(QDate::currentDate());
-	layout->addWidget(m_pEnableFromFilter,8,0);
-	layout->addWidget(m_pFromDateEdit,8,1);
-	connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));
-	m_pFromDateEdit->setEnabled(false);
-
-	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
-	m_pToDateEdit = new QDateEdit(m_pSearchTab);
-	m_pToDateEdit->setDate(QDate::currentDate());
-	layout->addWidget(m_pEnableToFilter,9,0);
-	layout->addWidget(m_pToDateEdit,9,1);
-	connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool)));
-	m_pToDateEdit->setEnabled(false);
-
-	QPushButton *pb = new QPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
-	connect(pb,SIGNAL(clicked()),this,SLOT(applyFilter()));
-	layout->addWidget(pb,10,1);
-
-	QWidget *w = new QWidget(m_pSearchTab);
-	w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
-	layout->addWidget(w,11,1);
-
-	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
-	m_pIrcView->setFocusPolicy(QWidget::ClickFocus);
-	
-	QValueList<int> li;
-	li.append(110);
-	li.append(width()-110);
-	m_pSplitter->setSizes(li);
-	
-	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
-	KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
-	
-	cacheFileList();
-	setupItemList();
-
+//

+//   File : logviewmdiwindow.cpp

+//   Creation date : Tue Apr 23 2002 18:08:22 by Juanjo �varez

+//

+//   This file is part of the KVirc irc client distribution

+//   Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net)

+//

+//   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 opinion) 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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+//

+

+#include "logviewmdiwindow.h"

+#include "logviewwidget.h"

+#include "kvi_iconmanager.h"

+#include "kvi_locale.h"

+#include "kvi_module.h"

+#include "kvi_options.h"

+#include "kvi_frame.h"

+#include "kvi_ircview.h"

+#include "kvi_qstring.h"

+#include "kvi_qcstring.h"

+#include "kvi_app.h"

+#include "kvi_fileutils.h"

+#ifdef COMPILE_USE_QT4

+#include <Q3Accel>

+#include <Q3ValueList>

+#include <Q3ProgressDialog>

+#else

+#include <qaccel.h>

+#include <qprogressdialog.h> 

+#endif

+#include <qpixmap.h>

+#include <qsplitter.h>

+#include <qtoolbutton.h>

+#include "kvi_tal_listview.h"

+#include <qfileinfo.h>

+#include <qdir.h>

+#include "kvi_tal_popupmenu.h"

+#include <qcursor.h>

+#include <qlayout.h>

+#include <qpushbutton.h>

+

+

+

+#ifdef COMPILE_ZLIB_SUPPORT

+	#include <zlib.h>

+#endif

+#include <qtextcodec.h>

+#include "kvi_styled_controls.h"

+#include <qdatetimeedit.h>

+#include <qlineedit.h>

+#include <qlabel.h>

+

+extern KviLogViewMDIWindow * g_pLogViewWindow;

+

+KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)

+: KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)

+{

+	g_pLogViewWindow = this;

+//	m_pLogViewWidget = new KviLogViewWidget(this);

+	#ifdef COMPILE_USE_QT4
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
+#else

+	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");

+#endif

+	m_pTabWidget = new QTabWidget(m_pSplitter);

+	

+	m_pIndexTab  = new KviTalVBox(m_pTabWidget);

+	m_pTabWidget->insertTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));

+	m_pListView = new KviTalListView(m_pIndexTab);

+	m_pListView->addColumn(__tr2qs_ctx("Log File","logview"),135);

+	m_pListView->setColumnWidthMode(0,KviTalListView::Maximum);

+	m_pListView->setAllColumnsShowFocus(true);

+	m_pListView->setMultiSelection(false);

+	m_pListView->setShowSortIndicator(true);

+	m_pListView->setRootIsDecorated(true);

+	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemSelected(KviTalListViewItem *)));

+	connect(m_pListView,SIGNAL(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )));

+	

+	m_pSearchTab  = new QWidget(m_pTabWidget);

+	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));

+

+	QGridLayout *layout = new QGridLayout(m_pSearchTab,10,2,3,5);

+	

+	m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);

+	m_pShowChannelsCheck->setChecked(true);

+	layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);

+	

+	m_pShowQueryesCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);

+	m_pShowQueryesCheck->setChecked(true);

+	layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);

+	

+	m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);

+	m_pShowConsolesCheck->setChecked(true);

+	layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);

+

+	m_pShowDccChatCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);

+	m_pShowDccChatCheck->setChecked(true);

+	layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);

+	

+	m_pShowOtherCheck   = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);

+	m_pShowOtherCheck->setChecked(true);

+	layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);

+	

+	QLabel *l;

+	l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);

+	layout->addMultiCellWidget(l,5,5,0,1);

+

+	l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);

+	m_pFileNameMask = new QLineEdit(m_pSearchTab);

+	connect(m_pFileNameMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));

+	layout->addWidget(l,6,0);

+	layout->addWidget(m_pFileNameMask,6,1);

+

+	l = new QLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);

+	m_pContentsMask = new QLineEdit(m_pSearchTab);

+	connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));

+	layout->addWidget(l,7,0);

+	layout->addWidget(m_pContentsMask,7,1);

+

+	m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);

+	m_pFromDateEdit = new QDateEdit(m_pSearchTab);

+	m_pFromDateEdit->setDate(QDate::currentDate());

+	layout->addWidget(m_pEnableFromFilter,8,0);

+	layout->addWidget(m_pFromDateEdit,8,1);

+	connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));

+	m_pFromDateEdit->setEnabled(false);

+

+	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);

+	m_pToDateEdit = new QDateEdit(m_pSearchTab);

+	m_pToDateEdit->setDate(QDate::currentDate());

+	layout->addWidget(m_pEnableToFilter,9,0);

+	layout->addWidget(m_pToDateEdit,9,1);

+	connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool)));

+	m_pToDateEdit->setEnabled(false);

+

+	QPushButton *pb = new QPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);

+	connect(pb,SIGNAL(clicked()),this,SLOT(applyFilter()));

+	layout->addWidget(pb,10,1);

+

+	QWidget *w = new QWidget(m_pSearchTab);

+	w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);

+	layout->addWidget(w,11,1);

+

+	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);

+#ifdef COMPILE_USE_QT4

+	m_pIrcView->setFocusPolicy(Qt::ClickFocus);

+#else

+		m_pIrcView->setFocusPolicy(QWidget::ClickFocus);

+#endif

+#ifdef COMPILE_USE_QT4

+	Q3ValueList<int> li;

+#else

+	QValueList<int> li;

+#endif

+	li.append(110);

+	li.append(width()-110);

+	m_pSplitter->setSizes(li);

+	

+	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);

+	KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?

+	

+	cacheFileList();

+	setupItemList();

+#ifdef COMPILE_USE_QT4

+

+	Q3Accel *a = new Q3Accel( this );

+#else

 	QAccel *a = new QAccel( this );

+#endif

         a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),

                         m_pIrcView,

-                        SLOT(toggleToolWidget()) );
-}
-
-
-
-KviLogViewMDIWindow::~KviLogViewMDIWindow()
-{
-    g_pLogViewWindow = 0;
-}
-
-void KviLogViewMDIWindow::applyFilter()
-{
-	setupItemList();
-}
-
-
-QPixmap * KviLogViewMDIWindow::myIconPtr()
-{
-    return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);
-}
-
-
-void KviLogViewMDIWindow::resizeEvent(QResizeEvent *e)
-{
-	m_pSplitter->setGeometry(0,0,width(),height());
-}
-
-void KviLogViewMDIWindow::fillCaptionBuffers()
-{
-	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
-
-	m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii());
-	m_szHtmlActiveCaption.append(m_szPlainTextCaption);
-	m_szHtmlActiveCaption.append("</b></font></nobr>");
-
-	m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii());
-	m_szHtmlInactiveCaption.append(m_szPlainTextCaption);
-	m_szHtmlInactiveCaption.append("</b></font></nobr>");
-}
-
-void KviLogViewMDIWindow::die()
-{
-	close();
-}
-
-QSize KviLogViewMDIWindow::sizeHint() const
-{
-	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height());
-	return ret;
-}
-
-void KviLogViewMDIWindow::setupItemList()
-{
-	m_pListView->clear();
-	KviLogFile *pFile;
-	m_logList.begin();
-	KviLogListViewItem *pLastCategory=0;
-	KviLogListViewItemFolder *pLastGroupItem;
-	QString szLastGroup;
-	QString szCurGroup;
-	const bool bShowChannel=m_pShowChannelsCheck->isChecked();
-	const bool bShowQuery=m_pShowQueryesCheck->isChecked();
-	const bool bShowConsole=m_pShowConsolesCheck->isChecked();
-	const bool bShowOther=m_pShowOtherCheck->isChecked();
-	const bool bShowDccChat=m_pShowDccChatCheck->isChecked();
-
-	const bool filterFromDate=m_pEnableFromFilter->isChecked();
-	const bool filterToDate=m_pEnableToFilter->isChecked();
-
-	const QString nameFilterText = m_pFileNameMask->text();
-	const bool enableNameFilter = !nameFilterText.isEmpty();
-
-	const QString contentFilterText = m_pContentsMask->text();
-	const bool enableContentFilter = !contentFilterText.isEmpty();
-
-	QDate fromDate = m_pFromDateEdit->date();
-	QDate toDate   = m_pToDateEdit->date();
-
-	QString textBuffer;
-
+                        SLOT(toggleToolWidget()) );

+}

+

+

+

+KviLogViewMDIWindow::~KviLogViewMDIWindow()

+{

+    g_pLogViewWindow = 0;

+}

+

+void KviLogViewMDIWindow::applyFilter()

+{

+	setupItemList();

+}

+

+

+QPixmap * KviLogViewMDIWindow::myIconPtr()

+{

+    return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);

+}

+

+

+void KviLogViewMDIWindow::resizeEvent(QResizeEvent *e)

+{

+	m_pSplitter->setGeometry(0,0,width(),height());

+}

+

+void KviLogViewMDIWindow::fillCaptionBuffers()

+{

+	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");

+

+	m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii());

+	m_szHtmlActiveCaption.append(m_szPlainTextCaption);

+	m_szHtmlActiveCaption.append("</b></font></nobr>");

+

+	m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii());

+	m_szHtmlInactiveCaption.append(m_szPlainTextCaption);

+	m_szHtmlInactiveCaption.append("</b></font></nobr>");

+}

+

+void KviLogViewMDIWindow::die()

+{

+	close();

+}

+

+QSize KviLogViewMDIWindow::sizeHint() const

+{

+	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height());

+	return ret;

+}

+

+void KviLogViewMDIWindow::setupItemList()

+{

+	m_pListView->clear();

+	KviLogFile *pFile;

+	m_logList.begin();

+	KviLogListViewItem *pLastCategory=0;

+	KviLogListViewItemFolder *pLastGroupItem;

+	QString szLastGroup;

+	QString szCurGroup;

+	const bool bShowChannel=m_pShowChannelsCheck->isChecked();

+	const bool bShowQuery=m_pShowQueryesCheck->isChecked();

+	const bool bShowConsole=m_pShowConsolesCheck->isChecked();

+	const bool bShowOther=m_pShowOtherCheck->isChecked();

+	const bool bShowDccChat=m_pShowDccChatCheck->isChecked();

+

+	const bool filterFromDate=m_pEnableFromFilter->isChecked();

+	const bool filterToDate=m_pEnableToFilter->isChecked();

+

+	const QString nameFilterText = m_pFileNameMask->text();

+	const bool enableNameFilter = !nameFilterText.isEmpty();

+

+	const QString contentFilterText = m_pContentsMask->text();

+	const bool enableContentFilter = !contentFilterText.isEmpty();

+

+	QDate fromDate = m_pFromDateEdit->date();

+	QDate toDate   = m_pToDateEdit->date();

+

+	QString textBuffer;

+#ifdef COMPILE_USE_QT4

+	Q3ProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),

+		__tr2qs_ctx("Abort filtering","logview"), m_logList.count(),

+                          this, "progress", TRUE );

+#else

 	QProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),

 		__tr2qs_ctx("Abort filtering","logview"), m_logList.count(),

-                          this, "progress", TRUE );
-
-	int i=0;
-	for(pFile=m_logList.first();pFile;pFile=m_logList.next())
-	{
+                          this, "progress", TRUE );

+#endif

+

+

+	int i=0;

+	for(pFile=m_logList.first();pFile;pFile=m_logList.next())

+	{

 		progress.setProgress( i );

 		i++;

 		g_pApp->processEvents();

 

 		if ( progress.wasCanceled() )

-			break;
-
-		if(pFile->type()==KviLogFile::Channel && !bShowChannel)
-			continue;
-		if(pFile->type()==KviLogFile::Console && !bShowConsole)
-			continue;
-		if(pFile->type()==KviLogFile::DccChat && !bShowDccChat)
-			continue;
-		if(pFile->type()==KviLogFile::Other && !bShowOther)
-			continue;
-		if(pFile->type()==KviLogFile::Query && !bShowQuery)
-			continue;
-
-		if(filterFromDate)
-			if(pFile->date()<fromDate)
-				continue;
-
-		if(filterToDate)
-			if(pFile->date()>toDate)
-				continue;
-
-		if(enableNameFilter)
-			if(!KviQString::matchStringCI(nameFilterText,pFile->name()))
-				continue;
-
-		if(enableContentFilter)
-		{
-			pFile->getText(textBuffer,m_szLogDirectory);
-			if(!KviQString::matchStringCI(contentFilterText,textBuffer))
-				continue;
-		}
-
-		if(pLastCategory)
-		{
-			if(pLastCategory->m_type!=pFile->type())
-				pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
-		} else {
-			pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
-		}
-
-		KviQString::sprintf(szCurGroup,__tr2qs_ctx("%Q on %Q","logview"),&(pFile->name()),
-			&(pFile->network())
-			);
-
-		if(szLastGroup!=szCurGroup) {
-			szLastGroup=szCurGroup;
-			pLastGroupItem=new KviLogListViewItemFolder(pLastCategory,szLastGroup);
-		}
-		new KviLogListViewLog(pLastGroupItem,pFile->type(),pFile);
-	}
-	progress.setProgress( m_logList.count() );
-}
-
-void KviLogViewMDIWindow::cacheFileList()
-{
-	QStringList m_pFileNames = getFileNames();
-	m_pFileNames.sort();
-	QString szFname;
-
-    for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it)
-    {
-        szFname=(*it);
-        QFileInfo fi(szFname);
-		if(fi.extension(false)=="gz" || fi.extension(false)=="log")
-			m_logList.append(new KviLogFile(szFname));
-	}
-}
-
-void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
-{
-	bool bCompressed=0;
-	//A parent node
-	m_pIrcView->clearBuffer();
-	if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
-	{
-		return;
-	}
-	
-	QString text;
-	((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
-
-	QStringList lines=QStringList::split('\n',text);
-	bool bOk;
-	int iMsgType;
-	for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
-		QString num=(*it).section(' ',0,0);
-		iMsgType=num.toInt(&bOk);
-		if(bOk)
-			outputNoFmt(iMsgType,(*it).section(' ',1),KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
-		else
-			outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
-	}
-	m_pIrcView->repaint(false);
-}
-
-QStringList KviLogViewMDIWindow::getFileNames()
-{
-    QString logPath;
-    g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
-    QString qPath(logPath);
-    QDir logDir(qPath);
-    return logDir.entryList();
-}
-
-void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int )
-{
-	if(!it) return;
-	if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
-	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
-	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));
-	popup->exec( QCursor::pos() );
-}
-
-void KviLogViewMDIWindow::deleteCurrent()
-{
-	KviLogListViewItem* pItem = (KviLogListViewItem *)(m_pListView->currentItem());
-	if(pItem)
-	{
-		if(!pItem->fileName(0).isNull())
-		{
-			QString szFname;
-			g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->fileName(0));
-			KviFileUtils::removeFile(szFname);
-			delete pItem;
-			m_pIrcView->clearBuffer();
-		}
-	}
-}
-
-KviLogFile::KviLogFile(const QString& name)
-{
-	m_szFilename=name;
-	QFileInfo fi(m_szFilename);
-	m_bCompressed=(fi.extension(false)=="gz");
-	QString typeToken = m_szFilename.section('_',0,0);
-    // Ignore non-logs files, this includes '.' and '..'
-	if( KviQString::equalCI(typeToken,"channel") )
-		m_type = Channel;
-	else if( KviQString::equalCI(typeToken,"console") )
-		m_type = Console;
-	else if( KviQString::equalCI(typeToken,"dccchat") )
-		m_type = DccChat;
-	else if( KviQString::equalCI(typeToken,"query") )
-		m_type = Query;
-	else
-		m_type = Other;
-
-	KviStr undecoded = m_szFilename.section('.',0,0);
-	undecoded.cutToFirst('_');
-	m_szName = undecoded.hexDecode(undecoded.ptr()).ptr();
-
-	undecoded = m_szFilename.section('.',1,1).section('_',0,0);
-	m_szNetwork = undecoded.hexDecode(undecoded.ptr()).ptr();
-	
-	QString szDate = m_szFilename.section('.',1,3).section('_',1,1);
-	int iYear = szDate.section('.',0,0).toInt();
-	int iMonth = szDate.section('.',1,1).toInt();
-	int iDay = szDate.section('.',2,2).toInt();
-	m_date.setYMD(iYear,iMonth,iDay);
-	
-	//debug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
-}
-
-void KviLogFile::getText(QString & text,const QString& logDir){
-	QString logName = logDir;
-	QFile logFile;
-	logName.append(fileName());
-#ifdef COMPILE_ZLIB_SUPPORT
-	if(m_bCompressed)
-	{
-		gzFile file=gzopen(logName.local8Bit().data(),"rb");
-		if(file)
-		{
-			char buff[1025];
-			int len;
-			QCString data;
-			len=gzread(file,buff,1024);
-			while(len>0)
-			{
-				buff[len]=0;
-				data.append(buff);
-				len=gzread(file,buff,1024);
-			}
-			gzclose(file);
-			text = QString::fromUtf8(data);
-		} else {
-			debug("Cannot open compressed file %s",logName.local8Bit().data());
-		}
-	} else {
-#endif
-		logFile.setName(logName);
-		
-		if(!logFile.open(IO_ReadOnly))
-		return;
-	
-		QByteArray bytes;
-		bytes=logFile.readAll();
-		text = QString::fromUtf8(bytes.data(), bytes.size());
-		logFile.close();
-#ifdef COMPILE_ZLIB_SUPPORT
-	}
-#endif
-}
-
-#include "logviewmdiwindow.moc"
+			break;

+

+		if(pFile->type()==KviLogFile::Channel && !bShowChannel)

+			continue;

+		if(pFile->type()==KviLogFile::Console && !bShowConsole)

+			continue;

+		if(pFile->type()==KviLogFile::DccChat && !bShowDccChat)

+			continue;

+		if(pFile->type()==KviLogFile::Other && !bShowOther)

+			continue;

+		if(pFile->type()==KviLogFile::Query && !bShowQuery)

+			continue;

+

+		if(filterFromDate)

+			if(pFile->date()<fromDate)

+				continue;

+

+		if(filterToDate)

+			if(pFile->date()>toDate)

+				continue;

+

+		if(enableNameFilter)

+			if(!KviQString::matchStringCI(nameFilterText,pFile->name()))

+				continue;

+

+		if(enableContentFilter)

+		{

+			pFile->getText(textBuffer,m_szLogDirectory);

+			if(!KviQString::matchStringCI(contentFilterText,textBuffer))

+				continue;

+		}

+

+		if(pLastCategory)

+		{

+			if(pLastCategory->m_type!=pFile->type())

+				pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());

+		} else {

+			pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());

+		}

+

+		KviQString::sprintf(szCurGroup,__tr2qs_ctx("%Q on %Q","logview"),&(pFile->name()),

+			&(pFile->network())

+			);

+

+		if(szLastGroup!=szCurGroup) {

+			szLastGroup=szCurGroup;

+			pLastGroupItem=new KviLogListViewItemFolder(pLastCategory,szLastGroup);

+		}

+		new KviLogListViewLog(pLastGroupItem,pFile->type(),pFile);

+	}

+	progress.setProgress( m_logList.count() );

+}

+

+void KviLogViewMDIWindow::cacheFileList()

+{

+	QStringList m_pFileNames = getFileNames();

+	m_pFileNames.sort();

+	QString szFname;

+

+    for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it)

+    {

+        szFname=(*it);

+        QFileInfo fi(szFname);

+		if(fi.extension(false)=="gz" || fi.extension(false)=="log")

+			m_logList.append(new KviLogFile(szFname));

+	}

+}

+

+void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)

+{

+	bool bCompressed=0;

+	//A parent node

+	m_pIrcView->clearBuffer();

+	if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )

+	{

+		return;

+	}

+	

+	QString text;

+	((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);

+

+	QStringList lines=QStringList::split('\n',text);

+	bool bOk;

+	int iMsgType;

+	for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {

+		QString num=(*it).section(' ',0,0);

+		iMsgType=num.toInt(&bOk);

+		if(bOk)

+			outputNoFmt(iMsgType,(*it).section(' ',1),KviIrcView::NoRepaint | KviIrcView::NoTimestamp);

+		else

+			outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp);

+	}

+	m_pIrcView->repaint(false);

+}

+

+QStringList KviLogViewMDIWindow::getFileNames()

+{

+    QString logPath;

+    g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);

+    QString qPath(logPath);

+    QDir logDir(qPath);

+    return logDir.entryList();

+}

+

+void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int )

+{

+	if(!it) return;

+	if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;

+	KviTalPopupMenu* popup = new KviTalPopupMenu(this);

+	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));

+	popup->exec( QCursor::pos() );

+}

+

+void KviLogViewMDIWindow::deleteCurrent()

+{

+	KviLogListViewItem* pItem = (KviLogListViewItem *)(m_pListView->currentItem());

+	if(pItem)

+	{

+		if(!pItem->fileName(0).isNull())

+		{

+			QString szFname;

+			g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->fileName(0));

+			KviFileUtils::removeFile(szFname);

+			delete pItem;

+			m_pIrcView->clearBuffer();

+		}

+	}

+}

+

+KviLogFile::KviLogFile(const QString& name)

+{

+	m_szFilename=name;

+	QFileInfo fi(m_szFilename);

+	m_bCompressed=(fi.extension(false)=="gz");

+	QString typeToken = m_szFilename.section('_',0,0);

+    // Ignore non-logs files, this includes '.' and '..'

+	if( KviQString::equalCI(typeToken,"channel") )

+		m_type = Channel;

+	else if( KviQString::equalCI(typeToken,"console") )

+		m_type = Console;

+	else if( KviQString::equalCI(typeToken,"dccchat") )

+		m_type = DccChat;

+	else if( KviQString::equalCI(typeToken,"query") )

+		m_type = Query;

+	else

+		m_type = Other;

+

+	KviStr undecoded = m_szFilename.section('.',0,0);

+	undecoded.cutToFirst('_');

+	m_szName = undecoded.hexDecode(undecoded.ptr()).ptr();

+

+	undecoded = m_szFilename.section('.',1,1).section('_',0,0);

+	m_szNetwork = undecoded.hexDecode(undecoded.ptr()).ptr();

+	

+	QString szDate = m_szFilename.section('.',1,3).section('_',1,1);

+	int iYear = szDate.section('.',0,0).toInt();

+	int iMonth = szDate.section('.',1,1).toInt();

+	int iDay = szDate.section('.',2,2).toInt();

+	m_date.setYMD(iYear,iMonth,iDay);

+	

+	//debug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);

+}

+

+void KviLogFile::getText(QString & text,const QString& logDir){

+	QString logName = logDir;

+	QFile logFile;

+	logName.append(fileName());

+#ifdef COMPILE_ZLIB_SUPPORT

+	if(m_bCompressed)

+	{

+		gzFile file=gzopen(logName.local8Bit().data(),"rb");

+		if(file)

+		{

+			char buff[1025];

+			int len;

+			KviQCString data;

+			//QCString data;

+			len=gzread(file,buff,1024);

+			while(len>0)

+			{

+				buff[len]=0;

+				data.append(buff);

+				len=gzread(file,buff,1024);

+			}

+			gzclose(file);

+			text = QString::fromUtf8(data);

+		} else {

+			debug("Cannot open compressed file %s",logName.local8Bit().data());

+		}

+	} else {

+#endif

+		logFile.setName(logName);

+		

+		if(!logFile.open(IO_ReadOnly))

+		return;

+	

+		QByteArray bytes;

+		bytes=logFile.readAll();

+		text = QString::fromUtf8(bytes.data(), bytes.size());

+		logFile.close();

+#ifdef COMPILE_ZLIB_SUPPORT

+	}

+#endif

+}

+

+#include "logviewmdiwindow.moc"