piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next

Browse Source 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
This commit is contained in:
Bertrand Songis
2014-01-15 16:09:17 +01:00
parent 02f75dedd9 9cc9e115a4
commit e7dc6644c7
76 changed files with 4784 additions and 4176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/mdichild.cpp
+3 -3
View File
@@ -182,12 +182,12 @@ void MdiChild::OpenEditWindow(bool wizard=false)
QSettings settings("companion9x", "companion9x");
bool wizardEnable=settings.value("wizardEnable", true).toBool();
if (wizardEnable) {
ret = QMessageBox::question(this, tr("companion9x"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::question(this, tr("Companion"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
wizard=true;
} else {
qSleep(500);
ret = QMessageBox::question(this, tr("companion9x"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::question(this, tr("Companion"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::No) {
settings.setValue("wizardEnable", false);
}
@@ -470,7 +470,7 @@ bool MdiChild::maybeSave()
{
if (fileChanged) {
QMessageBox::StandardButton ret;
ret = QMessageBox::warning(this, tr("companion9x"),
ret = QMessageBox::warning(this, tr("Companion"),
tr("%1 has been modified.\n"
"Do you want to save your changes?").arg(userFriendlyCurrentFile()),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);