-Make ModemQuery to use the 'current' configuration

-Todo make FlowControl, LineTermination lwork across locales
for safe and restore

1 files changed, 17 insertions, 0 deletions

diff --git a/noncore/settings/networksettings/ppp/general.h b/noncore/settings/networksettings/ppp/general.h
index f43f241..a4dece4 100644
--- a/noncore/settings/networksettings/ppp/general.h
+++ b/noncore/settings/networksettings/ppp/general.h
@@ -43,12 +43,20 @@ class ModemWidget : public QWidget {
 public:
   ModemWidget(PPPData*, QWidget *parent=0, const char *name=0 );
   ~ModemWidget();
 
   bool save();
 
+private slots:
+    /*
+     * temporarily commit configuration so queryModem
+     * will use 'current' settings
+     */
+    void slotBeforeModemQuery();
+    void slotAfterModemQuery();
+
 /* private slots: */
         /*   void setmodemdc(int); */
 /*   void  setmodemdc(const QString &); */
         /*   void setflowcontrol(int); */
         /*   void modemtimeoutchanged(int); */
         /*   void modemlockfilechanged(bool); */
@@ -68,21 +76,30 @@ private:
   QComboBox *baud_c;
   QLabel *baud_label;
 
           QSpinBox *modemtimeout;
   QCheckBox     *modemlockfile;
   PPPData *_pppdata;
+
+private:
+    QString m_oldModemDev, m_oldFlowControl, m_oldSpeed;
+    bool m_oldModemLock;
+    int m_oldModemTimeout;
 };
 
 
 class ModemWidget2 : public QWidget {
   Q_OBJECT
 public:
   ModemWidget2( PPPData*, InterfacePPP*, QWidget *parent=0, const char *name=0 );
   bool save();
 
+signals:
+    void sig_beforeQueryModem();
+    void sig_afterQueryModem();
+
 private slots:
 /*   void  waitfordtchanged(bool); */
         /*   void busywaitchanged(int); */
         //  void use_cdline_toggled(bool);
           void modemcmdsbutton();
           //  void terminal();