Merge lp:~3v1n0/unity-control-center/fix-ui-paddings into lp:unity-control-center
- fix-ui-paddings
- Merge into trunk
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 12913 |
| Merged at revision: | 12891 |
| Proposed branch: | lp:~3v1n0/unity-control-center/fix-ui-paddings |
| Merge into: | lp:unity-control-center |
| Diff against target: |
273 lines (+71/-79) 1 file modified
panels/appearance/appearance.ui (+71/-79) |
| To merge this branch: | bzr merge lp:~3v1n0/unity-control-center/fix-ui-paddings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Commit message
appearance: ensure we use everywhere consistent margins
Description of the change
We had multiple ways to set margings and they were set badly.
Also I forgot to commit a change in my previous MP which made some parts not looking properly.
To post a comment you must log in.
- 12913. By Marco Trevisan (Treviño)
-
appearance: ensure we use everywhere consistent margins
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'panels/appearance/appearance.ui' | |||
| 2 | --- panels/appearance/appearance.ui 2017-06-27 23:34:56 +0000 | |||
| 3 | +++ panels/appearance/appearance.ui 2017-07-07 00:46:35 +0000 | |||
| 4 | @@ -580,20 +580,23 @@ | |||
| 5 | 580 | <object class="GtkBox" id="unity-behavior"> | 580 | <object class="GtkBox" id="unity-behavior"> |
| 6 | 581 | <property name="visible">True</property> | 581 | <property name="visible">True</property> |
| 7 | 582 | <property name="can_focus">False</property> | 582 | <property name="can_focus">False</property> |
| 10 | 583 | <property name="margin_top">3</property> | 583 | <property name="margin_left">3</property> |
| 11 | 584 | <property name="margin_bottom">3</property> | 584 | <property name="margin_right">3</property> |
| 12 | 585 | <property name="margin_top">13</property> | ||
| 13 | 586 | <property name="margin_bottom">13</property> | ||
| 14 | 585 | <property name="orientation">vertical</property> | 587 | <property name="orientation">vertical</property> |
| 15 | 586 | <property name="spacing">3</property> | 588 | <property name="spacing">3</property> |
| 16 | 587 | <child> | 589 | <child> |
| 17 | 588 | <object class="GtkBox" id="box1"> | 590 | <object class="GtkBox" id="box1"> |
| 18 | 589 | <property name="visible">True</property> | 591 | <property name="visible">True</property> |
| 19 | 590 | <property name="can_focus">False</property> | 592 | <property name="can_focus">False</property> |
| 20 | 593 | <property name="margin_left">10</property> | ||
| 21 | 594 | <property name="margin_right">10</property> | ||
| 22 | 591 | <property name="orientation">vertical</property> | 595 | <property name="orientation">vertical</property> |
| 23 | 592 | <child> | 596 | <child> |
| 24 | 593 | <object class="GtkBox" id="box3"> | 597 | <object class="GtkBox" id="box3"> |
| 25 | 594 | <property name="visible">True</property> | 598 | <property name="visible">True</property> |
| 26 | 595 | <property name="can_focus">False</property> | 599 | <property name="can_focus">False</property> |
| 27 | 596 | <property name="border_width">10</property> | ||
| 28 | 597 | <property name="spacing">12</property> | 600 | <property name="spacing">12</property> |
| 29 | 598 | <child> | 601 | <child> |
| 30 | 599 | <object class="GtkBox" id="box4"> | 602 | <object class="GtkBox" id="box4"> |
| 31 | @@ -787,7 +790,6 @@ | |||
| 32 | 787 | <packing> | 790 | <packing> |
| 33 | 788 | <property name="expand">False</property> | 791 | <property name="expand">False</property> |
| 34 | 789 | <property name="fill">True</property> | 792 | <property name="fill">True</property> |
| 35 | 790 | <property name="padding">5</property> | ||
| 36 | 791 | <property name="position">0</property> | 793 | <property name="position">0</property> |
| 37 | 792 | </packing> | 794 | </packing> |
| 38 | 793 | </child> | 795 | </child> |
| 39 | @@ -1084,34 +1086,19 @@ | |||
| 40 | 1084 | <object class="GtkBox" id="unity_gfx_mode_box"> | 1086 | <object class="GtkBox" id="unity_gfx_mode_box"> |
| 41 | 1085 | <property name="visible">True</property> | 1087 | <property name="visible">True</property> |
| 42 | 1086 | <property name="can_focus">False</property> | 1088 | <property name="can_focus">False</property> |
| 44 | 1087 | <property name="orientation">vertical</property> | 1089 | <property name="margin_left">10</property> |
| 45 | 1090 | <property name="margin_right">10</property> | ||
| 46 | 1091 | <property name="spacing">5</property> | ||
| 47 | 1088 | <child> | 1092 | <child> |
| 49 | 1089 | <object class="GtkBox" id="unity_gfx_mode_selector_box"> | 1093 | <object class="GtkBox"> |
| 50 | 1090 | <property name="visible">True</property> | 1094 | <property name="visible">True</property> |
| 51 | 1091 | <property name="can_focus">False</property> | 1095 | <property name="can_focus">False</property> |
| 55 | 1092 | <property name="margin_left">10</property> | 1096 | <property name="orientation">vertical</property> |
| 53 | 1093 | <property name="margin_right">10</property> | ||
| 54 | 1094 | <property name="spacing">5</property> | ||
| 56 | 1095 | <child> | 1097 | <child> |
| 58 | 1096 | <object class="GtkBox"> | 1098 | <object class="GtkLabel" id="label_gfx_mode"> |
| 59 | 1097 | <property name="visible">True</property> | 1099 | <property name="visible">True</property> |
| 60 | 1098 | <property name="can_focus">False</property> | 1100 | <property name="can_focus">False</property> |
| 77 | 1099 | <property name="orientation">vertical</property> | 1101 | <property name="label" translatable="yes">Visual effects:</property> |
| 62 | 1100 | <child> | ||
| 63 | 1101 | <object class="GtkLabel" id="label_gfx_mode"> | ||
| 64 | 1102 | <property name="visible">True</property> | ||
| 65 | 1103 | <property name="can_focus">False</property> | ||
| 66 | 1104 | <property name="label" translatable="yes">Visual effects:</property> | ||
| 67 | 1105 | </object> | ||
| 68 | 1106 | <packing> | ||
| 69 | 1107 | <property name="expand">False</property> | ||
| 70 | 1108 | <property name="fill">True</property> | ||
| 71 | 1109 | <property name="position">0</property> | ||
| 72 | 1110 | </packing> | ||
| 73 | 1111 | </child> | ||
| 74 | 1112 | <child> | ||
| 75 | 1113 | <placeholder/> | ||
| 76 | 1114 | </child> | ||
| 78 | 1115 | </object> | 1102 | </object> |
| 79 | 1116 | <packing> | 1103 | <packing> |
| 80 | 1117 | <property name="expand">False</property> | 1104 | <property name="expand">False</property> |
| 81 | @@ -1120,66 +1107,53 @@ | |||
| 82 | 1120 | </packing> | 1107 | </packing> |
| 83 | 1121 | </child> | 1108 | </child> |
| 84 | 1122 | <child> | 1109 | <child> |
| 85 | 1110 | <placeholder/> | ||
| 86 | 1111 | </child> | ||
| 87 | 1112 | </object> | ||
| 88 | 1113 | <packing> | ||
| 89 | 1114 | <property name="expand">False</property> | ||
| 90 | 1115 | <property name="fill">True</property> | ||
| 91 | 1116 | <property name="position">0</property> | ||
| 92 | 1117 | </packing> | ||
| 93 | 1118 | </child> | ||
| 94 | 1119 | <child> | ||
| 95 | 1120 | <object class="GtkBox"> | ||
| 96 | 1121 | <property name="visible">True</property> | ||
| 97 | 1122 | <property name="can_focus">False</property> | ||
| 98 | 1123 | <property name="orientation">vertical</property> | ||
| 99 | 1124 | <property name="spacing">2</property> | ||
| 100 | 1125 | <child> | ||
| 101 | 1123 | <object class="GtkBox"> | 1126 | <object class="GtkBox"> |
| 102 | 1124 | <property name="visible">True</property> | 1127 | <property name="visible">True</property> |
| 103 | 1125 | <property name="can_focus">False</property> | 1128 | <property name="can_focus">False</property> |
| 106 | 1126 | <property name="orientation">vertical</property> | 1129 | <property name="spacing">5</property> |
| 105 | 1127 | <property name="spacing">2</property> | ||
| 107 | 1128 | <child> | 1130 | <child> |
| 109 | 1129 | <object class="GtkBox"> | 1131 | <object class="GtkRadioButton" id="unity_gfx_mode_low_enable"> |
| 110 | 1132 | <property name="label" translatable="yes">Low</property> | ||
| 111 | 1130 | <property name="visible">True</property> | 1133 | <property name="visible">True</property> |
| 144 | 1131 | <property name="can_focus">False</property> | 1134 | <property name="can_focus">True</property> |
| 145 | 1132 | <property name="spacing">5</property> | 1135 | <property name="receives_default">False</property> |
| 146 | 1133 | <child> | 1136 | <property name="active">True</property> |
| 147 | 1134 | <object class="GtkRadioButton" id="unity_gfx_mode_low_enable"> | 1137 | <property name="draw_indicator">True</property> |
| 116 | 1135 | <property name="label" translatable="yes">Low</property> | ||
| 117 | 1136 | <property name="visible">True</property> | ||
| 118 | 1137 | <property name="can_focus">True</property> | ||
| 119 | 1138 | <property name="receives_default">False</property> | ||
| 120 | 1139 | <property name="active">True</property> | ||
| 121 | 1140 | <property name="draw_indicator">True</property> | ||
| 122 | 1141 | </object> | ||
| 123 | 1142 | <packing> | ||
| 124 | 1143 | <property name="expand">False</property> | ||
| 125 | 1144 | <property name="fill">False</property> | ||
| 126 | 1145 | <property name="position">0</property> | ||
| 127 | 1146 | </packing> | ||
| 128 | 1147 | </child> | ||
| 129 | 1148 | <child> | ||
| 130 | 1149 | <object class="GtkRadioButton" id="unity_gfx_mode_full_enable"> | ||
| 131 | 1150 | <property name="label" translatable="yes">High</property> | ||
| 132 | 1151 | <property name="visible">True</property> | ||
| 133 | 1152 | <property name="can_focus">True</property> | ||
| 134 | 1153 | <property name="receives_default">False</property> | ||
| 135 | 1154 | <property name="draw_indicator">True</property> | ||
| 136 | 1155 | <property name="group">unity_gfx_mode_low_enable</property> | ||
| 137 | 1156 | </object> | ||
| 138 | 1157 | <packing> | ||
| 139 | 1158 | <property name="expand">False</property> | ||
| 140 | 1159 | <property name="fill">False</property> | ||
| 141 | 1160 | <property name="position">1</property> | ||
| 142 | 1161 | </packing> | ||
| 143 | 1162 | </child> | ||
| 148 | 1163 | </object> | 1138 | </object> |
| 149 | 1164 | <packing> | 1139 | <packing> |
| 150 | 1165 | <property name="expand">False</property> | 1140 | <property name="expand">False</property> |
| 152 | 1166 | <property name="fill">True</property> | 1141 | <property name="fill">False</property> |
| 153 | 1167 | <property name="position">0</property> | 1142 | <property name="position">0</property> |
| 154 | 1168 | </packing> | 1143 | </packing> |
| 155 | 1169 | </child> | 1144 | </child> |
| 156 | 1170 | <child> | 1145 | <child> |
| 159 | 1171 | <object class="GtkLabel"> | 1146 | <object class="GtkRadioButton" id="unity_gfx_mode_full_enable"> |
| 160 | 1172 | <property name="name">5</property> | 1147 | <property name="label" translatable="yes">High</property> |
| 161 | 1173 | <property name="visible">True</property> | 1148 | <property name="visible">True</property> |
| 166 | 1174 | <property name="can_focus">False</property> | 1149 | <property name="can_focus">True</property> |
| 167 | 1175 | <property name="margin_top">5</property> | 1150 | <property name="receives_default">False</property> |
| 168 | 1176 | <property name="label" translatable="yes"><small>Includes shadows and animations when opening, resizing and switching windows.</small></property> | 1151 | <property name="draw_indicator">True</property> |
| 169 | 1177 | <property name="use_markup">True</property> | 1152 | <property name="group">unity_gfx_mode_low_enable</property> |
| 170 | 1178 | </object> | 1153 | </object> |
| 171 | 1179 | <packing> | 1154 | <packing> |
| 172 | 1180 | <property name="expand">False</property> | 1155 | <property name="expand">False</property> |
| 173 | 1181 | <property name="fill">False</property> | 1156 | <property name="fill">False</property> |
| 174 | 1182 | <property name="pack_type">end</property> | ||
| 175 | 1183 | <property name="position">1</property> | 1157 | <property name="position">1</property> |
| 176 | 1184 | </packing> | 1158 | </packing> |
| 177 | 1185 | </child> | 1159 | </child> |
| 178 | @@ -1187,21 +1161,38 @@ | |||
| 179 | 1187 | <packing> | 1161 | <packing> |
| 180 | 1188 | <property name="expand">False</property> | 1162 | <property name="expand">False</property> |
| 181 | 1189 | <property name="fill">True</property> | 1163 | <property name="fill">True</property> |
| 183 | 1190 | <property name="position">4</property> | 1164 | <property name="position">0</property> |
| 184 | 1165 | </packing> | ||
| 185 | 1166 | </child> | ||
| 186 | 1167 | <child> | ||
| 187 | 1168 | <object class="GtkLabel"> | ||
| 188 | 1169 | <property name="name">5</property> | ||
| 189 | 1170 | <property name="visible">True</property> | ||
| 190 | 1171 | <property name="can_focus">False</property> | ||
| 191 | 1172 | <property name="margin_top">5</property> | ||
| 192 | 1173 | <property name="label" translatable="yes"><small>Includes shadows and animations when opening, resizing and switching windows.</small></property> | ||
| 193 | 1174 | <property name="use_markup">True</property> | ||
| 194 | 1175 | </object> | ||
| 195 | 1176 | <packing> | ||
| 196 | 1177 | <property name="expand">False</property> | ||
| 197 | 1178 | <property name="fill">False</property> | ||
| 198 | 1179 | <property name="pack_type">end</property> | ||
| 199 | 1180 | <property name="position">1</property> | ||
| 200 | 1191 | </packing> | 1181 | </packing> |
| 201 | 1192 | </child> | 1182 | </child> |
| 202 | 1193 | </object> | 1183 | </object> |
| 203 | 1194 | <packing> | 1184 | <packing> |
| 204 | 1195 | <property name="expand">False</property> | 1185 | <property name="expand">False</property> |
| 205 | 1196 | <property name="fill">True</property> | 1186 | <property name="fill">True</property> |
| 207 | 1197 | <property name="position">0</property> | 1187 | <property name="position">4</property> |
| 208 | 1198 | </packing> | 1188 | </packing> |
| 209 | 1199 | </child> | 1189 | </child> |
| 210 | 1200 | </object> | 1190 | </object> |
| 211 | 1201 | <packing> | 1191 | <packing> |
| 212 | 1202 | <property name="expand">False</property> | 1192 | <property name="expand">False</property> |
| 213 | 1203 | <property name="fill">True</property> | 1193 | <property name="fill">True</property> |
| 215 | 1204 | <property name="position">6</property> | 1194 | <property name="padding">5</property> |
| 216 | 1195 | <property name="position">8</property> | ||
| 217 | 1205 | </packing> | 1196 | </packing> |
| 218 | 1206 | </child> | 1197 | </child> |
| 219 | 1207 | <child> | 1198 | <child> |
| 220 | @@ -1212,21 +1203,21 @@ | |||
| 221 | 1212 | <packing> | 1203 | <packing> |
| 222 | 1213 | <property name="expand">False</property> | 1204 | <property name="expand">False</property> |
| 223 | 1214 | <property name="fill">True</property> | 1205 | <property name="fill">True</property> |
| 225 | 1215 | <property name="position">7</property> | 1206 | <property name="position">9</property> |
| 226 | 1216 | </packing> | 1207 | </packing> |
| 227 | 1217 | </child> | 1208 | </child> |
| 228 | 1218 | <child> | 1209 | <child> |
| 229 | 1219 | <object class="GtkLabel" id="unity-label-external-tool"> | 1210 | <object class="GtkLabel" id="unity-label-external-tool"> |
| 230 | 1220 | <property name="can_focus">False</property> | 1211 | <property name="can_focus">False</property> |
| 232 | 1221 | <property name="xpad">12</property> | 1212 | <property name="margin_left">10</property> |
| 233 | 1213 | <property name="margin_right">10</property> | ||
| 234 | 1222 | <property name="label" translatable="yes">Some settings have been overriden by an external program, press "Restore Default Behaviors" to reset the behavior and return control to this panel.</property> | 1214 | <property name="label" translatable="yes">Some settings have been overriden by an external program, press "Restore Default Behaviors" to reset the behavior and return control to this panel.</property> |
| 235 | 1223 | <property name="wrap">True</property> | 1215 | <property name="wrap">True</property> |
| 236 | 1224 | <property name="xalign">0</property> | ||
| 237 | 1225 | </object> | 1216 | </object> |
| 238 | 1226 | <packing> | 1217 | <packing> |
| 239 | 1227 | <property name="expand">False</property> | 1218 | <property name="expand">False</property> |
| 240 | 1228 | <property name="fill">True</property> | 1219 | <property name="fill">True</property> |
| 242 | 1229 | <property name="position">8</property> | 1220 | <property name="position">10</property> |
| 243 | 1230 | </packing> | 1221 | </packing> |
| 244 | 1231 | </child> | 1222 | </child> |
| 245 | 1232 | <child> | 1223 | <child> |
| 246 | @@ -1234,7 +1225,9 @@ | |||
| 247 | 1234 | <property name="height_request">36</property> | 1225 | <property name="height_request">36</property> |
| 248 | 1235 | <property name="visible">True</property> | 1226 | <property name="visible">True</property> |
| 249 | 1236 | <property name="can_focus">False</property> | 1227 | <property name="can_focus">False</property> |
| 251 | 1237 | <property name="margin_top">10</property> | 1228 | <property name="margin_left">10</property> |
| 252 | 1229 | <property name="margin_right">10</property> | ||
| 253 | 1230 | <property name="margin_top">5</property> | ||
| 254 | 1238 | <child> | 1231 | <child> |
| 255 | 1239 | <object class="GtkButton" id="button-restore-unitybehavior"> | 1232 | <object class="GtkButton" id="button-restore-unitybehavior"> |
| 256 | 1240 | <property name="label" translatable="yes">Restore Behavior Settings</property> | 1233 | <property name="label" translatable="yes">Restore Behavior Settings</property> |
| 257 | @@ -1246,7 +1239,6 @@ | |||
| 258 | 1246 | <packing> | 1239 | <packing> |
| 259 | 1247 | <property name="expand">False</property> | 1240 | <property name="expand">False</property> |
| 260 | 1248 | <property name="fill">True</property> | 1241 | <property name="fill">True</property> |
| 261 | 1249 | <property name="padding">10</property> | ||
| 262 | 1250 | <property name="position">0</property> | 1242 | <property name="position">0</property> |
| 263 | 1251 | </packing> | 1243 | </packing> |
| 264 | 1252 | </child> | 1244 | </child> |
| 265 | @@ -1257,7 +1249,7 @@ | |||
| 266 | 1257 | <packing> | 1249 | <packing> |
| 267 | 1258 | <property name="expand">False</property> | 1250 | <property name="expand">False</property> |
| 268 | 1259 | <property name="fill">True</property> | 1251 | <property name="fill">True</property> |
| 270 | 1260 | <property name="position">9</property> | 1252 | <property name="position">11</property> |
| 271 | 1261 | </packing> | 1253 | </packing> |
| 272 | 1262 | </child> | 1254 | </child> |
| 273 | 1263 | </object> | 1255 | </object> |
better indeed, thanks