Temp update to show unexpected segfault error
This commit is contained in:
parent
1e71ebed47
commit
e59dd980bd
|
@ -23,19 +23,18 @@ public:
|
||||||
// attributes
|
// attributes
|
||||||
private:
|
private:
|
||||||
QFile file;
|
QFile file;
|
||||||
|
QString listOfDirs;
|
||||||
|
|
||||||
QVector3D m_bgColorOn = { 5, 5, 5 };
|
QVector3D m_bgColorOn = { 5, 5, 5 };
|
||||||
QVector3D m_bgColorOff = { 128, 204, 255 };
|
QVector3D m_bgColorOff = { 128, 204, 255 };
|
||||||
|
QVector3D m_lightColor = { 255,255,255 };
|
||||||
bool m_bfCulling = false;
|
bool m_bfCulling = false;
|
||||||
bool m_light = false;
|
bool m_light = false;
|
||||||
|
|
||||||
QString listOfDirs;
|
|
||||||
int m_lightType = 1; // 1 = direct, 2 = point
|
|
||||||
QVector3D m_lightColor = { 255,255,255 };
|
|
||||||
float m_attenuation = 0.0f;
|
|
||||||
float m_ambient = 0.005f;
|
|
||||||
bool m_headlight = false;
|
bool m_headlight = false;
|
||||||
bool m_autoColor = true;
|
bool m_autoColor = true;
|
||||||
|
float m_attenuation = 0.0f;
|
||||||
|
float m_ambient = 0.005f;
|
||||||
|
int m_lightType = 1; // 1 = direct, 2 = point
|
||||||
|
|
||||||
// functions
|
// functions
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -17,6 +17,7 @@ private:
|
||||||
Ui::SettingsWindow* ui;
|
Ui::SettingsWindow* ui;
|
||||||
|
|
||||||
void setupConnections();
|
void setupConnections();
|
||||||
|
void updateDirList();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString dirList;
|
QString dirList;
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
#include <QListWidgetItem>
|
#include <QListWidgetItem>
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////
|
||||||
// constructor/destructor
|
// constructor/destructor
|
||||||
|
|
||||||
|
@ -203,9 +202,22 @@ void SettingsWindow::on_addItem_clicked()
|
||||||
QFileDialog::ShowDirsOnly |
|
QFileDialog::ShowDirsOnly |
|
||||||
QFileDialog::DontResolveSymlinks);
|
QFileDialog::DontResolveSymlinks);
|
||||||
ui->dirListWidget->insertItem(0,dirName);
|
ui->dirListWidget->insertItem(0,dirName);
|
||||||
|
updateDirList();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsWindow::on_removeItem_clicked()
|
void SettingsWindow::on_removeItem_clicked()
|
||||||
{
|
{
|
||||||
qDeleteAll(ui->dirListWidget->selectedItems());
|
qDeleteAll(ui->dirListWidget->selectedItems());
|
||||||
|
updateDirList();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SettingsWindow::updateDirList()
|
||||||
|
{
|
||||||
|
int size = ui->dirListWidget->count();
|
||||||
|
QString dirs;
|
||||||
|
|
||||||
|
for (int i = 0; i < size; i++)
|
||||||
|
dirs += ui->dirListWidget->item(i)->text() + ";";
|
||||||
|
|
||||||
|
SettingsManager::getInstance()->setListOfDirs(dirs);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue