summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/netsystemtime.pro2
-rw-r--r--noncore/settings/netsystemtime/ntpbase.cpp24
-rw-r--r--noncore/settings/netsystemtime/ntpbase.h8
-rw-r--r--noncore/settings/netsystemtime/ntpbase.ui6
4 files changed, 20 insertions, 20 deletions
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index 0530ea5..3aaf369 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -5,13 +5,13 @@ HEADERS = ntp.h settime.h ntpbase.h
5 SOURCES = main.cpp ntp.cpp settime.cpp ntpbase.cpp 5 SOURCES = main.cpp ntp.cpp settime.cpp ntpbase.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe -lopie 8LIBS += -lqpe -lopie
9 INTERFACES= 9 INTERFACES=
10DESTDIR = $(OPIEDIR)/bin 10DESTDIR = $(OPIEDIR)/bin
11 TARGET = netsystemtime 11 TARGET = systemtime
12 12
13TRANSLATIONS = ../../../i18n/de/netsystemtime.ts \ 13TRANSLATIONS = ../../../i18n/de/netsystemtime.ts \
14 ../../../i18n/en/netsystemtime.ts \ 14 ../../../i18n/en/netsystemtime.ts \
15 ../../../i18n/es/netsystemtime.ts \ 15 ../../../i18n/es/netsystemtime.ts \
16 ../../../i18n/fr/netsystemtime.ts \ 16 ../../../i18n/fr/netsystemtime.ts \
17 ../../../i18n/hu/netsystemtime.ts \ 17 ../../../i18n/hu/netsystemtime.ts \
diff --git a/noncore/settings/netsystemtime/ntpbase.cpp b/noncore/settings/netsystemtime/ntpbase.cpp
index c10c6ae..8d44f17 100644
--- a/noncore/settings/netsystemtime/ntpbase.cpp
+++ b/noncore/settings/netsystemtime/ntpbase.cpp
@@ -41,15 +41,15 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl )
41 41
42 tabMain = new QWidget( TabWidgetMain, "tabMain" ); 42 tabMain = new QWidget( TabWidgetMain, "tabMain" );
43 tabMainLayout = new QGridLayout( tabMain ); 43 tabMainLayout = new QGridLayout( tabMain );
44 tabMainLayout->setSpacing( 2 ); 44 tabMainLayout->setSpacing( 2 );
45 tabMainLayout->setMargin( 2 ); 45 tabMainLayout->setMargin( 2 );
46 46
47 FrameSystemTime = new QFrame( tabMain, "FrameSystemTime" ); 47 FrameSystemTime = new QWidget( tabMain, "FrameSystemTime" );
48 FrameSystemTime->setFrameShape( QFrame::StyledPanel ); 48 // FrameSystemTime->setFrameShape( QFrame::StyledPanel );
49 FrameSystemTime->setFrameShadow( QFrame::Raised ); 49 //FrameSystemTime->setFrameShadow( QFrame::Raised );
50 50
51 tabMainLayout->addWidget( FrameSystemTime, 0, 0 ); 51 tabMainLayout->addWidget( FrameSystemTime, 0, 0 );
52 52
53 tabNtp = new QWidget( TabWidgetMain, "tabNtp" ); 53 tabNtp = new QWidget( TabWidgetMain, "tabNtp" );
54 tabNtpLayout = new QGridLayout( tabNtp ); 54 tabNtpLayout = new QGridLayout( tabNtp );
55 tabNtpLayout->setSpacing( 2 ); 55 tabNtpLayout->setSpacing( 2 );
@@ -57,15 +57,15 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl )
57 57
58 runNtp = new QPushButton( tabNtp, "runNtp" ); 58 runNtp = new QPushButton( tabNtp, "runNtp" );
59 runNtp->setText( tr( "Get time from network" ) ); 59 runNtp->setText( tr( "Get time from network" ) );
60 60
61 tabNtpLayout->addWidget( runNtp, 1, 0 ); 61 tabNtpLayout->addWidget( runNtp, 1, 0 );
62 62
63 FrameNtp = new QFrame( tabNtp, "FrameNtp" ); 63 FrameNtp = new QWidget( tabNtp, "FrameNtp" );
64 FrameNtp->setFrameShape( QFrame::StyledPanel ); 64 // FrameNtp->setFrameShape( QFrame::StyledPanel );
65 FrameNtp->setFrameShadow( QFrame::Raised ); 65 // FrameNtp->setFrameShadow( QFrame::Raised );
66 FrameNtpLayout = new QGridLayout( FrameNtp ); 66 FrameNtpLayout = new QGridLayout( FrameNtp );
67 FrameNtpLayout->setSpacing( 2 ); 67 FrameNtpLayout->setSpacing( 2 );
68 FrameNtpLayout->setMargin( 2 ); 68 FrameNtpLayout->setMargin( 2 );
69 69
70 Layout4 = new QVBoxLayout; 70 Layout4 = new QVBoxLayout;
71 Layout4->setSpacing( 6 ); 71 Layout4->setSpacing( 6 );
@@ -177,15 +177,15 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl )
177 177
178 TabSettings = new QWidget( TabWidgetMain, "TabSettings" ); 178 TabSettings = new QWidget( TabWidgetMain, "TabSettings" );
179 TabSettingsLayout = new QGridLayout( TabSettings ); 179 TabSettingsLayout = new QGridLayout( TabSettings );
180 TabSettingsLayout->setSpacing( 2 ); 180 TabSettingsLayout->setSpacing( 2 );
181 TabSettingsLayout->setMargin( 2 ); 181 TabSettingsLayout->setMargin( 2 );
182 182
183 FrameSettings = new QFrame( TabSettings, "FrameSettings" ); 183 FrameSettings = new QWidget( TabSettings, "FrameSettings" );
184 FrameSettings->setFrameShape( QFrame::StyledPanel ); 184 // FrameSettings->setFrameShape( QFrame::StyledPanel );
185 FrameSettings->setFrameShadow( QFrame::Raised ); 185 // FrameSettings->setFrameShadow( QFrame::Raised );
186 FrameSettingsLayout = new QVBoxLayout( FrameSettings ); 186 FrameSettingsLayout = new QVBoxLayout( FrameSettings );
187 FrameSettingsLayout->setSpacing( 6 ); 187 FrameSettingsLayout->setSpacing( 6 );
188 FrameSettingsLayout->setMargin( 11 ); 188 FrameSettingsLayout->setMargin( 11 );
189 189
190 Layout6 = new QGridLayout; 190 Layout6 = new QGridLayout;
191 Layout6->setSpacing( 6 ); 191 Layout6->setSpacing( 6 );
@@ -288,15 +288,15 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl )
288 288
289 tabManualSetTime = new QWidget( TabWidgetMain, "tabManualSetTime" ); 289 tabManualSetTime = new QWidget( TabWidgetMain, "tabManualSetTime" );
290 tabManualSetTimeLayout = new QVBoxLayout( tabManualSetTime ); 290 tabManualSetTimeLayout = new QVBoxLayout( tabManualSetTime );
291 tabManualSetTimeLayout->setSpacing( 2 ); 291 tabManualSetTimeLayout->setSpacing( 2 );
292 tabManualSetTimeLayout->setMargin( 2 ); 292 tabManualSetTimeLayout->setMargin( 2 );
293 293
294 FrameSetTime = new QFrame( tabManualSetTime, "FrameSetTime" ); 294 FrameSetTime = new QWidget( tabManualSetTime, "FrameSetTime" );
295 FrameSetTime->setFrameShape( QFrame::StyledPanel ); 295 // FrameSetTime->setFrameShape( QFrame::StyledPanel );
296 FrameSetTime->setFrameShadow( QFrame::Raised ); 296 // FrameSetTime->setFrameShadow( QFrame::Raised );
297 tabManualSetTimeLayout->addWidget( FrameSetTime ); 297 tabManualSetTimeLayout->addWidget( FrameSetTime );
298 298
299 PushButtonSetManualTime = new QPushButton( tabManualSetTime, "PushButtonSetManualTime" ); 299 PushButtonSetManualTime = new QPushButton( tabManualSetTime, "PushButtonSetManualTime" );
300 PushButtonSetManualTime->setText( tr( "Set time" ) ); 300 PushButtonSetManualTime->setText( tr( "Set time" ) );
301 tabManualSetTimeLayout->addWidget( PushButtonSetManualTime ); 301 tabManualSetTimeLayout->addWidget( PushButtonSetManualTime );
302 302
diff --git a/noncore/settings/netsystemtime/ntpbase.h b/noncore/settings/netsystemtime/ntpbase.h
index a669601..a443495 100644
--- a/noncore/settings/netsystemtime/ntpbase.h
+++ b/noncore/settings/netsystemtime/ntpbase.h
@@ -31,16 +31,16 @@ class NtpBase : public QWidget
31public: 31public:
32 NtpBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 32 NtpBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
33 ~NtpBase(); 33 ~NtpBase();
34 34
35 QTabWidget* TabWidgetMain; 35 QTabWidget* TabWidgetMain;
36 QWidget* tabMain; 36 QWidget* tabMain;
37 QFrame* FrameSystemTime; 37 QWidget* FrameSystemTime;
38 QWidget* tabNtp; 38 QWidget* tabNtp;
39 QPushButton* runNtp; 39 QPushButton* runNtp;
40 QFrame* FrameNtp; 40 QWidget* FrameNtp;
41 QLabel* TextLabel1; 41 QLabel* TextLabel1;
42 QLabel* TextLabelStartTime; 42 QLabel* TextLabelStartTime;
43 QLabel* TextLabel3; 43 QLabel* TextLabel3;
44 QLabel* TextLabelTimeShift; 44 QLabel* TextLabelTimeShift;
45 QLabel* TextLabel5; 45 QLabel* TextLabel5;
46 QLabel* TextLabelNewTime; 46 QLabel* TextLabelNewTime;
@@ -53,13 +53,13 @@ public:
53 QLabel* TextLabel3_2; 53 QLabel* TextLabel3_2;
54 QLabel* Mean_shift_label; 54 QLabel* Mean_shift_label;
55 QLabel* TextLabelPredTime; 55 QLabel* TextLabelPredTime;
56 QPushButton* PushButtonSetPredTime; 56 QPushButton* PushButtonSetPredTime;
57 QPushButton* PushButtonPredict; 57 QPushButton* PushButtonPredict;
58 QWidget* TabSettings; 58 QWidget* TabSettings;
59 QFrame* FrameSettings; 59 QWidget* FrameSettings;
60 QLabel* TextLabel7_2; 60 QLabel* TextLabel7_2;
61 QLabel* TextLabel2_2; 61 QLabel* TextLabel2_2;
62 QLabel* TextLabel1_3; 62 QLabel* TextLabel1_3;
63 QComboBox* ComboNtpSrv; 63 QComboBox* ComboNtpSrv;
64 QCheckBox* CheckBoxAdvSettings; 64 QCheckBox* CheckBoxAdvSettings;
65 QFrame* Line1; 65 QFrame* Line1;
@@ -69,13 +69,13 @@ public:
69 QSpinBox* SpinBoxNtpDelay; 69 QSpinBox* SpinBoxNtpDelay;
70 QLabel* TextLabel1_2; 70 QLabel* TextLabel1_2;
71 QLabel* TextLabel2; 71 QLabel* TextLabel2;
72 QLabel* TextLabel3_3; 72 QLabel* TextLabel3_3;
73 QSpinBox* SpinBoxMinLookupDelay; 73 QSpinBox* SpinBoxMinLookupDelay;
74 QWidget* tabManualSetTime; 74 QWidget* tabManualSetTime;
75 QFrame* FrameSetTime; 75 QWidget* FrameSetTime;
76 QPushButton* PushButtonSetManualTime; 76 QPushButton* PushButtonSetManualTime;
77 77
78protected: 78protected:
79 QGridLayout* NtpBaseLayout; 79 QGridLayout* NtpBaseLayout;
80 QGridLayout* tabMainLayout; 80 QGridLayout* tabMainLayout;
81 QGridLayout* tabNtpLayout; 81 QGridLayout* tabNtpLayout;
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui
index 62f736b..465bba0 100644
--- a/noncore/settings/netsystemtime/ntpbase.ui
+++ b/noncore/settings/netsystemtime/ntpbase.ui
@@ -110,13 +110,13 @@
110 <property stdset="1"> 110 <property stdset="1">
111 <name>text</name> 111 <name>text</name>
112 <string>Get time from network</string> 112 <string>Get time from network</string>
113 </property> 113 </property>
114 </widget> 114 </widget>
115 <widget row="0" column="0" > 115 <widget row="0" column="0" >
116 <class>QFrame</class> 116 <class>QWidget</class>
117 <property stdset="1"> 117 <property stdset="1">
118 <name>name</name> 118 <name>name</name>
119 <cstring>FrameNtp</cstring> 119 <cstring>FrameNtp</cstring>
120 </property> 120 </property>
121 <property stdset="1"> 121 <property stdset="1">
122 <name>frameShape</name> 122 <name>frameShape</name>
@@ -455,13 +455,13 @@
455 </property> 455 </property>
456 <property stdset="1"> 456 <property stdset="1">
457 <name>spacing</name> 457 <name>spacing</name>
458 <number>2</number> 458 <number>2</number>
459 </property> 459 </property>
460 <widget row="0" column="0" > 460 <widget row="0" column="0" >
461 <class>QFrame</class> 461 <class>QWidget</class>
462 <property stdset="1"> 462 <property stdset="1">
463 <name>name</name> 463 <name>name</name>
464 <cstring>FrameSettings</cstring> 464 <cstring>FrameSettings</cstring>
465 </property> 465 </property>
466 <property stdset="1"> 466 <property stdset="1">
467 <name>frameShape</name> 467 <name>frameShape</name>
@@ -806,13 +806,13 @@
806 </property> 806 </property>
807 <property stdset="1"> 807 <property stdset="1">
808 <name>spacing</name> 808 <name>spacing</name>
809 <number>2</number> 809 <number>2</number>
810 </property> 810 </property>
811 <widget> 811 <widget>
812 <class>QFrame</class> 812 <class>QWidget</class>
813 <property stdset="1"> 813 <property stdset="1">
814 <name>name</name> 814 <name>name</name>
815 <cstring>FrameSetTime</cstring> 815 <cstring>FrameSetTime</cstring>
816 </property> 816 </property>
817 <property stdset="1"> 817 <property stdset="1">
818 <name>frameShape</name> 818 <name>frameShape</name>