| -rw-r--r-- | noncore/settings/netsystemtime/ntpbase.ui | 962 | ||||
| -rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 17 |
2 files changed, 414 insertions, 565 deletions
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui index f5e9371..be2c8d3 100644 --- a/noncore/settings/netsystemtime/ntpbase.ui +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -1,783 +1,631 @@ -<!DOCTYPE UI><UI> +<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NtpBase</class> -<widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> +<widget class="QWidget"> + <property name="name"> <cstring>NtpBase</cstring> </property> - <property stdset="1"> - <name>geometry</name> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>324</width> <height>411</height> </rect> </property> - <property stdset="1"> - <name>caption</name> - <string>Network Time</string> + <property name="caption"> + <string>Set Time</string> </property> - <property> - <name>layoutMargin</name> + <property name="layoutMargin" stdset="0"> </property> - <property> - <name>layoutSpacing</name> + <property name="layoutSpacing" stdset="0"> </property> <grid> - <property stdset="1"> - <name>margin</name> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>2</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>2</number> </property> - <widget row="0" column="0" > - <class>QTabWidget</class> - <property stdset="1"> - <name>name</name> + <widget class="QTabWidget" row="0" column="0"> + <property name="name"> <cstring>TabWidgetMain</cstring> </property> - <property> - <name>layoutMargin</name> + <property name="layoutMargin" stdset="0"> </property> - <property> - <name>layoutSpacing</name> + <property name="layoutSpacing" stdset="0"> </property> - <widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> + <widget class="QWidget"> + <property name="name"> <cstring>tabMain</cstring> </property> - <attribute> - <name>title</name> + <attribute name="title"> <string>Main</string> </attribute> <grid> - <property stdset="1"> - <name>margin</name> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>2</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>2</number> </property> - <widget row="0" column="0" > - <class>QFrame</class> - <property stdset="1"> - <name>name</name> + <widget class="QFrame" row="0" column="0"> + <property name="name"> <cstring>FrameSystemTime</cstring> </property> - <property stdset="1"> - <name>frameShape</name> + <property name="frameShape"> <enum>StyledPanel</enum> </property> - <property stdset="1"> - <name>frameShadow</name> + <property name="frameShadow"> <enum>Raised</enum> </property> </widget> </grid> </widget> - <widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>tabNtp</cstring> + <widget class="QWidget"> + <property name="name"> + <cstring>tabSetTime</cstring> </property> - <attribute> - <name>title</name> - <string>NTP</string> + <attribute name="title"> + <string>Manual</string> </attribute> - <grid> - <property stdset="1"> - <name>margin</name> - <number>1</number> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> </property> - <property stdset="1"> - <name>spacing</name> + <property name="margin"> <number>2</number> </property> - <widget row="1" column="0" > - <class>QPushButton</class> - <property stdset="1"> - <name>name</name> - <cstring>runNtp</cstring> + <property name="spacing"> + <number>2</number> + </property> + <widget class="QFrame"> + <property name="name"> + <cstring>FrameSetTime</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>Get time from network</string> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>Raised</enum> </property> </widget> - <widget row="0" column="0" > - <class>QFrame</class> - <property stdset="1"> - <name>name</name> - <cstring>FrameNtp</cstring> + <widget class="QPushButton"> + <property name="name"> + <cstring>PushButtonSetManualTime</cstring> + </property> + <property name="text"> + <string>Set time</string> </property> - <property stdset="1"> - <name>frameShape</name> + </widget> + </vbox> + </widget> + <widget class="QWidget"> + <property name="name"> + <cstring>TabSettings</cstring> + </property> + <attribute name="title"> + <string>Settings</string> + </attribute> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <widget class="QFrame" row="0" column="0"> + <property name="name"> + <cstring>FrameSettings</cstring> + </property> + <property name="frameShape"> <enum>StyledPanel</enum> </property> - <property stdset="1"> - <name>frameShadow</name> + <property name="frameShadow"> <enum>Raised</enum> </property> - <property> - <name>layoutMargin</name> + <property name="layoutMargin" stdset="0"> </property> - <property> - <name>layoutSpacing</name> + <property name="layoutSpacing" stdset="0"> </property> <grid> - <property stdset="1"> - <name>margin</name> - <number>2</number> + <property name="name"> + <cstring>unnamed</cstring> </property> - <property stdset="1"> - <name>spacing</name> - <number>2</number> + <property name="margin"> + <number>3</number> </property> - <widget row="0" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout4</cstring> + <property name="spacing"> + <number>11</number> + </property> + <widget class="QLayoutWidget" row="0" column="0"> + <property name="name"> + <cstring>Layout6</cstring> </property> - <vbox> - <property stdset="1"> - <name>margin</name> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>0</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>6</number> </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1</cstring> - </property> - <property stdset="1"> - <name>autoMask</name> - <bool>false</bool> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel7_2</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>Start Time:</string> + <property name="text"> + <string>Use</string> </property> </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabelStartTime</cstring> + <widget class="QLabel" row="0" column="2"> + <property name="name"> + <cstring>TextLabel2_2</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>nan</string> + <property name="text"> + <string>as</string> </property> </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3</cstring> + <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>TextLabel1_3</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>Time Shift:</string> + <property name="text"> + <string>NTP server to get the time from the network.</string> + </property> + <property name="alignment"> + <set>WordBreak|AlignVCenter|AlignLeft</set> + </property> + <property name="wordwrap" stdset="0"> </property> </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabelTimeShift</cstring> + <widget class="QComboBox" row="0" column="1"> + <property name="name"> + <cstring>ComboNtpSrv</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>nan</string> + <property name="editable"> + <bool>true</bool> </property> </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel5</cstring> + </grid> + </widget> + <spacer row="3" column="0"> + <property name="name"> + <cstring>Spacer2</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="QLayoutWidget" row="2" column="0"> + <property name="name"> + <cstring>Layout7</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel1_2</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>New Time:</string> + <property name="text"> + <string>Insure a delay of</string> </property> </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabelNewTime</cstring> + <widget class="QLabel" row="0" column="2"> + <property name="name"> + <cstring>TextLabel2</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>nan</string> + <property name="text"> + <string>minutes until</string> </property> </widget> - <spacer> - <property> - <name>name</name> - <cstring>Spacer1</cstring> + <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>TextLabel3_3</cstring> </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> + <property name="text"> + <string>a new NTP lookup will be used to predict the time.</string> </property> - <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> + <property name="alignment"> + <set>WordBreak|AlignVCenter|AlignLeft</set> </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> + <property name="wordwrap" stdset="0"> </property> - </spacer> - </vbox> + </widget> + <widget class="QSpinBox" row="0" column="1"> + <property name="name"> + <cstring>SpinBoxMinLookupDelay</cstring> + </property> + <property name="maxValue"> + <number>9999999</number> + </property> + <property name="minValue"> + <number>42</number> + </property> + </widget> + </grid> </widget> - <widget row="1" column="0" > - <class>QMultiLineEdit</class> - <property stdset="1"> - <name>name</name> - <cstring>MultiLineEditntpOutPut</cstring> - </property> - <property stdset="1"> - <name>font</name> - <font> - <pointsize>7</pointsize> - </font> - </property> - <property stdset="1"> - <name>wordWrap</name> - <enum>WidgetWidth</enum> - </property> - <property stdset="1"> - <name>text</name> - <string></string> + <widget class="QLayoutWidget" row="1" column="0"> + <property name="name"> + <cstring>Layout7_2</cstring> </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel1_2_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Wait for </string> + </property> + </widget> + <widget class="QLabel" row="0" column="2"> + <property name="name"> + <cstring>TextLabel2_3</cstring> + </property> + <property name="text"> + <string>minutes until</string> + </property> + </widget> + <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>TextLabel3_3_2</cstring> + </property> + <property name="text"> + <string>NTP tries to syncronises the clock with the network.</string> + </property> + <property name="alignment"> + <set>WordBreak|AlignVCenter|AlignLeft</set> + </property> + <property name="wordwrap" stdset="0"> + </property> + </widget> + <widget class="QSpinBox" row="0" column="1"> + <property name="name"> + <cstring>SpinBoxNtpDelay</cstring> + </property> + <property name="maxValue"> + <number>9999999</number> + </property> + <property name="minValue"> + <number>0</number> + </property> + </widget> + </grid> </widget> </grid> </widget> </grid> </widget> - <widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> + <widget class="QWidget"> + <property name="name"> <cstring>tab</cstring> </property> - <attribute> - <name>title</name> + <attribute name="title"> <string>Predict</string> </attribute> <grid> - <property stdset="1"> - <name>margin</name> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>5</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>6</number> </property> - <widget row="0" column="0" > - <class>QTable</class> - <property stdset="1"> - <name>name</name> + <widget class="QTable" row="0" column="0"> + <property name="name"> <cstring>TableLookups</cstring> </property> - <property stdset="1"> - <name>font</name> + <property name="font"> <font> <pointsize>8</pointsize> </font> </property> - <property stdset="1"> - <name>numRows</name> + <property name="numRows"> <number>2</number> </property> - <property stdset="1"> - <name>numCols</name> + <property name="numCols"> <number>2</number> </property> </widget> - <widget row="1" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> + <widget class="QLayoutWidget" row="1" column="0"> + <property name="name"> <cstring>Layout9</cstring> </property> <grid> - <property stdset="1"> - <name>margin</name> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>0</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>6</number> </property> - <widget row="0" column="1" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="0" column="1"> + <property name="name"> <cstring>TextLabelShift</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>nan</string> </property> </widget> - <widget row="1" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="1" column="0"> + <property name="name"> <cstring>TextLabel4</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>Esimated Shift:</string> </property> </widget> - <widget row="1" column="1" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="1" column="1"> + <property name="name"> <cstring>TextLabelEstimatedShift</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>nan</string> </property> </widget> - <widget row="2" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="2" column="0"> + <property name="name"> <cstring>TextLabel3_2</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>Predicted Time:</string> </property> </widget> - <widget row="0" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="0" column="0"> + <property name="name"> <cstring>Mean_shift_label</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>Mean shift:</string> </property> </widget> - <widget row="2" column="1" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> + <widget class="QLabel" row="2" column="1"> + <property name="name"> <cstring>TextLabelPredTime</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>nan</string> </property> </widget> </grid> </widget> - <widget row="2" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> + <widget class="QLayoutWidget" row="2" column="0"> + <property name="name"> <cstring>Layout11</cstring> </property> <hbox> - <property stdset="1"> - <name>margin</name> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>0</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>6</number> </property> - <widget> - <class>QPushButton</class> - <property stdset="1"> - <name>name</name> + <widget class="QPushButton"> + <property name="name"> <cstring>PushButtonSetPredTime</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>Set predicted time</string> </property> </widget> - <widget> - <class>QPushButton</class> - <property stdset="1"> - <name>name</name> + <widget class="QPushButton"> + <property name="name"> <cstring>PushButtonPredict</cstring> </property> - <property stdset="1"> - <name>text</name> + <property name="text"> <string>Predict time</string> </property> </widget> </hbox> </widget> </grid> </widget> - <widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>TabSettings</cstring> + <widget class="QWidget"> + <property name="name"> + <cstring>tabNtp</cstring> </property> - <attribute> - <name>title</name> - <string>Settings</string> + <attribute name="title"> + <string>NTP</string> </attribute> <grid> - <property stdset="1"> - <name>margin</name> - <number>2</number> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>1</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>2</number> </property> - <widget row="0" column="0" > - <class>QFrame</class> - <property stdset="1"> - <name>name</name> - <cstring>FrameSettings</cstring> + <widget class="QPushButton" row="1" column="0"> + <property name="name"> + <cstring>runNtp</cstring> </property> - <property stdset="1"> - <name>frameShape</name> + <property name="text"> + <string>Get time from network</string> + </property> + </widget> + <widget class="QFrame" row="0" column="0"> + <property name="name"> + <cstring>FrameNtp</cstring> + </property> + <property name="frameShape"> <enum>StyledPanel</enum> </property> - <property stdset="1"> - <name>frameShadow</name> + <property name="frameShadow"> <enum>Raised</enum> </property> - <property> - <name>layoutMargin</name> + <property name="layoutMargin" stdset="0"> </property> - <property> - <name>layoutSpacing</name> + <property name="layoutSpacing" stdset="0"> </property> <grid> - <property stdset="1"> - <name>margin</name> - <number>3</number> + <property name="name"> + <cstring>unnamed</cstring> </property> - <property stdset="1"> - <name>spacing</name> - <number>11</number> + <property name="margin"> + <number>2</number> </property> - <widget row="0" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout6</cstring> + <property name="spacing"> + <number>2</number> + </property> + <widget class="QLayoutWidget" row="0" column="0"> + <property name="name"> + <cstring>Layout4</cstring> </property> - <grid> - <property stdset="1"> - <name>margin</name> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> <number>0</number> </property> - <property stdset="1"> - <name>spacing</name> + <property name="spacing"> <number>6</number> </property> - <widget row="0" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel7_2</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Use</string> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabel1</cstring> </property> - </widget> - <widget row="0" column="2" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel2_2</cstring> + <property name="autoMask"> + <bool>false</bool> </property> - <property stdset="1"> - <name>text</name> - <string>as</string> + <property name="text"> + <string>Start Time:</string> </property> </widget> - <widget row="1" column="0" rowspan="1" colspan="2" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1_3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>NTP server to get the time from the network.</string> - </property> - <property stdset="1"> - <name>alignment</name> - <set>WordBreak|AlignVCenter|AlignLeft</set> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabelStartTime</cstring> </property> - <property> - <name>wordwrap</name> + <property name="text"> + <string>nan</string> </property> </widget> - <widget row="0" column="1" > - <class>QComboBox</class> - <property stdset="1"> - <name>name</name> - <cstring>ComboNtpSrv</cstring> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabel3</cstring> </property> - <property stdset="1"> - <name>editable</name> - <bool>true</bool> + <property name="text"> + <string>Time Shift:</string> </property> </widget> - </grid> - </widget> - <spacer row="3" column="0" > - <property> - <name>name</name> - <cstring>Spacer2</cstring> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> - </property> - <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> - </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - <widget row="2" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout7</cstring> - </property> - <grid> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget row="0" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1_2</cstring> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabelTimeShift</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>Insure a delay of</string> + <property name="text"> + <string>nan</string> </property> </widget> - <widget row="0" column="2" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel2</cstring> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabel5</cstring> </property> - <property stdset="1"> - <name>text</name> - <string>minutes until</string> + <property name="text"> + <string>New Time:</string> </property> </widget> - <widget row="1" column="0" rowspan="1" colspan="3" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3_3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>a new NTP lookup will be used to predict the time.</string> - </property> - <property stdset="1"> - <name>alignment</name> - <set>WordBreak|AlignVCenter|AlignLeft</set> + <widget class="QLabel"> + <property name="name"> + <cstring>TextLabelNewTime</cstring> </property> - <property> - <name>wordwrap</name> + <property name="text"> + <string>nan</string> </property> </widget> - <widget row="0" column="1" > - <class>QSpinBox</class> - <property stdset="1"> - <name>name</name> - <cstring>SpinBoxMinLookupDelay</cstring> + <spacer> + <property name="name"> + <cstring>Spacer1</cstring> </property> - <property stdset="1"> - <name>maxValue</name> - <number>9999999</number> + <property name="orientation"> + <enum>Vertical</enum> </property> - <property stdset="1"> - <name>minValue</name> - <number>42</number> + <property name="sizeType"> + <enum>Expanding</enum> </property> - </widget> - </grid> + <property name="sizeHint"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </vbox> </widget> - <widget row="1" column="0" > - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout7_2</cstring> + <widget class="QMultiLineEdit" row="1" column="0"> + <property name="name"> + <cstring>MultiLineEditntpOutPut</cstring> + </property> + <property name="font"> + <font> + <pointsize>7</pointsize> + </font> + </property> + <property name="text"> + <string></string> + </property> + <property name="wordWrap"> + <enum>WidgetWidth</enum> </property> - <grid> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget row="0" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1_2_2</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>text</name> - <string>Wait for </string> - </property> - </widget> - <widget row="0" column="2" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel2_3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>minutes until</string> - </property> - </widget> - <widget row="1" column="0" rowspan="1" colspan="3" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3_3_2</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>NTP tries to syncronises the clock with the network.</string> - </property> - <property stdset="1"> - <name>alignment</name> - <set>WordBreak|AlignVCenter|AlignLeft</set> - </property> - <property> - <name>wordwrap</name> - </property> - </widget> - <widget row="0" column="1" > - <class>QSpinBox</class> - <property stdset="1"> - <name>name</name> - <cstring>SpinBoxNtpDelay</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>9999999</number> - </property> - <property stdset="1"> - <name>minValue</name> - <number>0</number> - </property> - </widget> - </grid> </widget> </grid> </widget> </grid> </widget> - <widget> - <class>QWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>tabSetTime</cstring> - </property> - <attribute> - <name>title</name> - <string>Manual</string> - </attribute> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>2</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>2</number> - </property> - <widget> - <class>QFrame</class> - <property stdset="1"> - <name>name</name> - <cstring>FrameSetTime</cstring> - </property> - <property stdset="1"> - <name>frameShape</name> - <enum>StyledPanel</enum> - </property> - <property stdset="1"> - <name>frameShadow</name> - <enum>Raised</enum> - </property> - </widget> - <widget> - <class>QPushButton</class> - <property stdset="1"> - <name>name</name> - <cstring>PushButtonSetManualTime</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Set time</string> - </property> - </widget> - </vbox> - </widget> </widget> </grid> </widget> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index d1dc5b8..f6e02d5 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp @@ -51,32 +51,26 @@ #include <stdio.h> SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) : NtpBase( parent, name, f ) { // setCaption( tr("Set System Time") ); // QVBoxLayout *vb = new QVBoxLayout( this, 5 ); QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 ); - TextLabelMainPredTime = new QLabel( FrameSystemTime ); - vb->addWidget( TextLabelMainPredTime, 1, 0 ); - ButtonSetTime = new QPushButton( FrameSystemTime ); - vb->addWidget( ButtonSetTime, 1, 0 ); - - QFrame *hline = new QFrame( FrameSystemTime ); - hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); - vb->addWidget( hline ); +# TextLabelMainPredTime = new QLabel( FrameSystemTime ); +# vb->addWidget( TextLabelMainPredTime, 1, 0 ); QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); lblZone->setMaximumSize( lblZone->sizeHint() ); hb->addWidget( lblZone ); tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" ); tz->setMinimumSize( tz->sizeHint() ); hb->addWidget( tz ); timeButton = new SetTime( FrameSetTime ); @@ -176,24 +170,31 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) clockAppletCombo = new QComboBox( FrameSystemTime ); clockAppletCombo->insertItem( tr("hh:mm"), 0 ); clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 ); clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 ); hb4->addWidget( clockAppletCombo, 2 ); int clockApplet = config.readNumEntry("ClockApplet",0); clockAppletCombo->setCurrentItem( clockApplet ); vb->addStretch( 0 ); + QFrame *hline = new QFrame( FrameSystemTime ); + hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + vb->addWidget( hline ); + + ButtonSetTime = new QPushButton( FrameSystemTime ); + vb->addWidget( ButtonSetTime, 1, 0 ); + QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()), this, SLOT(commitTime())); QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), timeButton, SLOT( slotTzChange( const QString& ) ) ); QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), SLOT( tzChange( const QString& ) ) ); QObject::connect( weekStartCombo, SIGNAL( activated ( int )), SLOT(updateSystem(int ) )); QObject::connect( ampmCombo, SIGNAL( activated ( int )), SLOT(updateSystem(int ) )); |