Commit f48b514f authored by Floréal Cabanettes's avatar Floréal Cabanettes

Remove Slackware from official supported distros + fix Fedora support

parent bf354f40
......@@ -116,10 +116,7 @@ int main(int argc, char *argv[])
fileOs.open(QFile::ReadOnly);
QTextStream stream (&fileOs);
QString osTxt = stream.readAll();
if (osTxt.contains("ID=slackware")) {
systExp = "linuxSlackware";
}
else if (osTxt.contains("ID=ubuntu") || osTxt.contains("ID=debian")) {
if (osTxt.contains("ID=ubuntu") || osTxt.contains("ID=debian")) {
systExp = "linuxDebian";
}
else if (osTxt.contains("ID=neon")) {
......@@ -128,6 +125,9 @@ int main(int argc, char *argv[])
else if (osTxt.contains("ID=arch") || osTxt.contains("ID=manjaro")) {
systExp = "linuxArch";
}
else if (osTxt.contains("ID=fedora")) {
systExp = "linuxFedora";
}
fileOs.close();
}
#else
......
......@@ -108,10 +108,6 @@ void Options::init()
{
ui->radioButtonWindows->setChecked(1);
}
else if(systExp=="linuxSlackware")
{
ui->radioButtonLinuxSlack->setChecked(1);
}
else if(systExp=="linuxDebian")
{
ui->radioButtonLinuxUbuntu->setChecked(1);
......@@ -269,7 +265,7 @@ void Options::on_buttonBox_accepted()
ui->lineEditDossierSauvegardes->setEnabled(false);
}
if(ui->lineEditCommandeNavigateur->text()==""||ui->lineEditDossierTemp->text()==""\
||(!ui->radioButtonLinuxAutre->isChecked()&&!ui->radioButtonLinuxSlack->isChecked()&&!ui->radioButtonLinuxUbuntu->isChecked()\
||(!ui->radioButtonLinuxAutre->isChecked()&&!ui->radioButtonLinuxUbuntu->isChecked()\
&&!ui->radioButtonLinuxArch->isChecked()&&!ui->radioButtonLinuxNeon->isChecked()&&!ui->radioButtonLinuxFedora->isChecked()\
&&!ui->radioButtonWindows->isChecked()))
{
......@@ -327,10 +323,6 @@ void Options::on_buttonBox_accepted()
{
systExp="linuxAutre";
}
else if(ui->radioButtonLinuxSlack->isChecked())
{
systExp="linuxSlackware";
}
else if (ui->radioButtonLinuxUbuntu->isChecked())
{
systExp="linuxDebian";
......
......@@ -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>170</x>
<y>366</y>
<x>530</x>
<y>350</y>
<width>101</width>
<height>17</height>
</rect>
......@@ -211,7 +211,7 @@
<property name="geometry">
<rect>
<x>530</x>
<y>348</y>
<y>330</y>
<width>121</width>
<height>17</height>
</rect>
......@@ -220,19 +220,6 @@
<string>Linux (au&amp;tre)</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButtonLinuxSlack">
<property name="geometry">
<rect>
<x>380</x>
<y>348</y>
<width>141</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Linux Slac&amp;kware</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButtonLinuxUbuntu">
<property name="geometry">
<rect>
......@@ -259,22 +246,6 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Système d'exploitation :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>140</x>
<y>382</y>
<width>371</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">border: none;</string>
</property>
<property name="title">
<string/>
</property>
</widget>
<widget class="QLabel" name="labelDossierTemporaire">
<property name="geometry">
<rect>
......@@ -486,8 +457,8 @@
<widget class="QRadioButton" name="radioButtonLinuxFedora">
<property name="geometry">
<rect>
<x>530</x>
<y>330</y>
<x>380</x>
<y>350</y>
<width>141</width>
<height>17</height>
</rect>
......@@ -506,7 +477,7 @@
</rect>
</property>
<property name="text">
<string>Linux KDE Neon</string>
<string>Linux &amp;KDE Neon</string>
</property>
</widget>
</widget>
......@@ -806,7 +777,7 @@
<item>
<widget class="QRadioButton" name="typeServer_wordpress_2">
<property name="text">
<string>Wordpress</string>
<string>Wo&amp;rdpress</string>
</property>
</widget>
</item>
......@@ -1482,7 +1453,6 @@
<tabstop>checkF7Send</tabstop>
<tabstop>radioButtonLinuxUbuntu</tabstop>
<tabstop>radioButtonLinuxArch</tabstop>
<tabstop>radioButtonLinuxSlack</tabstop>
<tabstop>radioButtonLinuxFedora</tabstop>
<tabstop>radioButtonLinuxAutre</tabstop>
<tabstop>radioButtonWindows</tabstop>
......
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