| [qet] [1179] Merged trunk into 0.3 branch: rev1067 to rev1077 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 1179
Author: xavier
Date: 2011-03-02 00:26:31 +0100 (Wed, 02 Mar 2011)
Log Message:
-----------
Merged trunk into 0.3 branch: rev1067 to rev1077
Modified Paths:
--------------
branches/0.3/sources/conductorpropertieswidget.cpp
branches/0.3/sources/conductorpropertieswidget.h
branches/0.3/sources/diagramview.cpp
Property Changed:
----------------
branches/0.3/
branches/0.3/elements/appareils_de_mesure/
branches/0.3/elements/domestiques/electromenager/convecteur.elmt
branches/0.3/elements/domestiques/electromenager/four.elmt
branches/0.3/elements/domestiques/electromenager/lave_linge.elmt
branches/0.3/elements/domestiques/electromenager/lave_vaiselle.elmt
branches/0.3/elements/domestiques/electromenager/plaque_cuisson.elmt
branches/0.3/elements/protections/disjoncteurs/disjoncteur4.elmt
branches/0.3/qelectrotech.pro
branches/0.3/sources/
branches/0.3/sources/aboutqet.cpp
Property changes on: branches/0.3
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:840-853,856-1002,1052,1065,1067
+ /trunk:840-853,856-1002,1052,1065,1067,1077
Property changes on: branches/0.3/elements/appareils_de_mesure
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/appareils_de_mesure:1052,1065,1067
+ /trunk/elements/appareils_de_mesure:1052,1065,1067,1077
Property changes on: branches/0.3/elements/domestiques/electromenager/convecteur.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/domestiques/electromenager/convecteur.elmt:840-853,856-1002,1052,1065,1067
/trunk/elements/recepteurs/domestiques/convecteur.elmt:1067
+ /trunk/elements/domestiques/electromenager/convecteur.elmt:840-853,856-1002,1052,1065,1067,1077
/trunk/elements/recepteurs/domestiques/convecteur.elmt:1067
Property changes on: branches/0.3/elements/domestiques/electromenager/four.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/domestiques/electromenager/four.elmt:840-853,856-1002,1052,1065,1067
/trunk/elements/recepteurs/domestiques/four.elmt:1067
+ /trunk/elements/domestiques/electromenager/four.elmt:840-853,856-1002,1052,1065,1067,1077
/trunk/elements/recepteurs/domestiques/four.elmt:1067
Property changes on: branches/0.3/elements/domestiques/electromenager/lave_linge.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/domestiques/electromenager/lave_linge.elmt:840-853,856-1002,1052,1065,1067
/trunk/elements/recepteurs/domestiques/lave_linge.elmt:1067
+ /trunk/elements/domestiques/electromenager/lave_linge.elmt:840-853,856-1002,1052,1065,1067,1077
/trunk/elements/recepteurs/domestiques/lave_linge.elmt:1067
Property changes on: branches/0.3/elements/domestiques/electromenager/lave_vaiselle.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/domestiques/electromenager/lave_vaiselle.elmt:840-853,856-1002,1052,1065,1067
/trunk/elements/recepteurs/domestiques/lave_vaiselle.elmt:1067
+ /trunk/elements/domestiques/electromenager/lave_vaiselle.elmt:840-853,856-1002,1052,1065,1067,1077
/trunk/elements/recepteurs/domestiques/lave_vaiselle.elmt:1067
Property changes on: branches/0.3/elements/domestiques/electromenager/plaque_cuisson.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/domestiques/electromenager/plaque_cuisson.elmt:840-853,856-1002,1052,1065,1067
/trunk/elements/recepteurs/domestiques/plaque_cuisson.elmt:1067
+ /trunk/elements/domestiques/electromenager/plaque_cuisson.elmt:840-853,856-1002,1052,1065,1067,1077
/trunk/elements/recepteurs/domestiques/plaque_cuisson.elmt:1067
Property changes on: branches/0.3/elements/protections/disjoncteurs/disjoncteur4.elmt
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/elements/protections/disjoncteurs/disjoncteur4.elmt:840-853,856-1002,1052,1057,1065,1067
+ /trunk/elements/protections/disjoncteurs/disjoncteur4.elmt:840-853,856-1002,1052,1057,1065,1067,1077
Property changes on: branches/0.3/qelectrotech.pro
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qelectrotech.pro:840-853,856-1002,1052,1057,1065,1067
+ /trunk/qelectrotech.pro:840-853,856-1002,1052,1057,1065,1067,1077
Property changes on: branches/0.3/sources
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/sources:833-853,856-1002,1052,1065,1067
+ /trunk/sources:833-853,856-1002,1052,1065,1067,1077
Property changes on: branches/0.3/sources/aboutqet.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/sources/aboutqet.cpp:833-853,856-1002,1052,1057,1065,1067
+ /trunk/sources/aboutqet.cpp:833-853,856-1002,1052,1057,1065,1067,1077
Modified: branches/0.3/sources/conductorpropertieswidget.cpp
===================================================================
--- branches/0.3/sources/conductorpropertieswidget.cpp 2011-03-01 23:23:29 UTC (rev 1178)
+++ branches/0.3/sources/conductorpropertieswidget.cpp 2011-03-01 23:26:31 UTC (rev 1179)
@@ -45,6 +45,7 @@
/// construit l'interface du widget
void ConductorPropertiesWidget::buildInterface() {
+ setFocusPolicy(Qt::StrongFocus);
setMinimumSize(380, 350);
QVBoxLayout *main_layout = new QVBoxLayout(this);
@@ -291,3 +292,17 @@
color_button -> 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);
+}
Modified: branches/0.3/sources/conductorpropertieswidget.h
===================================================================
--- branches/0.3/sources/conductorpropertieswidget.h 2011-03-01 23:23:29 UTC (rev 1178)
+++ branches/0.3/sources/conductorpropertieswidget.h 2011-03-01 23:26:31 UTC (rev 1179)
@@ -54,6 +54,9 @@
void updateDisplay();
void chooseColor();
+ protected:
+ void focusInEvent(QFocusEvent *);
+
// attributs prives
private:
QButtonGroup *radio_buttons;
Modified: branches/0.3/sources/diagramview.cpp
===================================================================
--- branches/0.3/sources/diagramview.cpp 2011-03-01 23:23:29 UTC (rev 1178)
+++ branches/0.3/sources/diagramview.cpp 2011-03-01 23:26:31 UTC (rev 1179)
@@ -840,6 +840,7 @@
dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept()));
connect(dbb, SIGNAL(rejected()), &conductor_dialog, SLOT(reject()));
+ cpw -> setFocus(Qt::ActiveWindowFocusReason);
// execute le dialogue et met a jour le conducteur
if (conductor_dialog.exec() == QDialog::Accepted) {