aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt6
-rw-r--r--TODO-Qt417
-rw-r--r--src/kvilib/CMakeLists.txt18
-rw-r--r--src/kvirc/CMakeLists.txt16
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp29
-rw-r--r--src/kvirc/ui/kvi_splash.cpp38
-rw-r--r--src/kvirc/ui/kvi_splash.h18
-rw-r--r--src/kvirc/ui/kvi_statusbar.cpp46
-rw-r--r--src/kvirc/ui/kvi_statusbar.h17
-rw-r--r--src/kvirc/ui/kvi_statusbarapplet.cpp46
-rw-r--r--src/kvirc/ui/kvi_statusbarapplet.h16
-rw-r--r--src/kvirc/ui/kvi_taskbar.cpp120
-rw-r--r--src/kvirc/ui/kvi_taskbar.h37
-rw-r--r--src/kvirc/ui/kvi_toolbar.cpp19
-rw-r--r--src/kvirc/ui/kvi_toolwindows_container.cpp56
-rw-r--r--src/kvirc/ui/kvi_toolwindows_container.h34
-rw-r--r--src/kvirc/ui/kvi_topicw.cpp31
-rw-r--r--src/kvirc/ui/kvi_topicw.h12
-rw-r--r--src/kvirc/ui/kvi_userlistview.cpp62
-rw-r--r--src/kvirc/ui/kvi_userlistview.h14
-rw-r--r--src/kvirc/ui/kvi_window.cpp270
-rw-r--r--src/kvirc/ui/kvi_window.h35
22 files changed, 299 insertions, 658 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b7fdcbb6..a0affe837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,10 +42,10 @@ SET(
IF(UNIX)
IF(APPLE)
# MacOS X
- IF (NOT DEFINED INSTALL_PREFIX)
+ IF(NOT DEFINED INSTALL_PREFIX)
SET(INSTALL_PREFIX ${CMAKE_BINARY_DIR}/KVirc.app)
SET(KVI_INSTALL_PREFIX ${INSTALL_PREFIX}/Contents/Resources)
- ENDIF (NOT DEFINED INSTALL_PREFIX)
+ ENDIF()
ELSE()
# Linux
SET(INSTALL_PREFIX /usr/local)
@@ -103,7 +103,6 @@ IF(CMAKE_USE_WIN32_THREADS_INIT OR CMAKE_USE_PTHREADS_INIT)
ELSE()
IF(CMAKE_HAVE_THREADS_LIBRARY)
LIST(APPEND LIBS ${CMAKE_THREAD_LIBS_INIT})
- #SET(CMAKE_LIBRARIES "${CMAKE_LIBRARIES} pthread")
ENDIF()
SET(COMPILE_THREADS_USE_POSIX 1)
SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX")
@@ -181,7 +180,6 @@ FIND_PACKAGE(Perl REQUIRED)
FIND_PACKAGE(OpenSSL)
IF(OPENSSL_FOUND)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
- #SET(LIBS ${LIBS} ${OPENSSL_LIBRARIES})
LIST(APPEND LIBS ${OPENSSL_LIBRARIES})
IF(APPLE)
LIST(APPEND LIBS -lcrypto)
diff --git a/TODO-Qt4 b/TODO-Qt4
index b747bdd08..db434c7b4 100644
--- a/TODO-Qt4
+++ b/TODO-Qt4
@@ -75,30 +75,17 @@ src/kvirc/ui
kvi_scripteditor.h
kvi_selectors.cpp
kvi_selectors.h
- kvi_splash.cpp
- kvi_splash.h
+
kvi_statusbar.cpp
- kvi_statusbar.h
- kvi_statusbarapplet.cpp
- kvi_statusbarapplet.h
kvi_styled_controls.cpp
kvi_styled_controls.h
- kvi_taskbar.cpp
- kvi_taskbar.h
+
kvi_texticonwin.cpp
kvi_texticonwin.h
kvi_themedlabel.cpp
kvi_themedlabel.h
- kvi_toolbar.cpp
- kvi_toolbar.h
kvi_toolwindows_container.cpp
kvi_toolwindows_container.h
- kvi_topicw.cpp
- kvi_topicw.h
- kvi_userlistview.cpp
- kvi_userlistview.h
- kvi_window.cpp
- kvi_window.h
src/modules
actioneditor
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 3bbfd48a9..34a93a7ed 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -176,9 +176,15 @@ TARGET_LINK_LIBRARIES(kvilib ${LIBS})
# Installation directives
SET_TARGET_PROPERTIES(kvilib PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
-IF (APPLE)
-SET_TARGET_PROPERTIES(kvilib PROPERTIES INSTALL_NAME_DIR "@executable_path/../Frameworks")
-INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Frameworks)
-ELSE (APPLE)
-INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/lib)
-ENDIF (APPLE)
+IF(UNIX)
+ IF(APPLE)
+ SET_TARGET_PROPERTIES(kvilib PROPERTIES INSTALL_NAME_DIR "@executable_path/../Frameworks")
+ INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Frameworks)
+ ELSE()
+ # Assume linux
+ INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/lib)
+ ENDIF()
+ELSE()
+ # Windows
+ # INSTALL(TARGETS kvilib LIBRARY DESTINATION ???)
+ENDIF()
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 0c5827c7a..f0a30d153 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -437,8 +437,14 @@ ADD_EXECUTABLE(${PACKAGE}-${VERSION_MAJOR} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
TARGET_LINK_LIBRARIES(${PACKAGE}-${VERSION_MAJOR} kvilib ${LIBS})
# Installation directives
-IF (APPLE)
-INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/Contents/MacOS)
-ELSE (APPLE)
-INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/bin)
-ENDIF (APPLE)
+IF(UNIX)
+ IF(APPLE)
+ INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/Contents/MacOS)
+ ELSE()
+ # Assume linux
+ INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/bin)
+ ENDIF()
+ELSE()
+ # Windows
+ #INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ???)
+ENDIF()
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 75167b0ae..785fa2b37 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -544,7 +544,7 @@ void KviApp::findGlobalKvircDirectory()
// I do it in that way...
#ifdef COMPILE_KDE_SUPPORT
// KDE compilation ...
- // The things usually go installed into $KDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
+ // The things usually go installed into $KDEDIR/share/apps/kvirc/$VERSION_BRANCH
// Look in the main KDE directory
KStandardDirs * d = dirs();
if(d)
@@ -554,7 +554,8 @@ void KviApp::findGlobalKvircDirectory()
#ifdef HAVE_GETENV
//KDEDIR sanity check...
m_szGlobalKvircDir = getenv("KDEDIR");
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ //m_szGlobalKvircDir+="/share/apps/kvirc/" VERSION_BRANCH;
m_szGlobalKvircDir+="/share/apps/kvirc/4.0/";
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
#endif
@@ -562,13 +563,14 @@ void KviApp::findGlobalKvircDirectory()
// FAILED ? Check the usual way...
#endif //COMPILE_WITH_KDE
- // Non KDE compilation , or not found under $KDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
+ // Non KDE compilation , or not found under $KDEDIR/share/apps/kvirc/$VERSION_BRANCH
// Check for MacOS X Bundle compilation
#ifdef Q_OS_MACX
m_szGlobalKvircDir = applicationDirPath();
m_szGlobalKvircDir+= "/../Resources/kvirc/";
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ //m_szGlobalKvircDir+= VERSION_BRANCH;
m_szGlobalKvircDir+= "4.0/";
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
#endif //Q_OS_MACX
@@ -578,7 +580,8 @@ void KviApp::findGlobalKvircDirectory()
for(int i=0;usualKvircGlobalDir[i] != 0;i++){
m_szGlobalKvircDir = usualKvircGlobalPrePath[j];
m_szGlobalKvircDir+= usualKvircGlobalDir[i];
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ //m_szGlobalKvircDir+= VERSION_BRANCH;
m_szGlobalKvircDir+= "4.0/";
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
@@ -588,7 +591,8 @@ void KviApp::findGlobalKvircDirectory()
for(int k=0;usualKvircGlobalDir[k] != 0;k++){
m_szGlobalKvircDir = QDir::homeDirPath();
m_szGlobalKvircDir+= usualKvircGlobalDir[k];
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ //m_szGlobalKvircDir+= VERSION_BRANCH;
m_szGlobalKvircDir+= "4.0/";
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
@@ -598,7 +602,8 @@ void KviApp::findGlobalKvircDirectory()
m_szGlobalKvircDir = QDir::homeDirPath();
m_szGlobalKvircDir+= "/.kde";
m_szGlobalKvircDir+= usualKvircGlobalDir[k];
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ //m_szGlobalKvircDir+= VERSION_BRANCH;
m_szGlobalKvircDir+= "4.0/";
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
@@ -813,7 +818,8 @@ void KviApp::saveKvircDirectory()
{
/*
#ifdef COMPILE_ON_WINDOWS
- #warning you must change back hardcoded 4.0 to KVI_VERSION_BRANCH
+ #warning you must change back hardcoded 4.0 to VERSION_BRANCH
+ KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",VERSION_BRANCH);
KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",4.0);
WritePrivateProfileString("kvirc",szKey.ptr(),m_szLocalKvircDir.ptr(),KVI_HOME_CONFIG_FILE_NAME);
#else //!COMPILE_ON_WINDOWS
@@ -822,7 +828,8 @@ void KviApp::saveKvircDirectory()
#ifdef COMPILE_KDE_SUPPORT
// In KDE we use the application config file
if(m_szConfigFile.isEmpty())
- { // not if user supplied a config file
+ {
+ // not if user supplied a config file
KConfig * cfg = config();
if(cfg)
{
@@ -838,10 +845,10 @@ void KviApp::saveKvircDirectory()
}
#endif //COMPILE_KDE_SUPPORT
// In NON-KDE we use $HOME/.kvirc.rc or $HOME/kvirc.ini
-
QString szF = QDir::homeDirPath();
if(!m_szConfigFile.isEmpty())
- {//Must be changed from QString::fromLocal8Bit to QTextCodec::codecForLocale()
+ {
+ //Must be changed from QString::fromLocal8Bit to QTextCodec::codecForLocale()
QString szConfig = m_szConfigFile;
if(QDir::isRelativePath(szConfig))
{
diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp
index e2a5d6ae6..1eff5f217 100644
--- a/src/kvirc/ui/kvi_splash.cpp
+++ b/src/kvirc/ui/kvi_splash.cpp
@@ -29,15 +29,12 @@
#include "kvi_splash.h"
#include "kvi_locale.h"
#include "kvi_fileutils.h"
-#include <qsplashscreen.h>
-#ifdef COMPILE_USE_QT4
- #include <qdesktopwidget.h>
-#endif
-
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qlayout.h>
+#include <QSplashScreen>
+#include <QDesktopWidget>
+#include <QPixmap>
+#include <QPainter>
+#include <QLayout>
#include <stdio.h>
@@ -107,14 +104,12 @@ KviSplashScreen::KviSplashScreen()
connect(m_pTimer,SIGNAL(timeout()),this,SLOT(suicide()));
delete pix;
-#ifdef COMPILE_USE_QT4
setWindowOpacity(0);
m_bIncreasing=true;
m_rTransparency=0;
m_pFadeTimer= new QTimer(this);
connect(m_pFadeTimer,SIGNAL(timeout()),this,SLOT(fadeTimerShot()));
m_pFadeTimer->start(6);
-#endif
}
// We don't need messages on the splash: they just add work to the translators and nobody can read them anyway :D
@@ -130,7 +125,6 @@ KviSplashScreen::~KviSplashScreen()
delete m_pOverlay;
}
-
void KviSplashScreen::showEvent(QShowEvent *e)
{
move((g_pApp->desktop()->width() - width())/2,
@@ -145,7 +139,6 @@ void KviSplashScreen::hideEvent(QHideEvent *e)
void KviSplashScreen::setProgress(int progress)
{
-#ifdef COMPILE_USE_QT4
QPixmap slowQt4Copy = pixmap();
QPainter painter(&slowQt4Copy);
QSize size = slowQt4Copy.size();
@@ -153,12 +146,7 @@ void KviSplashScreen::setProgress(int progress)
painter.drawPixmap(0,size.height() - m_pOverlay->height(),w,m_pOverlay->height(),*m_pOverlay,0,0,w,m_pOverlay->height());
painter.end();
setPixmap(slowQt4Copy);
-#else
- QPainter painter(pixmap());
- QSize size = pixmap()->size();
- painter.drawPixmap(0,size.height() - m_pOverlay->height(),*m_pOverlay,0,0,(m_pOverlay->width() * progress) / 100,m_pOverlay->height());
- painter.end();
-#endif
+
//raise();
repaint();
g_pApp->processEvents(); //damn...
@@ -168,19 +156,10 @@ void KviSplashScreen::setProgress(int progress)
void KviSplashScreen::die()
{
-#ifdef COMPILE_USE_QT4
m_bIncreasing = false;
m_pFadeTimer->start(6);
-#else
- QTime now = QTime::currentTime();
- int mSecs = m_creationTime.msecsTo(now);
- int mRemaining = KVI_SPLASH_SCREEN_MINIMUM_TIMEOUT_IN_MSECS - mSecs;
- if(mRemaining < 0)mRemaining = 0;
- m_pTimer->start(mRemaining,true);
-#endif
}
-
void KviSplashScreen::suicide()
{
if(!g_pSplashScreen)return; // already in suicide ?
@@ -190,10 +169,8 @@ void KviSplashScreen::suicide()
//delete this;
}
-
void KviSplashScreen::fadeTimerShot()
{
-#ifdef COMPILE_USE_QT4
if(m_bIncreasing)
{
m_rTransparency+=0.05;
@@ -203,8 +180,6 @@ void KviSplashScreen::fadeTimerShot()
m_pFadeTimer->stop();
m_bIncreasing=false;
}
-
-
} else {
m_rTransparency-=0.02;
setWindowOpacity(m_rTransparency);
@@ -215,7 +190,6 @@ void KviSplashScreen::fadeTimerShot()
suicide();
}
}
-#endif
}
diff --git a/src/kvirc/ui/kvi_splash.h b/src/kvirc/ui/kvi_splash.h
index 2e7da11ad..9f8e65cc5 100644
--- a/src/kvirc/ui/kvi_splash.h
+++ b/src/kvirc/ui/kvi_splash.h
@@ -26,15 +26,13 @@
#include "kvi_settings.h"
-
-#include <qframe.h>
-
-#include <qprogressbar.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qdatetime.h>
-#include <qsplashscreen.h>
-#include <qpixmap.h>
+#include <QFrame>
+#include <QProgressBar>
+#include <QLabel>
+#include <QTimer>
+#include <QDateTime>
+#include <QSplashScreen>
+#include <QPixmap>
class KVIRC_API KviSplashScreen : public QSplashScreen
{
@@ -46,11 +44,9 @@ private:
QTimer * m_pTimer;
QTime m_creationTime;
QPixmap * m_pOverlay;
-#ifdef COMPILE_USE_QT4
bool m_bIncreasing;
qreal m_rTransparency;
QTimer * m_pFadeTimer;
-#endif
protected:
virtual void showEvent(QShowEvent * e);
virtual void hideEvent(QHideEvent * e);
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 6bdab2d42..c899ee058 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -26,9 +26,6 @@
#include "kvi_statusbar.h"
#include "kvi_frame.h"
-
-#include <qlabel.h>
-
#include "kvi_iconmanager.h"
#include "kvi_window.h"
#include "kvi_irccontext.h"
@@ -37,45 +34,35 @@
#include "kvi_locale.h"
#include "kvi_app.h"
#include "kvi_config.h"
+#include "kvi_time.h"
+#include "kvi_qstring.h"
#include "kvi_modulemanager.h"
#include "kvi_statusbarapplet.h"
#include "kvi_dynamictooltip.h"
-
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qcursor.h>
#include "kvi_tal_popupmenu.h"
-#include <qpixmap.h>
-#ifdef COMPILE_USE_QT4
- #include <qevent.h>
-#endif
+#include <QPainter>
+#include <QStyle>
+#include <QLayout>
+#include <QTimer>
+#include <QCursor>
+#include <QPixmap>
+#include <QLabel>
+#include <QFont>
+#include <QEvent>
+#include <QMouseEvent>
// This class COULD be derived also from KStatusBar but in fact
// it adds no graphic functionality and it has only useless methods for us.
// ... for now let's keep it simple :)
-
-#include "kvi_time.h"
-#include "kvi_qstring.h"
-
-#include <qfont.h>
-
/*
IDEAS:
- Countdown timer
*/
-
-
-
-
-
KviStatusBar::KviStatusBar(KviFrame * pFrame)
: QStatusBar(pFrame)
{
-
setProperty("name","statusbar");
m_pFrame = pFrame;
// ugh :D
@@ -105,11 +92,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
m_pMessageLabel = new QLabel("<b>[x]</b> x",this,"msgstatuslabel");
m_pMessageLabel->setMargin(1);
-#ifdef COMPILE_USE_QT4
m_pMessageLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
-#else
- m_pMessageLabel->setAlignment(SingleLine | Qt::AlignVCenter | Qt::AlignLeft);
-#endif
m_pMessageLabel->setMinimumWidth(350);
m_iLastMinimumHeight = 0;
@@ -486,11 +469,7 @@ void KviStatusBar::mousePressEvent(QMouseEvent * e)
m_pClickedApplet = appletAt(mapToGlobal(e->pos()));
if(!m_pClickedApplet)return;
m_pClickedApplet->select();
-#ifdef COMPILE_USE_QT4
g_pApp->setOverrideCursor(Qt::SizeAllCursor);
-#else
- g_pApp->setOverrideCursor(sizeAllCursor);
-#endif
}
}
@@ -595,7 +574,6 @@ void KviStatusBar::showFirstMessageInQueue()
m_pMessageTimer->start(pMsg->timeout());
}
-
void KviStatusBar::setPermanentMessage()
{
if(m_pMessageTimer)return; // something is being actually shown!
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 0569e2760..9b6e148a5 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -27,16 +27,19 @@
#include "kvi_settings.h"
#include "kvi_pointerlist.h"
#include "kvi_heapobject.h"
-
-#include <qstring.h>
#include "kvi_pointerhashtable.h"
-#include <qstatusbar.h>
-class KviFrame;
+#include <QString>
+#include <QStatusBar>
class QTimer;
class QLabel;
+class KviFrame;
class KviTalPopupMenu;
+class KviStatusBarApplet;
+class KviStatusBarAppletDescriptor;
+class KviIrcContext;
+class KviDynamicToolTip;
class KVIRC_API KviStatusBarMessage : public KviHeapObject
{
@@ -55,12 +58,6 @@ public:
unsigned int priority(){ return m_uPriority; };
};
-
-class KviStatusBarApplet;
-class KviStatusBarAppletDescriptor;
-class KviIrcContext;
-class KviDynamicToolTip;
-
class KVIRC_API KviStatusBar : public QStatusBar
{
friend class KviStatusBarApplet;
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 11f0a194a..6315600e2 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -39,30 +39,24 @@
#include "kvi_lagmeter.h"
#include "kvi_options.h"
#include "kvi_kvs_script.h"
-
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qcursor.h>
+#include "kvi_time.h"
+#include "kvi_qstring.h"
#include "kvi_tal_popupmenu.h"
-#include <qpixmap.h>
-#ifdef COMPILE_USE_QT4
- #include <qevent.h>
-#endif
+
+#include <QPainter>
+#include <QStyle>
+#include <QLayout>
+#include <QTimer>
+#include <QCursor>
+#include <QPixmap>
+#include <QFont>
+#include <QEvent>
+#include <QMouseEvent>
// This class COULD be derived also from KStatusBar but in fact
// it adds no graphic functionality and it has only useless methods for us.
// ... for now let's keep it simple :)
-
-
// FIXME: Applets in modules SHOULD be unregistered automatically on unload!
-
-#include "kvi_time.h"
-#include "kvi_qstring.h"
-
-#include <qfont.h>
-
/*
IDEAS:
- Lag meter
@@ -108,10 +102,6 @@ void KviStatusBarAppletDescriptor::unregisterApplet(KviStatusBarApplet * a)
}
-
-
-
-
KviStatusBarApplet::KviStatusBarApplet(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor)
: QLabel(pParent), m_pStatusBar(pParent), m_pDescriptor(pDescriptor)
{
@@ -138,15 +128,9 @@ void KviStatusBarApplet::paintEvent(QPaintEvent * e)
if(m_bSelected)
{
QPainter p(this);
-#ifdef COMPILE_USE_QT4
p.setCompositionMode(QPainter::CompositionMode_SourceOut);
p.fillRect(rect(),Qt::black);
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-#else
- p.setRasterOp(Qt::NotROP);
- p.fillRect(rect(),Qt::black);
- p.setRasterOp(Qt::CopyROP);
-#endif
}
}
@@ -158,8 +142,6 @@ void KviStatusBarApplet::select(bool bSelect)
}
-
-
KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor)
: KviStatusBarApplet(pParent,pDescriptor)
{
@@ -384,7 +366,6 @@ KviStatusBarApplet * CreateStatusBarLagIndicator(KviStatusBar * pBar,KviStatusBa
return new KviStatusBarLagIndicator(pBar,pDescriptor);
}
-
void KviStatusBarLagIndicator::selfRegister(KviStatusBar * pBar)
{
KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor(
@@ -393,7 +374,6 @@ void KviStatusBarLagIndicator::selfRegister(KviStatusBar * pBar)
}
-
KviStatusBarClock::KviStatusBarClock(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor)
: KviStatusBarApplet(pParent,pDescriptor)
{
@@ -538,7 +518,6 @@ void KviStatusBarConnectionTimer::selfRegister(KviStatusBar * pBar)
}
-
KviStatusBarSeparator::KviStatusBarSeparator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor)
: KviStatusBarApplet(pParent,pDescriptor)
{
@@ -560,4 +539,3 @@ void KviStatusBarSeparator::selfRegister(KviStatusBar * pBar)
__tr2qs("Separator"),"separator",CreateStatusBarSeparator);
pBar->registerAppletDescriptor(d);
}
-
diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h
index 3e37fb67c..5e4043ce4 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.h
+++ b/src/kvirc/ui/kvi_statusbarapplet.h
@@ -28,17 +28,16 @@
#include "kvi_pointerlist.h"
#include "kvi_heapobject.h"
#include "kvi_statusbar.h"
-
-#include <qstring.h>
#include "kvi_pointerhashtable.h"
-#include <qstatusbar.h>
-#include <qlabel.h>
-#include <qpixmap.h>
+
+#include <QString>
+#include <QStatusBar>
+#include <QLabel>
+#include <QPixmap>
class QTimer;
class QLabel;
class KviTalPopupMenu;
-
class KviConfig;
class KviFrame;
class KviIrcContext;
@@ -106,7 +105,6 @@ protected:
};
-
class KviStatusBarClock : public KviStatusBarApplet
{
Q_OBJECT
@@ -126,6 +124,7 @@ protected slots:
void toggleUtc();
};
+
class KviStatusBarConnectionTimer : public KviStatusBarApplet
{
Q_OBJECT
@@ -145,6 +144,7 @@ protected slots:
void toggleTotal();
};
+
class KviStatusBarSeparator : public KviStatusBarApplet
{
Q_OBJECT
@@ -155,6 +155,7 @@ public:
static void selfRegister(KviStatusBar * pBar);
};
+
class KviStatusBarAwayIndicator : public KviStatusBarApplet
{
Q_OBJECT
@@ -176,6 +177,7 @@ protected slots:
void toggleContext();
};
+
class KviStatusBarLagIndicator : public KviStatusBarApplet
{
Q_OBJECT
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 6a521956b..7078a0354 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -45,26 +45,20 @@
#include "kvi_channel.h"
#include "kvi_ircconnection.h"
#include "kvi_doublebuffer.h"
-
-// FIXME: #warning "The tree taskbar min width should be configurable"
-#include <qtimer.h>
-#include <qfontmetrics.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qimage.h>
#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
-#ifdef COMPILE_USE_QT4
- #include <q3header.h>
-#else
- #include <qheader.h>
-#endif
-#include <qevent.h>
+// FIXME: #warning "The tree taskbar min width should be configurable"
+#include <QTimer>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPixmap>
+#include <QImage>
+#include <QCursor>
+#include <QPaintEvent>
+#include <QEvent>
-#ifdef COMPILE_USE_QT4
- #include <QPaintEvent>
-#endif
+// FIXME: Qt4 #include <QHeaderView>
+#include <q3header.h>
#ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -80,17 +74,11 @@ extern QPixmap * g_pActivityMeterPixmap;
//
KviTaskBarBase::KviTaskBarBase()
-#ifdef COMPILE_USE_QT4
: QDockWidget(__tr2qs("Taskbar"),g_pFrame)
-#else
-: KviToolBar(__tr2qs("Taskbar"),QT_DOCK_BOTTOM,false,"taskbar")
-#endif
{
// FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter)
-#ifdef COMPILE_USE_QT4
setObjectName(__tr2qs("taskbar"));
setFeatures(QDockWidget::DockWidgetMovable);
-#endif //COMPILE_USE_QT4
m_pActivityMeterTimer = new QTimer();
connect(m_pActivityMeterTimer,SIGNAL(timeout()),this,SLOT(updateActivityMeter()));
m_pActivityMeterTimer->start(5000);
@@ -234,13 +222,11 @@ void KviTaskBarButton::mousePressEvent(QMouseEvent *e)
} else m_pWindow->contextPopup();
}
-#if QT_VERSION >= 300
void KviTaskBarButton::contextMenuEvent(QContextMenuEvent *e)
{
m_pWindow->contextPopup();
e->accept();
}
-#endif
void KviTaskBarButton::setActive(bool bActive)
{
@@ -260,7 +246,6 @@ void KviTaskBarButton::setActive(bool bActive)
update();
}
-#ifdef COMPILE_USE_QT4
void KviTaskBarButton::paintEvent(QPaintEvent * e)
{
QPainter p(this);
@@ -271,7 +256,6 @@ void KviTaskBarButton::paintEvent(QPaintEvent * e)
style()->drawPrimitive(QStyle::PE_PanelButtonTool,&opt,&p,this);
drawButtonLabel(&p);
}
-#endif
void KviTaskBarButton::drawButtonLabel(QPainter * painter)
{
@@ -280,15 +264,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter)
int iWidth = distRect.width();
QPainter * pPainter;
-#ifdef COMPILE_USE_QT4
pPainter = painter;
-#else //!COMPILE_USE_QT4
- KviDoubleBuffer db(iWidth,iHeight);
- QPixmap * pMemBuffer = db.pixmap();
- QPainter p(pMemBuffer);
- bitBlt(pMemBuffer,0,0,painter->device(),distRect.x(),distRect.y(),iWidth,iHeight);
- pPainter = &p;
-#endif //!COMPILE_USE_QT4
+
if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator))
{
iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT;
@@ -407,13 +384,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter)
cRect.setWidth(cRect.width() + 10);
pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1);
}
-#ifndef COMPILE_USE_QT4
- pPainter->setClipping(FALSE);
- painter->drawPixmap(0,0,*pMemBuffer,distRect.x(),distRect.y(),iWidth,iHeight);
-#endif
}
-
void KviTaskBarButton::captionChanged()
{
update();
@@ -427,7 +399,7 @@ void KviTaskBarButton::setProgress(int progress)
}
void KviTaskBarButton::unhighlight()
-{
+{
if(m_iHighlightLevel < 1)return;
m_iHighlightLevel = 0;
if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
@@ -481,27 +453,15 @@ KviClassicTaskBar::KviClassicTaskBar()
m_pBase = new QWidget(this);
// m_pBase->setBackgroundMode(NoBackground);
-#ifdef COMPILE_USE_QT4
setWidget(m_pBase);
m_pBase->setMinimumWidth(KVI_TASKBAR_MIN_WIDTH);
setMinimumWidth(KVI_TASKBAR_MIN_WIDTH);
-#else //!COMPILE_USE_QT4
- setStretchableWidget(m_pBase);
-
- setVerticalStretchable(true);
- setHorizontalStretchable(true);
-#endif //!COMPILE_USE_QT4
//m_pBase->setMinimumWidth(KVI_TASKBAR_MIN_WIDTH);
//setMinimumWidth(KVI_TASKBAR_MIN_WIDTH);
m_pBase->setMinimumHeight(m_iButtonHeight+5);
setMinimumHeight(m_iButtonHeight+5);
-
-#ifndef COMPILE_USE_QT4
- setResizeEnabled( true );
- connect(this,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChangedSlot(Orientation)));
-#endif
}
KviClassicTaskBar::~KviClassicTaskBar()
@@ -512,9 +472,6 @@ KviClassicTaskBar::~KviClassicTaskBar()
void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o)
{
-#ifndef COMPILE_USE_QT4
- if (orientation() == Qt::Horizontal) m_pBase->setMinimumHeight(m_iButtonHeight);
-#endif
doLayout();
}
@@ -657,7 +614,6 @@ void KviClassicTaskBar::doLayout()
totCount -= btnsInRow;
}
-#ifdef COMPILE_USE_QT4
if(isFloating() || ((g_pFrame->dockWidgetArea(this) != Qt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != Qt::TopDockWidgetArea)))
{
QDockWidget::DockWidgetFeatures f = features();
@@ -674,13 +630,8 @@ void KviClassicTaskBar::doLayout()
setFeatures(f);
}
}
-#endif
-#ifdef COMPILE_USE_QT4
if ((width() > height()) &&
-#else
- if ((orientation() == Qt::Horizontal) &&
-#endif
(((unsigned int)rows) > m_pBase->height() / m_iButtonHeight ))
{
rows = m_pBase->height() / m_iButtonHeight;
@@ -710,12 +661,7 @@ void KviClassicTaskBar::doLayout()
if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX;
}
- if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) &&
-#ifdef COMPILE_USE_QT4
- (width() > height())
-#else
- (orientation() == Qt::Horizontal)
-#endif
+ if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && (width() > height())
)
theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth);
@@ -743,7 +689,6 @@ void KviClassicTaskBar::applyOptions()
void KviClassicTaskBar::resizeEvent(QResizeEvent *e)
{
/*
-#ifdef COMPILE_USE_QT4
if(orientation() == Qt::Horizontal)
{
int iRows = height()/m_iButtonHeight;
@@ -751,7 +696,6 @@ void KviClassicTaskBar::resizeEvent(QResizeEvent *e)
debug("%i %i",height(),iRows);
resize(width(),iRows*m_iButtonHeight);
}
-#endif
*/
KviTaskBarBase::resizeEvent(e);
doLayout();
@@ -883,11 +827,7 @@ void KviTreeTaskBarItem::setActive(bool bActive)
}
}
-#ifdef COMPILE_USE_QT4
void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h)
-#else
-void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h,GUIStyle s)
-#endif
{
SET_ANTI_ALIASING(*p);
((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,QRect(0,y,w,totalHeight() - height()));
@@ -1223,16 +1163,7 @@ KviTreeTaskBar::KviTreeTaskBar()
m_pListView->addColumn(__tr2qs("Window List"),135);
m_pListView->setAllColumnsShowFocus(true);
m_pListView->setMultiSelection(false);
-
-#ifdef COMPILE_USE_QT4
setWidget(m_pListView);
-#else //!COMPILE_USE_QT4
- setStretchableWidget(m_pListView);
-
- setVerticalStretchable(true);
- setHorizontalStretchable(true);
-#endif //!COMPILE_USE_QT4
-
// FIXME: this code is useless ?
if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48)
@@ -1240,44 +1171,29 @@ KviTreeTaskBar::KviTreeTaskBar()
int iMin = m_pListView->minimumSize().width() + 4;
if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth))
iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth);
- setMinimumWidth(iMin);
+ setMinimumWidth(iMin);
// this is surely useful :)
m_pListView->setMinimumWidth(4);
//setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
//m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth));
- //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
-#ifdef COMPILE_USE_QT4
+ //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
m_pListView->setFocusPolicy(Qt::NoFocus);
-#else
- m_pListView->setFocusPolicy(QWidget::NoFocus);
-#endif
m_pListView->setStaticBackground(true);
-#ifdef COMPILE_USE_QT4
m_pListView->viewport()->setAutoFillBackground(false);
-#else
- m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground);
-#endif
+
if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader))
{
m_pListView->header()->hide();
- }
+ }
m_pListView->header()->setResizeEnabled(true);
-#ifdef COMPILE_USE_QT4
setMaximumWidth(600);
-#endif
m_pListView->viewport()->installEventFilter(this);
-#if QT_VERSION >= 300
-#ifndef COMPILE_USE_QT4
- setResizeEnabled(true);
-#endif
-#endif
-
m_pToolTip = new KviDynamicToolTip(m_pListView->viewport(),"tree_taskbar_tooltip");
connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
}
diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
index 48d8a3583..80321fabf 100644
--- a/src/kvirc/ui/kvi_taskbar.h
+++ b/src/kvirc/ui/kvi_taskbar.h
@@ -25,18 +25,17 @@
//=============================================================================
#include "kvi_settings.h"
-
#include "kvi_pointerlist.h"
-#include <qframe.h>
#include "kvi_tal_tooltip.h"
#include "kvi_tal_listview.h"
-#include <qpushbutton.h>
-
+#include <QPushButton>
+#include <QFrame>
+#include <QDockWidget>
+class QPixmap;
class KviWindow;
class KviFrame;
-class QPixmap;
class KviDynamicToolTip;
class KviConsole;
@@ -83,29 +82,9 @@ public:
// build system that uses Qt4 then you must add the -DCOMPILE_USE_QT4
// commandline parameter to moc (at leat) when parsing this file.
-// MOC_SKIP_BEGIN
-#ifdef COMPILE_USE_QT4
-
-#include <QDockWidget>
-
class KVIRC_API KviTaskBarBase : public QDockWidget
{
Q_OBJECT
-#endif //COMPILE_USE_QT4
-// MOC_SKIP_END
-
-// Qt3 version
-#ifndef Q_MOC_RUN
-#ifndef COMPILE_USE_QT4
-
-#include "kvi_toolbar.h"
-
-class KVIRC_API KviTaskBarBase : public KviToolBar
-{
- Q_OBJECT
-#endif
-#endif
-
public:
KviTaskBarBase();
virtual ~KviTaskBarBase();
@@ -150,13 +129,9 @@ protected:
KviDynamicToolTip * m_pTip;
protected:
virtual void mousePressEvent(QMouseEvent *e);
-#if QT_VERSION >= 300
virtual void contextMenuEvent(QContextMenuEvent *e);
-#endif
virtual void drawButtonLabel(QPainter *p);
-#ifdef COMPILE_USE_QT4
virtual void paintEvent(QPaintEvent * e);
-#endif
public:
virtual bool active(){ return m_bActive; };
virtual void highlight(int iLevel = 1);
@@ -225,11 +200,7 @@ protected:
public:
virtual QString key(int column,bool) const;
virtual void paintCell(QPainter *p,const QColorGroup &cg,int column,int width,int alignment);
-#ifdef COMPILE_USE_QT4
virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h);
-#else
- virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h,GUIStyle s);
-#endif
virtual void captionChanged();
virtual void highlight(int iLevel = 1);
virtual void unhighlight();
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp
index ce4d6e877..429513182 100644
--- a/src/kvirc/ui/kvi_toolbar.cpp
+++ b/src/kvirc/ui/kvi_toolbar.cpp
@@ -28,13 +28,11 @@
#include "kvi_frame.h"
#include "kvi_locale.h"
#include "kvi_app.h"
-
-#include <qcursor.h>
#include "kvi_tal_popupmenu.h"
-#ifdef COMPILE_USE_QT4
- #include <qevent.h>
-#endif
+#include <QCursor>
+#include <QEvent>
+#include <QMouseEvent>
static KviTalPopupMenu * g_pToolBarContextPopup = 0;
static KviTalPopupMenu * g_pToolBarWindowsPopup = 0;
@@ -102,16 +100,8 @@ void KviToolBar::mousePressEvent(QMouseEvent *e)
void KviToolBar::moveTo(QT_TOOLBARDOCK_TYPE dock)
{
// FIXME: this should be hidden in Tal
-#ifdef COMPILE_USE_QT4
g_pFrame->removeToolBar(this);
g_pFrame->addToolBar(dock,this);
-#else //!COMPILE_USE_QT4
-#if QT_VERSION >= 300
- g_pFrame->moveDockWindow(this,dock);
-#else
- g_pFrame->moveToolBar(this,dock);
-#endif
-#endif //!COMPILE_USE_QT4
}
void KviToolBar::moveToTop()
@@ -154,9 +144,6 @@ void KviToolBar::setSmallIcons()
g_pFrame->setUsesBigPixmaps(false);
}
-
-
-
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "kvi_toolbar.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index 270a7063a..173d7c773 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -1,16 +1,39 @@
-#define __KVIRC__
-
+//=============================================================================
+//
+// File : kvi_toolwindows_container.cpp
+// Creation date : Tue Aug 1 2000 21:05:22 by Szymon Stefanek
+//
+// This file is part of the KVirc irc client distribution
+// Copyright (C) 2000-2008 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 <qlayout.h>
-#include <qtoolbutton.h>
-#include <qobjectcleanuphandler.h>
-#include <qpushbutton.h>
-#include "kvi_tal_vbox.h"
-#include <qpainter.h>
-#include <qapplication.h>
+#define __KVIRC__
#include "kvi_toolwindows_container.h"
#include "kvi_iconmanager.h"
+#include "kvi_tal_vbox.h"
+
+#include <QPainter>
+#include <QApplication>
+#include <QLayout>
+#include <QToolButton>
+#include <QObjectCleanupHandler>
+#include <QPushButton>
KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
@@ -80,17 +103,9 @@ void KviWindowToolWidget::unregisterSelf()
KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn, const char * name )
:TOOL_PAGE_PARENT(parent)
{
-#ifdef COMPILE_USE_QT4
setFlat(true);
setObjectName("kvi_window_tool_button");
setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon))));
-#else
- QIconSet is1;
- is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On);
- is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off);
- setIconSet(is1);
- setUsesBigPixmap(false);
-#endif
setToggleButton(true);
setOn(bOn);
@@ -99,7 +114,6 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const Q
KviWindowToolPageButton::~KviWindowToolPageButton()
{
-
}
/*void KviWindowToolPageButton::drawButton ( QPainter * p)
@@ -108,9 +122,9 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
if(isOn())
pixmap.fill(colorGroup().mid());
else
- pixmap.fill(colorGroup().button());
- QPainter painter( &pixmap );
-
+ pixmap.fill(colorGroup().button());
+ QPainter painter( &pixmap );
+
QPixmap icon;
if(isOn())
icon=iconSet()->pixmap(QIconSet::Small,QIconSet::Normal,QIconSet::On);
diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h
index ec131d9b3..0c2dbab46 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.h
+++ b/src/kvirc/ui/kvi_toolwindows_container.h
@@ -1,15 +1,39 @@
#ifndef _KVI_TOOLWINDOWS_CONTAINER_H_
#define _KVI_TOOLWINDOWS_CONTAINER_H_
+//=============================================================================
+//
+// File : kvi_toolwindows_container.h
+// Creation date : Tue Aug 1 2000 21:03:41 by Szymon Stefanek
+//
+// This file is part of the KVirc irc client distribution
+// Copyright (C) 2000-2008 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 "kvi_heapobject.h"
+#include "kvi_styled_controls.h"
#include "kvi_tal_widgetstack.h"
#include "kvi_tal_vbox.h"
-#include <qtoolbutton.h>
-#include <qobjectcleanuphandler.h>
-#include <qpushbutton.h>
+#include <QToolButton>
+#include <QObjectCleanupHandler>
+#include <QPushButton>
-#include "kvi_heapobject.h"
-#include "kvi_styled_controls.h"
class KviWindowToolWidget;
class KviWindowToolPageButton;
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 3650768e2..6d1b452af 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -41,26 +41,27 @@
#include "kvi_ircconnectionserverinfo.h"
#include "kvi_ircconnectionuserinfo.h"
#include "kvi_mirccntrl.h"
+#include "kvi_tal_tooltip.h"
+#include "kvi_tal_listbox.h"
+#include "kvi_tal_popupmenu.h"
+
+#include <QLineEdit>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QRegExp>
+#include <QClipboard>
+#include <QEvent>
+#include <QMouseEvent>
extern KviTextIconWindow * g_pTextIconWindow;
extern KviColorWindow * g_pColorWindow;
static int g_iInputFontCharWidth[256];
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include "kvi_tal_tooltip.h"
-#include <qlineedit.h>
-#include "kvi_tal_listbox.h"
-#include <qregexp.h>
-#include <qclipboard.h>
-#include "kvi_tal_popupmenu.h"
-#include <qevent.h>
// FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)"
#ifdef COMPILE_PSEUDO_TRANSPARENCY
extern QPixmap * g_pShadedChildGlobalDesktopBackground;
-
#endif
@@ -89,17 +90,9 @@ KviTopicWidget::KviTopicWidget(QWidget * par,const char * name)
m_pContextPopup = 0;
m_iCursorPosition = 0;
m_pInput = 0;
-#ifdef COMPILE_USE_QT4
setAutoFillBackground(false);
-#else
- setBackgroundMode(QWidget::NoBackground);
-#endif
reset();
-#ifdef COMPILE_USE_QT4
m_pCompletionBox=new KviTalListBox(this,Qt::Popup);
-#else
- m_pCompletionBox=new KviTalListBox(this,Qt::WType_Popup);
-#endif
m_pCompletionBox->setFont( font() );
m_pCompletionBox->setPalette( palette() );
// m_pCompletionBox->setVScrollBarMode( KviTalListBox::AlwaysOff );
@@ -411,14 +404,12 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou
}
}
-#ifdef COMPILE_USE_QT4
void KviTopicWidget::paintEvent(QPaintEvent * e)
{
QPainter pa(this);
drawFrame(&pa);
drawContents(&pa);
}
-#endif
void KviTopicWidget::drawContents(QPainter *p)
{
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
index ca142760e..a56ef60a1 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/kvi_topicw.h
@@ -26,14 +26,13 @@
//============================================================================
#include "kvi_settings.h"
-
-#include <qframe.h>
-#include <qpushbutton.h>
-#include "kvi_tal_listbox.h"
-
#include "kvi_string.h"
#include "kvi_app.h"
#include "kvi_input.h"
+#include "kvi_tal_listbox.h"
+
+#include <QFrame>
+#include <QPushButton>
class QComboBox;
class KviChannel;
@@ -80,9 +79,8 @@ protected:
virtual void mousePressEvent(QMouseEvent *e);
virtual void keyPressEvent(QKeyEvent *e);
virtual void resizeEvent(QResizeEvent *e);
-#ifdef COMPILE_USE_QT4
+
virtual void paintEvent(QPaintEvent * e);
-#endif
void updateToolTip();
void deactivate();
void iconButtonClicked();
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index da85d531c..2d50a1200 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -47,16 +47,17 @@
#include "kvi_stringconversion.h"
#include "kvi_ircconnection.h"
#include "kvi_ircconnectionserverinfo.h"
-
-#include <qlabel.h>
-#include <qscrollbar.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qfontmetrics.h>
-#include <qdatetime.h>
-#include <qmime.h>
#include "kvi_styled_controls.h"
-#include <qevent.h>
+
+#include <QLabel>
+#include <QScrollBar>
+#include <QPainter>
+#include <QPixmap>
+#include <QFontMetrics>
+#include <QDateTime>
+//#include <qmime.h>
+#include <QEvent>
+#include <QPaintEvent>
#ifdef COMPILE_PSEUDO_TRANSPARENCY
extern QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -89,8 +90,6 @@ void KviUserListToolTip::maybeTip(const QPoint &pnt)
}
-
-
KviUserListEntry::KviUserListEntry(KviUserListView * parent,const QString &nick,
KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown)
{
@@ -1146,7 +1145,7 @@ void KviUserListView::resizeEvent(QResizeEvent *)
m_pUsersLabel->setGeometry(0,0,width(),hght);
}
else
- {
+ {
hght =0;
}
@@ -1309,16 +1308,9 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * par)
: QWidget(par)
{
m_pListView = par;
-#ifdef COMPILE_USE_QT4
setAutoFillBackground(false);
-#else
- setBackgroundMode(QWidget::NoBackground);
-#endif
-#ifdef COMPILE_USE_QT4
+
m_pScrollBar = new QScrollBar(Qt::Vertical,this,"scrollbar");
-#else
- m_pScrollBar = new QScrollBar(QScrollBar::Vertical,this,"scrollbar");
-#endif
m_pScrollBar->setRange(0,0);
m_pScrollBar->setValue(0);
connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarMoved(int)));
@@ -1421,9 +1413,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
SET_ANTI_ALIASING(p);
p.setFont(KVI_OPTION_FONT(KviOption_fontUserListView));
-#ifdef COMPILE_USE_QT4
QFontMetrics fm(p.fontMetrics());
-#endif
#ifdef COMPILE_PSEUDO_TRANSPARENCY
if(g_pShadedChildGlobalDesktopBackground)
@@ -1516,11 +1506,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
case KVI_USERLISTVIEW_GRIDTYPE_PLAINGRID:
case KVI_USERLISTVIEW_GRIDTYPE_DOTGRID:
p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0,
-#ifdef COMPILE_USE_QT4
(KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? Qt::DotLine : Qt::SolidLine));
-#else
- (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? QPen::DotLine : QPen::SolidLine));
-#endif
p.drawLine(0,bottom - 1,wdth,bottom - 1);
if(bShowState || bShowIcons)
p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY);
@@ -1683,18 +1669,10 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
KVI_SMALLICON_VOICE : KVI_SMALLICON_USEROP)))) \
) \
);
-#ifdef COMPILE_USE_QT4
p.drawPixmap(theX,theY+(fm.lineSpacing()-16/*size of small icon*/)/2,*ico);
-#else
- p.drawPixmap(theX,theY+(m_pListView->m_iFontHeight-16/*size of small icon*/)/2,*ico);
-#endif
}
theX +=18;
-#ifdef COMPILE_USE_QT4
p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
-#else
- p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
-#endif
} else {
char flag = m_pListView->getUserFlag(e);
@@ -1702,17 +1680,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
{
QString ttt = QChar(flag);
ttt += e->m_szNick;
-#ifdef COMPILE_USE_QT4
p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,ttt);
-#else
- p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,ttt);
-#endif
} else {
-#ifdef COMPILE_USE_QT4
p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
-#else
- p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
-#endif
}
}
if(bColorAllocated) delete pClrFore;
@@ -1732,12 +1702,8 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
//p.drawLine(1,height()-1,wdth,height()-1);
//p.drawLine(wdth - 1,1,wdth - 1,height());
-#ifdef COMPILE_USE_QT4
QPainter qt4SuxBecauseOfThisAdditionalPainter(this);
qt4SuxBecauseOfThisAdditionalPainter.drawPixmap(r.left(),r.top(),r.width(),r.height(),*pMemBuffer,r.left(),r.top(),r.width(),r.height());
-#else
- bitBlt(this,r.left(),r.top(),pMemBuffer,r.left(),r.top(),r.width(),r.height(),Qt::CopyROP,false);
-#endif
}
void KviUserListViewArea::resizeEvent(QResizeEvent *)
@@ -1958,15 +1924,11 @@ void KviUserListViewArea::mouseReleaseEvent(QMouseEvent *)
void KviUserListViewArea::wheelEvent(QWheelEvent *e)
{
-#ifdef COMPILE_USE_QT4
static bool bHere = false; // Qt4(<= 4.2.2) has a nasty bug that makes the re-sent wheelEvent to cause infinite recursion
if(bHere)return;
bHere = true;
-#endif
g_pApp->sendEvent(m_pScrollBar,e);
-#ifdef COMPILE_USE_QT4
bHere = false;
-#endif
}
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index 33943fa45..74e4e6d95 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -26,22 +26,21 @@
//=============================================================================
#include "kvi_settings.h"
-
+#include "kvi_pointerlist.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_toolwindows_container.h"
#include "kvi_string.h"
#include "kvi_ircuserdb.h"
#include "kvi_ircmask.h"
#include "kvi_time.h"
+#include "kvi_tal_tooltip.h"
#include <time.h>
-#include "kvi_tal_tooltip.h"
-#include <qwidget.h>
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_toolwindows_container.h"
+
+#include <QWidget>
class QLabel;
class QScrollBar;
-
class KviUserListView;
class KviUserListViewArea;
class KviConsole;
@@ -68,7 +67,6 @@ public:
};
-
class KVIRC_API KviUserListEntry
{
friend class KviUserListView;
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 1a9aa47a3..04b7be230 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -52,30 +52,23 @@
#include "kvi_toolwindows_container.h"
#include "kvi_styled_controls.h"
#include "kvi_kvs_script.h"
-
-#include <qpixmap.h>
#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
-#include <qtimer.h>
-#include <qsplitter.h>
-#include <qmetaobject.h>
-#include <qdatetime.h>
-#include <qtextcodec.h>
-#include <qevent.h>
-
-// it looks they can't decide :D
-#ifdef COMPILE_USE_QT4
- #include <QPushButton>
- #include <qdesktopwidget.h>
-#else
- #include <qobjectlist.h>
-#endif
-
-
-#include <qvariant.h>
-#include <qtoolbutton.h>
#include "kvi_tal_tooltip.h"
-#include <qmessagebox.h>
+
+#include <QPixmap>
+#include <QCursor>
+#include <QTimer>
+#include <QSplitter>
+#include <QMetaObject>
+#include <QDateTime>
+#include <QTextCodec>
+#include <QPushButton>
+#include <QDesktopWidget>
+#include <QVariant>
+#include <QToolButton>
+#include <QMessageBox>
+#include <QEvent>
+#include <QCloseEvent>
#ifdef COMPILE_CRYPT_SUPPORT
#include "kvi_crypt.h"
@@ -133,25 +126,17 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole *
// m_pEditorsContainer = 0;
#ifdef COMPILE_CRYPT_SUPPORT
-
m_pCryptControllerButton = 0;
m_pCryptController = 0;
m_pCryptSessionInfo = 0;
#endif
m_pAccel = 0;
-
m_pTaskBarItem = 0;
setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT);
-#ifdef COMPILE_USE_QT4
//setAutoFillBackground(false);
setFocusPolicy(Qt::StrongFocus);
-#else
- setBackgroundMode(NoBackground);
- setFocusPolicy(StrongFocus);
-#endif
-
connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages()));
}
@@ -288,21 +273,13 @@ bool KviWindow::focusNextPrevChild(bool next)
QWidget * w = focusWidget();
if(w)
{
-#ifdef COMPILE_USE_QT4
if(w->focusPolicy() == Qt::StrongFocus)return false;
-#else
- if(w->focusPolicy() == QWidget::StrongFocus)return false;
-#endif
//QVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget!
if(w->parent())
{
-#ifdef COMPILE_USE_QT4
if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
-#else
- if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
-#endif
return false; // Do NOT change the focus widget!
}
}
@@ -368,7 +345,6 @@ bool KviWindow::activityMeter(unsigned int *,unsigned int *)
return false;
}
-
const char * KviWindow::m_typeTable[KVI_WINDOW_NUM_TYPES + 1]=
{
"console",
@@ -413,7 +389,6 @@ void KviWindow::setType(int iType)
m_iType = iType;
}
-
void KviWindow::createTaskBarItem()
{
if(m_pTaskBarItem)return;
@@ -429,21 +404,10 @@ void KviWindow::destroyTaskBarItem()
BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn)
{
-#ifdef COMPILE_USE_QT4
BUTTON_CLASS * b = new BUTTON_CLASS(par);
b->setObjectName(nam);
b->setFlat(true);
b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon))));
-#else
- BUTTON_CLASS * b = new BUTTON_CLASS(par,nam);
- b->setToggleButton(true);
- b->setUsesBigPixmap(false);
- QIconSet is1;
- is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On);
- is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off);
- b->setIconSet(is1);
-#endif
-
KviTalToolTip::add
(b,tooltip);
@@ -531,18 +495,10 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf)
}
if(m_pCryptControllerButton)
{
-#if QT_VERSION >= 300
QIconSet is;
is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),QIconSet::Small,QIconSet::Normal,QIconSet::Off);
is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIconSet::Small,QIconSet::Normal,QIconSet::On);
m_pCryptControllerButton->setIconSet(is);
-#else
-
- m_pCryptControllerButton->setOnIconSet(
- *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)));
- m_pCryptControllerButton->setOffIconSet(
- *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)));
-#endif
if(m_pCryptControllerButton->isOn())
m_pCryptControllerButton->setOn(false);
@@ -570,8 +526,6 @@ void KviWindow::cryptSessionInfoDestroyed()
#endif
}
-
-
void KviWindow::setProgress(int progress)
{
m_pTaskBarItem->setProgress(progress);
@@ -589,7 +543,6 @@ void KviWindow::getConfigGroupName(QString &buf)
buf = typeString();
}
-
void KviWindow::getDefaultLogFileName(QString &buffer)
{
// FIXME: #warning "Make it configurable ?"
@@ -619,7 +572,6 @@ void KviWindow::getBaseLogFileName(QString &buffer)
buffer = m_szName;
}
-
void KviWindow::saveProperties(KviConfig *cfg)
{
// store only the non-default text encoding.
@@ -627,11 +579,7 @@ void KviWindow::saveProperties(KviConfig *cfg)
QTextCodec * c = defaultTextCodec();
if(c && m_pTextCodec)
{
-#ifdef COMPILE_USE_QT4
if(KviQString::equalCI(szCodec,c->name().data()))szCodec = KviQString::empty; // store "default"
-#else
- if(KviQString::equalCI(szCodec,c->name()))szCodec = KviQString::empty; // store "default"
-#endif
}
QString szKey = "TextEncoding_";
szKey += m_szName;
@@ -641,11 +589,11 @@ void KviWindow::saveProperties(KviConfig *cfg)
cfg->writeEntry("commandLineIsUserFriendly",m_pInput->isUserFriendly());
}
- //
-
- /*if(m_pIrcView && m_iType==KVI_WINDOW_TYPE_CHANNEL)
- if(m_pIrcView->isLogging())
- cfg->writeEntry("LoggingEnabled",m_pIrcView->isLogging());*/
+ /*
+ if(m_pIrcView && m_iType==KVI_WINDOW_TYPE_CHANNEL)
+ if(m_pIrcView->isLogging())
+ cfg->writeEntry("LoggingEnabled",m_pIrcView->isLogging());
+ */
}
void KviWindow::loadProperties(KviConfig *cfg)
@@ -657,7 +605,8 @@ void KviWindow::loadProperties(KviConfig *cfg)
m_pInput->setButtonsHidden(cfg->readBoolEntry("inputToolButtonsHidden",KVI_OPTION_BOOL(KviOption_boolHideInputToolButtons)));
m_pInput->setUserFriendly(cfg->readBoolEntry("commandLineIsUserFriendly",KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault)));
}
-/* if(m_pIrcView && m_iType==KVI_WINDOW_TYPE_CHANNEL)
+ /*
+ if(m_pIrcView && m_iType==KVI_WINDOW_TYPE_CHANNEL)
{
bool bEnableLogs=cfg->readBoolEntry("LoggingEnabled",0);
if(!m_pIrcView->isLogging() && bEnableLogs)
@@ -666,7 +615,8 @@ void KviWindow::loadProperties(KviConfig *cfg)
getBaseLogFileName(szTmp);
m_pIrcView->startLogging();
}
- }*/
+ }
+ */
}
QPixmap * KviWindow::myIconPtr()
@@ -794,7 +744,6 @@ void KviWindow::createSystemTextEncodingPopup()
connect(g_pMdiWindowSystemTextEncodingPopupStandard,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupStandardActivated(int)));
}
-
void KviWindow::systemPopupRequest(const QPoint &pnt)
{
if(!g_pMdiWindowSystemMainPopup)
@@ -1013,7 +962,6 @@ void KviWindow::focusInEvent(QFocusEvent *)
if(m_pIrcView)m_pFocusHandler = m_pIrcView;
else {
-#ifdef COMPILE_USE_QT4
QList<QObject *> list = children();
for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it)
{
@@ -1024,20 +972,6 @@ void KviWindow::focusInEvent(QFocusEvent *)
break;
}
}
-#else
- QObjectList *list = (QObjectList *)(children());
- if(list)
- {
- for(QObject * c = list->first();c;c = list->next())
- {
- if(c->isWidgetType())
- {
- m_pFocusHandler = (QWidget *)c;
- break;
- }
- }
- }
-#endif
}
if(m_pFocusHandler)m_pFocusHandler->setFocus();
else {
@@ -1063,54 +997,48 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e)
{
switch(e->type())
{
- case QEvent::FocusIn:
- m_pLastFocusedChild = (QWidget *)o;
- if(g_pActiveWindow != this)activateSelf();
- break;
- case QEvent::Enter:
- // this is a handler moved here from KviMdiChild::eventFilter
- if(QApplication::overrideCursor())
- QApplication::restoreOverrideCursor();
- break;
- case QEvent::MouseButtonPress:
-#ifdef COMPILE_USE_QT4
- if( (((QWidget *)o)->focusPolicy() == Qt::NoFocus) ||
- (((QWidget *)o)->focusPolicy() == Qt::TabFocus))
-#else
- if( (((QWidget *)o)->focusPolicy() == QWidget::NoFocus) ||
- (((QWidget *)o)->focusPolicy() == QWidget::TabFocus))
-#endif
- {
- // this will not focus our window
- // set the focus to the focus handler
- if(m_pLastFocusedChild)
- {
- if(m_pLastFocusedChild->hasFocus() && m_pLastFocusedChild->isVisible())
- return false;
- }
-
- if(m_pFocusHandler)
+ case QEvent::FocusIn:
+ m_pLastFocusedChild = (QWidget *)o;
+ if(g_pActiveWindow != this)activateSelf();
+ break;
+ case QEvent::Enter:
+ // this is a handler moved here from KviMdiChild::eventFilter
+ if(QApplication::overrideCursor())
+ QApplication::restoreOverrideCursor();
+ break;
+ case QEvent::MouseButtonPress:
+ if( (((QWidget *)o)->focusPolicy() == Qt::NoFocus) ||
+ (((QWidget *)o)->focusPolicy() == Qt::TabFocus))
{
- m_pFocusHandler->setFocus();
- } else {
- setFocus(); // we grab the focus (someone must do it , damn :D)
+ // this will not focus our window
+ // set the focus to the focus handler
+ if(m_pLastFocusedChild)
+ {
+ if(m_pLastFocusedChild->hasFocus() && m_pLastFocusedChild->isVisible())
+ return false;
+ }
+
+ if(m_pFocusHandler)
+ {
+ m_pFocusHandler->setFocus();
+ } else {
+ setFocus(); // we grab the focus (someone must do it , damn :D)
+ }
}
- }
- break;
- case QEvent::ChildInserted:
- if(((QChildEvent *)e)->child()->isWidgetType())
- childInserted((QWidget *)((QChildEvent *)e)->child());
- break;
- case QEvent::ChildRemoved:
- if(((QChildEvent *)e)->child()->isWidgetType())
- childRemoved((QWidget *)((QChildEvent *)e)->child());
- break;
- default: /* make gcc happy */ break;
+ break;
+ case QEvent::ChildInserted:
+ if(((QChildEvent *)e)->child()->isWidgetType())
+ childInserted((QWidget *)((QChildEvent *)e)->child());
+ break;
+ case QEvent::ChildRemoved:
+ if(((QChildEvent *)e)->child()->isWidgetType())
+ childRemoved((QWidget *)((QChildEvent *)e)->child());
+ break;
+ default: /* make gcc happy */ break;
}
return false;
}
-
void KviWindow::childInserted(QWidget * o)
{
o->removeEventFilter(this); // ensure that we don't filter twice
@@ -1121,17 +1049,12 @@ void KviWindow::childInserted(QWidget * o)
m_pFocusHandler = o;
else
{
-#ifdef COMPILE_USE_QT4
if(!m_pFocusHandler && (o->focusPolicy() == Qt::StrongFocus))
-#else
- if(!m_pFocusHandler && (o->focusPolicy() == QWidget::StrongFocus))
-#endif
{
m_pFocusHandler = o;
}
}
-#ifdef COMPILE_USE_QT4
QList<QObject *> list = o->children();
for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it)
{
@@ -1141,17 +1064,6 @@ void KviWindow::childInserted(QWidget * o)
childInserted((QWidget *)c);
}
}
-#else
- QObjectList *list = (QObjectList *)(o->children());
- if(list)
- {
- for(QObject * c = list->first();c;c = list->next())
- {
- if(c->isWidgetType())
- childInserted((QWidget *)c);
- }
- }
-#endif
}
void KviWindow::childDestroyed()
@@ -1169,7 +1081,6 @@ void KviWindow::childRemoved(QWidget * o)
if(o == m_pLastFocusedChild)
m_pLastFocusedChild = 0;
-#ifdef COMPILE_USE_QT4
QList<QObject *> list = o->children();
for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it)
{
@@ -1179,17 +1090,6 @@ void KviWindow::childRemoved(QWidget * o)
childRemoved((QWidget *)c);
}
}
-#else
- QObjectList *list = (QObjectList *)(o->children());
- if(list)
- {
- for(QObject * c = list->first();c;c = list->next())
- {
- if(c->isWidgetType())
- childRemoved((QWidget *)c);
- }
- } //else debug("The removed object has no children");
-#endif
}
void KviWindow::childEvent(QChildEvent *e)
@@ -1209,7 +1109,6 @@ void KviWindow::wheelEvent(QWheelEvent *e)
/* NOTHING HERE FOR NOW (FIXME) */
}
-
void KviWindow::childrenTreeChanged(QWidget * widgetAdded)
{
// if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded);
@@ -1219,48 +1118,22 @@ void KviWindow::childrenTreeChanged(QWidget * widgetAdded)
delete e;
}
-
void KviWindow::updateBackgrounds(QObject * obj)
{
- if(!obj)
- obj = this;
-#ifdef COMPILE_USE_QT4
+ if(!obj) obj = this;
QList<QObject *> list = obj->children();
if (list.count())
{
-
- for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it)
- {
- QObject * child = *it;
- if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){
- // if (child->isWidgetType())
- ((QWidget *)child)->update();
- }
- updateBackgrounds(child);
- }
- }
-#else
- QObjectList * list = (QObjectList *)(obj->children());
- if(list)
- {
- for(unsigned int i=0;i<list->count();i++)
+ for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it)
{
- QObject * child = list->at(i);
-#if QT_VERSION >= 300
- // FIXME: check if this code can work with qt < 3.0.0 too
- if(child->metaObject()->findProperty("TransparencyCapable",true) != -1)
- ((QWidget *)child)->update();
-#else
-
- QVariant v = list->at(i)->property("TransparencyCapable");
- if(v.isValid())
+ QObject * child = *it;
+ if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){
+ // if (child->isWidgetType())
((QWidget *)child)->update();
-#endif
-
+ }
updateBackgrounds(child);
}
}
-#endif
}
void KviWindow::moveEvent(QMoveEvent *e)
@@ -1268,7 +1141,6 @@ void KviWindow::moveEvent(QMoveEvent *e)
#ifdef COMPILE_PSEUDO_TRANSPARENCY
updateBackgrounds();
#endif
-
QWidget::moveEvent(e);
}
@@ -1358,7 +1230,6 @@ void KviWindow::lostUserFocus()
if(m_pIrcView->hasLineMark())m_pIrcView->clearLineMark(true);
}
-
void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t * pText,int iFlags)
{
// all roads lead to Rome :)
@@ -1379,9 +1250,7 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t
if(wnd)wnd->outputNoFmt(msg_type,pText,iFlags);
}
- if(!m_pTaskBarItem) {
- return;
- }
+ if(!m_pTaskBarItem) return;
// if this option is checked we dont highlight other than channel msg
if(KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg))
@@ -1491,11 +1360,7 @@ void KviWindow::unhighlight()
void KviWindow::preprocessMessage(QString & szMessage)
{
// slow
-#ifdef COMPILE_USE_QT4
QStringList strings = szMessage.split(" ");
-#else
- QStringList strings = QStringList::split(" ",szMessage, TRUE);
-#endif
for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) {
QString tmp(*it);
if(tmp.contains('\r')) continue;
@@ -1514,7 +1379,6 @@ void KviWindow::preprocessMessage(QString & szMessage)
szMessage=strings.join(" ");
}
-
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "kvi_window.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 969148c29..88573fa34 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -28,6 +28,9 @@
#include "kvi_qstring.h"
#include "kvi_qcstring.h"
#include "kvi_settings.h"
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_widgetstack.h"
+#include "kvi_accel.h"
#ifdef COMPILE_ON_WINDOWS
// The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition
@@ -36,8 +39,13 @@
class KviMdiChild;
#endif
-#include <qframe.h>
+#include <QFrame>
+#include <QWidget>
+class QPixmap;
+class QSplitter;
+class QToolButton;
+class QTextCodec;
class KviFrame;
class KviTaskBarItem;
class KviConfig;
@@ -47,26 +55,18 @@ class KviConsole;
class KviIrcContext;
class KviIrcConnection;
class KviWindowToolPageButton;
-
class KviTalPopupMenu;
-class QPixmap;
-class QSplitter;
class KviTalHBox;
-class QToolButton;
-class QTextCodec;
class KviTalWidgetStack;
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_widgetstack.h"
-#include "kvi_accel.h"
+class QPushButton;
+#define BUTTON_CLASS QPushButton
#ifdef COMPILE_CRYPT_SUPPORT
class KviCryptController;
class KviCryptSessionInfo;
#endif
-#include <qwidget.h>
-
//
// Window types
//
@@ -100,15 +100,10 @@ class KviTalWidgetStack;
#define KVI_WINDOW_TYPE_USERWINDOW 22
#define KVI_WINDOW_TYPE_DEBUG 23
-
#define KVI_WINDOW_NUM_TYPES 24
-
#define KVI_WINDOW_TYPE_USER 10000
-
-
-
#define KVI_ACTIVITY_NONE 0
#define KVI_ACTIVITY_VERYLOW 1
#define KVI_ACTIVITY_LOW 2
@@ -124,14 +119,6 @@ class KviTalWidgetStack;
#define KVI_ACTIVITY_VERYHOT 5
#define KVI_ACTIVITY_FIRE 6
-#ifdef COMPILE_USE_QT4
- class QPushButton;
- #define BUTTON_CLASS QPushButton
-#else
- #define BUTTON_CLASS QToolButton
-#endif
-
-
class KVIRC_API KviWindow : public QWidget
{
friend class KviInput;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 11:06:12 +0000