GUI: restore minimized tabled on setCurrentIndex + fixed some syntax in GotoDialog
This commit is contained in:
		
							parent
							
								
									4712566802
								
							
						
					
					
						commit
						5a4d8dee2b
					
				|  | @ -12,9 +12,9 @@ GotoDialog::GotoDialog(QWidget *parent) : | |||
|     setFixedSize(this->size()); //fixed size
 | ||||
|     //initialize stuff
 | ||||
|     if(!DbgIsDebugging()) //not debugging
 | ||||
|         ui->labelError->setText("<font color='red'><b>Not debugging...</b></color>"); | ||||
|         ui->labelError->setText("<font color='red'><b>Not debugging...</b></font>"); | ||||
|     else | ||||
|         ui->labelError->setText("<font color='red'><b>Invalid expression...</b></color>"); | ||||
|         ui->labelError->setText("<font color='red'><b>Invalid expression...</b></font>"); | ||||
|     ui->buttonOk->setEnabled(false); | ||||
|     ui->editExpression->setFocus(); | ||||
|     validRangeStart=0; | ||||
|  | @ -30,13 +30,13 @@ void GotoDialog::on_editExpression_textChanged(const QString &arg1) | |||
| { | ||||
|     if(!DbgIsDebugging()) //not debugging
 | ||||
|     { | ||||
|         ui->labelError->setText("<font color='red'><b>Not debugging...</b></color>"); | ||||
|         ui->labelError->setText("<font color='red'><b>Not debugging...</b></font>"); | ||||
|         ui->buttonOk->setEnabled(false); | ||||
|         expressionText.clear(); | ||||
|     } | ||||
|     else if(!DbgIsValidExpression(arg1.toUtf8().constData())) //invalid expression
 | ||||
|     { | ||||
|         ui->labelError->setText("<font color='red'><b>Invalid expression...</b></color>"); | ||||
|         ui->labelError->setText("<font color='red'><b>Invalid expression...</b></font>"); | ||||
|         ui->buttonOk->setEnabled(false); | ||||
|         expressionText.clear(); | ||||
|     } | ||||
|  | @ -45,13 +45,13 @@ void GotoDialog::on_editExpression_textChanged(const QString &arg1) | |||
|         uint_t addr=DbgValFromString(arg1.toUtf8().constData()); | ||||
|         if(!DbgMemIsValidReadPtr(addr)) | ||||
|         { | ||||
|             ui->labelError->setText("<font color='red'><b>Invalid memory address...</b></color>"); | ||||
|             ui->labelError->setText("<font color='red'><b>Invalid memory address...</b></font>"); | ||||
|             ui->buttonOk->setEnabled(false); | ||||
|             expressionText.clear(); | ||||
|         } | ||||
|         else if(!IsValidMemoryRange(addr)) | ||||
|         { | ||||
|             ui->labelError->setText("<font color='red'><b>Memory out of range...</b></color>"); | ||||
|             ui->labelError->setText("<font color='red'><b>Memory out of range...</b></font>"); | ||||
|             ui->buttonOk->setEnabled(false); | ||||
|             expressionText.clear(); | ||||
|         } | ||||
|  | @ -71,7 +71,7 @@ void GotoDialog::on_editExpression_textChanged(const QString &arg1) | |||
|                 addrText=QString(module)+"."+QString("%1").arg(addr, sizeof(int_t)*2, 16, QChar('0')).toUpper(); | ||||
|             else | ||||
|                 addrText=QString("%1").arg(addr, sizeof(int_t)*2, 16, QChar('0')).toUpper(); | ||||
|             ui->labelError->setText(QString("<font color='#00DD00'><b>Correct expression! -> </b></color>" + addrText)); | ||||
|             ui->labelError->setText(QString("<font color='#00DD00'><b>Correct expression! -> </b></font>" + addrText)); | ||||
|             ui->buttonOk->setEnabled(true); | ||||
|             expressionText=arg1; | ||||
|         } | ||||
|  |  | |||
|  | @ -61,6 +61,8 @@ void MHTabWidget::setCurrentIndex(int index) | |||
|         // Otherwise it's going to be a window (just bring it up)
 | ||||
|         MHDetachedWindow* window = dynamic_cast<MHDetachedWindow*>(widget(index)->parent()); | ||||
|         window->activateWindow(); | ||||
|         window->showNormal(); | ||||
|         window->setFocus(); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
|  | @ -107,15 +109,15 @@ void MHTabWidget::DetachTab(int index, QPoint& dropPoint) | |||
|     detachedWidget->setCentralWidget(tearOffWidget); | ||||
| 
 | ||||
|     // Needs to be done explicitly
 | ||||
|     tearOffWidget->show(); | ||||
|     tearOffWidget->showNormal(); | ||||
|     QRect screenGeometry = QApplication::desktop()->screenGeometry(); | ||||
|     int w = 640; | ||||
|     int h = 480; | ||||
|     int x = (screenGeometry.width() - w) / 2; | ||||
|     int y = (screenGeometry.height() - h) / 2; | ||||
|     detachedWidget->show(); | ||||
|     detachedWidget->showNormal(); | ||||
|     detachedWidget->setGeometry(x, y, w, h); | ||||
|     detachedWidget->show(); | ||||
|     detachedWidget->showNormal(); | ||||
| } | ||||
| 
 | ||||
| //////////////////////////////////////////////////////////////////////////////
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue