From 0eff6f3f866b358ecfa4dfaecc85f5dfa916654b Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Mon, 5 Mar 2007 19:12:15 +0000 Subject: filesysyem icons git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@408 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/kvirc/ui/kvi_channel.cpp | 2 +- src/kvirc/ui/kvi_ircview.cpp | 17 ++++++++++------- src/kvirc/ui/kvi_ircview.h | 9 ++++++--- src/modules/my/win32/idleui_05.vcproj | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index bbd8844c7..139966cc1 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -201,7 +201,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name //setFocusHandler(m_pInput,this); // And turn on the secondary IRC view if needed - if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging(0); + if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging(); applyOptions(); m_joinTime = QDateTime::currentDateTime(); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 906579188..6ffad4180 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -680,18 +680,15 @@ void KviIrcView::masterDead() m_pMasterView = 0; } -bool KviIrcView::startLogging(const char *filename,bool bPrependCurBuffer) +bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) { stopLogging(); - QString fName; + QString szFname = szFname; - QString szFname(filename); - - if(!filename) + if(fname.isEmpty()) { if(!m_pKviWindow)return false; - m_pKviWindow->getDefaultLogFileName(fName); - szFname=fName; + m_pKviWindow->getDefaultLogFileName(szFname); } #ifdef COMPILE_ZLIB_SUPPORT @@ -830,6 +827,12 @@ void KviIrcView::clearLineMark(bool bRepaint) #endif } } + +void KviIrcView::checkLogDate() +{ + QDate::currentDate(); +} + void KviIrcView::clearUnreaded() { m_bHaveUnreadedHighlightedMessages = false; diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index a12f2e277..aa1f08abc 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -64,7 +64,8 @@ public: public: int dummyRead() const { return 0; }; private: - int m_iFlushTimer; + QDate m_lastLogDay; + int m_iFlushTimer; KviIrcViewLine * m_pFirstLine; KviIrcViewLine * m_pCurLine; // Bottom line in the view KviIrcViewLine * m_pLastLine; @@ -84,7 +85,7 @@ private: QPixmap * m_pPrivateBackgroundPixmap; QScrollBar * m_pScrollBar; QToolButton * m_pToolsButton; - KviTalPopupMenu * m_pToolsPopup; + KviTalPopupMenu * m_pToolsPopup; KviIrcViewToolWidget * m_pToolWidget; @@ -139,6 +140,7 @@ private: bool m_bHaveUnreadedHighlightedMessages; bool m_bHaveUnreadedMessages; public: + void checkLogDate(); void clearUnreaded(); void applyOptions(); void enableDnd(bool bEnable); @@ -165,7 +167,8 @@ public: //============================================================================================== // Logging // Stops previous logging session too... - bool startLogging(const char *filename,bool bPrependCurBuffer = false); + bool startLogging(bool bPrependCurBuffer = false); + bool startLogging(const QString& fname = QString::null,bool bPrependCurBuffer = false); void stopLogging(); bool isLogging(){ return (m_pLogFile != 0); }; void getLogFileName(KviStr &buffer); diff --git a/src/modules/my/win32/idleui_05.vcproj b/src/modules/my/win32/idleui_05.vcproj index 03208f917..b1c39cd41 100644 --- a/src/modules/my/win32/idleui_05.vcproj +++ b/src/modules/my/win32/idleui_05.vcproj @@ -187,7 +187,7 @@ />