Skip to content

Commit 0c00f6c

Browse files
committed
bugfix: window appeared behind other windows when shown
language file correction
1 parent eac62e2 commit 0c00f6c

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

src/main.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@ int main(int argc, char *argv[])
2222

2323
QApplication a(argc, argv);
2424
a.setWindowIcon(QIcon(":/icons/Resources/falconG-icon.png"));
25-
// Splash Screen
26-
//SplashControl* splashControl = new SplashControl();
27-
//splashControl->Start();
28-
29-
splashScreen = new QSplashScreen(QPixmap(":/icons/Resources/falconG-splash.png"));
30-
splashScreen->setWindowFlag(Qt::WindowStaysOnTopHint);
31-
splashScreen->show();
32-
Qt::Alignment topRight = Qt::AlignHCenter | Qt::AlignBottom;
33-
splashScreen->showMessage(QObject::tr("falconG - Setting up..\n\n\n"), topRight, Qt::white);
34-
35-
a.processEvents();
36-
3725
PROGRAM_CONFIG::GetHomePath();
3826

3927
// after a new translation is added add language radio boxes
@@ -62,12 +50,23 @@ int main(int argc, char *argv[])
6250
if (!a.installTranslator(&translator))
6351
QMessageBox::warning(nullptr, "falconG - Warning", "Can't load language " + qs + "using default");
6452
}
53+
// Splash Screen
54+
splashScreen = new QSplashScreen(QPixmap(":/icons/Resources/falconG-splash.png"));
55+
splashScreen->setWindowFlag(Qt::WindowStaysOnTopHint);
56+
splashScreen->show();
57+
Qt::Alignment topRight = Qt::AlignHCenter | Qt::AlignBottom;
58+
splashScreen->showMessage(QObject::tr("falconG - Setting up...\n\n\n"), topRight, Qt::white);
59+
60+
a.processEvents();
61+
6562
FalconG w;
6663
w.show();
6764

6865
splashScreen->finish(&w);
6966
delete splashScreen;
7067
splashScreen = nullptr;
71-
68+
w.raise();
69+
w.activateWindow();
7270
return a.exec();
7371
}
72+

translations/en_US.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ Are you &gt;&gt;really&lt;&lt; sure you want to do this?</source>
11021102
</message>
11031103
<message>
11041104
<location filename="../src/main.cpp" line="32"/>
1105-
<source>falconG - Setting up..
1105+
<source>falconG - Setting up...
11061106

11071107

11081108
</source>

translations/hu_HU.qm

1 Byte
Binary file not shown.

translations/hu_HU.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ Abszolút biztos vagy benne, hogy ezt akarod?</translation>
12561256
</message>
12571257
<message>
12581258
<location filename="../src/main.cpp" line="32"/>
1259-
<source>falconG - Setting up..
1259+
<source>falconG - Setting up...
12601260

12611261

12621262
</source>

0 commit comments

Comments
 (0)