ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-15 21:21:22 +05:00
Code Issues Packages Projects Releases Wiki Activity

NPAL13898 Ok Apply Close laborious for User...

Browse Source
This commit is contained in:
dmv 2008-03-14 14:05:26 +00:00
parent 9961f0f994
commit c75ecc0adc
6 changed files with 105 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/DlgRef/DlgRef_Skeleton_QTD.cxx
View File

@ -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' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** 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->setColumnLayout(0, Qt::Vertical );
GroupButtons->layout()->setSpacing( 6 ); GroupButtons->layout()->setSpacing( 6 );
GroupButtons->layout()->setMargin( 11 ); GroupButtons->layout()->setMargin( 11 );
GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() ); GroupButtonsLayout = new QVBoxLayout( GroupButtons->layout() );
GroupButtonsLayout->setAlignment( Qt::AlignTop ); 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" ); buttonOk = new QPushButton( GroupButtons, "buttonOk" );
Layout3->addWidget( buttonOk );
layout3->addWidget( buttonOk, 0, 2 );
buttonApply = new QPushButton( GroupButtons, "buttonApply" ); buttonApply = new QPushButton( GroupButtons, "buttonApply" );
Layout3->addWidget( buttonApply );
Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); layout3->addWidget( buttonApply, 0, 0 );
Layout3->addItem( Spacer1 );
buttonCancel = new QPushButton( GroupButtons, "buttonCancel" ); buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
Layout3->addWidget( buttonCancel );
layout3->addWidget( buttonCancel, 0, 1 );
buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); buttonHelp = new QPushButton( GroupButtons, "buttonHelp" );
Layout3->addWidget( buttonHelp );
GroupButtonsLayout->addLayout( Layout3 ); layout3->addWidget( buttonHelp, 0, 4 );
GroupButtonsLayout->addLayout( layout3 );
Layout1->addWidget( GroupButtons, 3, 0 ); 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 ); DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
languageChange(); languageChange();
resize( QSize(307, 378).expandedTo(minimumSizeHint()) ); resize( QSize(615, 682).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
} }
@ -150,5 +135,17 @@ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD()
*/ */
void DlgRef_Skeleton_QTD::languageChange() 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 );
} }

29
src/DlgRef/DlgRef_Skeleton_QTD.h
View File

@ -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' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -29,8 +10,6 @@
#ifndef DLGREF_SKELETON_QTD_H #ifndef DLGREF_SKELETON_QTD_H
#define DLGREF_SKELETON_QTD_H #define DLGREF_SKELETON_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
@ -45,7 +24,7 @@ class QRadioButton;
class QLineEdit; class QLineEdit;
class QLabel; class QLabel;
class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog class DlgRef_Skeleton_QTD : public QDialog
{ {
Q_OBJECT Q_OBJECT
@ -70,8 +49,8 @@ public:
protected: protected:
QGridLayout* DlgRef_Skeleton_QTDLayout; QGridLayout* DlgRef_Skeleton_QTDLayout;
QGridLayout* Layout1; QGridLayout* Layout1;
QHBoxLayout* GroupButtonsLayout; QVBoxLayout* GroupButtonsLayout;
QHBoxLayout* Layout3; QGridLayout* layout3;
QSpacerItem* Spacer1; QSpacerItem* Spacer1;
QHBoxLayout* GroupConstructorsLayout; QHBoxLayout* GroupConstructorsLayout;
QHBoxLayout* Layout2; QHBoxLayout* Layout2;

88
src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
View File

@ -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> <class>DlgRef_Skeleton_QTD</class>
<widget class="QDialog"> <widget class="QDialog">
<property name="name"> <property name="name">
@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>307</width> <width>615</width>
<height>378</height> <height>682</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -20,6 +20,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="caption">
<string>DlgRef_Skeleton_QTD</string>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -59,7 +62,10 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<hbox> <property name="title">
<string></string>
</property>
<vbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
@ -71,29 +77,13 @@
</property> </property>
<widget class="QLayoutWidget"> <widget class="QLayoutWidget">
<property name="name"> <property name="name">
<cstring>Layout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<property name="margin"> <spacer row="0" column="3">
<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>
<property name="name"> <property name="name">
<cstring>Spacer1</cstring> <cstring>Spacer1</cstring>
</property> </property>
@ -105,24 +95,46 @@
</property> </property>
<property name="sizeHint"> <property name="sizeHint">
<size> <size>
<width>91</width> <width>90</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </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"> <property name="name">
<cstring>buttonCancel</cstring> <cstring>buttonCancel</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton" row="0" column="4">
<property name="name"> <property name="name">
<cstring>buttonHelp</cstring> <cstring>buttonHelp</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
</hbox> </grid>
</widget> </widget>
</hbox> </vbox>
</widget> </widget>
<widget class="QButtonGroup" row="0" column="0"> <widget class="QButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
@ -136,6 +148,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -164,21 +179,33 @@
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton2</cstring> <cstring>RadioButton2</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton3</cstring> <cstring>RadioButton3</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton4</cstring> <cstring>RadioButton4</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
@ -188,6 +215,9 @@
<property name="name"> <property name="name">
<cstring>GroupBoxName</cstring> <cstring>GroupBoxName</cstring>
</property> </property>
<property name="title">
<string></string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>

8
src/DlgRef/UIFiles/ui_to_cxx
View File

@ -18,8 +18,8 @@
# #
#!/bin/sh #!/bin/sh
uic -o 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_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.h DlgRef_1Sel_QTD.ui
#uic -o DlgRef_1Sel_QTD.cxx -impl 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.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_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.h DlgRef_3Sel3Spin2Check_QTD.ui
#uic -o DlgRef_3Sel3Spin2Check_QTD.cxx -impl DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui uic -o DlgRef_3Sel3Spin2Check_QTD.cxx -impl DlgRef_3Sel3Spin2Check_QTD.h DlgRef_3Sel3Spin2Check_QTD.ui

2
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -62,7 +62,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* paren
NameLabel->setText(tr("GEOM_RESULT_NAME_LBL")); NameLabel->setText(tr("GEOM_RESULT_NAME_LBL"));
buttonCancel->setText(tr("GEOM_BUT_CLOSE")); 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")); buttonApply->setText(tr("GEOM_BUT_APPLY"));
buttonHelp->setText(tr("GEOM_BUT_HELP")); buttonHelp->setText(tr("GEOM_BUT_HELP"));

10
src/GEOMGUI/GEOM_msg_en.po
View File

@ -49,6 +49,10 @@ msgstr "&Cancel"
msgid "GEOM_BUT_OK" msgid "GEOM_BUT_OK"
msgstr "O&k" msgstr "O&k"
#Button Apply and Close
msgid "GEOM_BUT_APPLY_AND_CLOSE"
msgstr "A&pply and Close"
#Button Yes #Button Yes
msgid "GEOM_BUT_YES" msgid "GEOM_BUT_YES"
msgstr "&Yes" msgstr "&Yes"
@ -1842,6 +1846,12 @@ msgstr "Main Shape"
msgid "GroupGUI_GroupDlg::SELECT_SUB_SHAPES" msgid "GroupGUI_GroupDlg::SELECT_SUB_SHAPES"
msgstr "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" msgid "GroupGUI_GroupDlg::SELECT_ALL"
msgstr "Select All" msgstr "Select All"