Ported #209 fix to master.

This commit is contained in:
Matthias Koefferlein 2018-12-16 23:35:30 +01:00
parent 3ed9e63480
commit db3b1d8eee
2 changed files with 27 additions and 29 deletions

View File

@ -33,17 +33,14 @@
<number>9</number>
</property>
<item>
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="tech_frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
@ -56,17 +53,17 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<item row="0" column="1">
<widget class="QComboBox" name="tech_cbx"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="tech_cbx_label">
<property name="text">
<string>Technology to be associated with layout</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="tech_cbx"/>
</item>
<item>
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -79,25 +76,25 @@
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">

View File

@ -187,7 +187,7 @@ LoadLayoutOptionsDialog::update ()
}
const db::Technology *tech = m_tech_array [m_technology_index];
mp_ui->options_tab->setEnabled (tech && tech->is_persisted ());
mp_ui->options_tab->setEnabled (!tech || tech->is_persisted ());
for (std::vector< std::pair<StreamReaderOptionsPage *, std::string> >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) {
if (page->first) {
@ -240,6 +240,7 @@ LoadLayoutOptionsDialog::edit_global_options (lay::PluginRoot *config_root, db::
mp_ui->tech_cbx->blockSignals (false);
mp_ui->tech_cbx->show ();
mp_ui->tech_frame->show ();
if (get_options_internal ()) {
@ -271,7 +272,7 @@ LoadLayoutOptionsDialog::edit_global_options (lay::PluginRoot *config_root, db::
bool
LoadLayoutOptionsDialog::get_options (db::LoadLayoutOptions &options)
{
mp_ui->tech_cbx->hide ();
mp_ui->tech_frame->hide ();
mp_ui->always_cbx->hide ();
m_opt_array.clear ();