[pkg-wpa-devel] r1037 - in /wpasupplicant/trunk/debian: changelog patches/37_wpa_gui_qt4_save_config.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Jan 13 13:13:07 2008
New Revision: 1037

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1037
Log:
* Add debian/patches/37_wpa_gui_qt4_save_config.patch to allow configuration
  to be saved from file menu item.

Added:
    wpasupplicant/trunk/debian/patches/37_wpa_gui_qt4_save_config.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1037&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jan 13 13:13:07 2008
@@ -25,8 +25,10 @@
     on stop or down actions.
   * Add debian/patches/32_wpa_gui_qt4_enable_disable_all.patch to take
     advantage of `disable_network all` and `enable_network all` via wpa_gui.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 13 Jan 2008 21:27:10 +1000
+  * Add debian/patches/37_wpa_gui_qt4_save_config.patch to allow configuration
+    to be saved from file menu item.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 13 Jan 2008 23:11:44 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/37_wpa_gui_qt4_save_config.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/37_wpa_gui_qt4_save_config.patch?rev=1037&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/37_wpa_gui_qt4_save_config.patch (added)
+++ wpasupplicant/trunk/debian/patches/37_wpa_gui_qt4_save_config.patch Sun Jan 13 13:13:07 2008
@@ -1,0 +1,79 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -52,6 +52,7 @@
+ 		SLOT(enableAllNetworks()));
+ 	connect(fileDisableALLNetworksAction, SIGNAL(triggered()), this,
+ 		SLOT(disableAllNetworks()));
++	connect(fileSaveConfig, SIGNAL(triggered()), this, SLOT(saveConfig()));
+ 	connect(adapterSelect, SIGNAL(activated(const QString&)), this,
+ 		SLOT(selectAdapter(const QString&)));
+ 
+@@ -806,6 +807,30 @@
+ }
+ 
+ 
++void WpaGui::saveConfig()
++{
++	char buf[10];
++	size_t len;
++
++	len = sizeof(buf) - 1;
++	ctrlRequest("SAVE_CONFIG", buf, &len);
++
++	buf[len] = '\0';
++
++	if (str_match(buf, "FAIL"))
++		QMessageBox::warning(this, "Failed to save configuration",
++			             "The configuration could not be saved.\n"
++				     "\n"
++				     "The update_config=1 configuration option\n"
++				     "must be used for configuration saving to\n"
++				     "be permitted.\n");
++	else
++		QMessageBox::information(this, "Saved configuration",
++			                 "The current configuration was saved."
++					 "\n");
++}
++
++
+ void WpaGui::selectAdapter( const QString & sel )
+ {
+ 	if (openCtrlConnection(sel.toAscii().constData()) < 0)
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -53,6 +53,7 @@
+ 	virtual void addNetwork();
+ 	virtual void enableAllNetworks();
+ 	virtual void disableAllNetworks();
++	virtual void saveConfig();
+ 	virtual void selectAdapter(const QString &sel);
+ 	virtual void exitApp();
+ 
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -197,6 +197,7 @@
+         <addaction name="fileEdit_networkAction" />
+         <addaction name="fileEnableALLNetworksAction" />
+         <addaction name="fileDisableALLNetworksAction" />
++        <addaction name="fileSaveConfig" />
+         <addaction name="separator" />
+         <addaction name="fileExitAction" />
+       </widget>
+@@ -329,6 +330,17 @@
+         <string>&amp;Disable All Networks</string>
+       </property>
+     </action>
++    <action name="fileSaveConfig" >
++      <property name="name" stdset="0" >
++        <string>fileSaveConfig</string>
++      </property>
++      <property name="iconText" >
++        <string>Save Configuration</string>
++      </property>
++      <property name="text" >
++        <string>&amp;Save Configuration</string>
++      </property>
++    </action>
+   </widget>
+   <layoutdefault spacing="6" margin="11" />
+   <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1037&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Jan 13 13:13:07 2008
@@ -12,3 +12,4 @@
 34_ctrl_iface_enable_all.patch
 35_ctrl_iface_disable_all.patch
 36_ctrl_iface_remove_all.patch
+37_wpa_gui_qt4_save_config.patch