1
0
Fork 0

GUI: removed QDialogButtonBox

This commit is contained in:
mrexodia 2016-10-01 16:49:56 +02:00
parent ce4d5642bb
commit 16bf75a15b
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
6 changed files with 148 additions and 129 deletions

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>510</width>
<height>346</height>
<width>503</width>
<height>339</height>
</rect>
</property>
<property name="sizePolicy">
@ -23,22 +23,6 @@
<iconset resource="../../resource.qrc">
<normaloff>:/icons/images/memory-map.png</normaloff>:/icons/images/memory-map.png</iconset>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>350</x>
<y>310</y>
<width>121</width>
<height>21</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
<widget class="QTableWidget" name="pagetableWidget">
<property name="enabled">
<bool>true</bool>
@ -174,19 +158,6 @@
</item>
</layout>
</widget>
<widget class="QLineEdit" name="LnEdStatus">
<property name="geometry">
<rect>
<x>10</x>
<y>310</y>
<width>371</width>
<height>20</height>
</rect>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
@ -213,13 +184,39 @@
<string>PAGE GUARD</string>
</property>
</widget>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>10</x>
<y>300</y>
<width>481</width>
<height>25</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="LnEdStatus">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
<zorder>paddingLayoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>buttonBox</zorder>
<zorder>LnEdStatus</zorder>
<zorder>pagetableWidget</zorder>
<zorder>label</zorder>
<zorder>chkPageguard</zorder>
<zorder>pushButton</zorder>
</widget>
<tabstops>
<tabstop>pagetableWidget</tabstop>
@ -242,34 +239,18 @@
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>PageMemoryRights</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>PageMemoryRights</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>460</x>
<y>314</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>496</x>
<y>316</y>
</hint>
</hints>
</connection>

View File

@ -28,14 +28,22 @@
<widget class="QListWidget" name="listWidget"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>&amp;OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@ -44,34 +52,34 @@
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<sender>pushButton_2</sender>
<signal>clicked()</signal>
<receiver>SelectFields</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>19</x>
<y>150</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
<x>27</x>
<y>176</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>SelectFields</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>182</x>
<y>153</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>207</x>
<y>164</y>
</hint>
</hints>
</connection>

View File

@ -18,7 +18,6 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
LoadSettings(); //load settings from file
connect(Bridge::getBridge(), SIGNAL(setLastException(uint)), this, SLOT(setLastException(uint)));
lastException = 0;
ui->chkSystemBreakpoint->setFocus();
}
SettingsDialog::~SettingsDialog()

View File

@ -76,7 +76,7 @@ void WordEditDialog::expressionChanged(bool validExpression, bool validPointer,
ui->expressionLineEdit->setStyleSheet("");
ui->signedLineEdit->setStyleSheet("");
ui->unsignedLineEdit->setStyleSheet("");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(true);
ui->btnOk->setEnabled(true);
//hex
mWord = value;
@ -115,7 +115,7 @@ void WordEditDialog::expressionChanged(bool validExpression, bool validPointer,
else
{
ui->expressionLineEdit->setStyleSheet("border: 1px solid red");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->btnOk->setEnabled(false);
}
}
@ -125,13 +125,13 @@ void WordEditDialog::on_signedLineEdit_textEdited(const QString & arg1)
if(sscanf_s(arg1.toUtf8().constData(), "%lld", &value) == 1)
{
ui->signedLineEdit->setStyleSheet("");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(true);
ui->btnOk->setEnabled(true);
ui->expressionLineEdit->setText(QString("%1").arg((duint)value, sizeof(duint) * 2, 16, QChar('0')).toUpper());
}
else
{
ui->signedLineEdit->setStyleSheet("border: 1px solid red");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->btnOk->setEnabled(false);
}
}
@ -141,13 +141,13 @@ void WordEditDialog::on_unsignedLineEdit_textEdited(const QString & arg1)
if(sscanf_s(arg1.toUtf8().constData(), "%llu", &value) == 1)
{
ui->unsignedLineEdit->setStyleSheet("");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(true);
ui->btnOk->setEnabled(true);
ui->expressionLineEdit->setText(QString("%1").arg((duint)value, sizeof(duint) * 2, 16, QChar('0')).toUpper());
}
else
{
ui->unsignedLineEdit->setStyleSheet("border: 1px solid red");
ui->buttons->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->btnOk->setEnabled(false);
}
}

View File

@ -23,22 +23,6 @@
<iconset resource="../../resource.qrc">
<normaloff>:/icons/images/ui-combo-box-edit.png</normaloff>:/icons/images/ui-combo-box-edit.png</iconset>
</property>
<widget class="QDialogButtonBox" name="buttons">
<property name="geometry">
<rect>
<x>90</x>
<y>130</y>
<width>161</width>
<height>27</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
@ -211,6 +195,32 @@
</font>
</property>
</widget>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>90</x>
<y>130</y>
<width>158</width>
<height>25</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="btnOk">
<property name="text">
<string>&amp;OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCancel">
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<tabstops>
<tabstop>expressionLineEdit</tabstop>
@ -223,34 +233,34 @@
</resources>
<connections>
<connection>
<sender>buttons</sender>
<signal>accepted()</signal>
<sender>btnOk</sender>
<signal>clicked()</signal>
<receiver>WordEditDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>109</x>
<y>147</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
<x>48</x>
<y>136</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttons</sender>
<signal>rejected()</signal>
<sender>btnCancel</sender>
<signal>clicked()</signal>
<receiver>WordEditDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>215</x>
<y>138</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>260</x>
<y>128</y>
</hint>
</hints>
</connection>

View File

@ -24,48 +24,69 @@
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>&amp;OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>XrefBrowseDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>227</x>
<y>408</y>
<x>167</x>
<y>398</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
<x>141</x>
<y>398</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<sender>pushButton_2</sender>
<signal>clicked()</signal>
<receiver>XrefBrowseDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>295</x>
<y>414</y>
<x>266</x>
<y>405</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>324</x>
<y>396</y>
</hint>
</hints>
</connection>