Delete Wifi

procount · Mar 17, 2022 · 3f17a29 · 3f17a29
1 parent af947b7
commit 3f17a29
Show file tree

Hide file tree

Showing 24 changed files with 3,077 additions and 2,942 deletions.
diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts
diff --git a/recovery/wifisettingsdialog.cpp b/recovery/wifisettingsdialog.cpp
@@ -13,6 +13,7 @@
 #include "wpa_supplicant/wpafactory.h"
 #include "twoiconsdelegate.h"
 #include "input.h"
+#include "util.h"
 
 #include <QMessageBox>
 #include <QPushButton>
@@ -431,3 +432,22 @@ void WifiSettingsDialog::on_checkBox_stateChanged(int arg1)
         mode = QLineEdit::Normal;
     ui->passwordEdit->setEchoMode(mode);
 }
+
+void WifiSettingsDialog::on_pbDelete_clicked()
+{
+    int errorcode;
+    qDebug() << "Deleting wifi configuration";
+    readexec(1, "/usr/sbin/wpa_cli -i "+_ifname+" remove_network 0", errorcode);
+    msleep(500);
+    readexec(1, "/usr/sbin/wpa_cli -i "+_ifname+" save_config", errorcode);
+
+    /* Clear the icon showing the current connection (if any) */
+    for (int i=0; i< ui->list->count(); i++)
+    {
+        QListWidgetItem *wi = ui->list->item(i);
+        if ( wi->data(SecondIconRole).isValid() )
+        {
+            wi->setData(SecondIconRole, QVariant() );
+        }
+    }
+}
diff --git a/recovery/wifisettingsdialog.h b/recovery/wifisettingsdialog.h
@@ -60,6 +60,7 @@ private slots:
     void on_list_currentItemChanged(QListWidgetItem *current);
     void on_vkeyboard_toggled(bool checked);
     void on_checkBox_stateChanged(int arg1);
+    void on_pbDelete_clicked();
 };
 
 #endif // WIFISETTINGSDIALOG_H
diff --git a/recovery/wifisettingsdialog.ui b/recovery/wifisettingsdialog.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>415</height>
+    <height>480</height>
    </rect>
   </property>
   <property name="font">
@@ -148,47 +148,61 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="topMargin">
+      <number>0</number>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+     <item>
+      <widget class="QPushButton" name="pbDelete">
+       <property name="text">
+        <string>&amp;Delete</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
-   <signal>accepted()</signal>
+   <signal>rejected()</signal>
    <receiver>WifiSettingsDialog</receiver>
-   <slot>accept()</slot>
+   <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
+     <x>325</x>
+     <y>419</y>
     </hint>
     <hint type="destinationlabel">
-     <x>157</x>
+     <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
-   <signal>rejected()</signal>
+   <signal>accepted()</signal>
    <receiver>WifiSettingsDialog</receiver>
-   <slot>reject()</slot>
+   <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
+     <x>257</x>
+     <y>419</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
+     <x>157</x>
      <y>274</y>
     </hint>
    </hints>