summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-25 15:02:43 (UTC)
committer mickeyl <mickeyl>2003-09-25 15:02:43 (UTC)
commit9047b6d4ffe0cbcecd90fd994ce2353277c378a1 (patch) (unidiff)
treec649c9c85c9c5846c0019e26bb3aaafbfbc76757
parent990e3c5834b33227b327e1fec0d7f7f429e75952 (diff)
downloadopie-9047b6d4ffe0cbcecd90fd994ce2353277c378a1.zip
opie-9047b6d4ffe0cbcecd90fd994ce2353277c378a1.tar.gz
opie-9047b6d4ffe0cbcecd90fd994ce2353277c378a1.tar.bz2
start with persistent configuration
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui107
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp31
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h5
3 files changed, 95 insertions, 48 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index d9a0aea..d7ab3bb 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -11,8 +11,8 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>286</width> 14 <width>303</width>
15 <height>280</height> 15 <height>287</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
@@ -627,7 +627,7 @@
627 <name>title</name> 627 <name>title</name>
628 <string>UI</string> 628 <string>UI</string>
629 </attribute> 629 </attribute>
630 <grid> 630 <vbox>
631 <property stdset="1"> 631 <property stdset="1">
632 <name>margin</name> 632 <name>margin</name>
633 <number>11</number> 633 <number>11</number>
@@ -636,7 +636,61 @@
636 <name>spacing</name> 636 <name>spacing</name>
637 <number>6</number> 637 <number>6</number>
638 </property> 638 </property>
639 <widget row="3" column="0" > 639 <widget>
640 <class>QCheckBox</class>
641 <property stdset="1">
642 <name>name</name>
643 <cstring>lookupVendor</cstring>
644 </property>
645 <property stdset="1">
646 <name>text</name>
647 <string>Lookup MAC vendor names</string>
648 </property>
649 </widget>
650 <widget>
651 <class>QCheckBox</class>
652 <property stdset="1">
653 <name>name</name>
654 <cstring>openTree</cstring>
655 </property>
656 <property stdset="1">
657 <name>text</name>
658 <string>Open Tree On New Station</string>
659 </property>
660 </widget>
661 <widget>
662 <class>QCheckBox</class>
663 <property stdset="1">
664 <name>name</name>
665 <cstring>disablePM</cstring>
666 </property>
667 <property stdset="1">
668 <name>text</name>
669 <string>Disable Power Management</string>
670 </property>
671 </widget>
672 <spacer>
673 <property>
674 <name>name</name>
675 <cstring>Spacer3</cstring>
676 </property>
677 <property stdset="1">
678 <name>orientation</name>
679 <enum>Vertical</enum>
680 </property>
681 <property stdset="1">
682 <name>sizeType</name>
683 <enum>Expanding</enum>
684 </property>
685 <property>
686 <name>sizeHint</name>
687 <size>
688 <width>20</width>
689 <height>20</height>
690 </size>
691 </property>
692 </spacer>
693 <widget>
640 <class>QGroupBox</class> 694 <class>QGroupBox</class>
641 <property stdset="1"> 695 <property stdset="1">
642 <name>name</name> 696 <name>name</name>
@@ -711,50 +765,7 @@
711 </widget> 765 </widget>
712 </grid> 766 </grid>
713 </widget> 767 </widget>
714 <spacer row="2" column="0" > 768 </vbox>
715 <property>
716 <name>name</name>
717 <cstring>Spacer3</cstring>
718 </property>
719 <property stdset="1">
720 <name>orientation</name>
721 <enum>Vertical</enum>
722 </property>
723 <property stdset="1">
724 <name>sizeType</name>
725 <enum>Expanding</enum>
726 </property>
727 <property>
728 <name>sizeHint</name>
729 <size>
730 <width>20</width>
731 <height>20</height>
732 </size>
733 </property>
734 </spacer>
735 <widget row="0" column="0" >
736 <class>QCheckBox</class>
737 <property stdset="1">
738 <name>name</name>
739 <cstring>lookupVendor</cstring>
740 </property>
741 <property stdset="1">
742 <name>text</name>
743 <string>Lookup MAC vendor names</string>
744 </property>
745 </widget>
746 <widget row="1" column="0" >
747 <class>QCheckBox</class>
748 <property stdset="1">
749 <name>name</name>
750 <cstring>openTree</cstring>
751 </property>
752 <property stdset="1">
753 <name>text</name>
754 <string>Open Tree On New Station</string>
755 </property>
756 </widget>
757 </grid>
758 </widget> 769 </widget>
759 <widget> 770 <widget>
760 <class>QWidget</class> 771 <class>QWidget</class>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index a331925..d255c6a 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -55,6 +55,8 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
55 ++it; 55 ++it;
56 } 56 }
57 57
58 if ( !load() ) // no configuration present
59 {
58 // try to guess device type 60 // try to guess device type
59 QFile m( "/proc/modules" ); 61 QFile m( "/proc/modules" );
60 if ( m.open( IO_ReadOnly ) ) 62 if ( m.open( IO_ReadOnly ) )
@@ -77,6 +79,7 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
77 qDebug( "Wellenreiter: guessed device type to be #%d", devicetype ); 79 qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
78 } 80 }
79 } 81 }
82 }
80 83
81 #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here 84 #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
82 QPushButton* okButton = new QPushButton( "ok", this ); 85 QPushButton* okButton = new QPushButton( "ok", this );
@@ -95,6 +98,12 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
95}; 98};
96 99
97 100
101WellenreiterConfigWindow::~WellenreiterConfigWindow()
102{
103 save();
104}
105
106
98int WellenreiterConfigWindow::driverType() const 107int WellenreiterConfigWindow::driverType() const
99{ 108{
100 QString name = deviceType->currentText(); 109 QString name = deviceType->currentText();
@@ -208,3 +217,25 @@ int WellenreiterConfigWindow::gpsPort() const
208 bool ok; 217 bool ok;
209 return useGPS() ? gpsdPort->value() : -1; 218 return useGPS() ? gpsdPort->value() : -1;
210} 219}
220
221
222bool WellenreiterConfigWindow::load()
223{
224#ifdef Q_WS_X11
225 #warning Persistent Configuration not yet implemented for standalone X11 build
226 return false;
227#else
228 qDebug( "loading configuration settings..." );
229 return true;
230#endif
231}
232
233
234void WellenreiterConfigWindow::save()
235{
236#ifdef Q_WS_X11
237 #warning Persistent Configuration not yet implemented for standalone X11 build
238#else
239 qDebug( "saving configuration settings..." );
240#endif
241}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index 8f160b1..2986320 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -37,6 +37,8 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
37 37
38 public: 38 public:
39 WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 ); 39 WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
40 ~WellenreiterConfigWindow();
41
40 int driverType() const; 42 int driverType() const;
41 const QString soundOnNetwork() const { return "";/*netSound->currentText();*/ }; 43 const QString soundOnNetwork() const { return "";/*netSound->currentText();*/ };
42 const QString soundOnBeacon() const { return "";/*beaconSound->currentText();*/ }; 44 const QString soundOnBeacon() const { return "";/*beaconSound->currentText();*/ };
@@ -50,6 +52,9 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
50 const QString gpsHost() const; 52 const QString gpsHost() const;
51 int gpsPort() const; 53 int gpsPort() const;
52 54
55 void save();
56 bool load();
57
53 public slots: 58 public slots:
54 void changedDeviceType(int); 59 void changedDeviceType(int);
55 void getCaptureFileNameClicked(); 60 void getCaptureFileNameClicked();