nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Splash-screen fixes:

Browse Source 
- change "Warwick Allison + DevTeam" to just "DevTeam".
  - fixes for Qt 3.0.
This commit is contained in:
warwick
2002-01-17 06:40:41 +00:00
parent f86ab80cfb
commit 6ddd18069e
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
win/Qt/qt_win.cpp
View File

@@ -122,8 +122,8 @@ extern "C" void play_sound_for_message(const char* str);
// Warwick prefers it this way... // Warwick prefers it this way...
#define QT_CHOOSE_RACE_FIRST #define QT_CHOOSE_RACE_FIRST
static const char nh_attribution[] = "<big>Qt NetHack</big>" static const char nh_attribution[] = "<center><big>NetHack</big>"
"<br><small>by Warwick Allison<br>and the NetHack DevTeam</small>"; "<br><small>by the NetHack DevTeam</small></center>";
static QString static QString
aboutMsg() aboutMsg()
@@ -4307,20 +4307,21 @@ NetHackQtBind::NetHackQtBind(int& argc, char** argv) :
{ {
QPixmap pm("nhsplash.xpm"); QPixmap pm("nhsplash.xpm");
if ( !pm.isNull() ) { if ( !pm.isNull() ) {
QVBox *vb = new QVBox(0,0,pm.mask() ? Qt::WStyle_Customize|Qt::WStyle_NoBorder : 0); QVBox *vb = new QVBox(0,0,
WStyle_Customize | WStyle_NoBorder | WX11BypassWM | WStyle_StaysOnTop );
splash = vb; splash = vb;
QLabel *lsplash = new QLabel(vb); QLabel *lsplash = new QLabel(vb);
lsplash->setAlignment(AlignCenter); lsplash->setAlignment(AlignCenter);
lsplash->setPixmap(pm); lsplash->setPixmap(pm);
QLabel* capt = new QLabel("Loading...",vb); QLabel* capt = new QLabel("Loading...",vb);
capt->setAlignment(AlignCenter); capt->setAlignment(AlignCenter);
if ( pm.mask() ) { if ( pm.mask() ) {
lsplash->setFixedSize(pm.size()); lsplash->setFixedSize(pm.size());
lsplash->setMask(*pm.mask()); lsplash->setMask(*pm.mask());
splash->move((QApplication::desktop()->width()-pm.width())/2,
(QApplication::desktop()->height()-pm.height())/2);
} }
splash->move((QApplication::desktop()->width()-pm.width())/2,
(QApplication::desktop()->height()-pm.height())/2);
//splash->setGeometry(0,0,100,100);
if ( qt_compact_mode ) { if ( qt_compact_mode ) {
splash->showMaximized(); splash->showMaximized();
} else { } else {
@@ -4329,10 +4330,13 @@ NetHackQtBind::NetHackQtBind(int& argc, char** argv) :
splash->adjustSize(); splash->adjustSize();
splash->show(); splash->show();
} }
flushX();
syncX(); // force content refresh outside event loop
processEvents(); splash->repaint(FALSE);
flushX(); lsplash->repaint(FALSE);
capt->repaint(FALSE);
qApp->flushX();
} else { } else {
splash = 0; splash = 0;
} }
@@ -4397,7 +4401,7 @@ NetHackQtSavedGameSelector::NetHackQtSavedGameSelector(const char** saved) :
QLabel* logo = new QLabel(this); vbl->addWidget(logo); QLabel* logo = new QLabel(this); vbl->addWidget(logo);
logo->setAlignment(AlignCenter); logo->setAlignment(AlignCenter);
logo->setPixmap(QPixmap("nhsplash.xpm")); logo->setPixmap(QPixmap("nhsplash.xpm"));
QLabel* attr = new QLabel("by Warwick Allison and the NetHack DevTeam",this); QLabel* attr = new QLabel("by the NetHack DevTeam",this);
attr->setAlignment(AlignCenter); attr->setAlignment(AlignCenter);
vbl->addWidget(attr); vbl->addWidget(attr);
vbl->addStretch(2); vbl->addStretch(2);
@@ -4480,6 +4484,7 @@ void NetHackQtBind::qt_askname()
char** saved = get_saved_names(); char** saved = get_saved_names();
int ch = -1; int ch = -1;
if ( saved && *saved ) { if ( saved && *saved ) {
if ( splash ) splash->hide();
NetHackQtSavedGameSelector sgsel((const char**)saved); NetHackQtSavedGameSelector sgsel((const char**)saved);
ch = sgsel.choose(); ch = sgsel.choose();
if ( ch >= 0 ) if ( ch >= 0 )
@@ -4489,6 +4494,7 @@ void NetHackQtBind::qt_askname()
switch (ch) { switch (ch) {
case -1: case -1:
if ( splash ) splash->hide();
if (NetHackQtPlayerSelector(keybuffer).Choose()) if (NetHackQtPlayerSelector(keybuffer).Choose())
return; return;
case -2: case -2: