Commit 857c5964 authored by Floréal Cabanettes's avatar Floréal Cabanettes

Add KDE Neon to the list of linux OS

parent dd4d1651
......@@ -115,6 +115,9 @@ int main(int argc, char *argv[])
else if (osTxt.contains("ID=ubuntu") || osTxt.contains("ID=debian")) {
systExp = "linuxDebian";
}
else if (osTxt.contains("ID=neon")) {
systExp = "linuxNeon";
}
else if (osTxt.contains("ID=arch") || osTxt.contains("ID=manjaro")) {
systExp = "linuxArch";
}
......
......@@ -117,6 +117,14 @@ void Options::init()
{
ui->radioButtonLinuxArch->setChecked(true);
}
else if (systExp=="linuxFedora")
{
ui->radioButtonLinuxFedora->setChecked(true);
}
else if (systExp=="linuxNeon")
{
ui->radioButtonLinuxNeon->setChecked(true);
}
QFile *idFile = new QFile(idfile + ".1");
if(idFile->exists())
......@@ -259,7 +267,8 @@ void Options::on_buttonBox_accepted()
}
if(ui->lineEditCommandeNavigateur->text()==""||ui->lineEditDossierTemp->text()==""\
||(!ui->radioButtonLinuxAutre->isChecked()&&!ui->radioButtonLinuxSlack->isChecked()&&!ui->radioButtonLinuxUbuntu->isChecked()\
&&!ui->radioButtonLinuxArch->isChecked()&&!ui->radioButtonWindows->isChecked()))
&&!ui->radioButtonLinuxArch->isChecked()&&!ui->radioButtonLinuxNeon->isChecked()&&!ui->radioButtonLinuxFedora->isChecked()\
&&!ui->radioButtonWindows->isChecked()))
{
QMessageBox::critical(this,tr("Préférences"),tr("Veuillez remplir tous les champs obligatoires des paramètres client"),QMessageBox::Ok);
}
......@@ -323,6 +332,18 @@ void Options::on_buttonBox_accepted()
{
systExp="linuxDebian";
}
else if (ui->radioButtonLinuxArch->isChecked())
{
systExp="linuxArch";
}
else if (ui->radioButtonLinuxFedora->isChecked())
{
systExp="linuxFedora";
}
else if (ui->radioButtonLinuxNeon->isChecked())
{
systExp="linuxNeon";
}
else if(ui->radioButtonWindows->isChecked())
{
systExp="windows";
......@@ -556,22 +577,7 @@ void Options::saveXML(int activeServerConfig)
writer.writeTextElement("corrOrtho", ui->lineEditDictionnairePath->text());
writer.writeTextElement("editPict",ui->lineEditEditeurImages->text());
writer.writeTextElement("appI18n", appI18n);
if(ui->radioButtonLinuxAutre->isChecked())
{
writer.writeTextElement("systExp","linuxAutre");
}
else if(ui->radioButtonLinuxSlack->isChecked())
{
writer.writeTextElement("systExp","linuxSlackware");
}
else if(ui->radioButtonLinuxUbuntu->isChecked())
{
writer.writeTextElement("systExp","linuxDebian");
}
else if(ui->radioButtonWindows->isChecked())
{
writer.writeTextElement("systExp","windows");
}
writer.writeTextElement("systExp", systExp);
writer.writeTextElement("activeServerConfig", QString::number(activeServerConfig));
QString openlast_s = ui->backup_useLastOne->isChecked() ? "1" : "0";
writer.writeTextElement("openLastDir_Sauvegarde", openlast_s);
......
......@@ -57,7 +57,7 @@
</rect>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
......@@ -197,8 +197,8 @@
<widget class="QRadioButton" name="radioButtonWindows">
<property name="geometry">
<rect>
<x>530</x>
<y>348</y>
<x>170</x>
<y>366</y>
<width>101</width>
<height>17</height>
</rect>
......@@ -211,7 +211,7 @@
<property name="geometry">
<rect>
<x>530</x>
<y>330</y>
<y>348</y>
<width>121</width>
<height>17</height>
</rect>
......@@ -224,7 +224,7 @@
<property name="geometry">
<rect>
<x>380</x>
<y>330</y>
<y>348</y>
<width>141</width>
<height>17</height>
</rect>
......@@ -486,8 +486,8 @@
<widget class="QRadioButton" name="radioButtonLinuxFedora">
<property name="geometry">
<rect>
<x>380</x>
<y>348</y>
<x>530</x>
<y>330</y>
<width>141</width>
<height>17</height>
</rect>
......@@ -496,6 +496,19 @@
<string>Linux Fedora</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButtonLinuxNeon">
<property name="geometry">
<rect>
<x>380</x>
<y>330</y>
<width>141</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Linux KDE Neon</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
......@@ -511,7 +524,7 @@
</rect>
</property>
<property name="currentIndex">
<number>4</number>
<number>0</number>
</property>
<widget class="QWidget" name="config1">
<attribute name="title">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment