NPAL13898 Ok Apply Close laborious for User...

diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.cxx b/src/DlgRef/DlgRef_Skeleton_QTD.cxx
index 0e2b081bcc8182aa612344220525399339a9fc42..c1ee25cebc8ee61b5745cf96be2331d4a5ed16cd 100644 (file)
--- a/src/DlgRef/DlgRef_Skeleton_QTD.cxx
+++ b/src/DlgRef/DlgRef_Skeleton_QTD.cxx
@@ -1,26 +1,7 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 /****************************************************************************
 ** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
 **
-** Created: Tue Mar 13 14:40:34 2007
+** Created: Wed Feb 13 17:37:30 2008
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -62,25 +43,29 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, boo
     GroupButtons->setColumnLayout(0, Qt::Vertical );
     GroupButtons->layout()->setSpacing( 6 );
     GroupButtons->layout()->setMargin( 11 );
-    GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
+    GroupButtonsLayout = new QVBoxLayout( GroupButtons->layout() );
     GroupButtonsLayout->setAlignment( Qt::AlignTop );
 
-    Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); 
+    layout3 = new QGridLayout( 0, 1, 1, 0, 6, "layout3"); 
+    Spacer1 = new QSpacerItem( 90, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+    layout3->addItem( Spacer1, 0, 3 );
 
     buttonOk = new QPushButton( GroupButtons, "buttonOk" );
-    Layout3->addWidget( buttonOk );
+
+    layout3->addWidget( buttonOk, 0, 2 );
 
     buttonApply = new QPushButton( GroupButtons, "buttonApply" );
-    Layout3->addWidget( buttonApply );
-    Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    Layout3->addItem( Spacer1 );
+
+    layout3->addWidget( buttonApply, 0, 0 );
 
     buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
-    Layout3->addWidget( buttonCancel );
+
+    layout3->addWidget( buttonCancel, 0, 1 );
 
     buttonHelp = new QPushButton( GroupButtons, "buttonHelp" );
-    Layout3->addWidget( buttonHelp );
-    GroupButtonsLayout->addLayout( Layout3 );
+
+    layout3->addWidget( buttonHelp, 0, 4 );
+    GroupButtonsLayout->addLayout( layout3 );
 
     Layout1->addWidget( GroupButtons, 3, 0 );
 
@@ -132,7 +117,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, boo
 
     DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
     languageChange();
-    resize( QSize(307, 378).expandedTo(minimumSizeHint()) );
+    resize( QSize(615, 682).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
@@ -150,5 +135,17 @@ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD()
  */
 void DlgRef_Skeleton_QTD::languageChange()
 {
+    setCaption( tr( "DlgRef_Skeleton_QTD" ) );
+    GroupButtons->setTitle( QString::null );
+    buttonOk->setText( QString::null );
+    buttonApply->setText( QString::null );
+    buttonCancel->setText( QString::null );
+    buttonHelp->setText( QString::null );
+    GroupConstructors->setTitle( QString::null );
+    RadioButton1->setText( QString::null );
+    RadioButton2->setText( QString::null );
+    RadioButton3->setText( QString::null );
+    RadioButton4->setText( QString::null );
+    GroupBoxName->setTitle( QString::null );
 }
 

diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h
index 0ecfdfcaaff2b43862ba4768030160dc65d1fbe2..2afaefc84a7e6cd0b6c75c8458139b7904cc6630 100644 (file)
--- a/src/DlgRef/DlgRef_Skeleton_QTD.h
+++ b/src/DlgRef/DlgRef_Skeleton_QTD.h
@@ -1,26 +1,7 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 /****************************************************************************
 ** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
 **
-** Created: Tue Mar 13 14:40:29 2007
+** Created: Wed Feb 13 17:37:30 2008
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -29,8 +10,6 @@
 #ifndef DLGREF_SKELETON_QTD_H
 #define DLGREF_SKELETON_QTD_H
 
-#include "GEOM_DlgRef.hxx"
-
 #include <qvariant.h>
 #include <qdialog.h>
 
@@ -45,7 +24,7 @@ class QRadioButton;
 class QLineEdit;
 class QLabel;
 
-class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
+class DlgRef_Skeleton_QTD : public QDialog
 {
     Q_OBJECT
 
@@ -70,8 +49,8 @@ public:
 protected:
     QGridLayout* DlgRef_Skeleton_QTDLayout;
     QGridLayout* Layout1;
-    QHBoxLayout* GroupButtonsLayout;
-    QHBoxLayout* Layout3;
+    QVBoxLayout* GroupButtonsLayout;
+    QGridLayout* layout3;
     QSpacerItem* Spacer1;
     QHBoxLayout* GroupConstructorsLayout;
     QHBoxLayout* Layout2;

diff --git a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
index 8979116e8844322aee96f0303fc173a54ed19149..99a216a36733f2810163e10a520fcde6cac246b6 100644 (file)
--- a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
+++ b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DlgRef_Skeleton_QTD</class>
 <widget class="QDialog">
     <property name="name">
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>307</width>
-            <height>378</height>
+            <width>615</width>
+            <height>682</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -20,6 +20,9 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
+    <property name="caption">
+        <string>DlgRef_Skeleton_QTD</string>
+    </property>
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
@@ -59,7 +62,10 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <hbox>
+                    <property name="title">
+                        <string></string>
+                    </property>
+                    <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
@@ -71,29 +77,13 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>Layout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
-                            <hbox>
+                            <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                               <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonOk</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                </widget>
-                                <spacer>
+                                <spacer row="0" column="3">
                                     <property name="name">
                                         <cstring>Spacer1</cstring>
                                     </property>
@@ -105,24 +95,46 @@
                                     </property>
                                     <property name="sizeHint">
                                         <size>
-                                            <width>91</width>
-                                            <height>0</height>
+                                            <width>90</width>
+                                            <height>20</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QPushButton">
+                                <widget class="QPushButton" row="0" column="2">
+                                    <property name="name">
+                                        <cstring>buttonOk</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
+                                </widget>
+                                <widget class="QPushButton" row="0" column="0">
+                                    <property name="name">
+                                        <cstring>buttonApply</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
+                                </widget>
+                                <widget class="QPushButton" row="0" column="1">
                                     <property name="name">
                                         <cstring>buttonCancel</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
-                               <widget class="QPushButton">
+                                <widget class="QPushButton" row="0" column="4">
                                     <property name="name">
                                         <cstring>buttonHelp</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
-                            </hbox>
+                            </grid>
                         </widget>
-                    </hbox>
+                    </vbox>
                 </widget>
                 <widget class="QButtonGroup" row="0" column="0">
                     <property name="name">
@@ -136,6 +148,9 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
+                    <property name="title">
+                        <string></string>
+                    </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -164,21 +179,33 @@
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton3</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton4</cstring>
                                     </property>
+                                    <property name="text">
+                                        <string></string>
+                                    </property>
                                 </widget>
                             </hbox>
                         </widget>
@@ -188,6 +215,9 @@
                     <property name="name">
                         <cstring>GroupBoxName</cstring>
                     </property>
+                    <property name="title">
+                        <string></string>
+                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>

diff --git a/src/DlgRef/UIFiles/ui_to_cxx b/src/DlgRef/UIFiles/ui_to_cxx
index 3e611c628e6b53c9e73017535a39ef06e0f69900..0740a1f9372a614b55033a246529469e66baf288 100755 (executable)
--- a/src/DlgRef/UIFiles/ui_to_cxx
+++ b/src/DlgRef/UIFiles/ui_to_cxx
@@ -18,8 +18,8 @@
 #
 #!/bin/sh
 
-uic -o DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui
-uic -o DlgRef_Skeleton_QTD.cxx -impl DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui
+#uic -o DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui
+#uic -o DlgRef_Skeleton_QTD.cxx -impl DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui
 
 #uic -o DlgRef_1Sel_QTD.h DlgRef_1Sel_QTD.ui
 #uic -o DlgRef_1Sel_QTD.cxx -impl DlgRef_1Sel_QTD.h DlgRef_1Sel_QTD.ui
@@ -117,5 +117,5 @@ uic -o DlgRef_Skeleton_QTD.cxx -impl DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.u
 #uic -o DlgRef_3Sel1Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui
 #uic -o DlgRef_3Sel1Check_QTD.cxx -impl DlgRef_3Sel1Check_QTD.h DlgRef_3Sel1Check_QTD.ui>>>>>>> 1.6.2.3
 
-#uic -o DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui
-#uic -o DlgRef_3Sel3Spin2Check_QTD.cxx -impl DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui
\ No newline at end of file
+uic -o DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui
+uic -o DlgRef_3Sel3Spin2Check_QTD.cxx -impl DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui
\ No newline at end of file

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index c4e65d0bcfbc741544dd28f899172c37f3f49a3b..32f3ff2af2a45ac5de949636d3ea5a235c04fabb 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -62,7 +62,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* paren
   NameLabel->setText(tr("GEOM_RESULT_NAME_LBL"));
 
   buttonCancel->setText(tr("GEOM_BUT_CLOSE"));
-  buttonOk->setText(tr("GEOM_BUT_OK"));
+  buttonOk->setText(tr("GEOM_BUT_APPLY_AND_CLOSE"));
   buttonApply->setText(tr("GEOM_BUT_APPLY"));
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
 

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index 11e004ab0f7f12104eaa64f788b411aa7751a0dc..ec1d79de1abbd8025008e0b09557ca39207b9174 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -49,6 +49,10 @@ msgstr "&Cancel"
 msgid "GEOM_BUT_OK"
 msgstr "O&k"
 
+#Button Apply and Close
+msgid "GEOM_BUT_APPLY_AND_CLOSE"
+msgstr "A&pply and Close"
+
 #Button Yes
 msgid "GEOM_BUT_YES"
 msgstr "&Yes"
@@ -1842,6 +1846,12 @@ msgstr "Main Shape"
 msgid "GroupGUI_GroupDlg::SELECT_SUB_SHAPES"
 msgstr "Select Sub-Shapes"
 
+msgid "GroupGUI_GroupDlg::GET_IN_PLACE"
+msgstr "Get In Place"
+
+msgid "GroupGUI_GroupDlg::SECOND_SHAPE"
+msgstr "Second Shape"
+
 msgid "GroupGUI_GroupDlg::SELECT_ALL"
 msgstr "Select All"