* ./hurricane:
- Bug: In CellWidget, correct the slightly off position of Labels references. - New: In ControllerWidget, new TabSettings tab to hold the configuration settings of the various Coriolis tools. The TabSettings is a tab itself.
This commit is contained in:
parent
17ac99fa46
commit
92422cb683
|
@ -431,6 +431,29 @@ namespace Hurricane {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------
|
||||||
|
// Class : "Hurricane::TabSettings".
|
||||||
|
|
||||||
|
|
||||||
|
TabSettings::TabSettings ( QWidget* parent )
|
||||||
|
: ControllerTab(parent)
|
||||||
|
, _settings(new QTabWidget())
|
||||||
|
{
|
||||||
|
setContentsMargins ( 5, 0, 5, 5 );
|
||||||
|
|
||||||
|
_settings->setObjectName ( "controller.tabSettings.settings" );
|
||||||
|
|
||||||
|
QVBoxLayout* vLayout = new QVBoxLayout ();
|
||||||
|
vLayout->setContentsMargins ( 0, 0, 0, 0 );
|
||||||
|
vLayout->addWidget ( _settings );
|
||||||
|
setLayout ( vLayout );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void TabSettings::setCellWidget ( CellWidget* )
|
||||||
|
{ }
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
// Class : "Hurricane::ControllerWidget".
|
// Class : "Hurricane::ControllerWidget".
|
||||||
|
|
||||||
|
@ -444,6 +467,7 @@ namespace Hurricane {
|
||||||
, _tabNetlist (new TabNetlist())
|
, _tabNetlist (new TabNetlist())
|
||||||
, _tabSelection (new TabSelection())
|
, _tabSelection (new TabSelection())
|
||||||
, _tabInspector (new TabInspector())
|
, _tabInspector (new TabInspector())
|
||||||
|
, _tabSettings (new TabSettings())
|
||||||
{
|
{
|
||||||
setObjectName ( "controller" );
|
setObjectName ( "controller" );
|
||||||
setAttribute ( Qt::WA_QuitOnClose, false );
|
setAttribute ( Qt::WA_QuitOnClose, false );
|
||||||
|
@ -457,6 +481,7 @@ namespace Hurricane {
|
||||||
_tabNetlist ->setObjectName ( "controller.tabNetlist" );
|
_tabNetlist ->setObjectName ( "controller.tabNetlist" );
|
||||||
_tabSelection ->setObjectName ( "controller.tabSelection" );
|
_tabSelection ->setObjectName ( "controller.tabSelection" );
|
||||||
_tabInspector ->setObjectName ( "controller.tabInspector" );
|
_tabInspector ->setObjectName ( "controller.tabInspector" );
|
||||||
|
_tabSettings ->setObjectName ( "controller.tabSettings" );
|
||||||
|
|
||||||
addTab ( _tabGraphics , "Look" );
|
addTab ( _tabGraphics , "Look" );
|
||||||
addTab ( _tabDisplayFilter , "Filter" );
|
addTab ( _tabDisplayFilter , "Filter" );
|
||||||
|
@ -464,6 +489,7 @@ namespace Hurricane {
|
||||||
addTab ( _tabNetlist , "Netlist" );
|
addTab ( _tabNetlist , "Netlist" );
|
||||||
addTab ( _tabSelection , "Selection" );
|
addTab ( _tabSelection , "Selection" );
|
||||||
addTab ( _tabInspector , "Inspector" );
|
addTab ( _tabInspector , "Inspector" );
|
||||||
|
addTab ( _tabSettings , "Settings" );
|
||||||
|
|
||||||
QAction* toggleShow = new QAction ( tr("Controller"), this );
|
QAction* toggleShow = new QAction ( tr("Controller"), this );
|
||||||
toggleShow->setObjectName ( "controller.action.hideShow" );
|
toggleShow->setObjectName ( "controller.action.hideShow" );
|
||||||
|
|
|
@ -227,6 +227,29 @@ namespace Hurricane {
|
||||||
inline QComboBox* TabInspector::getBookmarks () { return _bookmarks; }
|
inline QComboBox* TabInspector::getBookmarks () { return _bookmarks; }
|
||||||
|
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------
|
||||||
|
// Class : "Hurricane::TabSettings".
|
||||||
|
|
||||||
|
|
||||||
|
class TabSettings : public ControllerTab {
|
||||||
|
Q_OBJECT;
|
||||||
|
|
||||||
|
public:
|
||||||
|
TabSettings ( QWidget* parent=NULL );
|
||||||
|
inline QTabWidget* getSettings ();
|
||||||
|
inline int addSetting ( QWidget* page, const QString& label );
|
||||||
|
public slots:
|
||||||
|
void setCellWidget ( CellWidget* );
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QTabWidget* _settings;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
inline QTabWidget* TabSettings::getSettings () { return _settings; }
|
||||||
|
inline int TabSettings::addSetting ( QWidget* page, const QString& label ) { return _settings->addTab(page,label); }
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
// Class : "Hurricane::ControllerWidget".
|
// Class : "Hurricane::ControllerWidget".
|
||||||
|
|
||||||
|
@ -243,7 +266,9 @@ namespace Hurricane {
|
||||||
inline NetlistWidget* getNetlistBrowser ();
|
inline NetlistWidget* getNetlistBrowser ();
|
||||||
inline SelectionWidget* getSelection ();
|
inline SelectionWidget* getSelection ();
|
||||||
inline InspectorWidget* getInspectorWidget ();
|
inline InspectorWidget* getInspectorWidget ();
|
||||||
|
inline TabSettings* getSettings ();
|
||||||
void setCellWidget ( CellWidget* );
|
void setCellWidget ( CellWidget* );
|
||||||
|
inline int addSetting ( QWidget* page, const QString& label );
|
||||||
public slots:
|
public slots:
|
||||||
void cellPreModificate ();
|
void cellPreModificate ();
|
||||||
void cellPostModificate ();
|
void cellPostModificate ();
|
||||||
|
@ -259,6 +284,7 @@ namespace Hurricane {
|
||||||
TabNetlist* _tabNetlist;
|
TabNetlist* _tabNetlist;
|
||||||
TabSelection* _tabSelection;
|
TabSelection* _tabSelection;
|
||||||
TabInspector* _tabInspector;
|
TabInspector* _tabInspector;
|
||||||
|
TabSettings* _tabSettings;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -269,6 +295,8 @@ namespace Hurricane {
|
||||||
inline NetlistWidget* ControllerWidget::getNetlistBrowser () { return _tabNetlist->getNetlistBrowser(); }
|
inline NetlistWidget* ControllerWidget::getNetlistBrowser () { return _tabNetlist->getNetlistBrowser(); }
|
||||||
inline SelectionWidget* ControllerWidget::getSelection () { return _tabSelection->getSelection(); }
|
inline SelectionWidget* ControllerWidget::getSelection () { return _tabSelection->getSelection(); }
|
||||||
inline InspectorWidget* ControllerWidget::getInspectorWidget () { return _tabInspector->getInspectorWidget(); }
|
inline InspectorWidget* ControllerWidget::getInspectorWidget () { return _tabInspector->getInspectorWidget(); }
|
||||||
|
inline TabSettings* ControllerWidget::getSettings () { return _tabSettings; }
|
||||||
|
inline int ControllerWidget::addSetting ( QWidget* page, const QString& label ) { return _tabSettings->addSetting(page,label); }
|
||||||
|
|
||||||
|
|
||||||
} // End of Hurricane namespace.
|
} // End of Hurricane namespace.
|
||||||
|
|
Loading…
Reference in New Issue