From 84e6fdc3cbf8f8c6acf77b830b12666361b1541f Mon Sep 17 00:00:00 2001 From: gdd Date: Wed, 20 Apr 2011 09:43:47 +0000 Subject: [PATCH] rnc: slight GUI and translation modifications --- .../EntityGUI_1Sel1Spin1Check_QTD.ui | 2 +- src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui | 120 ++++++++------- src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui | 6 +- src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui | 138 +++++++++--------- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 26 +++- src/GEOMGUI/GEOM_msg_en.ts | 8 +- src/GEOMGUI/GEOM_msg_fr.ts | 8 +- 7 files changed, 160 insertions(+), 148 deletions(-) diff --git a/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui b/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui index 2cfcd29cf..df1b68894 100644 --- a/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui @@ -108,7 +108,7 @@ - + CheckBox diff --git a/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui b/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui index 656442d1b..4d0f6d907 100644 --- a/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui @@ -6,8 +6,8 @@ 0 0 - 438 - 121 + 366 + 119 @@ -25,47 +25,7 @@ Values - - - 9 - - - 6 - - - - - 6 - - - 0 - - - - - Undo - - - - - - - Redo - - - - - - - - - - 0 - 0 - - - - + @@ -95,20 +55,20 @@ - - - - Create + + + + + 0 + 0 + - - - - - + + - + Create @@ -119,19 +79,57 @@ - - + + - CheckBox + - - - - TextLabel + + + + + + + 6 - + + 0 + + + + + Undo + + + + + + + Redo + + + + + + + + + + + CheckBox + + + + + + + TextLabel + + + + diff --git a/src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui b/src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui index 8383c1f96..9dc92e222 100644 --- a/src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui @@ -6,8 +6,8 @@ 0 0 - 496 - 148 + 270 + 149 @@ -120,7 +120,7 @@ - + CheckBox diff --git a/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui b/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui index 060767868..fa876ac60 100644 --- a/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui @@ -6,8 +6,8 @@ 0 0 - 456 - 181 + 384 + 189 @@ -25,25 +25,52 @@ Values - - - 9 - - - 6 - - - + + + + + + 0 + 0 + + + + TL1 + + + false + + - - + + + + + + + Create + + + + + + + + 0 + 0 + + + + TL2 + + + false + + - - - @@ -68,15 +95,8 @@ - - - - Create - - - - - + + 0 @@ -84,13 +104,16 @@ - TL1 + TL3 false + + + @@ -107,51 +130,26 @@ - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - CheckBox - - + + - - - - TextLabel - - + + + + + + CheckBox + + + + + + + TextLabel + + + + diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 90b0eac23..f01a072d4 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -462,6 +462,7 @@ void EntityGUI_SketcherDlg::TypeClicked( int constructorId ) { myConstructorId = constructorId; if ( myConstructorId == 0 ) { // SEGMENT + GroupPt2->RB_Point1->setChecked( true ); GroupPt2->setEnabled( false ); GroupD2->setEnabled( true ); MainWidget->RB_Dest1->setEnabled( true ); @@ -470,6 +471,7 @@ void EntityGUI_SketcherDlg::TypeClicked( int constructorId ) } else if ( myConstructorId == 1 ) { // ARC GroupPt2->setEnabled( true ); + GroupD2->RB_Dir21->setChecked( true ); GroupD2->setEnabled( false ); MainWidget->RB_Dest1->setEnabled( true ); MainWidget->RB_Dest1->setChecked( true ); @@ -518,9 +520,16 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId ) { MESSAGE("PointClicked") myConstructorPntId = constructorId; - GroupPt2->RB_Point1->setChecked( true ); - GroupPt->RB_Point3->setEnabled( true ); - Point2Clicked( 1 ); + GroupPt->RB_Point3->setEnabled( true ); + int buttonId = GroupPt2->ButtonGroup->checkedId(); + MESSAGE("checkedId ="<< buttonId) + if (buttonId >= 0){ // = If a button is checked + Point2Clicked(buttonId); + } + else{ + GroupPt2->RB_Point1->setChecked( true ); + Point2Clicked( 1 ); + } } //================================================================================= @@ -706,8 +715,15 @@ void EntityGUI_SketcherDlg::Point2Clicked( int constructorId ) void EntityGUI_SketcherDlg::Dir1Clicked( int constructorId ) { myConstructorDirId = constructorId; - GroupD2->RB_Dir21->setChecked( true ); - Dir2Clicked( 2 ); + int dirButtonId = GroupD2->ButtonGroup->checkedId(); + MESSAGE("checkedId ="<< dirButtonId) + if (dirButtonId >= 0){ // = If a button is checked + Dir2Clicked(dirButtonId); + } + else{ + GroupD2->RB_Dir21->setChecked( true ); + Dir2Clicked( 2 ); + } } diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index ce17adc22..8080afbbd 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -1547,19 +1547,19 @@ Please, select face, shell or solid and try again GEOM_SKETCHER_CENTER_X - Center X coord. : + X Center : GEOM_SKETCHER_CENTER_Y - Center Y coord. : + Y Center : GEOM_SKETCHER_CENTER_DX - Center DX coord. : + DX Center : GEOM_SKETCHER_CENTER_DY - Center DY coord. : + DY Center : GEOM_SKETCHER_DEST diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index fc5c6d797..6645b3d5a 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -1547,19 +1547,19 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SKETCHER_CENTER_X - Centre coord. X : + X Centre : GEOM_SKETCHER_CENTER_Y - Centre coord. Y : + Y Centre : GEOM_SKETCHER_CENTER_DX - Centre coord. DX : + DX Centre : GEOM_SKETCHER_CENTER_DY - Centre coord. DY : + DY Centre : GEOM_SKETCHER_DEST -- 2.39.2