mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-28 18:30:35 +05:00
1) Fix for bug IPAL19258 : Qt4 porting. Incorrect view of Preferences: no default color; small black square; alignment.
2) SMESHGUI_Preferences_ScalarBarDlg dialog box: add <Help> button.
This commit is contained in:
mkr
parent
eebb1370b2
commit
e618e38681
@ -3085,11 +3085,12 @@ void SMESHGUI::createPreferences()
|
||||
addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, LightApp_Preferences::Bool, "SMESH", "auto_update" );
|
||||
|
||||
int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
|
||||
setPreferenceProperty( qaGroup, "columns", 2 );
|
||||
addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "display_entity" );
|
||||
addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "use_precision" );
|
||||
|
||||
int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab );
|
||||
setPreferenceProperty( precGroup, "columns", 1 );
|
||||
setPreferenceProperty( precGroup, "columns", 2 );
|
||||
|
||||
int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, LightApp_Preferences::IntSpin, "SMESH", "controls_precision" );
|
||||
|
||||
@ -3097,6 +3098,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( prec, "max", 16 );
|
||||
|
||||
int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab );
|
||||
setPreferenceProperty( dispgroup, "columns", 2 );
|
||||
int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" );
|
||||
QStringList modes;
|
||||
modes.append( "Wireframe" );
|
||||
@ -3112,11 +3114,13 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( dispmode, "indexes", indices );
|
||||
|
||||
int exportgroup = addPreference( tr( "PREF_GROUP_EXPORT" ), genTab );
|
||||
setPreferenceProperty( exportgroup, "columns", 2 );
|
||||
addPreference( tr( "PREF_AUTO_GROUPS" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "auto_groups" );
|
||||
addPreference( tr( "PREF_RENUMBER" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "renumbering" );
|
||||
|
||||
int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
|
||||
int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
|
||||
setPreferenceProperty( nodeGroup, "columns", 2 );
|
||||
|
||||
addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" );
|
||||
int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, LightApp_Preferences::IntSpin, "SMESH", "node_size" );
|
||||
@ -3125,6 +3129,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( nodeSz, "max", 5 );
|
||||
|
||||
int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab );
|
||||
setPreferenceProperty( elemGroup, "columns", 2 );
|
||||
|
||||
addPreference( tr( "PREF_FILL" ), elemGroup, LightApp_Preferences::Color, "SMESH", "fill_color" );
|
||||
addPreference( tr( "PREF_OUTLINE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" );
|
||||
@ -3143,6 +3148,7 @@ void SMESHGUI::createPreferences()
|
||||
int selTab = addPreference( tr( "PREF_TAB_SELECTION" ) );
|
||||
|
||||
int selGroup = addPreference( tr( "PREF_GROUP_SELECTION" ), selTab );
|
||||
setPreferenceProperty( selGroup, "columns", 2 );
|
||||
|
||||
addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_object_color" );
|
||||
addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_element_color" );
|
||||
@ -3152,6 +3158,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( selW, "max", 5 );
|
||||
|
||||
int preGroup = addPreference( tr( "PREF_GROUP_PRESELECTION" ), selTab );
|
||||
setPreferenceProperty( preGroup, "columns", 2 );
|
||||
|
||||
addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, LightApp_Preferences::Color, "SMESH", "highlight_color" );
|
||||
int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, LightApp_Preferences::IntSpin, "SMESH", "highlight_width" );
|
||||
@ -3160,6 +3167,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( preW, "max", 5 );
|
||||
|
||||
int precSelGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), selTab );
|
||||
setPreferenceProperty( precSelGroup, "columns", 2 );
|
||||
|
||||
addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" );
|
||||
addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
|
||||
@ -3167,6 +3175,7 @@ void SMESHGUI::createPreferences()
|
||||
|
||||
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
|
||||
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
|
||||
setPreferenceProperty( fontGr, "columns", 4 );
|
||||
|
||||
int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_title_font" );
|
||||
addPreference( tr( "PREF_TITLE_COLOR" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" );
|
||||
@ -3187,6 +3196,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( lfont, "widget_flags", wflag );
|
||||
|
||||
int colorsLabelsGr = addPreference( tr( "SMESH_LABELS_COLORS_SCALARBAR" ), sbarTab );
|
||||
setPreferenceProperty( colorsLabelsGr, "columns", 4 );
|
||||
|
||||
int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" );
|
||||
setPreferenceProperty( numcol, "min", 2 );
|
||||
@ -3197,6 +3207,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( numlab, "max", 65 );
|
||||
|
||||
int orientGr = addPreference( tr( "SMESH_ORIENTATION" ), sbarTab );
|
||||
setPreferenceProperty( orientGr, "columns", 2 );
|
||||
int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, LightApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" );
|
||||
QStringList orients;
|
||||
orients.append( tr( "SMESH_VERTICAL" ) );
|
||||
@ -3206,6 +3217,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( orient, "indexes", indices );
|
||||
|
||||
int posVSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_VERTICAL" ), sbarTab );
|
||||
setPreferenceProperty( posVSizeGr, "columns", 4 );
|
||||
int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" );
|
||||
int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" );
|
||||
int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" );
|
||||
@ -3224,6 +3236,7 @@ void SMESHGUI::createPreferences()
|
||||
setPreferenceProperty( hv, "step", 0.1 );
|
||||
|
||||
int posHSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_HORIZONTAL" ), sbarTab );
|
||||
setPreferenceProperty( posHSizeGr, "columns", 4 );
|
||||
int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" );
|
||||
int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" );
|
||||
int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" );
|
||||
|
||||
@ -35,7 +35,10 @@
|
||||
// SALOME GUI includes
|
||||
#include <SUIT_Desktop.h>
|
||||
#include <SUIT_ResourceMgr.h>
|
||||
#include <SUIT_Session.h>
|
||||
#include <SUIT_MessageBox.h>
|
||||
|
||||
#include <LightApp_Application.h>
|
||||
#include <LightApp_SelectionMgr.h>
|
||||
#include <SALOME_ListIO.hxx>
|
||||
|
||||
@ -278,6 +281,8 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
|
||||
myApplyBtn->setAutoDefault( true );
|
||||
myCancelBtn = new QPushButton( tr( "SMESH_BUT_CLOSE" ), myButtonGrp );
|
||||
myCancelBtn->setAutoDefault( true );
|
||||
myHelpBtn = new QPushButton( tr("SMESH_BUT_HELP"), myButtonGrp );
|
||||
myHelpBtn->setAutoDefault(true);
|
||||
|
||||
myButtonGrpLayout->addWidget( myOkBtn );
|
||||
myButtonGrpLayout->addSpacing( 10 );
|
||||
@ -285,6 +290,7 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
|
||||
myButtonGrpLayout->addSpacing( 10 );
|
||||
myButtonGrpLayout->addStretch();
|
||||
myButtonGrpLayout->addWidget( myCancelBtn );
|
||||
myButtonGrpLayout->addWidget( myHelpBtn );
|
||||
|
||||
aTopLayout->addWidget( myButtonGrp );
|
||||
|
||||
@ -367,11 +373,14 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
|
||||
connect( myOkBtn, SIGNAL( clicked() ), this, SLOT( onOk() ) );
|
||||
connect( myApplyBtn, SIGNAL( clicked() ), this, SLOT( onApply() ) );
|
||||
connect( myCancelBtn, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
|
||||
connect( myHelpBtn, SIGNAL(clicked()), this, SLOT( onHelp() ) );
|
||||
connect( myXSpin, SIGNAL( valueChanged( double ) ), this, SLOT( onXYChanged() ) );
|
||||
connect( myYSpin, SIGNAL( valueChanged( double ) ), this, SLOT( onXYChanged() ) );
|
||||
connect( aOrientationGrp, SIGNAL( buttonClicked( int ) ), this, SLOT( onOrientationChanged() ) );
|
||||
connect( mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionChanged() ) );
|
||||
connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onCancel() ) );
|
||||
|
||||
myHelpFileName = "about_quality_controls_page.html";
|
||||
}
|
||||
|
||||
//=================================================================================================
|
||||
@ -475,6 +484,33 @@ void SMESHGUI_Preferences_ScalarBarDlg::onCancel()
|
||||
close();
|
||||
}
|
||||
|
||||
//=================================================================================================
|
||||
/*!
|
||||
* SMESHGUI_Preferences_ScalarBarDlg::onHelp
|
||||
*
|
||||
* Help button slot
|
||||
*/
|
||||
//=================================================================================================
|
||||
void SMESHGUI_Preferences_ScalarBarDlg::onHelp()
|
||||
{
|
||||
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
|
||||
if (app)
|
||||
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
|
||||
else {
|
||||
QString platform;
|
||||
#ifdef WIN32
|
||||
platform = "winapplication";
|
||||
#else
|
||||
platform = "application";
|
||||
#endif
|
||||
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
|
||||
tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
|
||||
arg(app->resourceMgr()->stringValue("ExternalBrowser",
|
||||
platform)).
|
||||
arg(myHelpFileName));
|
||||
}
|
||||
}
|
||||
|
||||
//=================================================================================================
|
||||
/*!
|
||||
* SMESHGUI_Preferences_ScalarBarDlg::onSelectionChanged
|
||||
|
||||
@ -72,6 +72,7 @@ protected slots:
|
||||
void onOk();
|
||||
bool onApply();
|
||||
void onCancel();
|
||||
void onHelp();
|
||||
void onSelectionChanged();
|
||||
void onXYChanged();
|
||||
void onOrientationChanged();
|
||||
@ -119,6 +120,9 @@ private:
|
||||
QPushButton* myOkBtn;
|
||||
QPushButton* myApplyBtn;
|
||||
QPushButton* myCancelBtn;
|
||||
QPushButton* myHelpBtn;
|
||||
|
||||
QString myHelpFileName;
|
||||
};
|
||||
|
||||
#endif // SMESHGUI_PREFERENCES_SCALARBARDLG_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user