Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging with WPdev
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index b4b23b38117bf8b261d692ee7906f53fe1d615fa..9fdc3f71996e087995d068a33c65490e6d332f07 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-963,7
+963,7
@@
void SMESHGUI_FilterTable::onRemoveBtn()
if (aTable->isRowSelected(i))
{
aRows.resize(aRows.size() + 1);
if (aTable->isRowSelected(i))
{
aRows.resize(aRows.size() + 1);
- aRows[
aRows.size() - 1
] = i;
+ aRows[
(int)(aRows.size() - 1)
] = i;
removeAdditionalWidget(aTable, i);
}
}
removeAdditionalWidget(aTable, i);
}
}
@@
-1958,9
+1958,15
@@
void SMESHGUI_FilterDlg::onHelp()
if (app)
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
if (app)
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
+ QString platform;
+#ifdef WIN32
+ platform = "winapplication";
+#else
+ platform = "application";
+#endif
SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser",
"application"
)).arg(myHelpFileName),
+ arg(app->resourceMgr()->stringValue("ExternalBrowser",
platform
)).arg(myHelpFileName),
QObject::tr("BUT_OK"));
}
}
QObject::tr("BUT_OK"));
}
}