equal
deleted
inserted
replaced
132 |
132 |
133 groupTeams->layout()->setColumnStretch(0, 1); |
133 groupTeams->layout()->setColumnStretch(0, 1); |
134 |
134 |
135 CBTeamName = new QComboBox(groupTeams); |
135 CBTeamName = new QComboBox(groupTeams); |
136 CBTeamName->setMaxVisibleItems(50); |
136 CBTeamName->setMaxVisibleItems(50); |
|
137 CBTeamName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); |
137 groupTeams->layout()->addWidget(CBTeamName, 0, 0); |
138 groupTeams->layout()->addWidget(CBTeamName, 0, 0); |
138 |
139 |
139 BtnNewTeam = new QPushButton(groupTeams); |
140 BtnNewTeam = new QPushButton(groupTeams); |
140 BtnNewTeam->setWhatsThis(tr("New team")); |
141 BtnNewTeam->setWhatsThis(tr("New team")); |
141 BtnNewTeam->setIconSize(pmNew.size()); |
142 BtnNewTeam->setIconSize(pmNew.size()); |
173 |
174 |
174 groupSchemes->layout()->setColumnStretch(0, 1); |
175 groupSchemes->layout()->setColumnStretch(0, 1); |
175 |
176 |
176 SchemesName = new QComboBox(groupSchemes); |
177 SchemesName = new QComboBox(groupSchemes); |
177 SchemesName->setMaxVisibleItems(50); |
178 SchemesName->setMaxVisibleItems(50); |
|
179 SchemesName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); |
178 groupSchemes->layout()->addWidget(SchemesName, 0, 0); |
180 groupSchemes->layout()->addWidget(SchemesName, 0, 0); |
179 |
181 |
180 SchemeNew = new QPushButton(groupSchemes); |
182 SchemeNew = new QPushButton(groupSchemes); |
181 SchemeNew->setWhatsThis(tr("New scheme")); |
183 SchemeNew->setWhatsThis(tr("New scheme")); |
182 SchemeNew->setIconSize(pmNew.size()); |
184 SchemeNew->setIconSize(pmNew.size()); |
205 |
207 |
206 groupWeapons->layout()->setColumnStretch(0, 1); |
208 groupWeapons->layout()->setColumnStretch(0, 1); |
207 |
209 |
208 WeaponsName = new QComboBox(groupWeapons); |
210 WeaponsName = new QComboBox(groupWeapons); |
209 WeaponsName->setMaxVisibleItems(50); |
211 WeaponsName->setMaxVisibleItems(50); |
|
212 WeaponsName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); |
210 groupWeapons->layout()->addWidget(WeaponsName, 0, 0); |
213 groupWeapons->layout()->addWidget(WeaponsName, 0, 0); |
211 |
214 |
212 WeaponNew = new QPushButton(groupWeapons); |
215 WeaponNew = new QPushButton(groupWeapons); |
213 WeaponNew->setWhatsThis(tr("New weapon set")); |
216 WeaponNew->setWhatsThis(tr("New weapon set")); |
214 WeaponNew->setIconSize(pmNew.size()); |
217 WeaponNew->setIconSize(pmNew.size()); |
650 entryName = loc.nativeLanguageName(); |
653 entryName = loc.nativeLanguageName(); |
651 } |
654 } |
652 // Fallback code, if language name is empty for some reason. This should normally not happen |
655 // Fallback code, if language name is empty for some reason. This should normally not happen |
653 if(entryName.isEmpty()) |
656 if(entryName.isEmpty()) |
654 { |
657 { |
655 if(lname == "gd") |
658 // Show error and the locale identifier |
656 { |
659 entryName = tr("MISSING LANGUAGE NAME [%1]").arg(lname); |
657 /* Workaround for Qt4: nativeLanguageName does not return correct name for Scottish Gaelic (QTBUG-59929), |
|
658 so we have to add it ourselves :-/ */ |
|
659 entryName = QString::fromUtf8("Gàidhlig"); |
|
660 } |
|
661 else |
|
662 { |
|
663 // If all else fails, show error and the locale identifier |
|
664 entryName = tr("MISSING LANGUAGE NAME [%1]").arg(lname); |
|
665 } |
|
666 } |
660 } |
667 CBLanguage->addItem(entryName, lname); |
661 CBLanguage->addItem(entryName, lname); |
668 } |
662 } |
669 |
663 |
670 QLabel *restartNoticeLabel = new QLabel(groupMisc); |
664 QLabel *restartNoticeLabel = new QLabel(groupMisc); |