put spins instead of edits (aef82776) · Commits · passwords / cppack

forms/mainwindow.ui

+33 −33

Original line number	Diff line number	Diff line
		@@ -108,9 +108,6 @@
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QLineEdit" name="ThreadlineEdit"/>
		</item>
		<item row="1" column="0">
		<widget class="QCheckBox" name="threadsCheckBox">
		<property name="text">
		@@ -135,6 +132,13 @@
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QSpinBox" name="threadNumberSpin">
		<property name="minimum">
		<number>1</number>
		</property>
		</widget>
		</item>
		</layout>
		</widget>
		</widget>
		@@ -182,45 +186,41 @@
		</property>
		</widget>
		</item>
		<item row="0" column="1">
		<widget class="QLineEdit" name="lengthLineEdit">
		<item row="0" column="0">
		<widget class="QLabel" name="lengthLabel">
		<property name="text">
		<string>8</string>
		<string>Min Length</string>
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QLineEdit" name="specialLineEdit">
		<property name="text">
		<string>0</string>
		<item row="0" column="1">
		<widget class="QSpinBox" name="MinLenSpin">
		<property name="value">
		<number>8</number>
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QSpinBox" name="MinOccSpecialSpin"/>
		</item>
		<item row="2" column="1">
		<widget class="QLineEdit" name="digitLineEdit">
		<property name="text">
		<string>1</string>
		<widget class="QSpinBox" name="MinOccDigitsSpin">
		<property name="value">
		<number>1</number>
		</property>
		</widget>
		</item>
		<item row="3" column="1">
		<widget class="QLineEdit" name="upperLineEdit">
		<property name="text">
		<string>1</string>
		<widget class="QSpinBox" name="MinOccUpperSpin">
		<property name="value">
		<number>1</number>
		</property>
		</widget>
		</item>
		<item row="4" column="1">
		<widget class="QLineEdit" name="lowerLineEdit">
		<property name="text">
		<string>1</string>
		</property>
		</widget>
		</item>
		<item row="0" column="0">
		<widget class="QLabel" name="lengthLabel">
		<property name="text">
		<string>Min Length</string>
		<widget class="QSpinBox" name="MinOccLowerSpin">
		<property name="value">
		<number>1</number>
		</property>
		</widget>
		</item>
		@@ -239,7 +239,7 @@
		<x>20</x>
		<y>20</y>
		<width>301</width>
		<height>101</height>
		<height>107</height>
		</rect>
		</property>
		<layout class="QGridLayout" name="gridLayout_4">
		@@ -257,9 +257,6 @@
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QLineEdit" name="AdvancedlineEdit"/>
		</item>
		<item row="0" column="0">
		<widget class="QCheckBox" name="maxSimpleCheckBox">
		<property name="text">
		@@ -268,10 +265,13 @@
		</widget>
		</item>
		<item row="0" column="1">
		<widget class="QLineEdit" name="SimplelineEdit"/>
		<widget class="QSpinBox" name="MaxSimpleMaxSpin"/>
		</item>
		<item row="1" column="1">
		<widget class="QSpinBox" name="MaxAdvMaskSpin"/>
		</item>
		<item row="2" column="1">
		<widget class="QLineEdit" name="topLineEdit"/>
		<widget class="QSpinBox" name="TopXAnswerSpin"/>
		</item>
		</layout>
		</widget>
		@@ -376,7 +376,7 @@
		<x>0</x>
		<y>0</y>
		<width>1350</width>
		<height>22</height>
		<height>20</height>
		</rect>
		</property>
		</widget>

src/gui/mainwindow.cpp

