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

Fix focus order for playerselection.

Browse Source
This commit is contained in:
warwick
2002-07-01 05:06:56 +00:00
parent 6fc29fb400
commit a495cf38ad
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_win.cpp
+9 -6
View File
@@ -986,10 +986,6 @@ NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
connect(name, SIGNAL(textChanged(const QString&)), connect(name, SIGNAL(textChanged(const QString&)),
this, SLOT(selectName(const QString&)) ); this, SLOT(selectName(const QString&)) );
name->setFocus(); name->setFocus();
role = new NhPSListView(this);
race = new NhPSListView(this);
role->addColumn("Role");
race->addColumn("Race");
QButtonGroup* genderbox = new QButtonGroup("Sex",this); QButtonGroup* genderbox = new QButtonGroup("Sex",this);
QButtonGroup* alignbox = new QButtonGroup("Alignment",this); QButtonGroup* alignbox = new QButtonGroup("Alignment",this);
QVBoxLayout* vbgb = new QVBoxLayout(genderbox,3,1); QVBoxLayout* vbgb = new QVBoxLayout(genderbox,3,1);
@@ -1002,12 +998,19 @@ NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
l->addMultiCellWidget( namebox, 0,0,0,2 ); l->addMultiCellWidget( namebox, 0,0,0,2 );
#ifdef QT_CHOOSE_RACE_FIRST #ifdef QT_CHOOSE_RACE_FIRST
race = new NhPSListView(this);
role = new NhPSListView(this);
l->addMultiCellWidget( race, 1,5,0,0 ); l->addMultiCellWidget( race, 1,5,0,0 );
l->addMultiCellWidget( role, 1,5,1,1 ); l->addMultiCellWidget( role, 1,5,1,1 );
#else #else
role = new NhPSListView(this);
race = new NhPSListView(this);
l->addMultiCellWidget( role, 1,5,0,0 ); l->addMultiCellWidget( role, 1,5,0,0 );
l->addMultiCellWidget( race, 1,5,1,1 ); l->addMultiCellWidget( race, 1,5,1,1 );
#endif #endif
role->addColumn("Role");
race->addColumn("Race");
l->addWidget( genderbox, 1, 2 ); l->addWidget( genderbox, 1, 2 );
l->addWidget( alignbox, 2, 2 ); l->addWidget( alignbox, 2, 2 );
l->addWidget( logo, 3, 2, AlignCenter ); l->addWidget( logo, 3, 2, AlignCenter );
@@ -1132,7 +1135,7 @@ void NetHackQtPlayerSelector::selectRole()
int ro = role->selectedItemNumber(); int ro = role->selectedItemNumber();
if (ra == -1 || ro == -1) return; if (ra == -1 || ro == -1) return;
#ifndef QT_CHOOSE_RACE_FIRST #ifdef QT_CHOOSE_RACE_FIRST
selectRace(); selectRace();
#else #else
QListViewItem* i=role->currentItem(); QListViewItem* i=role->currentItem();
@@ -1168,7 +1171,7 @@ void NetHackQtPlayerSelector::selectRace()
int ro = role->selectedItemNumber(); int ro = role->selectedItemNumber();
if (ra == -1 || ro == -1) return; if (ra == -1 || ro == -1) return;
#ifdef QT_CHOOSE_RACE_FIRST #ifndef QT_CHOOSE_RACE_FIRST
selectRole(); selectRole();
#else #else
QListViewItem* i=race->currentItem(); QListViewItem* i=race->currentItem();