aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/logview/logviewmdiwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/logview/logviewmdiwindow.cpp')
-rw-r--r--src/modules/logview/logviewmdiwindow.cpp56
1 files changed, 29 insertions, 27 deletions
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 78f822d4e..9d785cb13 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -33,11 +33,9 @@
#include "kvi_qcstring.h"
#include "kvi_app.h"
#include "kvi_fileutils.h"
-#include "kvi_tal_listview.h"
#include "kvi_tal_popupmenu.h"
#include <QList>
-#include <q3progressdialog.h>
#include <QPixmap>
#include <QSplitter>
#include <QToolButton>
@@ -46,6 +44,7 @@
#include <QCursor>
#include <QLayout>
#include <QPushButton>
+#include <QProgressDialog>
#include <QTextCodec>
#include <QDateTimeEdit>
#include <QLineEdit>
@@ -65,23 +64,24 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
g_pLogViewWindow = this;
// m_pLogViewWidget = new KviLogViewWidget(this);
- m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
+ m_pSplitter = new QSplitter(Qt::Horizontal,this);
+ m_pSplitter->setObjectName("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_pTabWidget->addTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));
+ m_pListView = new KviTalTreeWidget(m_pIndexTab);
+ m_pListView->addColumn(__tr2qs_ctx("Log File","logview"));
+ //m_pListView->setColumnWidth(0,m_pListView->viewport()->width());
m_pListView->setAllColumnsShowFocus(true);
- m_pListView->setMultiSelection(false);
- m_pListView->setShowSortIndicator(true);
+ m_pListView->setSelectionMode(QAbstractItemView::SingleSelection);
+ m_pListView->header()->setSortIndicatorShown(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 )));
+ connect(m_pListView,SIGNAL(selectionChanged(KviTalTreeWidgetItem *)),this,SLOT(itemSelected(KviTalTreeWidgetItem *)));
+ connect(m_pListView,SIGNAL(rightButtonClicked ( KviTalTreeWidgetItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( KviTalTreeWidgetItem * , const QPoint &, int )));
m_pSearchTab = new QWidget(m_pTabWidget);
- m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
+ m_pTabWidget->addTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
QGridLayout *layout = new QGridLayout(m_pSearchTab);
@@ -192,11 +192,11 @@ 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 = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data());
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 = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data());
m_szHtmlInactiveCaption.append(m_szPlainTextCaption);
m_szHtmlInactiveCaption.append("</b></font></nobr>");
}
@@ -240,14 +240,16 @@ void KviLogViewMDIWindow::setupItemList()
QDate toDate = m_pToDateEdit->date();
QString textBuffer;
- Q3ProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
- __tr2qs_ctx("Abort filtering","logview"), m_logList.count(),
- this, "progress", TRUE );
+ QProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
+ __tr2qs_ctx("Abort filtering","logview"), 0, m_logList.count(),
+ this);
+ progress.setObjectName("progress");
+ progress.setModal(TRUE);
int i=0;
for(pFile=m_logList.first();pFile;pFile=m_logList.next())
{
- progress.setProgress( i );
+ progress.setValue( i );
i++;
g_pApp->processEvents();
@@ -302,7 +304,7 @@ void KviLogViewMDIWindow::setupItemList()
}
new KviLogListViewLog(pLastGroupItem,pFile->type(),pFile);
}
- progress.setProgress( m_logList.count() );
+ progress.setValue( m_logList.count() );
}
void KviLogViewMDIWindow::cacheFileList()
@@ -315,12 +317,12 @@ void KviLogViewMDIWindow::cacheFileList()
{
szFname=(*it);
QFileInfo fi(szFname);
- if(fi.extension(false)=="gz" || fi.extension(false)=="log")
+ if(fi.suffix()=="gz" || fi.suffix()=="log")
m_logList.append(new KviLogFile(szFname));
}
}
-void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
+void KviLogViewMDIWindow::itemSelected(KviTalTreeWidgetItem * it)
{
bool bCompressed=0;
//A parent node
@@ -333,7 +335,7 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
QString text;
((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
- QStringList lines=QStringList::split('\n',text);
+ QStringList lines= text.split('\n');
bool bOk;
int iMsgType;
for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
@@ -344,7 +346,7 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
else
outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
}
- m_pIrcView->repaint(false);
+ m_pIrcView->repaint();
}
QStringList KviLogViewMDIWindow::getFileNames()
@@ -356,7 +358,7 @@ QStringList KviLogViewMDIWindow::getFileNames()
return logDir.entryList();
}
-void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int )
+void KviLogViewMDIWindow::rightButtonClicked ( KviTalTreeWidgetItem * it, const QPoint &, int )
{
if(!it) return;
if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
@@ -387,7 +389,7 @@ KviLogFile::KviLogFile(const QString& name)
m_szFilename=name;
QFileInfo fi(m_szFilename);
- m_bCompressed=(fi.extension(false)=="gz");
+ m_bCompressed=(fi.suffix()=="gz");
if(m_bCompressed)
{
//removes trailing dot and extension
@@ -450,9 +452,9 @@ void KviLogFile::getText(QString & text,const QString& logDir){
}
} else {
#endif
- logFile.setName(logName);
+ logFile.setFileName(logName);
- if(!logFile.open(IO_ReadOnly))
+ if(!logFile.open(QIODevice::ReadOnly))
return;
QByteArray bytes;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:16:50 +0000