retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Actions can now be added to a widget to handle shortcuts. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2485 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2009-02-19 08:28:12 +00:00
parent 335d0d57a0
commit bb4701528b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clients/qt4/qt4client.cpp
View File

@ -924,7 +924,7 @@ bool QtWindow::setText(const String& name, const String& text,
case QtWidget::TextEdit:
if (richText) {
w.textEdit()->clear();
w.textEdit()->insertHtml(text.c_str());
w.textEdit()->insertHtml(QtClient::setUtf8(text));
}
else
w.textEdit()->setText(QtClient::setUtf8(text));
@ -2019,11 +2019,16 @@ void QtWindow::doInit()
// Connect actions' signal
QList<QAction*> actions = qFindChildren<QAction*>(this);
for (int i = 0; i < actions.size(); i++)
for (int i = 0; i < actions.size(); i++) {
String addToWidget;
QtClient::getProperty(actions[i],"dynamicAddToParent",addToWidget);
if (addToWidget && addToWidget.toBoolean())
QWidget::addAction(actions[i]);
if (actions[i]->isCheckable())
QtClient::connectObjects(actions[i],SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
else
QtClient::connectObjects(actions[i],SIGNAL(triggered()),this,SLOT(action()));
}
// Connect combo boxes signals
QList<QComboBox*> combos = qFindChildren<QComboBox*>(this);