+27 −27

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ void MainWindow::startGame() {
		{
		try
		{
		stats->setNbThread(stoi(ui->ThreadlineEdit->text().toStdString()));
		stats->setNbThread(stoi(ui->threadNumberSpin->text().toStdString()));
		}
		catch(invalid_argument)
		{
		@@ -83,7 +83,7 @@ void MainWindow::startGame() {
		{
		try
		{
		stats->setLimitSimplemask(stoi(ui->SimplelineEdit->text().toStdString()));
		stats->setLimitSimplemask(stoi(ui->MaxSimpleMaxSpin->text().toStdString()));
		}
		catch(invalid_argument)
		{
		@@ -100,7 +100,7 @@ void MainWindow::startGame() {
		{
		try
		{
		stats->setLimitAdvancedmask(stoi(ui->AdvancedlineEdit->text().toStdString()));
		stats->setLimitAdvancedmask(stoi(ui->MaxAdvMaskSpin->text().toStdString()));
		}
		catch(invalid_argument)
		{
		@@ -117,7 +117,7 @@ void MainWindow::startGame() {
		{
		try
		{
		stats->setTop(stoi(ui->topLineEdit->text().toStdString()));
		stats->setTop(stoi(ui->TopXAnswerSpin->text().toStdString()));
		}
		catch(invalid_argument)
		{
		@@ -132,11 +132,11 @@ void MainWindow::startGame() {

		try
		{
		int length=stoi(ui->lengthLineEdit->text().toStdString());
		int special=stoi(ui->specialLineEdit->text().toStdString());
		int digit=stoi(ui->digitLineEdit->text().toStdString());
		int upper=stoi(ui->upperLineEdit->text().toStdString());
		int lower=stoi(ui->lowerLineEdit->text().toStdString());
		int length=stoi(ui->MinLenSpin->text().toStdString());
		int special=stoi(ui->MinOccSpecialSpin->text().toStdString());
		int digit=stoi(ui->MinOccDigitsSpin->text().toStdString());
		int upper=stoi(ui->MinOccUpperSpin->text().toStdString());
		int lower=stoi(ui->MinOccLowerSpin->text().toStdString());

		stats->setSecurityRules(length,special,digit,upper,lower);
		}
		@@ -149,16 +149,16 @@ void MainWindow::startGame() {
		stats->setSecurityRules(8,0,1,1,1);
		}

		ui->ThreadlineEdit->setDisabled(true);
		ui->topLineEdit->setDisabled(true);
		ui->SimplelineEdit->setDisabled(true);
		ui->AdvancedlineEdit->setDisabled(true);
		ui->threadNumberSpin->setDisabled(true);
		ui->TopXAnswerSpin->setDisabled(true);
		ui->MaxSimpleMaxSpin->setDisabled(true);
		ui->MaxAdvMaskSpin->setDisabled(true);
		ui->RegexlineEdit->setDisabled(true);
		ui->lengthLineEdit->setDisabled(true);
		ui->lowerLineEdit->setDisabled(true);
		ui->upperLineEdit->setDisabled(true);
		ui->specialLineEdit->setDisabled(true);
		ui->digitLineEdit->setDisabled(true);
		ui->MinLenSpin->setDisabled(true);
		ui->MinOccLowerSpin->setDisabled(true);
		ui->MinOccUpperSpin->setDisabled(true);
		ui->MinOccSpecialSpin->setDisabled(true);
		ui->MinOccDigitsSpin->setDisabled(true);
		ui->startButton->setDisabled(true);
		ui->threadsCheckBox->setDisabled(true);
		ui->topCheckBox->setDisabled(true);
		@@ -244,16 +244,16 @@ void MainWindow::handleResults()
		waitBox.close();
		ui->charsetWidget->setHidden(false);
		ui->lengthWidget->show();
		ui->ThreadlineEdit->setDisabled(false);
		ui->topLineEdit->setDisabled(false);
		ui->SimplelineEdit->setDisabled(false);
		ui->AdvancedlineEdit->setDisabled(false);
		ui->threadNumberSpin->setDisabled(false);
		ui->TopXAnswerSpin->setDisabled(false);
		ui->MaxSimpleMaxSpin->setDisabled(false);
		ui->MaxAdvMaskSpin->setDisabled(false);
		ui->RegexlineEdit->setDisabled(false);
		ui->lengthLineEdit->setDisabled(false);
		ui->lowerLineEdit->setDisabled(false);
		ui->upperLineEdit->setDisabled(false);
		ui->specialLineEdit->setDisabled(false);
		ui->digitLineEdit->setDisabled(false);
		ui->MinLenSpin->setDisabled(false);
		ui->MinOccLowerSpin->setDisabled(false);
		ui->MinOccUpperSpin->setDisabled(false);
		ui->MinOccSpecialSpin->setDisabled(false);
		ui->MinOccDigitsSpin->setDisabled(false);
		ui->startButton->setDisabled(false);
		ui->threadsCheckBox->setDisabled(false);
		ui->topCheckBox->setDisabled(false);