diff options
Diffstat (limited to 'src/modules')
41 files changed, 171 insertions, 172 deletions
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index b4a61ec79..abc0c4560 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -53,8 +53,8 @@ #include <QMessageBox>
#include <QLineEdit>
#include <QComboBox>
-#include <QToolButton>
-#include <QCheckBox>
+#include "kvi_styled_controls.h"
+#include "kvi_styled_controls.h"
#include <QPainter>
#include <QTabWidget>
#include <QLabel>
@@ -151,7 +151,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) gl->addWidget(l,2,0);
m_pSmallIconEdit = new QLineEdit(tab);
gl->addWidget(m_pSmallIconEdit,2,1);
- m_pSmallIconButton = new QToolButton(tab);
+ m_pSmallIconButton = new KviStyledToolButton(tab);
m_pSmallIconButton->setMinimumSize(QSize(20,20));
connect(m_pSmallIconButton,SIGNAL(clicked()),this,SLOT(chooseSmallIcon()));
gl->addWidget(m_pSmallIconButton,2,2);
@@ -165,7 +165,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) gl->addWidget(l,3,0);
m_pBigIconEdit = new QLineEdit(tab);
gl->addWidget(m_pBigIconEdit,3,1);
- m_pBigIconButton = new QToolButton(tab);
+ m_pBigIconButton = new KviStyledToolButton(tab);
m_pBigIconButton->setMinimumSize(QSize(48,48));
m_pBigIconButton->setIconSize(QSize(32,32));
connect(m_pBigIconButton,SIGNAL(clicked()),this,SLOT(chooseBigIcon()));
@@ -205,7 +205,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) gl = new QGridLayout(tab);
- m_pNeedsContextCheck = new QCheckBox(__tr2qs("Needs IRC Context"),tab);
+ m_pNeedsContextCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Context"),tab);
connect(m_pNeedsContextCheck,SIGNAL(toggled(bool)),this,SLOT(needsContextCheckToggled(bool)));
m_pNeedsContextCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window belongs to an irc context"));
@@ -217,7 +217,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) l->setMinimumWidth(40);
gl->addWidget(l,1,0);
- m_pNeedsConnectionCheck = new QCheckBox(__tr2qs("Needs IRC Connection"),tab);
+ m_pNeedsConnectionCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Connection"),tab);
connect(m_pNeedsConnectionCheck,SIGNAL(toggled(bool)),this,SLOT(needsConnectionCheckToggled(bool)));
m_pNeedsConnectionCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window has an active IRC connection"));
@@ -229,13 +229,13 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) l->setMinimumWidth(40);
gl->addWidget(l,2,1);
- m_pEnableAtLoginCheck = new QCheckBox(__tr2qs("Enable at Login"),tab);
+ m_pEnableAtLoginCheck = new KviStyledCheckBox(__tr2qs("Enable at Login"),tab);
m_pEnableAtLoginCheck->setToolTip(__tr2qs("Check this option if this action should be enabled also during " \
"the login operations (so when the logical IRC connection hasn't been estabilished yet)"));
gl->addWidget(m_pEnableAtLoginCheck,2,2,1,2);
// gl->addMultiCellWidget(m_pEnableAtLoginCheck,2,2,2,3);
- m_pSpecificWindowsCheck = new QCheckBox(__tr2qs("Enable Only in Specified Windows"),tab);
+ m_pSpecificWindowsCheck = new KviStyledCheckBox(__tr2qs("Enable Only in Specified Windows"),tab);
connect(m_pSpecificWindowsCheck,SIGNAL(toggled(bool)),this,SLOT(specificWindowsCheckToggled(bool)));
m_pSpecificWindowsCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window is of a specified type"));
@@ -243,46 +243,46 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) // gl->addMultiCellWidget(m_pSpecificWindowsCheck,3,3,0,3);
- m_pWindowConsoleCheck = new QCheckBox(__tr2qs("Enable in Console Windows"),tab);
+ m_pWindowConsoleCheck = new KviStyledCheckBox(__tr2qs("Enable in Console Windows"),tab);
m_pWindowConsoleCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window is a console"));
connect(m_pWindowConsoleCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
gl->addWidget(m_pWindowConsoleCheck,4,1,1,3);
// gl->addMultiCellWidget(m_pWindowConsoleCheck,4,4,1,3);
- m_pConsoleOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
+ m_pConsoleOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
m_pConsoleOnlyIfUsersSelectedCheck->setToolTip(__tr2qs("This will enable the action only if there are " \
"selected users in the active window"));
gl->addWidget(m_pConsoleOnlyIfUsersSelectedCheck,5,2,1,2);
// gl->addMultiCellWidget(m_pConsoleOnlyIfUsersSelectedCheck,5,5,2,3);
- m_pWindowChannelCheck = new QCheckBox(__tr2qs("Enable in Channel Windows"),tab);
+ m_pWindowChannelCheck = new KviStyledCheckBox(__tr2qs("Enable in Channel Windows"),tab);
m_pWindowChannelCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window is a channel"));
connect(m_pWindowChannelCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
gl->addWidget(m_pWindowChannelCheck,6,1,1,3);
// gl->addMultiCellWidget(m_pWindowChannelCheck,6,6,1,3);
- m_pChannelOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
+ m_pChannelOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
m_pChannelOnlyIfUsersSelectedCheck->setToolTip(__tr2qs("This will enable the action only if there are " \
"selected users in the active window"));
gl->addWidget(m_pChannelOnlyIfUsersSelectedCheck,7,2,1,2);
// gl->addMultiCellWidget(m_pChannelOnlyIfUsersSelectedCheck,7,7,2,3);
- m_pWindowQueryCheck = new QCheckBox(__tr2qs("Enable in Query Windows"),tab);
+ m_pWindowQueryCheck = new KviStyledCheckBox(__tr2qs("Enable in Query Windows"),tab);
m_pWindowQueryCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window is a query"));
connect(m_pWindowQueryCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
gl->addWidget(m_pWindowQueryCheck,8,1,1,3);
// gl->addMultiCellWidget(m_pWindowQueryCheck,8,8,1,3);
- m_pQueryOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
+ m_pQueryOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
m_pQueryOnlyIfUsersSelectedCheck->setToolTip(__tr2qs("This will enable the action only if there are " \
"selected users in the active window"));
gl->addWidget(m_pQueryOnlyIfUsersSelectedCheck,9,2,1,2);
// gl->addMultiCellWidget(m_pQueryOnlyIfUsersSelectedCheck,9,9,2,3);
- m_pWindowDccChatCheck = new QCheckBox(__tr2qs("Enable in DCC Chat Windows"),tab);
+ m_pWindowDccChatCheck = new KviStyledCheckBox(__tr2qs("Enable in DCC Chat Windows"),tab);
m_pWindowDccChatCheck->setToolTip(__tr2qs("Check this option if this action should be enabled only when " \
"the active window is a dcc chat"));
gl->addWidget(m_pWindowDccChatCheck,10,1,1,2);
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h index 02134a43b..dc50e2a8d 100644 --- a/src/modules/actioneditor/actioneditor.h +++ b/src/modules/actioneditor/actioneditor.h @@ -29,13 +29,13 @@ #include <QWidget> #include <QTextDocument> -#include <QCheckBox> -#include <QToolButton> +#include "kvi_styled_controls.h" +#include "kvi_styled_controls.h" class QLineEdit; class QComboBox; -class QToolButton; +class KviStyledToolButton; class QSimpleRichText; class QPushButton; class QSplitter; @@ -126,19 +126,19 @@ protected: QLineEdit * m_pDescriptionEdit; QLineEdit * m_pSmallIconEdit; QLineEdit * m_pBigIconEdit; - QToolButton * m_pSmallIconButton; - QToolButton * m_pBigIconButton; - QCheckBox * m_pNeedsContextCheck; - QCheckBox * m_pNeedsConnectionCheck; - QCheckBox * m_pEnableAtLoginCheck; - QCheckBox * m_pSpecificWindowsCheck; - QCheckBox * m_pWindowConsoleCheck; - QCheckBox * m_pWindowChannelCheck; - QCheckBox * m_pWindowQueryCheck; - QCheckBox * m_pWindowDccChatCheck; - QCheckBox * m_pConsoleOnlyIfUsersSelectedCheck; - QCheckBox * m_pChannelOnlyIfUsersSelectedCheck; - QCheckBox * m_pQueryOnlyIfUsersSelectedCheck; + KviStyledToolButton * m_pSmallIconButton; + KviStyledToolButton * m_pBigIconButton; + KviStyledCheckBox * m_pNeedsContextCheck; + KviStyledCheckBox * m_pNeedsConnectionCheck; + KviStyledCheckBox * m_pEnableAtLoginCheck; + KviStyledCheckBox * m_pSpecificWindowsCheck; + KviStyledCheckBox * m_pWindowConsoleCheck; + KviStyledCheckBox * m_pWindowChannelCheck; + KviStyledCheckBox * m_pWindowQueryCheck; + KviStyledCheckBox * m_pWindowDccChatCheck; + KviStyledCheckBox * m_pConsoleOnlyIfUsersSelectedCheck; + KviStyledCheckBox * m_pChannelOnlyIfUsersSelectedCheck; + KviStyledCheckBox * m_pQueryOnlyIfUsersSelectedCheck; public: KviActionData * actionData(){ return m_pActionData; }; void setActionData(KviActionData * d); diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 16655a30d..badaf2226 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -39,7 +39,7 @@ #include <QLabel> #include <QLineEdit> #include <QLayout> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QPushButton> #include <QEvent> #include <QCloseEvent> diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index 8eaffdf9e..b8853f0a2 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -38,7 +38,7 @@ #include <QPushButton> #include <QLayout> #include <QLabel> -#include <QToolButton> +#include "kvi_styled_controls.h" extern KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList; diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 30190dd12..f487f139f 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -64,7 +64,7 @@ #include <QPainter> #include <QDateTime> #include <qglobal.h> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QSpinBox> #include <QLayout> #include <QPushButton> diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 87d810c73..7891d8e9f 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -679,7 +679,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pVolumeSlider->setMaximumHeight(2*m_pPlayingLabel->height()); connect(m_pVolumeSlider, SIGNAL(valueChanged(int)), this, SLOT(setMixerVolume(int))); - m_pTalkButton = new QToolButton(m_pHBox); + m_pTalkButton = new KviStyledToolButton(m_pHBox); m_pTalkButton->setEnabled(false); m_pTalkButton->setToggleButton(true); QIcon iset; diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h index 944551dd5..237adc10d 100644 --- a/src/modules/dcc/voice.h +++ b/src/modules/dcc/voice.h @@ -33,7 +33,7 @@ #include "kvi_tal_hbox.h" #include <QLabel> -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QTimer> class QSlider; @@ -113,7 +113,7 @@ protected: QLabel * m_pOutputLabel; QLabel * m_pRecordingLabel; QLabel * m_pPlayingLabel; - QToolButton * m_pTalkButton; + KviStyledToolButton * m_pTalkButton; QTimer * m_pUpdateTimer; QString m_szTarget; KviDccVoiceThread * m_pSlaveThread; diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index ef20eb9df..4a26b4dc6 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -44,7 +44,7 @@ //FIXME
#include <QLayout>
-#include <QToolButton>
+#include "kvi_styled_controls.h"
#include <QMessageBox>
#include <QTimer>
#include <QCursor>
@@ -919,7 +919,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par) g->setRowStretch(0,1);
- QToolButton * b = new QToolButton(this);
+ KviStyledToolButton * b = new KviStyledToolButton(this);
b->setArrowType(Qt::DownArrow);
b->setObjectName("ToolButtonEditor");
@@ -932,7 +932,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par) pop->insertSeparator();
pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
b->setMenu(pop);
- b->setPopupMode(QToolButton::InstantPopup);
+ b->setPopupMode(KviStyledToolButton::InstantPopup);
g->setColumnStretch(1,1);
g->setColumnStretch(2,10);
@@ -1225,7 +1225,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, con replacebutton->setEnabled( FALSE );
layout->addWidget( replacebutton, 3, 2 );
- checkReplaceAll = new QCheckBox( this);
+ checkReplaceAll = new KviStyledCheckBox( this);
checkReplaceAll->setObjectName("replaceAll" );
checkReplaceAll->setText(tr("&Replace in all Aliases"));
layout->addWidget( checkReplaceAll, 2, 0 );
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index 329c6af0f..c6286bff5 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -35,7 +35,7 @@ #include <QLabel> #include <QDialog> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QEvent> #include <QTextEdit> #include <QListWidget> @@ -179,7 +179,7 @@ protected: QPushButton *findNext; // QPushButton *cancelbutton; - QCheckBox *checkReplaceAll; + KviStyledCheckBox *checkReplaceAll; QWidget *m_pParent; protected slots: void textChanged(const QString &); diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h index 76fd64273..39469912c 100644 --- a/src/modules/filetransferwindow/filetransferwindow.h +++ b/src/modules/filetransferwindow/filetransferwindow.h @@ -35,7 +35,7 @@ #include "kvi_tal_listview.h" #include "kvi_tal_popupmenu.h" -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QTimer> #include <QPixmap> diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 137f9be78..979690f31 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -51,7 +51,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) // The button box on the left KviTalHBox * box = new KviTalHBox(m_pTopSplitter); - m_pRequestButton = new QToolButton(box,"request_button"); + m_pRequestButton = new KviStyledToolButton(box,"request_button"); m_pRequestButton->setUsesBigPixmap(false); m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS))); connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestLinks())); diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h index 3befc875d..b73a2860f 100644 --- a/src/modules/links/linkswindow.h +++ b/src/modules/links/linkswindow.h @@ -31,7 +31,7 @@ #include "kvi_tal_listview.h" #include "kvi_tal_popupmenu.h" -#include <QToolButton> +#include "kvi_styled_controls.h" class KviThemedLabel; @@ -58,7 +58,7 @@ protected: KviPointerList<KviLink> * m_pLinkList; KviTalPopupMenu * m_pHostPopup; QString m_szRootServer; - QToolButton * m_pRequestButton; + KviStyledToolButton * m_pRequestButton; KviThemedLabel * m_pInfoLabel; public: // Methods virtual void control(int msg); diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 3d03acefa..32dc0e189 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -129,7 +129,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton) bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - SET_OBJECT(QToolButton); + SET_OBJECT(KviStyledToolButton); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); return true; } @@ -143,10 +143,10 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c) if (!widget()) return true; QPixmap * pix = g_pIconManager->getImage(icon); if(pix){ - ((QToolButton *)widget())->setIcon(QIcon(*pix)); + ((KviStyledToolButton *)widget())->setIcon(QIcon(*pix)); } else - ((QToolButton *)widget())->setIcon(QIcon()); + ((KviStyledToolButton *)widget())->setIcon(QIcon()); return true; } bool KviKvsObject_toolbutton::functionsetUsesBigPixmap(KviKvsObjectFunctionCall *c) @@ -156,13 +156,13 @@ bool KviKvsObject_toolbutton::functionsetUsesBigPixmap(KviKvsObjectFunctionCall KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QToolButton *)widget())->setUsesBigPixmap(bEnabled); + ((KviStyledToolButton *)widget())->setUsesBigPixmap(bEnabled); return true; } bool KviKvsObject_toolbutton::functionusesBigPixmap(KviKvsObjectFunctionCall *c) { if (widget()) - c->returnValue()->setBoolean(((QToolButton *)widget())->usesBigPixmap()); + c->returnValue()->setBoolean(((KviStyledToolButton *)widget())->usesBigPixmap()); return true; } bool KviKvsObject_toolbutton::functionsetUsesTextLabel(KviKvsObjectFunctionCall *c) @@ -172,13 +172,13 @@ bool KviKvsObject_toolbutton::functionsetUsesTextLabel(KviKvsObjectFunctionCall KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QToolButton *)widget())->setUsesTextLabel(bEnabled); + ((KviStyledToolButton *)widget())->setUsesTextLabel(bEnabled); return true; } bool KviKvsObject_toolbutton::functionusesTextLabel(KviKvsObjectFunctionCall *c) { if (widget()) - c->returnValue()->setBoolean(((QToolButton *)widget())->usesTextLabel()); + c->returnValue()->setBoolean(((KviStyledToolButton *)widget())->usesTextLabel()); return true; } bool KviKvsObject_toolbutton::function_setAutoRaise(KviKvsObjectFunctionCall *c) @@ -188,13 +188,13 @@ bool KviKvsObject_toolbutton::function_setAutoRaise(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QToolButton *)widget())->setAutoRaise(bEnabled); + ((KviStyledToolButton *)widget())->setAutoRaise(bEnabled); return true; } bool KviKvsObject_toolbutton::function_autoRaise(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QToolButton *)widget())->autoRaise()); + c->returnValue()->setBoolean(((KviStyledToolButton *)widget())->autoRaise()); return true; } bool KviKvsObject_toolbutton::functionsetOn(KviKvsObjectFunctionCall *c) @@ -204,7 +204,7 @@ bool KviKvsObject_toolbutton::functionsetOn(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QToolButton *)widget())->setOn(bEnabled); + ((KviStyledToolButton *)widget())->setOn(bEnabled); return true; } @@ -215,13 +215,13 @@ bool KviKvsObject_toolbutton::functionsetToggleButton(KviKvsObjectFunctionCall * KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QToolButton *)widget())->setCheckable(bEnabled); + ((KviStyledToolButton *)widget())->setCheckable(bEnabled); return true; } bool KviKvsObject_toolbutton::functiontoggle(KviKvsObjectFunctionCall *c) { if (widget()) - ((QToolButton *)widget())->toggle(); + ((KviStyledToolButton *)widget())->toggle(); return true; } @@ -233,14 +233,14 @@ bool KviKvsObject_toolbutton::functionsetTextLabel(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("tooltip",KVS_PT_STRING,KVS_PF_OPTIONAL,szTip) KVSO_PARAMETERS_END(c) if(!widget()) return true; - ((QToolButton *)widget())->setText(szLabel); - if (!szTip.isEmpty()) ((QToolButton *)widget())->setToolTip(szTip); + ((KviStyledToolButton *)widget())->setText(szLabel); + if (!szTip.isEmpty()) ((KviStyledToolButton *)widget())->setToolTip(szTip); return true; } bool KviKvsObject_toolbutton::functiontextLabel(KviKvsObjectFunctionCall *c) { if (widget()) - c->returnValue()->setString(((QToolButton *)widget())->text()); + c->returnValue()->setString(((KviStyledToolButton *)widget())->text()); return true; } bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c) @@ -267,13 +267,13 @@ bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c) return TRUE; } if(widget()) - ((QToolButton *)widget())->setMenu(((KviTalPopupMenu *)(ob->object()))); + ((KviStyledToolButton *)widget())->setMenu(((KviTalPopupMenu *)(ob->object()))); return true; } bool KviKvsObject_toolbutton::functionopenPopup(KviKvsObjectFunctionCall *c) { if(widget()) - ((QToolButton *)widget())->showMenu(); + ((KviStyledToolButton *)widget())->showMenu(); return true; } bool KviKvsObject_toolbutton::functionsetPopupDelay(KviKvsObjectFunctionCall *c) @@ -283,13 +283,13 @@ bool KviKvsObject_toolbutton::functionsetPopupDelay(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("delay",KVS_PT_UNSIGNEDINTEGER,0,uDelay) KVSO_PARAMETERS_END(c) if (widget()) - ((QToolButton *)widget())->setPopupDelay(uDelay); + ((KviStyledToolButton *)widget())->setPopupDelay(uDelay); return true; } bool KviKvsObject_toolbutton::functionpopupDelay(KviKvsObjectFunctionCall *c) { if (widget()) - c->returnValue()->setInteger(((QToolButton *)widget())->popupDelay()); + c->returnValue()->setInteger(((KviStyledToolButton *)widget())->popupDelay()); return true; } bool KviKvsObject_toolbutton::functionsetTextPosition(KviKvsObjectFunctionCall *c) @@ -300,9 +300,9 @@ bool KviKvsObject_toolbutton::functionsetTextPosition(KviKvsObjectFunctionCall * KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviQString::equalCI(szPos,"BesideIcon")) - ((QToolButton *)widget())->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + ((KviStyledToolButton *)widget())->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); else if(KviQString::equalCI(szPos,"BelowIcon")) - ((QToolButton *)widget())->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + ((KviStyledToolButton *)widget())->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); else c->warning(__tr2qs("Unknown text position '%Q'"),&szPos); return true; } @@ -310,7 +310,7 @@ bool KviKvsObject_toolbutton::functiontextPosition(KviKvsObjectFunctionCall *c) { if(!widget()) return true; QString szPos="BelowIcon"; - if ((((QToolButton *)widget())->toolButtonStyle())==(Qt::ToolButtonTextBesideIcon)) + if ((((KviStyledToolButton *)widget())->toolButtonStyle())==(Qt::ToolButtonTextBesideIcon)) szPos="BesideIcon"; c->returnValue()->setString(szPos); return true; diff --git a/src/modules/objects/class_toolbutton.h b/src/modules/objects/class_toolbutton.h index 36ea25993..fb056d6f5 100644 --- a/src/modules/objects/class_toolbutton.h +++ b/src/modules/objects/class_toolbutton.h @@ -25,7 +25,7 @@ // -#include <qtoolbutton.h> +#include <KviStyledToolButton.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index c27b0b53d..b181b5b36 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -89,7 +89,7 @@ Now %A. will be point to the wrapped object, therefore we could modify its property or to consider it as if it were an object created by us in scripting. [br] Obviously, deleting the created object (for example %A) you don't will delete the object of Kvirc (in this case the statusbar). [br] Another example could be this:[br] - %A=$new(wrapper,0,test,KviFrame::kvirc_frame,QToolButton::kvirc.identityoptions)[br] + %A=$new(wrapper,0,test,KviFrame::kvirc_frame,KviStyledToolButton::kvirc.identityoptions)[br] %A->$setProperty(usesBigPixmap,0)[br] In this fool example with the function $setProperty, we has setted the property usesBigPixmap to False, making to become the small icons of the ToolBar.[br] [br] diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 9feaf0c7c..e3ac65673 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -43,8 +43,8 @@ #include <QLabel> #include <QSplitter> #include <QPushButton> -#include <QToolButton> -#include <QCheckBox> +#include "kvi_styled_controls.h" +#include "kvi_styled_controls.h" #include <QPainter> #include <QFont> #include <QEvent> @@ -200,7 +200,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup) m_pSearchLineEdit = new QLineEdit(hbox); connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked())); - m_pSearchButton = new QToolButton(hbox); + m_pSearchButton = new KviStyledToolButton(hbox); m_pSearchButton->setUsesBigPixmap(false); m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH))); connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked())); @@ -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("QCheckBox"))szText = ((QCheckBox *)o)->text(); + else if(o->inherits("KviStyledCheckBox"))szText = ((KviStyledCheckBox *)o)->text(); else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title(); if(o->inherits("QWidget")) diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h index 5b59abe08..62c5a2e69 100644 --- a/src/modules/options/dialog.h +++ b/src/modules/options/dialog.h @@ -36,7 +36,7 @@ class QLabel; class QPushButton; class QLineEdit; -class QToolButton; +class KviStyledToolButton; class KviTalWidgetStack; class KviGeneralOptionsFrontWidget : public KviOptionsWidget @@ -76,7 +76,7 @@ private: KviGeneralOptionsFrontWidget* m_pFrontWidget; QString m_szGroup; QLineEdit * m_pSearchLineEdit; - QToolButton * m_pSearchButton; + KviStyledToolButton * m_pSearchButton; private: void recursiveCommit(KviOptionsListViewItem *it); void fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 75ac7e5f0..64c066be7 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -39,7 +39,7 @@ #include "kvi_tal_tooltip.h" #include <QLineEdit> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QPushButton> #include <QLayout> #include <QTabWidget> @@ -479,7 +479,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent) "The image also should be smaller than 800x600 pixels since<br>" \ "it will have to be viewable in everyone's monitor.","options"); - m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar","options"),this); + m_pUseAvatarCheck = new KviStyledCheckBox(__tr2qs_ctx("Use avatar","options"),this); addWidgetToLayout(m_pUseAvatarCheck,0,0,0,0); m_pUseAvatarCheck->setChecked(bHaveAvatar); mergeTip(m_pUseAvatarCheck,szTip); diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h index 0178a7dd0..db20cb690 100644 --- a/src/modules/options/optw_identity.h +++ b/src/modules/options/optw_identity.h @@ -34,7 +34,7 @@ #include <QDialog> class QLineEdit; -class QCheckBox; +class KviStyledCheckBox; class QPushButton; class QComboBox; class KviHttpRequest; @@ -152,7 +152,7 @@ public: KviIdentityAvatarOptionsWidget(QWidget * pParent); ~KviIdentityAvatarOptionsWidget(); protected: - QCheckBox * m_pUseAvatarCheck; + KviStyledCheckBox * m_pUseAvatarCheck; QLineEdit * m_pAvatarNameEdit; QPushButton * m_pChooseAvatarButton; KviPixmap * m_pLocalAvatar; diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 0a8f8f1de..a5b4da725 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -47,7 +47,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p QString szSplashDisableFile; g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION); bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile); - m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this); + m_pDisableSplash = new KviStyledCheckBox(__tr2qs_ctx("Disable splash screen","options"),this); addWidgetToLayout(m_pDisableSplash,0,3,0,3); m_pDisableSplash->setChecked(bDisableSplash); diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h index c0652cd7e..f917588f3 100644 --- a/src/modules/options/optw_interfacefeatures.h +++ b/src/modules/options/optw_interfacefeatures.h @@ -31,7 +31,7 @@ #define KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget __tr2qs_no_lookup("Interface") #define KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget 50000 -class QCheckBox; +class KviStyledCheckBox; class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget { @@ -40,7 +40,7 @@ public: KviInterfaceFeaturesOptionsWidget(QWidget * parent); ~KviInterfaceFeaturesOptionsWidget(); protected: - QCheckBox * m_pDisableSplash; + KviStyledCheckBox * m_pDisableSplash; public: virtual void commit(); }; diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index ba088e1b9..1219677fa 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -35,7 +35,7 @@ #include <QLayout> #include <QLineEdit> #include <QPushButton> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QMessageBox> @@ -229,7 +229,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) KviNickServRuleSet * rs = g_pNickServRuleSet; bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; - m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this); + m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this); gl->addWidget(m_pNickServCheck,0,0,1,3); // gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options")); diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h index 8afec3843..6c0f9bcb8 100644 --- a/src/modules/options/optw_nickserv.h +++ b/src/modules/options/optw_nickserv.h @@ -33,7 +33,7 @@ class QLineEdit; class QPushButton; -class QCheckBox; +class KviStyledCheckBox; class KviNickServRule; class KviTalTreeWidget; @@ -73,7 +73,7 @@ public: ~KviNickServOptionsWidget(); protected: KviTalTreeWidget * m_pNickServTreeWidget; - QCheckBox * m_pNickServCheck; + KviStyledCheckBox * m_pNickServCheck; QPushButton * m_pAddRuleButton; QPushButton * m_pDelRuleButton; QPushButton * m_pEditRuleButton; diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 48e9569c2..62f7a2af9 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -37,9 +37,9 @@ #include <QLabel> #include <QLineEdit> #include <QComboBox> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QCursor> -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QIcon> @@ -85,13 +85,13 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent) KviTalVBox * vbox = new KviTalVBox(this); addWidgetToLayout(vbox,1,1,1,1); - QToolButton * tb = new QToolButton(vbox); + KviStyledToolButton * tb = new KviStyledToolButton(vbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)))); tb->setAutoRaise(true); connect(tb,SIGNAL(clicked()),this,SLOT(newProxy())); mergeTip(tb,__tr2qs_ctx("New Proxy","options")); - tb = new QToolButton(vbox); + tb = new KviStyledToolButton(vbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)))); //tb->setEnabled(false); tb->setAutoRaise(true); @@ -125,7 +125,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent) m_pProtocolBox->addItems(l); - m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); + m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool))); #ifndef COMPILE_IPV6_SUPPORT m_pIpV6Check->setEnabled(false); diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h index 9f6ced14f..6b0f8dc83 100644 --- a/src/modules/options/optw_proxy.h +++ b/src/modules/options/optw_proxy.h @@ -28,7 +28,7 @@ class QLabel; class QLineEdit; -class QCheckBox; +class KviStyledCheckBox; class QComboBox; class KviIpEditor; class KviTalPopupMenu; @@ -74,7 +74,7 @@ protected: QLabel * m_pProtocolLabel; QComboBox * m_pProtocolBox; KviTalPopupMenu * m_pContextPopup; - QCheckBox * m_pIpV6Check; + KviStyledCheckBox * m_pIpV6Check; KviProxyOptionsTreeWidgetItem * m_pLastEditedItem; private: diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 972df5712..08f4fe2e0 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -54,9 +54,9 @@ #include "kvi_tal_popupmenu.h" #include "kvi_tal_tooltip.h" -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QLineEdit> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QCursor> #include <QValidator> #include <QMessageBox> @@ -178,7 +178,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pEncodingEditor->setCurrentIndex(current); - m_pAutoConnectCheck = new QCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab); + m_pAutoConnectCheck = new KviStyledCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab); m_pAutoConnectCheck->setChecked(n->autoConnect()); gl->addWidget(m_pAutoConnectCheck,2,0,1,2); // gl->addMultiCellWidget(m_pAutoConnectCheck,2,2,0,1); @@ -253,7 +253,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n KviNickServRuleSet * rs = n->nickServRuleSet(); bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; - m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab); + m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab); gl->addWidget(m_pNickServCheck,0,0,1,3); // gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); KviTalToolTip::add(m_pNickServCheck, @@ -498,7 +498,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("User Mode","options"),tab); gl->addWidget(gbox,1,0); - m_pUseDefaultInitUMode = new QCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); + m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); KviTalToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("<center>If this is enabled, the global initial <b>user mode</b> (configured from"\ " the identity dialog) will be used. If disabled, you can configure an initial user mode for this server","options")); bool bHasUmode = !(s->initUMode().isEmpty()); @@ -506,15 +506,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pUseDefaultInitUMode->setChecked(!bHasUmode); connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool))); - m_pIMode = new QCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox); + m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox); m_pIMode->setEnabled(bHasUmode); m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',Qt::CaseInsensitive) : szDefUMode.contains('i',Qt::CaseInsensitive)); - m_pSMode = new QCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox); + m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox); m_pSMode->setEnabled(bHasUmode); m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',Qt::CaseInsensitive) : szDefUMode.contains('s',Qt::CaseInsensitive)); - m_pWMode = new QCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox); + m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox); m_pWMode->setEnabled(bHasUmode); m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',Qt::CaseInsensitive) : szDefUMode.contains('w',Qt::CaseInsensitive)); @@ -568,7 +568,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) #endif } - m_pCacheIpCheck = new QCheckBox(__tr2qs_ctx("Cache IP address","options"),tab); + m_pCacheIpCheck = new KviStyledCheckBox(__tr2qs_ctx("Cache IP address","options"),tab); gl->addWidget(m_pCacheIpCheck,2,0,1,2); // gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1); KviTalToolTip::add(m_pCacheIpCheck,__tr2qs_ctx("<center>This check will enable <b>IP address caching</b> for this server:<br>" \ @@ -580,7 +580,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pCacheIpCheck->setChecked(s->cacheIp()); - m_pUseIPV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab); + m_pUseIPV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab); gl->addWidget(m_pUseIPV6Check,3,0,1,2); // gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1); #ifdef COMPILE_IPV6_SUPPORT @@ -593,7 +593,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \ "(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options")); - m_pUseSSLCheck = new QCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab); + m_pUseSSLCheck = new KviStyledCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab); gl->addWidget(m_pUseSSLCheck,4,0,1,2); // gl->addMultiCellWidget(m_pUseSSLCheck,4,4,0,1); KviTalToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Secure Socket Layer</b> " \ @@ -604,7 +604,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pUseSSLCheck->setChecked(s->useSSL()); - m_pUseAutoConnect = new QCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); + m_pUseAutoConnect = new KviStyledCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); m_pUseAutoConnect->setChecked(s->autoConnect()); gl->addWidget(m_pUseAutoConnect,5,0,1,2); @@ -1029,19 +1029,19 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) vbox->setSpacing(0); addWidgetToLayout(vbox,1,0,1,0); - m_pNewNetworkButton = new QToolButton(vbox); + m_pNewNetworkButton = new KviStyledToolButton(vbox); m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)))); m_pNewNetworkButton->setAutoRaise(true); connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork())); KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options")); - m_pNewServerButton = new QToolButton(vbox); + m_pNewServerButton = new KviStyledToolButton(vbox); m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)))); m_pNewServerButton->setAutoRaise(true); connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer())); KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options")); - m_pRemoveButton = new QToolButton(vbox); + m_pRemoveButton = new KviStyledToolButton(vbox); m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)))); m_pRemoveButton->setEnabled(false); m_pRemoveButton->setAutoRaise(true); @@ -1051,14 +1051,14 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) QFrame * f = new QFrame(vbox); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); - m_pCopyServerButton = new QToolButton(vbox); + m_pCopyServerButton = new KviStyledToolButton(vbox); m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)))); m_pCopyServerButton->setEnabled(false); m_pCopyServerButton->setAutoRaise(true); connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer())); KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options")); - m_pPasteServerButton = new QToolButton(vbox); + m_pPasteServerButton = new KviStyledToolButton(vbox); m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE))); m_pPasteServerButton->setEnabled(false); m_pPasteServerButton->setAutoRaise(true); @@ -1068,7 +1068,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) f = new QFrame(vbox); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); - m_pImportButton = new QToolButton(vbox); + m_pImportButton = new KviStyledToolButton(vbox); m_pImportButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)))); m_pImportButton->setAutoRaise(true); m_pImportButton->setMenu(m_pImportPopup); @@ -1085,7 +1085,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options")); /* - m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); + m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); #ifndef COMPILE_IPV6_SUPPORT m_pIpV6Check->setEnabled(false); @@ -1114,7 +1114,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow())); connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int))); - QToolButton * tb = new QToolButton(this); + KviStyledToolButton * tb = new KviStyledToolButton(this); addWidgetToLayout(tb,1,2,1,2); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)))); tb->setMenu(m_pRecentPopup); @@ -1338,11 +1338,11 @@ void KviServerOptionsWidget::commit() if(network == m_pLastEditedItem)g_pIrcServerDataBase->setCurrentNetwork(net->name()); KviServerOptionsTreeWidgetItem * ch; - for (int j=0;j<network->childCount();i++) + for (int j=0;j<network->childCount();j++) { //KviServerOptionsTreeWidgetItem * ch;// = (KviServerOptionsTreeWidgetItem *)it->firstChild(); KviIrcServer *srv; - ch=(KviServerOptionsTreeWidgetItem *)network->child(i); + ch=(KviServerOptionsTreeWidgetItem *)network->child(j); // while(ch) // { if(ch->m_pServerData) diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index 37436763a..e3c133537 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -34,10 +34,10 @@ class QLabel; class QLineEdit; -class QCheckBox; +class KviStyledCheckBox; class QComboBox; class QPushButton; -class QToolButton; +class KviStyledToolButton; class KviIpEditor; class KviIrcServer; class KviTalPopupMenu; @@ -82,10 +82,10 @@ protected: QComboBox * m_pEncodingEditor; - QCheckBox * m_pAutoConnectCheck; + KviStyledCheckBox * m_pAutoConnectCheck; KviTalTreeWidget * m_pNickServTreeWidget; - QCheckBox * m_pNickServCheck; + KviStyledCheckBox * m_pNickServCheck; QPushButton * m_pAddRuleButton; QPushButton * m_pDelRuleButton; QPushButton * m_pEditRuleButton; @@ -121,14 +121,14 @@ protected: QComboBox * m_pLinkFilterEditor; QComboBox * m_pEncodingEditor; KviIpEditor * m_pIpEditor; - QCheckBox * m_pCacheIpCheck; - QCheckBox * m_pUseSSLCheck; - QCheckBox * m_pUseDefaultInitUMode; - QCheckBox * m_pIMode; - QCheckBox * m_pWMode; - QCheckBox * m_pSMode; - QCheckBox * m_pUseAutoConnect; - QCheckBox * m_pUseIPV6Check; + KviStyledCheckBox * m_pCacheIpCheck; + KviStyledCheckBox * m_pUseSSLCheck; + KviStyledCheckBox * m_pUseDefaultInitUMode; + KviStyledCheckBox * m_pIMode; + KviStyledCheckBox * m_pWMode; + KviStyledCheckBox * m_pSMode; + KviStyledCheckBox * m_pUseAutoConnect; + KviStyledCheckBox * m_pUseIPV6Check; QLineEdit * m_pPortEditor; QStringList m_lstChannels; KviCahnnelListSelector * m_pChannelListSelector; @@ -167,7 +167,7 @@ protected: KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pImportPopup; KviIrcServer * m_pClipboard; - //QCheckBox * m_pIpV6Check; + //KviStyledCheckBox * m_pIpV6Check; QPushButton * m_pConnectCurrent; QPushButton * m_pConnectNew; KviServerOptionsTreeWidgetItem * m_pLastEditedItem; @@ -175,12 +175,12 @@ protected: KviNetworkDetailsWidget * m_pNetworkDetailsDialog; KviMexServerImport * m_pImportFilter; - QToolButton * m_pNewServerButton; - QToolButton * m_pNewNetworkButton; - QToolButton * m_pRemoveButton; - QToolButton * m_pCopyServerButton; - QToolButton * m_pPasteServerButton; - QToolButton * m_pImportButton; + KviStyledToolButton * m_pNewServerButton; + KviStyledToolButton * m_pNewNetworkButton; + KviStyledToolButton * m_pRemoveButton; + KviStyledToolButton * m_pCopyServerButton; + KviStyledToolButton * m_pPasteServerButton; + KviStyledToolButton * m_pImportButton; private: void fillServerList(); void saveLastItem(); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index de660d94b..a490d7040 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -164,8 +164,8 @@ void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i) delete m_pBox; m_pBox=new KviTalHBox(0); m_pItem=(KviTextIconTableItem *)i; - QToolButton *iconButton=new QToolButton(m_pBox); - QToolButton *browseButton=new QToolButton(m_pBox); + KviStyledToolButton *iconButton=new KviStyledToolButton(m_pBox); + KviStyledToolButton *browseButton=new KviStyledToolButton(m_pBox); browseButton->setText("..."); m_pBox->setSpacing(0); m_pBox->setMargin(0); diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h index 79e7cc24a..091415aeb 100644 --- a/src/modules/options/optw_texticons.h +++ b/src/modules/options/optw_texticons.h @@ -28,7 +28,7 @@ #include "kvi_tal_popupmenu.h" #include "kvi_tal_hbox.h" -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QTableWidget> #include <QTableWidgetItem> diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h index 00308e215..151f6ebc9 100644 --- a/src/modules/reguser/edituser.h +++ b/src/modules/reguser/edituser.h @@ -103,7 +103,7 @@ protected: QPushButton * m_pEditMaskButton; QPushButton * m_pAddMaskButton; - QCheckBox * m_pNotifyCheck; + KviStyledCheckBox * m_pNotifyCheck; QLineEdit * m_pNotifyNick; KviPixmap * m_pAvatar; @@ -111,18 +111,18 @@ protected: KviPointerHashTable<QString,QString> * m_pPropertyDict; - QCheckBox * m_pCustomColorCheck; + KviStyledCheckBox * m_pCustomColorCheck; QColor * m_pCustomColor; KviColorSelector * m_pCustomColorSelector; //Ignore TAB - QCheckBox * m_pIgnoreEnabled; - QCheckBox * m_pIgnoreQuery; - QCheckBox * m_pIgnoreChannel; - QCheckBox * m_pIgnoreNotice; - QCheckBox * m_pIgnoreCtcp; - QCheckBox * m_pIgnoreInvite; - QCheckBox * m_pIgnoreDcc; + KviStyledCheckBox * m_pIgnoreEnabled; + KviStyledCheckBox * m_pIgnoreQuery; + KviStyledCheckBox * m_pIgnoreChannel; + KviStyledCheckBox * m_pIgnoreNotice; + KviStyledCheckBox * m_pIgnoreCtcp; + KviStyledCheckBox * m_pIgnoreInvite; + KviStyledCheckBox * m_pIgnoreDcc; virtual void closeEvent(QCloseEvent *); protected slots: diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 206a75856..62604df9e 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -33,7 +33,7 @@ #include "kvi_iconmanager.h" #include <QDesktopWidget> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QLabel> #include <QLineEdit> #include <QPushButton> @@ -209,7 +209,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste f->setFrameStyle(QFrame::HLine | QFrame::Sunken); m_pPage4Layout->addMultiCellWidget(f,1,1,0,1); - m_pNotifyCheck = new QCheckBox(m_pPage4); + m_pNotifyCheck = new KviStyledCheckBox(m_pPage4); m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list")); m_pNotifyCheck->setChecked(false); connect(m_pNotifyCheck,SIGNAL(toggled(bool)),this,SLOT(notifyCheckToggled(bool))); diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h index 9d34aa667..4908764d4 100644 --- a/src/modules/reguser/wizard.h +++ b/src/modules/reguser/wizard.h @@ -26,7 +26,7 @@ #include <kvi_tal_wizard.h> class QGridLayout; -class QCheckBox; +class KviStyledCheckBox; class QLabel; class QLineEdit; class QWidget; @@ -64,7 +64,7 @@ public: QLabel* m_pLabel3; KviPixmapSelector * m_pAvatarSelector; QWidget* m_pPage4; - QCheckBox* m_pNotifyCheck; + KviStyledCheckBox* m_pNotifyCheck; QLabel* m_pNotifyNickLabel1; QLabel* m_pNotifyNickLabel2; QLabel* m_pLabel4; diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 3a817a7be..b5614f416 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -498,11 +498,11 @@ KviSetupWizard::KviSetupWizard() addPage(m_pDesktopIntegration,__tr2qs("Desktop Integration")); #ifdef COMPILE_ON_WINDOWS - m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox); + m_pCreateUrlHandlers = new KviStyledCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox); m_pCreateUrlHandlers->setChecked(true); #endif #ifdef COMPILE_KDE_SUPPORT - m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox); + m_pCreateDesktopShortcut = new KviStyledCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox); m_pCreateDesktopShortcut->setChecked(true); #endif diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index 6d7edc44c..2304a1678 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -37,7 +37,7 @@ #include <QLineEdit> #include <QRadioButton> #include <QComboBox> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QGroupBox> #define KviTalVButtonGroup QGroupBox @@ -86,8 +86,8 @@ public: QRadioButton * m_pThemeNone; // Welcome - QCheckBox * m_pCreateUrlHandlers; - QCheckBox * m_pCreateDesktopShortcut; + KviStyledCheckBox * m_pCreateUrlHandlers; + KviStyledCheckBox * m_pCreateDesktopShortcut; //Dir QLineEdit * m_pDataPathEdit; diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 5e72c4567..6fde3fcd1 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -45,7 +45,7 @@ #include <QPushButton> #include <QSplitter> #include <QLayout> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QMessageBox> #include <QFileInfo> diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 74c048514..503510ec5 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -127,10 +127,10 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent) hb->setSpacing(1); g->addWidget(hb,0,0); - QToolButton * tb; + KviStyledToolButton * tb; QFrame * sep; - tb = new QToolButton(hb); + tb = new KviStyledToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))); tb->setIconSize(QSize(32,32)); QToolTip::add(tb,__tr2qs_ctx("Save Current Theme...","theme")); @@ -140,14 +140,14 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent) sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); sep->setMinimumWidth(12); - m_pPackThemeButton = new QToolButton(hb); + m_pPackThemeButton = new KviStyledToolButton(hb); m_pPackThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK))); m_pPackThemeButton->setIconSize(QSize(32,32)); QToolTip::add(m_pPackThemeButton,__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme")); connect(m_pPackThemeButton,SIGNAL(clicked()),this,SLOT(packTheme())); - m_pDeleteThemeButton = new QToolButton(hb); + m_pDeleteThemeButton = new KviStyledToolButton(hb); m_pDeleteThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE))); m_pDeleteThemeButton->setIconSize(QSize(32,32)); QToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme")); @@ -157,13 +157,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent) sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); sep->setMinimumWidth(12); - tb = new QToolButton(hb); + tb = new KviStyledToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); tb->setIconSize(QSize(32,32)); QToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme")); connect(tb,SIGNAL(clicked()),this,SLOT(installFromFile())); - tb = new QToolButton(hb); + tb = new KviStyledToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW))); tb->setIconSize(QSize(32,32)); QToolTip::add(tb,__tr2qs_ctx("Get More Themes...","theme")); diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h index 044c147fe..610e2abb7 100644 --- a/src/modules/theme/managementdialog.h +++ b/src/modules/theme/managementdialog.h @@ -42,7 +42,7 @@ class QLineEdit; class QPushButton; class QLabel; -class QCheckBox; +class KviStyledCheckBox; class KviDynamicToolTip; class KviStyledToolButton; @@ -71,8 +71,8 @@ protected: KviTalIconAndRichTextItemDelegate * m_pItemDelegate; KviTalListWidget * m_pListWidget; KviTalPopupMenu * m_pContextPopup; - QToolButton * m_pDeleteThemeButton; - QToolButton * m_pPackThemeButton; + KviStyledToolButton * m_pDeleteThemeButton; + KviStyledToolButton * m_pPackThemeButton; public: static KviThemeManagementDialog * instance(){ return m_pInstance; }; static void display(); diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index e7d693b04..b77b6cced 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -33,7 +33,7 @@ class QLineEdit; class QPushButton; -class QCheckBox; +class KviStyledCheckBox; class QLabel; //class Q3MultiLineEdit; class KviTalTextEdit; diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index 144876fd3..fdbe0a5f4 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -263,7 +263,6 @@ namespace KviThemeFunctions hd.addHtmlResource("theme_dialog_details",szDetails); hd.addHtmlResource("theme_dialog_main",hd.szHtmlText); - QString beginCenter = "<center>"; QString endCenter = "</center>"; diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h index 6e288768f..f898b42d5 100644 --- a/src/modules/tip/libkvitip.h +++ b/src/modules/tip/libkvitip.h @@ -30,7 +30,7 @@ #include <QWidget> #include <QFrame> #include <QPixmap> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QTextDocument> diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index dd7a69ff3..8f4918151 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -36,10 +36,10 @@ #include <QString> #include <QPushButton> #include <QFile> -#include <QCheckBox> +#include "kvi_styled_controls.h" #include <QMenuBar> #include <QInputDialog> -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QIcon> #include <QPixmap> |