-#ifdef Q_WS_MACX
- // On Mac it's common to have tool windows which are always in the
- // foreground and are hidden when the main window is not focused.
- setWindowFlags(Qt::Tool);
- autoapplyCB->setChecked(true);
-#endif
-
- family = getFamilyData();
- series = getSeriesData();
- shape = getShapeData();
- size = getSizeData();
- bar = getBarData();
- color = getColorData();
- language = getLanguageData(true);
-
- for (vector<FamilyPair>::const_iterator cit = family.begin();
- cit != family.end(); ++cit) {
- familyCO->addItem(cit->first);
- }
-
- for (vector<SeriesPair>::const_iterator cit = series.begin();
- cit != series.end(); ++cit) {
- seriesCO->addItem(cit->first);
- }
- for (vector<ShapePair>::const_iterator cit = shape.begin();
- cit != shape.end(); ++cit) {
- shapeCO->addItem(cit->first);
- }
- for (vector<SizePair>::const_iterator cit = size.begin();
- cit != size.end(); ++cit) {
- sizeCO->addItem(cit->first);
- }
- for (vector<BarPair>::const_iterator cit = bar.begin();
- cit != bar.end(); ++cit) {
- miscCO->addItem(cit->first);
- }
- for (vector<ColorPair>::const_iterator cit = color.begin();
- cit != color.end(); ++cit) {
- colorCO->addItem(cit->first);
- }
- for (vector<LanguagePair>::const_iterator cit = language.begin();
- cit != language.end(); ++cit) {
- langCO->addItem(toqstr(cit->first));
- }
-
- bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
+ family = familyData();
+ series = seriesData();
+ shape = shapeData();
+ size = sizeData();
+ bar = barData();
+ color = colorData();
+
+ language = languageData();
+ language.prepend(LanguagePair(qt_("Reset"), "reset"));
+ language.prepend(LanguagePair(qt_("No change"), "ignore"));
+
+ fillCombo(familyCO, family);
+ fillCombo(seriesCO, series);
+ fillCombo(sizeCO, size);
+ fillCombo(shapeCO, shape);
+ fillCombo(miscCO, bar);
+ fillCombo(colorCO, color);
+ fillCombo(langCO, language);
+
+ bc().setPolicy(ButtonPolicy::OkApplyCancelAutoReadOnlyPolicy);