kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged trunk into 0.3 branch: rev1067 to rev1077

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1179 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2011-03-01 23:26:31 +00:00
parent 87da5daed1
commit 287e458f4b
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/conductorpropertieswidget.cpp
View File

@@ -45,6 +45,7 @@ ConductorPropertiesWidget::ConductorPropertiesWidget(const ConductorProperties &
/// construit l'interface du widget /// construit l'interface du widget
void ConductorPropertiesWidget::buildInterface() { void ConductorPropertiesWidget::buildInterface() {
setFocusPolicy(Qt::StrongFocus);
setMinimumSize(380, 350); setMinimumSize(380, 350);
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
@@ -291,3 +292,17 @@ void ConductorPropertiesWidget::setReadOnly(bool ro) {
color_button -> setDisabled(ro); color_button -> setDisabled(ro);
dashed_checkbox -> setDisabled(ro); dashed_checkbox -> setDisabled(ro);
} }
/**
Gere le focus de ce widget
*/
void ConductorPropertiesWidget::focusInEvent(QFocusEvent *event) {
if (properties_.type == ConductorProperties::Multi) {
text_field -> setFocus(Qt::ActiveWindowFocusReason);
text_field -> selectAll();
} else if (properties_.type == ConductorProperties::Single) {
phase_spinbox -> setFocus(Qt::ActiveWindowFocusReason);
phase_spinbox -> selectAll();
}
QWidget::focusInEvent(event);
}

3
sources/conductorpropertieswidget.h
View File

@@ -54,6 +54,9 @@ class ConductorPropertiesWidget : public QWidget {
void updateDisplay(); void updateDisplay();
void chooseColor(); void chooseColor();
protected:
void focusInEvent(QFocusEvent *);
// attributs prives // attributs prives
private: private:
QButtonGroup *radio_buttons; QButtonGroup *radio_buttons;

1
sources/diagramview.cpp
View File

@@ -840,6 +840,7 @@ void DiagramView::editConductor(Conductor *edited_conductor) {
dialog_layout -> addWidget(dbb); dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept())); connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept()));
connect(dbb, SIGNAL(rejected()), &conductor_dialog, SLOT(reject())); connect(dbb, SIGNAL(rejected()), &conductor_dialog, SLOT(reject()));
cpw -> setFocus(Qt::ActiveWindowFocusReason);
// execute le dialogue et met a jour le conducteur // execute le dialogue et met a jour le conducteur
if (conductor_dialog.exec() == QDialog::Accepted) { if (conductor_dialog.exec() == QDialog::Accepted) {