From 6271b388d25e2ece90c3e24d4fdd41aae56d10c3 Mon Sep 17 00:00:00 2001 From: tille Date: Sat, 19 Oct 2002 16:50:55 +0000 Subject: gui fixes following Harlekins wishes not yet tested --- (limited to 'noncore/settings') 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,13 +1,10 @@ - + NtpBase - - QWidget - - name + + NtpBase - - geometry + 0 0 @@ -15,422 +12,458 @@ 411 - - caption - Network Time + + Set Time - - layoutMargin + - - layoutSpacing + - - margin + + unnamed + + 2 - - spacing + 2 - - QTabWidget - - name + + TabWidgetMain - - layoutMargin + - - layoutSpacing + - - QWidget - - name + + tabMain - - title + Main - - margin + + unnamed + + 2 - - spacing + 2 - - QFrame - - name + + FrameSystemTime - - frameShape + StyledPanel - - frameShadow + Raised - - QWidget - - name - tabNtp + + + tabSetTime - - title - NTP + + Manual - - - margin - 1 + + + unnamed - - spacing + 2 - - QPushButton - - name - runNtp + + 2 + + + + FrameSetTime - - text - Get time from network + + StyledPanel + + + Raised - - QFrame - - name - FrameNtp + + + PushButtonSetManualTime + + + Set time - - frameShape + + + + + + TabSettings + + + Settings + + + + unnamed + + + 2 + + + 2 + + + + FrameSettings + + StyledPanel - - frameShadow + Raised - - layoutMargin + - - layoutSpacing + - - margin - 2 + + unnamed - - spacing - 2 + + 3 - - QLayoutWidget - - name - Layout4 + + 11 + + + + Layout6 - - - margin + + + unnamed + + 0 - - spacing + 6 - - QLabel - - name - TextLabel1 - - - autoMask - false + + + TextLabel7_2 - - text - Start Time: + + Use - - QLabel - - name - TextLabelStartTime + + + TextLabel2_2 - - text - nan + + as - - QLabel - - name - TextLabel3 + + + TextLabel1_3 - - text - Time Shift: + + NTP server to get the time from the network. + + + WordBreak|AlignVCenter|AlignLeft + + - - QLabel - - name - TextLabelTimeShift + + + ComboNtpSrv - - text - nan + + true - - QLabel - - name - TextLabel5 + + + + + Spacer2 + + + Vertical + + + Expanding + + + + 0 + 20 + + + + + + Layout7 + + + + unnamed + + + 0 + + + 6 + + + + TextLabel1_2 - - text - New Time: + + Insure a delay of - - QLabel - - name - TextLabelNewTime + + + TextLabel2 - - text - nan + + minutes until - - - name - Spacer1 + + + TextLabel3_3 - - orientation - Vertical + + a new NTP lookup will be used to predict the time. - - sizeType - Expanding + + WordBreak|AlignVCenter|AlignLeft - - sizeHint - - 20 - 20 - + - - + + + + SpinBoxMinLookupDelay + + + 9999999 + + + 42 + + + - - QMultiLineEdit - - name - MultiLineEditntpOutPut - - - font - - 7 - - - - wordWrap - WidgetWidth - - - text - + + + Layout7_2 + + + unnamed + + + 0 + + + 6 + + + + TextLabel1_2_2 + + + + 1 + 1 + 0 + 0 + + + + Wait for + + + + + TextLabel2_3 + + + minutes until + + + + + TextLabel3_3_2 + + + NTP tries to syncronises the clock with the network. + + + WordBreak|AlignVCenter|AlignLeft + + + + + + + SpinBoxNtpDelay + + + 9999999 + + + 0 + + + - - QWidget - - name + + tab - - title + Predict - - margin + + unnamed + + 5 - - spacing + 6 - - QTable - - name + + TableLookups - - font + 8 - - numRows + 2 - - numCols + 2 - - QLayoutWidget - - name + + Layout9 - - margin + + unnamed + + 0 - - spacing + 6 - - QLabel - - name + + TextLabelShift - - text + nan - - QLabel - - name + + TextLabel4 - - text + Esimated Shift: - - QLabel - - name + + TextLabelEstimatedShift - - text + nan - - QLabel - - name + + TextLabel3_2 - - text + Predicted Time: - - QLabel - - name + + Mean_shift_label - - text + Mean shift: - - QLabel - - name + + TextLabelPredTime - - text + nan - - QLayoutWidget - - name + + Layout11 - - margin + + unnamed + + 0 - - spacing + 6 - - QPushButton - - name + + PushButtonSetPredTime - - text + Set predicted time - - QPushButton - - name + + PushButtonPredict - - text + Predict time @@ -438,346 +471,161 @@ - - QWidget - - name - TabSettings + + + tabNtp - - title - Settings + + NTP - - margin - 2 + + unnamed + + + 1 - - spacing + 2 - - QFrame - - name - FrameSettings + + + runNtp - - frameShape + + Get time from network + + + + + FrameNtp + + StyledPanel - - frameShadow + Raised - - layoutMargin + - - layoutSpacing + - - margin - 3 + + unnamed - - spacing - 11 + + 2 - - QLayoutWidget - - name - Layout6 + + 2 + + + + Layout4 - - - margin + + + unnamed + + 0 - - spacing + 6 - - QLabel - - name - TextLabel7_2 - - - text - Use + + + TextLabel1 - - - QLabel - - name - TextLabel2_2 + + false - - text - as + + Start Time: - - QLabel - - name - TextLabel1_3 - - - text - NTP server to get the time from the network. - - - alignment - WordBreak|AlignVCenter|AlignLeft + + + TextLabelStartTime - - wordwrap + + nan - - QComboBox - - name - ComboNtpSrv + + + TextLabel3 - - editable - true + + Time Shift: - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel1_2 + + + TextLabelTimeShift - - text - Insure a delay of + + nan - - QLabel - - name - TextLabel2 + + + TextLabel5 - - text - minutes until + + New Time: - - QLabel - - name - TextLabel3_3 - - - text - a new NTP lookup will be used to predict the time. - - - alignment - WordBreak|AlignVCenter|AlignLeft + + + TextLabelNewTime - - wordwrap + + nan - - QSpinBox - - name - SpinBoxMinLookupDelay + + + Spacer1 - - maxValue - 9999999 + + Vertical - - minValue - 42 + + Expanding - - + + + 0 + 20 + + + + - - QLayoutWidget - - name - Layout7_2 + + + MultiLineEditntpOutPut + + + + 7 + + + + + + + WidgetWidth - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel1_2_2 - - - sizePolicy - - 1 - 1 - - - - text - Wait for - - - - QLabel - - name - TextLabel2_3 - - - text - minutes until - - - - QLabel - - name - TextLabel3_3_2 - - - text - NTP tries to syncronises the clock with the network. - - - alignment - WordBreak|AlignVCenter|AlignLeft - - - wordwrap - - - - QSpinBox - - name - SpinBoxNtpDelay - - - maxValue - 9999999 - - - minValue - 0 - - - - - QWidget - - name - tabSetTime - - - title - Manual - - - - margin - 2 - - - spacing - 2 - - - QFrame - - name - FrameSetTime - - - frameShape - StyledPanel - - - frameShadow - Raised - - - - QPushButton - - name - PushButtonSetManualTime - - - text - Set time - - - - + 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 @@ -60,14 +60,8 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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" ); @@ -185,6 +179,13 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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())); -- cgit v0.9.0.2