Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom.git
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_MainWindow.cpp
diff --git
a/src/XGUI/XGUI_MainWindow.cpp
b/src/XGUI/XGUI_MainWindow.cpp
index 25ea218c9519b3771d8e7507805341737061f50f..b675c5fd7d59639c83e5075dec96d6d27092df76 100644
(file)
--- a/
src/XGUI/XGUI_MainWindow.cpp
+++ b/
src/XGUI/XGUI_MainWindow.cpp
@@
-28,9
+28,9
@@
XGUI_MainWindow::XGUI_MainWindow(QWidget* parent)
: QMainWindow(parent),
XGUI_MainWindow::XGUI_MainWindow(QWidget* parent)
: QMainWindow(parent),
- myObjectBrowser(
NULL
),
- myPythonConsole(
NULL
),
- myPropertyPanelDock(
NULL
)
+ myObjectBrowser(
0
),
+ myPythonConsole(
0
),
+ myPropertyPanelDock(
0
)
{
setWindowTitle(tr("New Geom"));
myMenuBar = new XGUI_MainMenu(this);
{
setWindowTitle(tr("New Geom"));
myMenuBar = new XGUI_MainMenu(this);
@@
-40,7
+40,7
@@
XGUI_MainWindow::XGUI_MainWindow(QWidget* parent)
myViewer = new XGUI_Viewer(this);
myViewer = new XGUI_Viewer(this);
- createDockWidgets();
+
//
createDockWidgets();
}
XGUI_MainWindow::~XGUI_MainWindow(void)
}
XGUI_MainWindow::~XGUI_MainWindow(void)
@@
-75,11
+75,7
@@
void XGUI_MainWindow::showPythonConsole()
aDoc->setMinimumHeight(0);
aDoc->setWindowTitle("Console");
myPythonConsole = new PyConsole_EnhConsole( aDoc, new PyConsole_EnhInterp());
aDoc->setMinimumHeight(0);
aDoc->setWindowTitle("Console");
myPythonConsole = new PyConsole_EnhConsole( aDoc, new PyConsole_EnhInterp());
- //myPythonConsole = new QTextEdit(aDoc);
- //myPythonConsole->setGeometry(0,0,200, 50);
- //myPythonConsole->setText(">>>");
aDoc->setWidget(myPythonConsole);
aDoc->setWidget(myPythonConsole);
- //myPythonConsole->setMinimumHeight(0);
addDockWidget(Qt::TopDockWidgetArea, aDoc);
tabifyDockWidget(myMenuBar->getLastDockWindow(), aDoc);
}
addDockWidget(Qt::TopDockWidgetArea, aDoc);
tabifyDockWidget(myMenuBar->getLastDockWindow(), aDoc);
}
@@
-125,11
+121,17
@@
void XGUI_MainWindow::createDockWidgets()
tabifyDockWidget(aObjDock, myPropertyPanelDock);
}
tabifyDockWidget(aObjDock, myPropertyPanelDock);
}
+void XGUI_MainWindow::setPropertyPannelTitle(const QString& theTitle)
+{
+ myPropertyPanelDock->setWindowTitle(theTitle);
+}
+
QDockWidget* XGUI_MainWindow::createPropertyPanel()
{
QDockWidget* aPropPanel = new QDockWidget(this);
aPropPanel->setWindowTitle(tr("Property Panel"));
QDockWidget* XGUI_MainWindow::createPropertyPanel()
{
QDockWidget* aPropPanel = new QDockWidget(this);
aPropPanel->setWindowTitle(tr("Property Panel"));
+ QAction* aViewAct = aPropPanel->toggleViewAction();
aPropPanel->setObjectName(XGUI::PROP_PANEL);
QWidget* aContent = new QWidget(aPropPanel);
aPropPanel->setObjectName(XGUI::PROP_PANEL);
QWidget* aContent = new QWidget(aPropPanel);
@@
-137,11
+139,6
@@
QDockWidget* XGUI_MainWindow::createPropertyPanel()
aMainLay->setContentsMargins(3, 3, 3, 3);
aPropPanel->setWidget(aContent);
aMainLay->setContentsMargins(3, 3, 3, 3);
aPropPanel->setWidget(aContent);
- QWidget* aCustomWidget = new QWidget(aContent);
- aCustomWidget->setObjectName(XGUI::PROP_PANEL_WDG);
- aMainLay->addWidget(aCustomWidget);
- aMainLay->addStretch(1);
-
QFrame* aFrm = new QFrame(aContent);
aFrm->setFrameStyle(QFrame::Sunken);
aFrm->setFrameShape(QFrame::Panel);
QFrame* aFrm = new QFrame(aContent);
aFrm->setFrameStyle(QFrame::Sunken);
aFrm->setFrameShape(QFrame::Panel);
@@
-151,17
+148,25
@@
QDockWidget* XGUI_MainWindow::createPropertyPanel()
QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
aBtn->setFlat(true);
QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
aBtn->setFlat(true);
+ //connect(aBtn, SIGNAL(clicked()), this, SIGNAL(propertyHelpPressed()));
aBtnLay->addWidget(aBtn);
aBtnLay->addStretch(1);
aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
aBtn->setObjectName(XGUI::PROP_PANEL_OK);
aBtn->setFlat(true);
aBtnLay->addWidget(aBtn);
aBtnLay->addStretch(1);
aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
aBtn->setObjectName(XGUI::PROP_PANEL_OK);
aBtn->setFlat(true);
+ //connect(aBtn, SIGNAL(clicked()), this, SIGNAL(propertyOkPressed()));
aBtnLay->addWidget(aBtn);
aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
aBtn->setFlat(true);
aBtnLay->addWidget(aBtn);
aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
aBtn->setFlat(true);
+ //connect(aBtn, SIGNAL(clicked()), this, SIGNAL(propertyClosePressed()));
aBtnLay->addWidget(aBtn);
aBtnLay->addWidget(aBtn);
+ QWidget* aCustomWidget = new QWidget(aContent);
+ aCustomWidget->setObjectName(XGUI::PROP_PANEL_WDG);
+ aMainLay->addWidget(aCustomWidget);
+ aMainLay->addStretch(1);
+
return aPropPanel;
}
return aPropPanel;
}