diff options
Diffstat (limited to 'utils/regtools/qeditor/regdisplaypanel.cpp')
-rw-r--r-- | utils/regtools/qeditor/regdisplaypanel.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/utils/regtools/qeditor/regdisplaypanel.cpp b/utils/regtools/qeditor/regdisplaypanel.cpp index 3dbdb54241..167c776cce 100644 --- a/utils/regtools/qeditor/regdisplaypanel.cpp +++ b/utils/regtools/qeditor/regdisplaypanel.cpp | |||
@@ -196,7 +196,7 @@ RegDisplayPanel::RegDisplayPanel(QWidget *parent, IoBackend *io_backend, const S | |||
196 | raw_val_layout->addWidget(m_raw_val_edit); | 196 | raw_val_layout->addWidget(m_raw_val_edit); |
197 | raw_val_layout->addStretch(); | 197 | raw_val_layout->addStretch(); |
198 | 198 | ||
199 | m_value_table = new GrowingTableView; | 199 | m_value_table = new GrowingTableView(); |
200 | m_value_model = new RegFieldTableModel(m_value_table); // view takes ownership | 200 | m_value_model = new RegFieldTableModel(m_value_table); // view takes ownership |
201 | m_value_model->SetRegister(m_reg.GetReg()); | 201 | m_value_model->SetRegister(m_reg.GetReg()); |
202 | m_value_model->SetReadOnly(read_only); | 202 | m_value_model->SetReadOnly(read_only); |
@@ -208,7 +208,7 @@ RegDisplayPanel::RegDisplayPanel(QWidget *parent, IoBackend *io_backend, const S | |||
208 | // FIXME we cannot use setAlternatingRowColors() because we override the | 208 | // FIXME we cannot use setAlternatingRowColors() because we override the |
209 | // background color, should it be part of the model ? | 209 | // background color, should it be part of the model ? |
210 | 210 | ||
211 | SocFieldCachedItemDelegate *m_table_delegate = new SocFieldCachedItemDelegate(this); | 211 | m_table_delegate = new SocFieldCachedItemDelegate(this); |
212 | m_table_edit_factory = new QItemEditorFactory(); | 212 | m_table_edit_factory = new QItemEditorFactory(); |
213 | SocFieldCachedEditorCreator *m_table_edit_creator = new SocFieldCachedEditorCreator(); | 213 | SocFieldCachedEditorCreator *m_table_edit_creator = new SocFieldCachedEditorCreator(); |
214 | // FIXME see QTBUG-30392 | 214 | // FIXME see QTBUG-30392 |
@@ -217,8 +217,10 @@ RegDisplayPanel::RegDisplayPanel(QWidget *parent, IoBackend *io_backend, const S | |||
217 | m_table_delegate->setItemEditorFactory(m_table_edit_factory); | 217 | m_table_delegate->setItemEditorFactory(m_table_edit_factory); |
218 | m_value_table->setItemDelegate(m_table_delegate); | 218 | m_value_table->setItemDelegate(m_table_delegate); |
219 | 219 | ||
220 | m_sexy_display = new RegSexyDisplay(reg_ref, this); | 220 | m_sexy_display2 = new Unscroll<RegSexyDisplay2>(this); |
221 | m_sexy_display->setFont(m_reg_font); | 221 | m_sexy_display2->setFont(m_reg_font); |
222 | m_sexy_display2->setModel(m_value_model); | ||
223 | m_sexy_display2->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | ||
222 | 224 | ||
223 | m_desc = new QLabel(this); | 225 | m_desc = new QLabel(this); |
224 | m_desc->setTextFormat(Qt::RichText); | 226 | m_desc->setTextFormat(Qt::RichText); |
@@ -228,8 +230,9 @@ RegDisplayPanel::RegDisplayPanel(QWidget *parent, IoBackend *io_backend, const S | |||
228 | right_layout->addLayout(top_layout); | 230 | right_layout->addLayout(top_layout); |
229 | if(raw_val_layout) | 231 | if(raw_val_layout) |
230 | right_layout->addLayout(raw_val_layout); | 232 | right_layout->addLayout(raw_val_layout); |
231 | right_layout->addWidget(m_sexy_display); | 233 | right_layout->addWidget(m_sexy_display2); |
232 | right_layout->addWidget(m_value_table); | 234 | right_layout->addWidget(m_value_table); |
235 | right_layout->addStretch(); | ||
233 | 236 | ||
234 | setTitle("Register Description"); | 237 | setTitle("Register Description"); |
235 | m_viewport = new QWidget; | 238 | m_viewport = new QWidget; |