-rw-r--r-- | noncore/settings/netsystemtime/ntptabwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/predicttabwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/ntptabwidget.cpp b/noncore/settings/netsystemtime/ntptabwidget.cpp index 16d21cc..d0107a4 100644 --- a/noncore/settings/netsystemtime/ntptabwidget.cpp +++ b/noncore/settings/netsystemtime/ntptabwidget.cpp | |||
@@ -52,49 +52,49 @@ NTPTabWidget::NTPTabWidget( QWidget *parent ) | |||
52 | sv->addChild( container ); | 52 | sv->addChild( container ); |
53 | 53 | ||
54 | QGridLayout *layout = new QGridLayout( container ); | 54 | QGridLayout *layout = new QGridLayout( container ); |
55 | layout->setMargin( 2 ); | 55 | layout->setMargin( 2 ); |
56 | layout->setSpacing( 4 ); | 56 | layout->setSpacing( 4 ); |
57 | 57 | ||
58 | // Start time | 58 | // Start time |
59 | layout->addWidget( new QLabel( tr( "Start time" ), container ), 0, 0 ); | 59 | layout->addWidget( new QLabel( tr( "Start time" ), container ), 0, 0 ); |
60 | lblStartTime = new QLabel( tr( "n/a" ), container ); | 60 | lblStartTime = new QLabel( tr( "n/a" ), container ); |
61 | layout->addWidget( lblStartTime, 0, 1 ); | 61 | layout->addWidget( lblStartTime, 0, 1 ); |
62 | 62 | ||
63 | // Time shift | 63 | // Time shift |
64 | layout->addWidget( new QLabel( tr( "Time shift" ), container ), 1, 0 ); | 64 | layout->addWidget( new QLabel( tr( "Time shift" ), container ), 1, 0 ); |
65 | lblTimeShift = new QLabel( tr( "n/a" ), container ); | 65 | lblTimeShift = new QLabel( tr( "n/a" ), container ); |
66 | layout->addWidget( lblTimeShift, 1, 1 ); | 66 | layout->addWidget( lblTimeShift, 1, 1 ); |
67 | 67 | ||
68 | // New time | 68 | // New time |
69 | layout->addWidget( new QLabel( tr( "New time" ), container ), 2, 0 ); | 69 | layout->addWidget( new QLabel( tr( "New time" ), container ), 2, 0 ); |
70 | lblNewTime = new QLabel( tr( "n/a" ), container ); | 70 | lblNewTime = new QLabel( tr( "n/a" ), container ); |
71 | layout->addWidget( lblNewTime, 2, 1 ); | 71 | layout->addWidget( lblNewTime, 2, 1 ); |
72 | 72 | ||
73 | // NTP output display | 73 | // NTP output display |
74 | mleNtpOutput = new QMultiLineEdit( container ); | 74 | mleNtpOutput = new QMultiLineEdit( container ); |
75 | QFont font( mleNtpOutput->font() ); | 75 | QFont font( mleNtpOutput->font() ); |
76 | font.setPointSize( 7 ); | 76 | font.setPointSize( font.pointSize() - 2 ); |
77 | mleNtpOutput->setFont( font ); | 77 | mleNtpOutput->setFont( font ); |
78 | mleNtpOutput->setWordWrap( QMultiLineEdit::WidgetWidth ); | 78 | mleNtpOutput->setWordWrap( QMultiLineEdit::WidgetWidth ); |
79 | layout->addMultiCellWidget( mleNtpOutput, 3, 3, 0, 1 ); | 79 | layout->addMultiCellWidget( mleNtpOutput, 3, 3, 0, 1 ); |
80 | 80 | ||
81 | // Set NTP time button | 81 | // Set NTP time button |
82 | m_ntpBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "netsystemtime/ntptab", Opie::Core::OResource::SmallIcon ), | 82 | m_ntpBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "netsystemtime/ntptab", Opie::Core::OResource::SmallIcon ), |
83 | tr( "Get time from the network" ), container ); | 83 | tr( "Get time from the network" ), container ); |
84 | m_ntpBtn->setMinimumHeight( AppLnk::smallIconSize()+4 ); | 84 | m_ntpBtn->setMinimumHeight( AppLnk::smallIconSize()+4 ); |
85 | connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); | 85 | connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); |
86 | layout->addMultiCellWidget( m_ntpBtn, 4, 4, 0, 1 ); | 86 | layout->addMultiCellWidget( m_ntpBtn, 4, 4, 0, 1 ); |
87 | } | 87 | } |
88 | 88 | ||
89 | NTPTabWidget::~NTPTabWidget() | 89 | NTPTabWidget::~NTPTabWidget() |
90 | { | 90 | { |
91 | } | 91 | } |
92 | 92 | ||
93 | void NTPTabWidget::setStartTime( const QString &str ) | 93 | void NTPTabWidget::setStartTime( const QString &str ) |
94 | { | 94 | { |
95 | lblStartTime->setText( str ); | 95 | lblStartTime->setText( str ); |
96 | } | 96 | } |
97 | 97 | ||
98 | void NTPTabWidget::setTimeShift( const QString &str ) | 98 | void NTPTabWidget::setTimeShift( const QString &str ) |
99 | { | 99 | { |
100 | lblTimeShift->setText( str ); | 100 | lblTimeShift->setText( str ); |
diff --git a/noncore/settings/netsystemtime/predicttabwidget.cpp b/noncore/settings/netsystemtime/predicttabwidget.cpp index 98e0afd..0b95277 100644 --- a/noncore/settings/netsystemtime/predicttabwidget.cpp +++ b/noncore/settings/netsystemtime/predicttabwidget.cpp | |||
@@ -55,49 +55,49 @@ PredictTabWidget::PredictTabWidget( QWidget *parent ) | |||
55 | */ | 55 | */ |
56 | 56 | ||
57 | QGridLayout *layout = new QGridLayout( this ); | 57 | QGridLayout *layout = new QGridLayout( this ); |
58 | layout->setMargin( 2 ); | 58 | layout->setMargin( 2 ); |
59 | layout->setSpacing( 4 ); | 59 | layout->setSpacing( 4 ); |
60 | 60 | ||
61 | // Predicted time drift | 61 | // Predicted time drift |
62 | layout->addWidget( new QLabel( tr( "Predicted time drift" ), this ), 0, 0 ); | 62 | layout->addWidget( new QLabel( tr( "Predicted time drift" ), this ), 0, 0 ); |
63 | lblDrift = new QLabel( tr( "n/a" ), this ); | 63 | lblDrift = new QLabel( tr( "n/a" ), this ); |
64 | layout->addWidget( lblDrift, 0, 1 ); | 64 | layout->addWidget( lblDrift, 0, 1 ); |
65 | 65 | ||
66 | // Estimated time difference | 66 | // Estimated time difference |
67 | layout->addWidget( new QLabel( tr( "Estimated shift" ), this ), 1, 0 ); | 67 | layout->addWidget( new QLabel( tr( "Estimated shift" ), this ), 1, 0 ); |
68 | lblDiff = new QLabel( tr( "n/a" ), this ); | 68 | lblDiff = new QLabel( tr( "n/a" ), this ); |
69 | layout->addWidget( lblDiff, 1, 1 ); | 69 | layout->addWidget( lblDiff, 1, 1 ); |
70 | 70 | ||
71 | // Predicted time | 71 | // Predicted time |
72 | layout->addWidget( new QLabel( tr( "Predicted time" ), this ), 2, 0 ); | 72 | layout->addWidget( new QLabel( tr( "Predicted time" ), this ), 2, 0 ); |
73 | lblPredicted = new QLabel( tr( "n/a" ), this ); | 73 | lblPredicted = new QLabel( tr( "n/a" ), this ); |
74 | layout->addWidget( lblPredicted, 2, 1 ); | 74 | layout->addWidget( lblPredicted, 2, 1 ); |
75 | 75 | ||
76 | // Prediction table | 76 | // Prediction table |
77 | tblLookups = new QTable( 2, 3, this ); | 77 | tblLookups = new QTable( 2, 3, this ); |
78 | QFont font( tblLookups->font() ); | 78 | QFont font( tblLookups->font() ); |
79 | font.setPointSize( 7 ); | 79 | font.setPointSize( font.pointSize() - 2 ); |
80 | tblLookups->setFont( font ); | 80 | tblLookups->setFont( font ); |
81 | tblLookups->horizontalHeader()->setLabel( 0, tr( "Shift [s/h]" ) ); | 81 | tblLookups->horizontalHeader()->setLabel( 0, tr( "Shift [s/h]" ) ); |
82 | tblLookups->horizontalHeader()->setLabel( 1, tr( "Last [h]" ) ); | 82 | tblLookups->horizontalHeader()->setLabel( 1, tr( "Last [h]" ) ); |
83 | tblLookups->horizontalHeader()->setLabel( 2, tr( "Offset [s]" ) ); | 83 | tblLookups->horizontalHeader()->setLabel( 2, tr( "Offset [s]" ) ); |
84 | 84 | ||
85 | tblLookups->setMinimumHeight( 50 ); | 85 | tblLookups->setMinimumHeight( 50 ); |
86 | tblLookups->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) ); | 86 | tblLookups->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) ); |
87 | layout->addMultiCellWidget( tblLookups, 3, 3, 0, 1 ); | 87 | layout->addMultiCellWidget( tblLookups, 3, 3, 0, 1 ); |
88 | 88 | ||
89 | // Predict time button | 89 | // Predict time button |
90 | QPushButton *pb = new QPushButton( tr( "Predict time" ), this ); | 90 | QPushButton *pb = new QPushButton( tr( "Predict time" ), this ); |
91 | connect( pb, SIGNAL(clicked()), this, SLOT(slotPredictTime()) ); | 91 | connect( pb, SIGNAL(clicked()), this, SLOT(slotPredictTime()) ); |
92 | layout->addWidget( pb, 4, 0 ); | 92 | layout->addWidget( pb, 4, 0 ); |
93 | 93 | ||
94 | // Set predicted time button | 94 | // Set predicted time button |
95 | pb = new QPushButton( tr( "Set predicted time" ), this ); | 95 | pb = new QPushButton( tr( "Set predicted time" ), this ); |
96 | connect( pb, SIGNAL(clicked()), this, SLOT(slotSetPredictedTime()) ); | 96 | connect( pb, SIGNAL(clicked()), this, SLOT(slotSetPredictedTime()) ); |
97 | layout->addWidget( pb, 4, 1 ); | 97 | layout->addWidget( pb, 4, 1 ); |
98 | 98 | ||
99 | // Initialize values | 99 | // Initialize values |
100 | Config config( "ntp" ); | 100 | Config config( "ntp" ); |
101 | config.setGroup( "lookups" ); | 101 | config.setGroup( "lookups" ); |
102 | int lookupCount = config.readNumEntry( "count", 0 ); | 102 | int lookupCount = config.readNumEntry( "count", 0 ); |
103 | float last, shift, shiftPerSec; | 103 | float last, shift, shiftPerSec; |