Mirrors/QtAwesome
1
0
Fork 0
mirror of https://github.com/gamecreature/QtAwesome.git synced 2025-12-17 20:24:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

change style enum entries name because the entry "far" causes conflicts in some projects

Browse Source
This commit is contained in:
mbsanchez
2019-09-05 18:08:33 -04:00
parent 0fa06af758
commit 3bda39f70c
4 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
QtAwesomeSample/mainwindow.cpp
View File

@@ -12,23 +12,23 @@ MainWindow::MainWindow(QWidget *parent) :
awesome = new QtAwesome(this);
awesome->initFontAwesome();
for(int st=style::fas; st<=style::fab; st++){
for(int st=style::stfas; st<=style::stfab; st++){
switch(st){
case style::fab:
ui->comboBox->insertItem(style::fab, "Brands", style::fab);
case style::stfab:
ui->comboBox->insertItem(style::stfab, "Brands", style::stfab);
break;
case style::far:
ui->comboBox->insertItem(style::far, "Regular", style::far);
case style::stfar:
ui->comboBox->insertItem(style::stfar, "Regular", style::stfar);
break;
case style::fas:
ui->comboBox->insertItem(style::fas, "Solid", style::fas);
case style::stfas:
ui->comboBox->insertItem(style::stfas, "Solid", style::stfas);
break;
#ifdef FONT_AWESOME_PRO
case style::fal:
ui->comboBox->insertItem(style::fal, "Light", style::fal);
case style::stfal:
ui->comboBox->insertItem(style::stfal, "Light", style::stfal);
break;
case style::fad:
ui->comboBox->insertItem(style::fad, "Duotone", style::fad);
case style::stfad:
ui->comboBox->insertItem(style::stfad, "Duotone", style::stfad);
break;
#endif
}
@@ -61,8 +61,8 @@ MainWindow::MainWindow(QWidget *parent) :
ui->listView->setModel(model);
connect(ui->comboBox, SIGNAL(activated(int)), this, SLOT(styleChanged(int)));
ui->comboBox->setCurrentIndex(style::fab);
styleChanged(style::fab);
ui->comboBox->setCurrentIndex(style::stfab);
styleChanged(style::stfab);
}
MainWindow::~MainWindow()