diff options
38 files changed, 108 insertions, 150 deletions
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 39292dde9..596c41f03 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -35,11 +35,8 @@ #include "kvi_channel.h" #include "kvi_console.h" #include "kvi_query.h" -#include "kvi_styled_controls.h" #include "kvi_tal_popupmenu.h" -#include "kvi_styled_controls.h" - KviAction::~KviAction() { if(m_pWidgetList) @@ -177,8 +174,8 @@ void KviAction::reloadImages() QPixmap * p = bigIcon(); for(QWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) { - if(b->inherits("KviStyledToolButton")) - ((KviStyledToolButton *)b)->setIcon(p ? *p : QPixmap()); + if(b->inherits("QToolButton")) + ((QToolButton *)b)->setIcon(p ? *p : QPixmap()); } } @@ -412,7 +409,7 @@ QWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) { if(!setupDone())setup(); QPixmap * p = bigIcon(); - KviStyledToolButton * b = new KviStyledToolButton( + QToolButton * b = new QToolButton( p ? *p : QPixmap(), visibleName(), visibleName(), diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index bff128058..15e905356 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -42,7 +42,6 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_coreactionnames.h" #include "kvi_ircconnectionserverinfo.h" -#include "kvi_styled_controls.h" #include "kvi_kvs_script.h" #include "kvi_tal_popupmenu.h" @@ -594,14 +593,14 @@ void KviConnectAction::activeContextStateChanged() if(p) { - for(KviStyledToolButton * b = (KviStyledToolButton *)bl->first();b;b =(KviStyledToolButton *)bl->next()) + for(QToolButton * b = (QToolButton *)bl->first();b;b =(QToolButton *)bl->next()) { if(!b->isEnabled())b->setEnabled(true); b->setIcon(QIcon(*p)); b->setText(txt); } } else { - for(KviStyledToolButton * b = (KviStyledToolButton *)bl->first();b;b = (KviStyledToolButton *)bl->next()) + for(QToolButton * b = (QToolButton *)bl->first();b;b = (QToolButton *)bl->next()) { if(b->isEnabled())b->setEnabled(false); } @@ -669,7 +668,7 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) QWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - KviStyledToolButton * b = new KviStyledToolButton( + QToolButton * b = new QToolButton( *(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)), m_szConnectString, m_szConnectString, @@ -738,14 +737,14 @@ bool KviSubmenuAction::addToPopupMenu(KviTalPopupMenu *p) QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - KviStyledToolButton * b = new KviStyledToolButton( + QToolButton * b = new QToolButton( *(bigIcon()), visibleName(), visibleName(), this,SLOT(activate()),t,name()); b->setMenu(m_pPopup); - b->setPopupMode( scriptCode().isEmpty() ? KviStyledToolButton::InstantPopup : KviStyledToolButton::MenuButtonPopup); + b->setPopupMode( scriptCode().isEmpty() ? QToolButton::InstantPopup : QToolButton::MenuButtonPopup); t->addWidget(b); registerWidget(b); if(!isEnabled())b->setEnabled(false); @@ -1006,7 +1005,7 @@ void KviGoAwayAction::activeContextStateChanged() if(p) { - for(KviStyledToolButton * b = (KviStyledToolButton *)bl->first();b;b =(KviStyledToolButton *)bl->next()) + for(QToolButton * b = (QToolButton *)bl->first();b;b =(QToolButton *)bl->next()) { if(!b->isEnabled())b->setEnabled(true); b->setIcon(QIcon(*p)); @@ -1014,7 +1013,7 @@ void KviGoAwayAction::activeContextStateChanged() } m_uInternalFlags |= KVI_ACTION_FLAG_ENABLED; } else { - for(KviStyledToolButton * b = (KviStyledToolButton *)bl->first();b;b = (KviStyledToolButton *)bl->next()) + for(QToolButton * b = (QToolButton *)bl->first();b;b = (QToolButton *)bl->next()) { if(b->isEnabled())b->setEnabled(false); } @@ -1068,7 +1067,7 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) QWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - KviStyledToolButton * b = new KviStyledToolButton( + QToolButton * b = new QToolButton( *(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")), m_szAwayString, m_szAwayString, diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h index c1de000b3..ac7b5061d 100644 --- a/src/kvirc/kernel/kvi_coreactions.h +++ b/src/kvirc/kernel/kvi_coreactions.h @@ -29,8 +29,6 @@ #include "kvi_kvs_action.h" #include "kvi_pointerlist.h" -#include "kvi_styled_controls.h" - class KviConnectAction : public KviAction { Q_OBJECT diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index f369dc3c6..1912f582a 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -29,7 +29,6 @@ #define __KVIRC__ #include "kvi_toolwindows_container.h" -#include "kvi_styled_controls.h" #include "kvi_channel.h" #include "kvi_console.h" #include "kvi_iconmanager.h" @@ -72,7 +71,6 @@ #include <time.h> #include <QSplitter> -#include "kvi_styled_controls.h" #include <QLabel> #include <QEvent> #include <QPalette> @@ -182,7 +180,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const QString &na createCryptControllerButton(m_pButtonContainer); #endif - m_pHideToolsButton = new KviStyledToolButton(m_pButtonBox,"hide_container_button"); + m_pHideToolsButton = new QToolButton(m_pButtonBox,"hide_container_button"); m_pHideToolsButton->setIconSize(QSize(22,22)); diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 17674f5af..3cf286009 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -38,10 +38,10 @@ #include <QDateTime> #include <QStringList> +#include <QToolButton> class KviConsole; class QSplitter; -class KviStyledToolButton; class KviTopicWidget; class KviIrcMask; class KviThemedLabel; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 9b17fee38..b512998c0 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -72,7 +72,6 @@ #include "kvi_ircdatastreammonitor.h" #include "kvi_toolwindows_container.h" #include "kvi_msgbox.h" -#include "kvi_styled_controls.h" #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_tal_hbox.h" @@ -174,13 +173,13 @@ void KviConsole::recentUrlsChanged(){ m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)),*it); } // m_pAddressEdit->setCurrentText(cur); - int i = m_pAddressEdit->findText(cur);
- if (i != -1)m_pAddressEdit->setCurrentIndex(i);
- else
- {
- if (m_pAddressEdit->isEditable())m_pAddressEdit->setEditText(cur);
- else
- m_pAddressEdit->setItemText(m_pAddressEdit->currentIndex(), cur);
+ int i = m_pAddressEdit->findText(cur); + if (i != -1)m_pAddressEdit->setCurrentIndex(i); + else + { + if (m_pAddressEdit->isEditable())m_pAddressEdit->setEditText(cur); + else + m_pAddressEdit->setItemText(m_pAddressEdit->currentIndex(), cur); } } @@ -512,13 +511,13 @@ void KviConsole::updateUri() } } // m_pAddressEdit->setCurrentText(uri); - int i = m_pAddressEdit->findText(uri);
- if (i != -1)m_pAddressEdit->setCurrentIndex(i);
- else
- {
- if (m_pAddressEdit->isEditable())m_pAddressEdit->setEditText(uri);
- else
- m_pAddressEdit->setItemText(m_pAddressEdit->currentIndex(), uri);
+ int i = m_pAddressEdit->findText(uri); + if (i != -1)m_pAddressEdit->setCurrentIndex(i); + else + { + if (m_pAddressEdit->isEditable())m_pAddressEdit->setEditText(uri); + else + m_pAddressEdit->setItemText(m_pAddressEdit->currentIndex(), uri); } } diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index 51a994703..1db34adbb 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -35,10 +35,10 @@ #include <time.h> #include <QComboBox> +#include <QToolButton> class QToolBar; -class KviStyledToolButton; class KviAvatar; class KviDns; class KviIrcUserDataBase; diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 276c8a18c..d4e72c84d 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -27,7 +27,6 @@ #ifdef COMPILE_CRYPT_SUPPORT #include "kvi_cryptcontroller.h" - #include "kvi_styled_controls.h" #include "kvi_window.h" #include "kvi_locale.h" #include "kvi_out.h" @@ -90,7 +89,7 @@ frm->setFrameStyle(QFrame::HLine | QFrame::Sunken); g->addWidget(frm,1,0,1,4); - m_pEnableCheck = new KviStyledCheckBox(__tr2qs("Use the crypt engine"),this); + m_pEnableCheck = new QCheckBox(__tr2qs("Use the crypt engine"),this); g->addWidget(m_pEnableCheck,2,0,1,4); connect(m_pEnableCheck,SIGNAL(toggled(bool)),this,SLOT(enableCheckToggled(bool))); @@ -107,7 +106,7 @@ m_pAuthorLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); g->addWidget(m_pAuthorLabel,4,1,1,3); - m_pEnableEncrypt = new KviStyledCheckBox(__tr2qs("Enable encryption"),this); + m_pEnableEncrypt = new QCheckBox(__tr2qs("Enable encryption"),this); g->addWidget(m_pEnableEncrypt,5,1,1,3); m_pEncryptKeyLabel = new QLabel(__tr2qs("Encrypt key:"),this); @@ -116,10 +115,10 @@ m_pEncryptKeyEdit = new QLineEdit(this); g->addWidget(m_pEncryptKeyEdit,6,2); - m_pEncryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); + m_pEncryptHexKeyCheck = new QCheckBox(__tr2qs("Hex"),this); g->addWidget(m_pEncryptHexKeyCheck,6,3); - m_pEnableDecrypt = new KviStyledCheckBox(__tr2qs("Enable decryption"),this); + m_pEnableDecrypt = new QCheckBox(__tr2qs("Enable decryption"),this); g->addWidget(m_pEnableDecrypt,7,1,1,3); m_pDecryptKeyLabel = new QLabel(__tr2qs("Decrypt key:"),this); @@ -128,7 +127,7 @@ m_pDecryptKeyEdit = new QLineEdit(this); g->addWidget(m_pDecryptKeyEdit,8,2); - m_pDecryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); + m_pDecryptHexKeyCheck = new QCheckBox(__tr2qs("Hex"),this); g->addWidget(m_pDecryptHexKeyCheck,8,3); m_pOkButton = new QPushButton(__tr2qs("OK"),this); diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index ef497a095..72615dcc3 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -27,7 +27,6 @@ #include "kvi_settings.h" #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN) - #include "kvi_styled_controls.h" #include "kvi_crypt.h" #include "kvi_heapobject.h" #include "kvi_toolwindows_container.h" @@ -35,9 +34,11 @@ #include <QWidget> #include <QPushButton> - #include "kvi_styled_controls.h" + #include <QToolButton> #include <QLabel> #include <QLineEdit> + #include <QCheckBox> + class KviWindow; class KVIRC_API KviCryptSessionInfo : public KviHeapObject @@ -74,17 +75,17 @@ KviWindow * m_pWindow; KviTalListBox * m_pListBox; QPushButton * m_pOkButton; - KviStyledCheckBox * m_pEnableCheck; + QCheckBox * m_pEnableCheck; QLabel * m_pDescriptionLabel; QLabel * m_pAuthorLabel; - KviStyledCheckBox * m_pEnableEncrypt; + QCheckBox * m_pEnableEncrypt; QLabel * m_pEncryptKeyLabel; QLineEdit * m_pEncryptKeyEdit; - KviStyledCheckBox * m_pEncryptHexKeyCheck; - KviStyledCheckBox * m_pEnableDecrypt; + QCheckBox * m_pEncryptHexKeyCheck; + QCheckBox * m_pEnableDecrypt; QLabel * m_pDecryptKeyLabel; QLineEdit * m_pDecryptKeyEdit; - KviStyledCheckBox * m_pDecryptHexKeyCheck; + QCheckBox * m_pDecryptHexKeyCheck; KviEngineListBoxItem * m_pLastItem; KviCryptSessionInfo * m_pSessionInfo; private slots: diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index a204309fe..fbc5f97e9 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -35,7 +35,6 @@ #include <QCursor> #include <QLayout> #include <QPixmap> -#include "kvi_styled_controls.h" #include <QPainter> #include <QStyle> #include <QEvent> @@ -192,12 +191,12 @@ void KviCustomToolBar::syncDescriptor() ++iter; } */ - int i = 0;
- for (int i=0;i<layout()->count();i++)
- {
- if (QWidget * w=layout()->itemAt(i)->widget())
- m_pDescriptor->actions()->append(new QString(w->objectName()));
- }
+ int i = 0; + for (int i=0;i<layout()->count();i++) + { + if (QWidget * w=layout()->itemAt(i)->widget()) + m_pDescriptor->actions()->append(new QString(w->objectName())); + } diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 50eb6100a..b0ff3c0fc 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -38,7 +38,6 @@ #include <QPixmap> #include <QSplitter> -#include "kvi_styled_controls.h" KviDebugWindow * KviDebugWindow::m_pInstance = 0; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index b2f539cfe..b384de8ac 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -63,7 +63,6 @@ #include <QVariant>
#include <QLineEdit>
#include <QMessageBox>
-#include "kvi_styled_controls.h"
#include <QTimer>
#include <QLayout>
#include <QDesktopWidget>
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 99cd93aa9..ff8358bcb 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -50,7 +50,6 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_kernel.h" #include "kvi_doublebuffer.h" -#include "kvi_styled_controls.h" #include "kvi_texticonmanager.h" #include "kvi_draganddrop.h" #include "kvi_pointerlist.h" @@ -2247,7 +2246,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pWindow = par; m_pMultiLineEditor = 0; - m_pHideToolsButton = new KviStyledToolButton(this,"hide_container_button"); + m_pHideToolsButton = new QToolButton(this,"hide_container_button"); m_pHideToolsButton->setIconSize(QSize(22,22)); m_pHideToolsButton->setFixedWidth(10); @@ -2265,7 +2264,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) //if(m_pButtonContainer->layout()) // m_pButtonContainer->layout()->setSizeConstraint(QLayout::SetMinimumSize); - m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); + m_pHistoryButton = new QToolButton(m_pButtonContainer,"historybutton"); m_pHistoryButton->setIconSize(QSize(22,22)); //m_pHistoryButton->setUpdatesEnabled(TRUE); ??? QIcon is1; @@ -2283,7 +2282,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); } - m_pIconButton = new KviStyledToolButton(m_pButtonContainer,"iconbutton"); + m_pIconButton = new QToolButton(m_pButtonContainer,"iconbutton"); m_pIconButton->setIconSize(QSize(22,22)); QIcon is3; is3.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN))); @@ -2293,7 +2292,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); - m_pCommandlineModeButton = new KviStyledToolButton(m_pButtonContainer,"commandlinemodebutton"); + m_pCommandlineModeButton = new QToolButton(m_pButtonContainer,"commandlinemodebutton"); m_pCommandlineModeButton->setIconSize(QSize(22,22)); m_pCommandlineModeButton->setCheckable(true); QIcon is0; @@ -2305,7 +2304,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pCommandlineModeButton->setChecked(true); - m_pMultiEditorButton = new KviStyledToolButton(m_pButtonContainer,"multieditorbutton"); + m_pMultiEditorButton = new QToolButton(m_pButtonContainer,"multieditorbutton"); m_pMultiEditorButton->setCheckable(true); m_pMultiEditorButton->setIconSize(QSize(22,22)); QIcon is2; diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index cc7afc69f..71dafeb02 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -34,9 +34,9 @@ #include <QWidget> #include <QPixmap> #include <QFrame> +#include <QToolButton> //#include <QDialog> -#include "kvi_styled_controls.h" class KviUserListView; class KviWindow; @@ -223,11 +223,11 @@ public: KviInputEditor * m_pInputEditor; KviScriptEditor * m_pMultiLineEditor; KviTalHBox * m_pButtonContainer; - KviStyledToolButton * m_pMultiEditorButton; - KviStyledToolButton * m_pHistoryButton; - KviStyledToolButton * m_pIconButton; - KviStyledToolButton * m_pCommandlineModeButton; - KviStyledToolButton * m_pHideToolsButton; + QToolButton * m_pMultiEditorButton; + QToolButton * m_pHistoryButton; + QToolButton * m_pIconButton; + QToolButton * m_pCommandlineModeButton; + QToolButton * m_pHideToolsButton; QHBoxLayout * m_pLayout; protected: // virtual void resizeEvent(QResizeEvent * e); diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index ab0cbeeb8..e75e20064 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -56,7 +56,7 @@ static QPixmap * g_pIccMemBuffer static KviPointerList<KviToolBarGraphicalApplet> * g_pToolBarGraphicalAppletList = 0; KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * name) -: KviStyledToolButton(par) +: QToolButton(par) { setObjectName(name); if(!g_pToolBarGraphicalAppletList) diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h index 3ecbeffaf..e7f9a38c7 100644 --- a/src/kvirc/ui/kvi_irctoolbar.h +++ b/src/kvirc/ui/kvi_irctoolbar.h @@ -32,7 +32,7 @@ #include "kvi_tal_widgetstack.h" #include <QWidget> -#include "kvi_styled_controls.h" +#include <QToolButton> #include <QLabel> class KviTalPopupMenu; @@ -45,7 +45,7 @@ class KviTalPopupMenu; // Can be a child of any AppletContainer // -class KVIRC_API KviToolBarGraphicalApplet : public KviStyledToolButton +class KVIRC_API KviToolBarGraphicalApplet : public QToolButton { Q_OBJECT public: diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 734197c74..932b45061 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -74,7 +74,6 @@ #include "kvi_ircview.h" #include "kvi_ircviewtools.h" #include "kvi_ircviewprivate.h" -#include "kvi_styled_controls.h" #include "kvi_debug.h" #include "kvi_app.h" #include "kvi_settings.h" @@ -113,7 +112,6 @@ #include <QPainter> #include <QRegExp> #include <QFile> -#include "kvi_styled_controls.h" #include <QFontMetrics> // needed #include <QApplication> #include <QMessageBox> @@ -364,7 +362,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pScrollBar->setFocusProxy(this); - m_pToolsButton = new KviStyledToolButton(this,"btntools"); + m_pToolsButton = new QToolButton(this,"btntools"); QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); m_pToolsButton->setAutoRaise(true); m_pToolsButton->setIcon(is1); diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 6289e3584..45f49ec99 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -27,16 +27,15 @@ #include "kvi_settings.h" #include "kvi_string.h" #include "kvi_pointerlist.h" -#include "kvi_styled_controls.h"
+#include <QToolButton> #include <QWidget> #include <QPixmap> // needed class QScrollBar; class QLineEdit; class QFile; -//class KviStyledToolButton; -class QFontMetrics; +class QFQs; class KviTalPopupMenu; class KviWindow; @@ -89,7 +88,7 @@ private: QPixmap * m_pPrivateBackgroundPixmap; QScrollBar * m_pScrollBar; - KviStyledToolButton * m_pToolsButton; + QToolButton * m_pToolsButton; KviTalPopupMenu * m_pToolsPopup; KviIrcViewToolWidget * m_pToolWidget; diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index 206a2bfc9..dfb0b39d2 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -26,7 +26,6 @@ #include "kvi_ircviewtools.h" #include "kvi_ircview.h" -#include "kvi_styled_controls.h" #include "kvi_iconmanager.h" #include "kvi_options.h" #include "kvi_locale.h" @@ -36,12 +35,9 @@ #include "kvi_app.h" #include "kvi_memmove.h" - -#include "kvi_styled_controls.h" #include <QTabWidget> #include <QLayout> #include <QLabel> -#include "kvi_styled_controls.h" #include <QPushButton> #include <QLineEdit> #include <QCursor> @@ -121,15 +117,15 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) g->addWidget(m_pStringToFind,0,0,1,3); connect(m_pStringToFind,SIGNAL(returnPressed()),this,SLOT(findNext())); - m_pRegExp = new KviStyledCheckBox(__tr2qs("&Regular expression"),w); + m_pRegExp = new QCheckBox(__tr2qs("&Regular expression"),w); g->addWidget(m_pRegExp,1,0,1,3); - m_pExtendedRegExp = new KviStyledCheckBox(__tr2qs("E&xtended regexp."),w); + m_pExtendedRegExp = new QCheckBox(__tr2qs("E&xtended regexp."),w); g->addWidget(m_pExtendedRegExp,2,0,1,3); m_pExtendedRegExp->setEnabled(false); connect(m_pRegExp,SIGNAL(toggled(bool)),m_pExtendedRegExp,SLOT(setEnabled(bool))); - m_pCaseSensitive = new KviStyledCheckBox(__tr2qs("C&ase sensitive"),w); + m_pCaseSensitive = new QCheckBox(__tr2qs("C&ase sensitive"),w); g->addWidget(m_pCaseSensitive,3,0,1,3); QPushButton * pb = new QPushButton(__tr2qs("Find &Prev."),w); diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index a9540c9a0..cb9950e60 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -30,7 +30,7 @@ #include <QFrame> #include <QString> #include <QTreeWidget> -#include "kvi_styled_controls.h" +#include <QCheckBox> class QLabel; class QLineEdit; @@ -63,7 +63,7 @@ public: KviIrcMessageCheckListItem(QTreeWidget * par,KviIrcViewToolWidget * w,int id); ~KviIrcMessageCheckListItem(); private: - KviStyledCheckBox *m_pCbox; + QCheckBox *m_pCbox; int m_iId; KviIrcViewToolWidget * m_pToolWidget; public: @@ -93,9 +93,9 @@ protected: QLineEdit * m_pStringToFind; QPoint m_pressPoint; - KviStyledCheckBox * m_pCaseSensitive; - KviStyledCheckBox * m_pRegExp; - KviStyledCheckBox * m_pExtendedRegExp; + QCheckBox * m_pCaseSensitive; + QCheckBox * m_pRegExp; + QCheckBox * m_pExtendedRegExp; QLabel * m_pFindResult; diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index f96812b1d..83fbda7c6 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -56,7 +56,7 @@ KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name) -: KviStyledToolButton(parent) +: QToolButton(parent) { setObjectName(name); setIcon(QIcon(pix)); @@ -214,7 +214,7 @@ void KviMdiCaption::paintEvent(QPaintEvent * e) // Q3SimpleRichText rt(text,font()); - // QSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
+ // QSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); // rt.draw(&p,height() + 2,-1,rect(),colorGroup()); QTextDocument doc; p.translate(16,0); @@ -254,7 +254,7 @@ void KviMdiCaption::resizeEvent(QResizeEvent * e) KviMenuBarToolButton::KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name) -: KviStyledToolButton(par) +: QToolButton(par) { setProperty("name","name"); setIcon(img); diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index 9f15dcca0..30427f85e 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -25,15 +25,13 @@ //================================================================================================= #include "kvi_settings.h" -#include "kvi_styled_controls.h" - -#include "kvi_styled_controls.h" #include <QLabel> +#include <QToolButton> class KviMdiManager; class KviMdiChild; -class KVIRC_API KviMdiCaptionButton : public KviStyledToolButton +class KVIRC_API KviMdiCaptionButton : public QToolButton { Q_OBJECT public: @@ -45,7 +43,7 @@ protected: }; -class KviMenuBarToolButton : public KviStyledToolButton +class KviMenuBarToolButton : public QToolButton { Q_OBJECT public: diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index e040efb77..d69ed7ad9 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -258,12 +258,14 @@ void KviMdiChild::moveEvent(QMoveEvent *e) void KviMdiChild::systemPopupSlot() { - if(sender()->inherits("KviStyledToolButton")) +/* + if(sender()->inherits("QToolButton")) { - emit systemPopupRequest(((KviStyledToolButton *)sender())->mapToGlobal(QPoint(0,((KviStyledToolButton *)sender())->height()))); + emit systemPopupRequest(((QToolButton *)sender())->mapToGlobal(QPoint(0,((QToolButton *)sender())->height()))); } else { +*/ emit systemPopupRequest(m_pCaption->mapToGlobal(QPoint(5,5))); - } +// } } void KviMdiChild::resizeEvent(QResizeEvent *e) diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index b39d239d5..ba97810fe 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -28,7 +28,6 @@ #include "kvi_string.h" #include <QFrame> -#include "kvi_styled_controls.h" #include <QLabel> class KviMdiManager; diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index 498941a3a..a7b667c36 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -32,7 +32,6 @@ #include <QWidget> #include <QFrame> #include <QPixmap> -#include "kvi_styled_controls.h" #define KVI_MDICHILD_BORDER 4 #define KVI_MDICHILD_SPACING 2 diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 0a9b859e2..76640aeae 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -29,7 +29,6 @@ #include "kvi_ircconnectionserverinfo.h" #include "kvi_channel.h" #include "kvi_ircconnectionuserinfo.h" -#include "kvi_styled_controls.h" #include "kvi_toolwindows_container.h" #include "kvi_tal_scrollview.h" @@ -101,7 +100,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const int i = 1; QString tmp; - m_pCheckBoxes = new KviPointerList<KviStyledCheckBox>; + m_pCheckBoxes = new KviPointerList<QCheckBox>; m_pCheckBoxes->setAutoDelete(false); @@ -114,7 +113,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const szModes.remove(0,1); KviQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); - KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); + QCheckBox * cb = new QCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); cb->setChecked(m_szMode.contains((char)ccc.unicode())); @@ -123,7 +122,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const } KviQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); - m_pLimitBox = new KviStyledCheckBox(tmp,pBackground); + m_pLimitBox = new QCheckBox(tmp,pBackground); m_pLimitBox->setEnabled(isEnabled); i++; g->addWidget(m_pLimitBox,i,0,1,3); @@ -144,7 +143,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const } KviQString::sprintf(tmp,"k: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('k'))); - m_pKeyBox = new KviStyledCheckBox(tmp,pBackground); + m_pKeyBox = new QCheckBox(tmp,pBackground); m_pKeyBox->setEnabled(isEnabled); i++; @@ -191,7 +190,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const szModes.remove(0,1); KviQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); - KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); + QCheckBox * cb = new QCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); cb->setChecked(m_szMode.contains((char)ccc.unicode())); @@ -306,7 +305,7 @@ void KviModeEditor::commit() } - for(KviStyledCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next()) + for(QCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next()) { QString sz = cb->text(); sz.replace("&",""); diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h index da26ecca4..f7e352733 100644 --- a/src/kvirc/ui/kvi_modeeditor.h +++ b/src/kvirc/ui/kvi_modeeditor.h @@ -26,12 +26,11 @@ #include "kvi_settings.h" #include "kvi_string.h" #include "kvi_pointerlist.h" -#include "kvi_styled_controls.h" #include "kvi_toolwindows_container.h" #include <QWidget> #include <QPushButton> -#include "kvi_styled_controls.h" +#include <QCheckBox> #include <QLineEdit> #include <QLabel> @@ -52,10 +51,10 @@ protected: // fields QString m_szMode; QString m_szKey; QString m_szLimit; - KviPointerList<KviStyledCheckBox> * m_pCheckBoxes; - KviStyledCheckBox * m_pLimitBox; + KviPointerList<QCheckBox> * m_pCheckBoxes; + QCheckBox * m_pLimitBox; QLineEdit * m_pLimitEdit; - KviStyledCheckBox * m_pKeyBox; + QCheckBox * m_pKeyBox; QLineEdit * m_pKeyEdit; signals: void setMode(const char *); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index e92aef813..6deba8835 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -59,8 +59,6 @@ #include <QPixmap> #include <QSplitter> -#include "kvi_styled_controls.h" - KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole) diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index ad0cd4978..c862c2896 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -31,7 +31,7 @@ KviScriptUserButton::KviScriptUserButton(QWidget * par,const char * name) -: KviStyledToolButton(par,name) +: QToolButton(par,name) { m_pScript = 0; // setAutoRaise(true); diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h index 4232e6d67..7b15795c8 100644 --- a/src/kvirc/ui/kvi_scriptbutton.h +++ b/src/kvirc/ui/kvi_scriptbutton.h @@ -24,15 +24,14 @@ #include "kvi_settings.h" #include "kvi_string.h" -#include "kvi_styled_controls.h" -#include "kvi_styled_controls.h" +#include <QToolButton> #include <QToolBar> class KviKvsScript; class KviWindow; -class KVIRC_API KviScriptUserButton : public KviStyledToolButton +class KVIRC_API KviScriptUserButton : public QToolButton { Q_OBJECT public: diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index b742a3a48..1ea3a3f7b 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -42,7 +42,7 @@ #include <QAbstractItemView> KviBoolSelector::KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled) -: KviStyledCheckBox(txt,par), KviSelectorInterface() +: QCheckBox(txt,par), KviSelectorInterface() { setEnabled(bEnabled); setChecked(*pOption); @@ -215,7 +215,7 @@ KviPixmapSelector::KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap m_localPixmap = *pOption; - m_pCheckBox = new KviStyledCheckBox(txt,this); + m_pCheckBox = new QCheckBox(txt,this); m_pCheckBox->setChecked(m_localPixmap.pixmap()); connect(m_pCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index b03cb4398..dadb634c2 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -29,14 +29,13 @@ #include "kvi_settings.h" #include "kvi_string.h" #include "kvi_pixmap.h" -#include "kvi_styled_controls.h" #include "kvi_tal_hbox.h" #include "kvi_tal_vbox.h" #include "kvi_tal_scrollview.h" #include "kvi_tal_listwidget.h" #include "kvi_tal_treewidget.h" -#include "kvi_styled_controls.h" +#include <QCheckBox> #include <QLineEdit> #include <QLabel> #include <QPushButton> @@ -76,7 +75,7 @@ public: virtual void commit(){}; }; -class KVIRC_API KviBoolSelector : public KviStyledCheckBox, public KviSelectorInterface +class KVIRC_API KviBoolSelector : public QCheckBox, public KviSelectorInterface { Q_OBJECT public: @@ -139,7 +138,7 @@ public: KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap * pOption,bool bEnabled); ~KviPixmapSelector(); private: - KviStyledCheckBox * m_pCheckBox; + QCheckBox * m_pCheckBox; QLabel * m_pFileNameLabel; KviPixmapPreview * m_pPreview; QPushButton * m_pChooseButton; diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 7c1ab6b5e..791790553 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -27,7 +27,6 @@ #include "kvi_toolwindows_container.h" #include "kvi_iconmanager.h" #include "kvi_tal_vbox.h" -#include "kvi_styled_controls.h" #include <QPainter> #include <QApplication> @@ -101,7 +100,7 @@ void KviWindowToolWidget::unregisterSelf() }*/ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn, const char * name ) -:TOOL_PAGE_PARENT(parent) +:QToolButton(parent) { // setFlat(true); setToolTip(text); diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h index d634ceff7..7257082c9 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.h +++ b/src/kvirc/ui/kvi_toolwindows_container.h @@ -26,14 +26,11 @@ //============================================================================= #include "kvi_heapobject.h" -#include "kvi_styled_controls.h" #include "kvi_tal_widgetstack.h" #include "kvi_tal_vbox.h" -#include "kvi_styled_controls.h" +#include <QToolButton> #include <QObjectCleanupHandler> -#include <QPushButton> - class KviWindowToolWidget; class KviWindowToolPageButton; @@ -69,14 +66,7 @@ protected: }; -//#ifdef COMPILE_USE_QT4 -// #define TOOL_PAGE_PARENT QPushButton -//#else - #define TOOL_PAGE_PARENT KviStyledToolButton -//#endif - - -class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT +class KVIRC_API KviWindowToolPageButton : public QToolButton { Q_OBJECT public: diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index cffba3bef..e8ffe00df 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -47,7 +47,6 @@ #include "kvi_stringconversion.h" #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" -#include "kvi_styled_controls.h" #include <QLabel> #include <QScrollBar> diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index f99c393b0..ec427d6f8 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -50,7 +50,6 @@ #include "kvi_ircconnectionserverinfo.h" #include "kvi_mirccntrl.h" #include "kvi_toolwindows_container.h" -#include "kvi_styled_controls.h" #include "kvi_kvs_script.h" #include "kvi_tal_popupmenu.h" #include "kvi_tal_tooltip.h" @@ -65,7 +64,6 @@ #include <QPushButton> #include <QDesktopWidget> #include <QVariant> -#include "kvi_styled_controls.h" #include <QMessageBox> #include <QEvent> #include <QCloseEvent> diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index deee93860..751c680e2 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -41,10 +41,10 @@ #include <QFrame> #include <QWidget> +#include <QToolButton> class QPixmap; class QSplitter; -class KviStyledToolButton; class QTextCodec; class KviFrame; class KviTaskBarItem; @@ -158,7 +158,7 @@ protected: // almost private: don't touch :D KviCryptSessionInfo * m_pCryptSessionInfo; #endif BUTTON_CLASS * m_pTextEncodingButton; - KviStyledToolButton * m_pHideToolsButton; + QToolButton * m_pHideToolsButton; QWidget * m_pLastFocusedChild; KviAccel * m_pAccel; static const char * m_typeTable[KVI_WINDOW_NUM_TYPES + 1]; diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 8e4080091..703d188f3 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -320,7 +320,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr o = *it; QString szText; if(o->inherits("QLabel"))szText = ((QLabel *)o)->text(); - else if(o->inherits("KviStyledCheckBox"))szText = ((KviStyledCheckBox *)o)->text(); + else if(o->inherits("QCheckBox"))szText = ((KviStyledCheckBox *)o)->text(); else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title(); if(o->inherits("QWidget")) |