aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_channel.cpp16
-rw-r--r--src/kvirc/ui/kvi_console.cpp4
-rw-r--r--src/kvirc/ui/kvi_input.cpp10
-rw-r--r--src/kvirc/ui/kvi_query.cpp4
-rw-r--r--src/kvirc/ui/kvi_window.cpp21
-rw-r--r--src/modules/objects/class_button.cpp11
-rw-r--r--src/modules/objects/class_button.h4
-rw-r--r--src/modules/toolbareditor/toolbareditor.cpp61
8 files changed, 75 insertions, 56 deletions
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 7f58fee18..d28c1a878 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -353,13 +353,13 @@ void KviChannel::showDoubleView(bool bShow)
m_VertSplitterSizesList=m_pVertSplitter->sizes();
delete m_pMessageView;
m_pMessageView = 0;
- if(m_pDoubleViewButton->isOn())m_pDoubleViewButton->setOn(false);
+ if(m_pDoubleViewButton->isOn())m_pDoubleViewButton->setChecked(false);
} else {
if(!bShow)return;
m_pMessageView = new KviIrcView(m_pVertSplitter,m_pFrm,this);
m_pVertSplitter->setSizes(m_VertSplitterSizesList);
//setFocusHandler(m_pInput,m_pMessageView); //socket it!
- if(!(m_pDoubleViewButton->isOn()))m_pDoubleViewButton->setOn(true);
+ if(!(m_pDoubleViewButton->isOn()))m_pDoubleViewButton->setChecked(true);
if(m_privateBackground.pixmap())
{
m_pMessageView->setPrivateBackgroundPixmap(*(m_privateBackground.pixmap()));
@@ -381,10 +381,10 @@ void KviChannel::toggleListView()
if(m_pUserListView->isVisible())
{
m_pUserListView->hide();
- if(m_pListViewButton->isOn())m_pListViewButton->setOn(false);
+ if(m_pListViewButton->isOn())m_pListViewButton->setChecked(false);
} else {
m_pUserListView->show();
- if(!(m_pListViewButton->isOn()))m_pListViewButton->setOn(true);
+ if(!(m_pListViewButton->isOn()))m_pListViewButton->setChecked(true);
}
}
@@ -396,7 +396,7 @@ void KviChannel::toggleModeEditor()
delete m_pModeEditor;
m_pModeEditor = 0;
m_pSplitter->setMinimumHeight(20); //gfgf
- if(m_pModeEditorButton->isOn()) m_pModeEditorButton->setOn(false);
+ if(m_pModeEditorButton->isOn()) m_pModeEditorButton->setChecked(false);
resizeEvent(0);
} else {
m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr());
@@ -404,7 +404,7 @@ void KviChannel::toggleModeEditor()
connect(m_pModeEditor,SIGNAL(done()),this,SLOT(modeSelectorDone()));
m_pModeEditor->show();
//setFocusHandlerNoClass(m_pInput,m_pModeEditor,"QLineEdit");
- if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true);
+ if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setChecked(true);
}
}
@@ -445,7 +445,7 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p
delete *ppEd;
*ppEd = 0;
if(!(*ppBtn))return;
- if((*ppBtn)->isOn()) (*ppBtn)->setOn(false);
+ if((*ppBtn)->isOn()) (*ppBtn)->setChecked(false);
} else {
bool bHasList = true;
switch(flag)
@@ -487,7 +487,7 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p
//setFocusHandler(m_pInput,*ppEd); //socket it!
(*ppEd)->show();
if(!(*ppBtn))return;
- if(!((*ppBtn)->isOn()))(*ppBtn)->setOn(true);
+ if(!((*ppBtn)->isOn()))(*ppBtn)->setChecked(true);
}
}
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 34a66bebc..13a8216ca 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -436,10 +436,10 @@ void KviConsole::showNotifyList(bool bShow)
if(!bShow)
{
m_pNotifyListView->hide();
- if(m_pNotifyViewButton->isOn())m_pNotifyViewButton->setOn(false);
+ if(m_pNotifyViewButton->isChecked())m_pNotifyViewButton->setChecked(false);
} else {
m_pNotifyListView->show();
- if(!(m_pNotifyViewButton->isOn()))m_pNotifyViewButton->setOn(true);
+ if(!(m_pNotifyViewButton->isChecked()))m_pNotifyViewButton->setChecked(true);
}
}
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index f56b20d96..3fcf4be6c 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -2300,7 +2300,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
m_pCommandlineModeButton->setIcon(is0);
KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline"));
if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))
- m_pCommandlineModeButton->setOn(true);
+ m_pCommandlineModeButton->setChecked(true);
m_pMultiEditorButton = new KviStyledToolButton(m_pButtonContainer,"multieditorbutton");
@@ -2362,7 +2362,7 @@ void KviInput::toggleToolButtons()
void KviInput::inputEditorEnterPressed()
{
QString szText = m_pInputEditor->text();
- KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn());
+ KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isChecked());
m_pInputEditor->setText("");
}
@@ -2430,7 +2430,7 @@ void KviInput::keyPressEvent(QKeyEvent *e)
}
}
}
- KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn());
+ KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isChecked());
m_pMultiLineEditor->setText("");
}
}
@@ -2458,7 +2458,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
m_pInputEditor->show();
m_pWindow->childrenTreeChanged(0);
m_pInputEditor->setFocus();
- m_pMultiEditorButton->setOn(false);
+ m_pMultiEditorButton->setChecked(false);
} else {
if(!bOn)return;
m_pMultiLineEditor = KviScriptEditor::createInstance(this);
@@ -2469,7 +2469,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
m_pMultiLineEditor->show();
m_pWindow->childrenTreeChanged(m_pMultiLineEditor);
m_pMultiLineEditor->setFocus();
- m_pMultiEditorButton->setOn(true);
+ m_pMultiEditorButton->setChecked(true);
}
}
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 0284c8dae..e92aef813 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -491,10 +491,10 @@ void KviQuery::showListView(bool bShow)
if(!bShow)
{
m_pUserListView->hide();
- if(m_pListViewButton->isOn())m_pListViewButton->setOn(false);
+ if(m_pListViewButton->isChecked())m_pListViewButton->setChecked(false);
} else {
m_pUserListView->show();
- if(!(m_pListViewButton->isOn()))m_pListViewButton->setOn(true);
+ if(!(m_pListViewButton->isChecked()))m_pListViewButton->setChecked(true);
}
}
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 9666a7c52..2cf8a49f1 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -401,9 +401,8 @@ BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pi
b->setFlat(true);
b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon))));
- KviTalToolTip::add
- (b,tooltip);
- b->setOn(bOn);
+ KviTalToolTip::add(b,tooltip);
+ b->setChecked(bOn);
return b;
}
@@ -427,7 +426,7 @@ void KviWindow::textEncodingButtonClicked()
{
createSystemTextEncodingPopup();
g_pMdiWindowSystemTextEncodingPopup->popup(m_pTextEncodingButton->mapToGlobal(QPoint(0,m_pTextEncodingButton->height())));
- m_pTextEncodingButton->setOn(false);
+ m_pTextEncodingButton->setChecked(false);
}
const QString & KviWindow::lastLineOfText()
@@ -448,7 +447,7 @@ const QString & KviWindow::lastMessageText()
void KviWindow::toggleCryptController()
{
#ifdef COMPILE_CRYPT_SUPPORT
- if(!m_pCryptControllerButton->isOn())
+ if(!m_pCryptControllerButton->isChecked())
{
if(m_pCryptController)
{
@@ -456,8 +455,8 @@ void KviWindow::toggleCryptController()
m_pCryptController = 0;
if(!m_pCryptControllerButton)
return;
- if(m_pCryptControllerButton->isOn())
- m_pCryptControllerButton->setOn(false);
+ if(m_pCryptControllerButton->isChecked())
+ m_pCryptControllerButton->setChecked(false);
}
} else {
if(m_pSplitter && m_pInput)
@@ -468,8 +467,8 @@ void KviWindow::toggleCryptController()
m_pCryptController->show();
if(!m_pCryptControllerButton)
return;
- if(!(m_pCryptControllerButton->isOn()))
- m_pCryptControllerButton->setOn(true);
+ if(!(m_pCryptControllerButton->isChecked()))
+ m_pCryptControllerButton->setChecked(true);
}
}
#endif // COMPILE_CRYPT_SUPPORT
@@ -492,8 +491,8 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf)
is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIcon::Normal,QIcon::On);
m_pCryptControllerButton->setIcon(is);
- if(m_pCryptControllerButton->isOn())
- m_pCryptControllerButton->setOn(false);
+ if(m_pCryptControllerButton->isChecked())
+ m_pCryptControllerButton->setChecked(false);
}
}
#endif // COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index ebde7161f..630a0538d 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -34,8 +34,11 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget")
KVSO_REGISTER_HANDLER(KviKvsObject_button,"text", functionText)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"setAutoDefault", functionSetAutoDefault)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"setToggleButton", functionSetToggleButton)
- KVSO_REGISTER_HANDLER(KviKvsObject_button,"setOn", functionSetOn)
- KVSO_REGISTER_HANDLER(KviKvsObject_button,"isOn", functionIsOn)
+ KVSO_REGISTER_HANDLER(KviKvsObject_button,"setOn", functionSetChecked)/*DEPRECATED*/
+ KVSO_REGISTER_HANDLER(KviKvsObject_button,"setChecked", functionSetChecked)
+ KVSO_REGISTER_HANDLER(KviKvsObject_button,"isOn", functionIsChecked)/*DEPRECATED*/
+ KVSO_REGISTER_HANDLER(KviKvsObject_button,"isChecked", functionIsChecked)
+
KVSO_REGISTER_HANDLER(KviKvsObject_button,"toggle", functionToggle)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"clickEvent", functionclickEvent)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"setImage", functionSetImage)
@@ -95,7 +98,7 @@ bool KviKvsObject_button::functionSetToggleButton(KviKvsObjectFunctionCall *c)
((QPushButton *)widget())->setCheckable(bEnabled);
return true;
}
-bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_button::functionSetChecked(KviKvsObjectFunctionCall *c)
{
bool bEnabled;
KVSO_PARAMETERS_BEGIN(c)
@@ -108,7 +111,7 @@ bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c)
//
-bool KviKvsObject_button::functionIsOn(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_button::functionIsChecked(KviKvsObjectFunctionCall *c)
{
if (widget()) c->returnValue()->setBoolean(((QPushButton *)widget())->isChecked());
return true;
diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h
index 5b1c92e4c..ae1c5e68b 100644
--- a/src/modules/objects/class_button.h
+++ b/src/modules/objects/class_button.h
@@ -42,8 +42,8 @@ protected:
bool functionText(KviKvsObjectFunctionCall *c);
bool functionSetAutoDefault(KviKvsObjectFunctionCall *c);
bool functionSetToggleButton(KviKvsObjectFunctionCall *c);
- bool functionSetOn(KviKvsObjectFunctionCall *c);
- bool functionIsOn(KviKvsObjectFunctionCall *c);
+ bool functionSetChecked(KviKvsObjectFunctionCall *c);
+ bool functionisChecked(KviKvsObjectFunctionCall *c);
bool functionToggle(KviKvsObjectFunctionCall *c);
bool functionSetImage(KviKvsObjectFunctionCall *c);
bool functionclickEvent(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 7b8ed1188..c6979a095 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -36,11 +36,11 @@
#include "kvi_filedialog.h"
#include "kvi_kvs_useraction.h"
#include "kvi_draganddrop.h"
+#include "kvi_tal_tooltip.h"
#include <QPushButton>
#include <QLayout>
#include <QApplication>
-#include <QToolTip>
#include <QLineEdit>
#include <QLabel>
#include <QMessageBox>
@@ -59,14 +59,14 @@ KviTrashcanLabel::KviTrashcanLabel(QWidget * p)
: QLabel(p)
{
setPixmap(*(g_pIconManager->getBigIcon("kvi_bigicon_trashcan.png")));
- QToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them"));
+ KviTalToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them"));
setFrameStyle(QFrame::Sunken | QFrame::WinPanel);
setAcceptDrops(true);
setAlignment(Qt::AlignCenter);
setMinimumSize(40,40);
m_uFlashCount = 0;
m_pFlashTimer = 0;
- m_clrOriginal = paletteBackgroundColor();
+ m_clrOriginal = palette().color(backgroundRole());
connect(KviActionManager::instance(),SIGNAL(removeActionsHintRequest()),this,SLOT(flash()));
}
@@ -91,10 +91,16 @@ void KviTrashcanLabel::flash()
void KviTrashcanLabel::heartbeat()
{
m_uFlashCount++;
- if(m_uFlashCount % 2)
- setPaletteBackgroundColor(QColor(0,0,0));
- else
- setPaletteBackgroundColor(m_clrOriginal);
+ if(m_uFlashCount % 2){
+ QPalette p = palette();
+ p.setColor(backgroundRole(),QColor(0,0,0));
+ setPalette(p);
+ }
+ else{
+ QPalette p = palette();
+ p.setColor(backgroundRole(),m_clrOriginal);
+ setPalette(p);
+ }
update();
if(m_uFlashCount == 8)
{
@@ -123,18 +129,20 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
m_szLabel = szLabel;
setWindowTitle(__tr2qs("ToolBar Properties"));
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)));
+ setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR))));
QGridLayout * g = new QGridLayout(this);
QLabel * l = new QLabel(szText,this);
- g->addMultiCellWidget(l,0,0,0,5);
+ g->addWidget(l,0,0,1,6);
+// g->addMultiCellWidget(l,0,0,0,5);
l = new QLabel(__tr2qs("Label") + ":",this);
g->addWidget(l,1,0);
m_pLabelEdit = new QLineEdit(this);
- g->addMultiCellWidget(m_pLabelEdit,1,1,1,5);
+ g->addWidget(m_pLabelEdit,1,1,1,5);
+// g->addMultiCellWidget(m_pLabelEdit,1,1,1,5);
m_pLabelEdit->setText(szLabel);
connect(m_pLabelEdit,SIGNAL(textChanged(const QString &)),this,SLOT(labelTextChanged(const QString &)));
@@ -143,10 +151,13 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
m_pIconEdit = new QLineEdit(this);
m_pIconEdit->setReadOnly(true);
- g->addMultiCellWidget(m_pIconEdit,2,2,1,4);
+ g->addWidget(m_pIconEdit,2,1,1,4);
+
+ //g->addMultiCellWidget(m_pIconEdit,2,2,1,4);
m_pIconButton = new QPushButton(this);
- g->addMultiCellWidget(m_pIconButton,2,2,5,5);
+ g->addWidget(m_pIconButton,2,5,1,1);
+// g->addMultiCellWidget(m_pIconButton,2,2,5,5);
connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
iconSelected(szIconId);
@@ -164,7 +175,8 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
m_pIdEdit->setText(szId);
- g->addMultiCellWidget(m_pAdvanced,3,3,0,5);
+ g->addWidget(m_pAdvanced,3,0,1,6);
+// g->addMultiCellWidget(m_pAdvanced,3,3,0,5);
m_pAdvanced->hide();
m_pLabelEdit->setFocus();
@@ -172,7 +184,8 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
QPushButton * pb = new QPushButton(__tr2qs("OK"),this);
connect(pb,SIGNAL(clicked()),this,SLOT(okClicked()));
pb->setMinimumWidth(80);
- g->addMultiCellWidget(pb,4,4,4,5);
+ g->addWidget(pb,4,4,1,2);
+ //g->addMultiCellWidget(pb,4,4,4,5);
pb = new QPushButton(__tr2qs("Cancel"),this);
connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
@@ -182,7 +195,8 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
m_pAdvancedButton = new QPushButton(__tr2qs("Advanced..."),this);
connect(m_pAdvancedButton,SIGNAL(clicked()),this,SLOT(advancedClicked()));
m_pAdvancedButton->setMinimumWidth(100);
- g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1);
+ g->addWidget(m_pAdvancedButton,4,0,1,2);
+// g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1);
g->setRowStretch(0,1);
g->setColumnStretch(2,1);
@@ -197,7 +211,7 @@ void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
QPixmap * p = g_pIconManager->getImage(szIconId.toUtf8().data());
if(p)
{
- m_pIconButton->setPixmap(*p);
+ m_pIconButton->setIcon(*p);
m_szIconId = szIconId;
m_pIconEdit->setText(szIconId);
} else {
@@ -275,16 +289,19 @@ void KviCustomToolBarPropertiesDialog::advancedClicked()
KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
-: QDialog(p,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/)
+: QDialog(p)//,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/)
{
+ setObjectName("Toolbar_editor");
+ debug("TOol bar editor");
setWindowTitle(__tr2qs("Customize Toolbars"));
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)));
+ setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)));
m_pInstance = this;
QGridLayout * g = new QGridLayout(this);
m_pDrawer = new KviActionDrawer(this);
- g->addMultiCellWidget(m_pDrawer,0,6,0,0);
+ g->addWidget(m_pDrawer,0,0,7,1);
+// g->addMultiCellWidget(m_pDrawer,0,6,0,0);
QPushButton * b = new QPushButton(__tr2qs("New ToolBar"),this);
connect(b,SIGNAL(clicked()),this,SLOT(newToolBar()));
@@ -363,7 +380,7 @@ void KviCustomizeToolBarsDialog::deleteToolBar()
if(!t)return;
if(QMessageBox::question(this,
__tr2qs("Confirm ToolBar Deletion"),
- __tr2qs("Do you really want to delete toolbar \"%1\" ?").arg(t->label()),
+ __tr2qs("Do you really want to delete toolbar \"%1\" ?").arg(t->windowTitle()),
__tr2qs("No"),
__tr2qs("Yes")) == 0)return;
KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id());
@@ -374,7 +391,7 @@ void KviCustomizeToolBarsDialog::exportToolBar()
KviCustomToolBar * t = KviActionManager::currentToolBar();
if(!t)return;
- QString szName = QDir::homeDirPath();
+ QString szName = QDir::homePath();
if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
szName += t->descriptor()->id();
szName += ".kvs";
@@ -453,7 +470,7 @@ void KviCustomizeToolBarsDialog::renameToolBar()
if(!t)return;
KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this,
- __tr2qs("Please specify the properties for the toolbar \"%1\"").arg(t->label()),
+ __tr2qs("Please specify the properties for the toolbar \"%1\"").arg(t->windowTitle()),
t->descriptor()->id(),
t->descriptor()->labelCode(),
t->descriptor()->iconId());