equal
deleted
inserted
replaced
130 rightColumn->addWidget(groupTeams); |
130 rightColumn->addWidget(groupTeams); |
131 |
131 |
132 groupTeams->layout()->setColumnStretch(0, 1); |
132 groupTeams->layout()->setColumnStretch(0, 1); |
133 |
133 |
134 CBTeamName = new QComboBox(groupTeams); |
134 CBTeamName = new QComboBox(groupTeams); |
|
135 CBTeamName->setMaxVisibleItems(50); |
135 groupTeams->layout()->addWidget(CBTeamName, 0, 0); |
136 groupTeams->layout()->addWidget(CBTeamName, 0, 0); |
136 |
137 |
137 BtnNewTeam = new QPushButton(groupTeams); |
138 BtnNewTeam = new QPushButton(groupTeams); |
138 BtnNewTeam->setWhatsThis(tr("New team")); |
139 BtnNewTeam->setWhatsThis(tr("New team")); |
139 BtnNewTeam->setIconSize(pmNew.size()); |
140 BtnNewTeam->setIconSize(pmNew.size()); |
170 leftColumn->addWidget(groupSchemes); |
171 leftColumn->addWidget(groupSchemes); |
171 |
172 |
172 groupSchemes->layout()->setColumnStretch(0, 1); |
173 groupSchemes->layout()->setColumnStretch(0, 1); |
173 |
174 |
174 SchemesName = new QComboBox(groupSchemes); |
175 SchemesName = new QComboBox(groupSchemes); |
|
176 SchemesName->setMaxVisibleItems(50); |
175 groupSchemes->layout()->addWidget(SchemesName, 0, 0); |
177 groupSchemes->layout()->addWidget(SchemesName, 0, 0); |
176 |
178 |
177 SchemeNew = new QPushButton(groupSchemes); |
179 SchemeNew = new QPushButton(groupSchemes); |
178 SchemeNew->setWhatsThis(tr("New scheme")); |
180 SchemeNew->setWhatsThis(tr("New scheme")); |
179 SchemeNew->setIconSize(pmNew.size()); |
181 SchemeNew->setIconSize(pmNew.size()); |
201 leftColumn->addWidget(groupWeapons); |
203 leftColumn->addWidget(groupWeapons); |
202 |
204 |
203 groupWeapons->layout()->setColumnStretch(0, 1); |
205 groupWeapons->layout()->setColumnStretch(0, 1); |
204 |
206 |
205 WeaponsName = new QComboBox(groupWeapons); |
207 WeaponsName = new QComboBox(groupWeapons); |
|
208 WeaponsName->setMaxVisibleItems(50); |
206 groupWeapons->layout()->addWidget(WeaponsName, 0, 0); |
209 groupWeapons->layout()->addWidget(WeaponsName, 0, 0); |
207 |
210 |
208 WeaponNew = new QPushButton(groupWeapons); |
211 WeaponNew = new QPushButton(groupWeapons); |
209 WeaponNew->setWhatsThis(tr("New weapon set")); |
212 WeaponNew->setWhatsThis(tr("New weapon set")); |
210 WeaponNew->setIconSize(pmNew.size()); |
213 WeaponNew->setIconSize(pmNew.size()); |
254 lblFullScreenRes = new QLabel(groupGame); |
257 lblFullScreenRes = new QLabel(groupGame); |
255 lblFullScreenRes->setText(QLabel::tr("Fullscreen Resolution")); |
258 lblFullScreenRes->setText(QLabel::tr("Fullscreen Resolution")); |
256 groupGame->layout()->addWidget(lblFullScreenRes, 1, 0); |
259 groupGame->layout()->addWidget(lblFullScreenRes, 1, 0); |
257 |
260 |
258 CBResolution = new QComboBox(groupGame); |
261 CBResolution = new QComboBox(groupGame); |
|
262 CBResolution->setMaxVisibleItems(50); |
259 CBResolution->setFixedWidth(200); |
263 CBResolution->setFixedWidth(200); |
260 groupGame->layout()->addWidget(CBResolution, 1, 1, Qt::AlignLeft); |
264 groupGame->layout()->addWidget(CBResolution, 1, 1, Qt::AlignLeft); |
261 |
265 |
262 // Windowed resolution |
266 // Windowed resolution |
263 |
267 |
308 QLabel * lblStereo = new QLabel(groupGame); |
312 QLabel * lblStereo = new QLabel(groupGame); |
309 lblStereo->setText(QLabel::tr("Stereo rendering")); |
313 lblStereo->setText(QLabel::tr("Stereo rendering")); |
310 groupGame->layout()->addWidget(lblStereo, 4, 0); |
314 groupGame->layout()->addWidget(lblStereo, 4, 0); |
311 |
315 |
312 CBStereoMode = new QComboBox(groupGame); |
316 CBStereoMode = new QComboBox(groupGame); |
|
317 CBStereoMode->setMaxVisibleItems(50); |
313 CBStereoMode->addItem(QComboBox::tr("Disabled")); |
318 CBStereoMode->addItem(QComboBox::tr("Disabled")); |
314 CBStereoMode->addItem(QComboBox::tr("Red/Cyan")); |
319 CBStereoMode->addItem(QComboBox::tr("Red/Cyan")); |
315 CBStereoMode->addItem(QComboBox::tr("Cyan/Red")); |
320 CBStereoMode->addItem(QComboBox::tr("Cyan/Red")); |
316 CBStereoMode->addItem(QComboBox::tr("Red/Blue")); |
321 CBStereoMode->addItem(QComboBox::tr("Red/Blue")); |
317 CBStereoMode->addItem(QComboBox::tr("Blue/Red")); |
322 CBStereoMode->addItem(QComboBox::tr("Blue/Red")); |
616 QLabel *labelLanguage = new QLabel(groupMisc); |
621 QLabel *labelLanguage = new QLabel(groupMisc); |
617 labelLanguage->setText(QLabel::tr("Locale")); |
622 labelLanguage->setText(QLabel::tr("Locale")); |
618 groupMisc->layout()->addWidget(labelLanguage, 0, 0); |
623 groupMisc->layout()->addWidget(labelLanguage, 0, 0); |
619 |
624 |
620 CBLanguage = new QComboBox(groupMisc); |
625 CBLanguage = new QComboBox(groupMisc); |
|
626 CBLanguage->setMaxVisibleItems(50); |
621 groupMisc->layout()->addWidget(CBLanguage, 0, 1); |
627 groupMisc->layout()->addWidget(CBLanguage, 0, 1); |
622 QStringList locs = DataManager::instance().entryList("Locale", QDir::Files, QStringList("hedgewars_*.qm")); |
628 QStringList locs = DataManager::instance().entryList("Locale", QDir::Files, QStringList("hedgewars_*.qm")); |
623 CBLanguage->addItem(QComboBox::tr("(System default)"), QString()); |
629 CBLanguage->addItem(QComboBox::tr("(System default)"), QString()); |
624 for(int i = 0; i < locs.count(); i++) |
630 for(int i = 0; i < locs.count(); i++) |
625 { |
631 { |
694 groupVideoRec->layout()->addWidget(labelFormat, 0, 0); |
700 groupVideoRec->layout()->addWidget(labelFormat, 0, 0); |
695 |
701 |
696 // list of supported formats |
702 // list of supported formats |
697 |
703 |
698 comboAVFormats = new QComboBox(groupVideoRec); |
704 comboAVFormats = new QComboBox(groupVideoRec); |
|
705 comboAVFormats->setMaxVisibleItems(50); |
699 groupVideoRec->layout()->addWidget(comboAVFormats, 0, 1, 1, 4); |
706 groupVideoRec->layout()->addWidget(comboAVFormats, 0, 1, 1, 4); |
700 LibavInteraction::instance().fillFormats(comboAVFormats); |
707 LibavInteraction::instance().fillFormats(comboAVFormats); |
701 |
708 |
702 // separator |
709 // separator |
703 |
710 |
714 groupVideoRec->layout()->addWidget(labelACodec, 2, 0); |
721 groupVideoRec->layout()->addWidget(labelACodec, 2, 0); |
715 |
722 |
716 // list of supported audio codecs |
723 // list of supported audio codecs |
717 |
724 |
718 comboAudioCodecs = new QComboBox(groupVideoRec); |
725 comboAudioCodecs = new QComboBox(groupVideoRec); |
|
726 comboAudioCodecs->setMaxVisibleItems(50); |
719 groupVideoRec->layout()->addWidget(comboAudioCodecs, 2, 1, 1, 3); |
727 groupVideoRec->layout()->addWidget(comboAudioCodecs, 2, 1, 1, 3); |
720 |
728 |
721 // checkbox 'record audio' |
729 // checkbox 'record audio' |
722 |
730 |
723 checkRecordAudio = new QCheckBox(groupVideoRec); |
731 checkRecordAudio = new QCheckBox(groupVideoRec); |
739 groupVideoRec->layout()->addWidget(labelVCodec, 4, 0); |
747 groupVideoRec->layout()->addWidget(labelVCodec, 4, 0); |
740 |
748 |
741 // list of supported video codecs |
749 // list of supported video codecs |
742 |
750 |
743 comboVideoCodecs = new QComboBox(groupVideoRec); |
751 comboVideoCodecs = new QComboBox(groupVideoRec); |
|
752 comboVideoCodecs->setMaxVisibleItems(50); |
744 groupVideoRec->layout()->addWidget(comboVideoCodecs, 4, 1, 1, 4); |
753 groupVideoRec->layout()->addWidget(comboVideoCodecs, 4, 1, 1, 4); |
745 |
754 |
746 // label for resolution |
755 // label for resolution |
747 |
756 |
748 QLabel *labelRes = new QLabel(groupVideoRec); |
757 QLabel *labelRes = new QLabel(groupVideoRec); |