Stellarium

Merge lp:~cardinot/stellarium/timeZonePlugin into lp:stellarium

  1. timeZonePlugin
  2. Merge into trunk
Proposed by Marcos Cardinot
Status: Merged
Merged at revision: 6437
Proposed branch: lp:~cardinot/stellarium/timeZonePlugin
Merge into: lp:stellarium
Diff against target: 162 lines (+83/-11)
1 file modified
plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui (+83/-11)
To merge this branch: bzr merge lp:~cardinot/stellarium/timeZonePlugin
Reviewer Review Type Date Requested Status
Alexander Wolf Approve
Bogdan Marinov Pending
Review via email: mp+199928@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) wrote :

This patch is very simple and contain cosmetic character in general.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui'
2--- plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui 2013-02-11 14:00:13 +0000
3+++ plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui 2013-12-23 00:30:40 +0000
4@@ -7,14 +7,23 @@
5 <x>0</x>
6 <y>0</y>
7 <width>448</width>
8- <height>398</height>
9+ <height>480</height>
10 </rect>
11 </property>
12 <layout class="QVBoxLayout" name="verticalLayout">
13 <property name="spacing">
14 <number>0</number>
15 </property>
16- <property name="margin">
17+ <property name="leftMargin">
18+ <number>0</number>
19+ </property>
20+ <property name="topMargin">
21+ <number>0</number>
22+ </property>
23+ <property name="rightMargin">
24+ <number>0</number>
25+ </property>
26+ <property name="bottomMargin">
27 <number>0</number>
28 </property>
29 <item>
30@@ -130,7 +139,16 @@
31 <property name="spacing">
32 <number>0</number>
33 </property>
34- <property name="margin">
35+ <property name="leftMargin">
36+ <number>0</number>
37+ </property>
38+ <property name="topMargin">
39+ <number>0</number>
40+ </property>
41+ <property name="rightMargin">
42+ <number>0</number>
43+ </property>
44+ <property name="bottomMargin">
45 <number>0</number>
46 </property>
47 <item>
48@@ -145,12 +163,21 @@
49 <string>Time zone</string>
50 </property>
51 <layout class="QGridLayout" name="gridLayoutCurrent">
52+ <property name="leftMargin">
53+ <number>0</number>
54+ </property>
55+ <property name="topMargin">
56+ <number>0</number>
57+ </property>
58+ <property name="rightMargin">
59+ <number>0</number>
60+ </property>
61+ <property name="bottomMargin">
62+ <number>0</number>
63+ </property>
64 <property name="verticalSpacing">
65 <number>8</number>
66 </property>
67- <property name="margin">
68- <number>0</number>
69- </property>
70 <item row="0" column="0" colspan="2">
71 <widget class="QLabel" name="labelTimeZoneInfo">
72 <property name="text">
73@@ -221,7 +248,16 @@
74 <item row="5" column="1">
75 <widget class="QFrame" name="frameUserDefined">
76 <layout class="QHBoxLayout" name="horizontalLayout">
77- <property name="margin">
78+ <property name="leftMargin">
79+ <number>0</number>
80+ </property>
81+ <property name="topMargin">
82+ <number>0</number>
83+ </property>
84+ <property name="rightMargin">
85+ <number>0</number>
86+ </property>
87+ <property name="bottomMargin">
88 <number>0</number>
89 </property>
90 <item>
91@@ -283,7 +319,16 @@
92 <property name="spacing">
93 <number>0</number>
94 </property>
95- <property name="margin">
96+ <property name="leftMargin">
97+ <number>0</number>
98+ </property>
99+ <property name="topMargin">
100+ <number>0</number>
101+ </property>
102+ <property name="rightMargin">
103+ <number>0</number>
104+ </property>
105+ <property name="bottomMargin">
106 <number>0</number>
107 </property>
108 <item>
109@@ -295,7 +340,16 @@
110 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
111 </property>
112 <layout class="QVBoxLayout" name="verticalLayout_4">
113- <property name="margin">
114+ <property name="leftMargin">
115+ <number>0</number>
116+ </property>
117+ <property name="topMargin">
118+ <number>0</number>
119+ </property>
120+ <property name="rightMargin">
121+ <number>0</number>
122+ </property>
123+ <property name="bottomMargin">
124 <number>0</number>
125 </property>
126 <item>
127@@ -314,7 +368,16 @@
128 <string>Time display format</string>
129 </property>
130 <layout class="QVBoxLayout" name="verticalLayoutTimeFormat">
131- <property name="margin">
132+ <property name="leftMargin">
133+ <number>0</number>
134+ </property>
135+ <property name="topMargin">
136+ <number>0</number>
137+ </property>
138+ <property name="rightMargin">
139+ <number>0</number>
140+ </property>
141+ <property name="bottomMargin">
142 <number>0</number>
143 </property>
144 <item>
145@@ -347,7 +410,16 @@
146 <string>Date display format</string>
147 </property>
148 <layout class="QVBoxLayout" name="verticalLayoutDateFormat">
149- <property name="margin">
150+ <property name="leftMargin">
151+ <number>0</number>
152+ </property>
153+ <property name="topMargin">
154+ <number>0</number>
155+ </property>
156+ <property name="rightMargin">
157+ <number>0</number>
158+ </property>
159+ <property name="bottomMargin">
160 <number>0</number>
161 </property>
162 <item>