onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

fixed #1790 "When an object

Browse Source 
is found using Find and the object is in the object tree, the
keyboard focus shifts to the Object Panel". The "find" pabel now
retains keyboard focus after it shows found object in the tree,
this allows the user to just hit Enter on the keyboard to find
the next object.
This commit is contained in:
Vadim Kurland 2010-10-05 01:23:39 +00:00
parent d079f0f445
commit 10862bdfed
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 3318
#define BUILD_NUM 3319

7
doc/ChangeLog
View File

@ -1,5 +1,12 @@
2010-10-04 Vadim Kurland <vadim@vk.crocodile.org>
* FindObjectWidget.cpp (showObject): fixed #1790 "When an object
is found using Find and the object is in the object tree, the
keyboard focus shifts to the Object Panel". The "find" pabel now
retains keyboard focus after it shows found object in the tree,
this allows the user to just hit Enter on the keyboard to find
the next object.
* FindObjectWidget.cpp (objectDeleted): fixed #1785 "Deleting
graphic icon of object from Find tab should also remove the text
name or label"

19
src/gui/FindObjectWidget.cpp
View File

@ -616,23 +616,28 @@ void FindObjectWidget::replaceDisable()
m_widget->replaceButton->setEnabled (false);
m_widget->repNextButton->setEnabled (false);
m_widget->replaceAllButton->setEnabled(false);
}
/**
* Show object that we have found in the tree or in rules but retain focus
* so that user can find next one by just hitting Return on the keyboard.
*/
void FindObjectWidget::showObject(FWObject* o)
{
if (fwbdebug)
qDebug("FindObjectWidget::showObject o: %s parent: %s",
o->getName().c_str(), o->getParent()->getName().c_str());
QWidget *focus_holder = focusWidget();
FWReference* ref = FWReference::cast(o);
if (ref!=NULL && RuleElement::cast(o->getParent())!=NULL)
{
// found object in rules
QCoreApplication::postEvent(
QCoreApplication::sendEvent(
project_panel, new showObjectInRulesetEvent(
project_panel->getFileName(), ref->getId()));
focus_holder->setFocus();
return;
}
@ -640,16 +645,16 @@ void FindObjectWidget::showObject(FWObject* o)
Group::cast(o->getParent())!=NULL &&
!FWBTree().isStandardFolder(o->getParent()))
{
QCoreApplication::postEvent(
QCoreApplication::sendEvent(
mw, new showObjectInTreeEvent(project_panel->getFileName(),
o->getParent()->getId()));
focus_holder->setFocus();
return;
}
QCoreApplication::postEvent(
QCoreApplication::sendEvent(
mw, new showObjectInTreeEvent(project_panel->getFileName(), o->getId()));
//project_panel->select(); // selects an item in the tree and assigns kbd focus to it
focus_holder->setFocus();
}
void FindObjectWidget::init()