Merge lp:~seb128/unity-control-center/info-backport-commits into lp:unity-control-center
- info-backport-commits
- Merge into trunk
Proposed by
Sebastien Bacher
Status: | Merged |
---|---|
Approved by: | Iain Lane |
Approved revision: | 12716 |
Merged at revision: | 12717 |
Proposed branch: | lp:~seb128/unity-control-center/info-backport-commits |
Merge into: | lp:unity-control-center |
Diff against target: |
835 lines (+120/-436) 3 files modified
panels/info/cc-info-panel.c (+107/-244) panels/info/info.ui (+12/-191) panels/info/unity-info-panel.desktop.in.in (+1/-1) |
To merge this branch: | bzr merge lp:~seb128/unity-control-center/info-backport-commits |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Iain Lane | Approve | ||
Review via email: mp+207504@code.launchpad.net |
Commit message
info: backport fixes and cleanings from gnome-3-8
Description of the change
info: backport fixes and cleanings from gnome-3-8
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : | # |
Revision history for this message
Iain Lane (laney) wrote : | # |
yep, good idea - I didn't fully review the upstream changes though
review:
Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:12716
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'panels/info/cc-info-panel.c' |
2 | --- panels/info/cc-info-panel.c 2014-02-18 04:27:04 +0000 |
3 | +++ panels/info/cc-info-panel.c 2014-02-20 17:20:19 +0000 |
4 | @@ -100,7 +100,6 @@ |
5 | char *gnome_distributor; |
6 | char *gnome_date; |
7 | UpdatesState updates_state; |
8 | - gboolean is_fallback; |
9 | |
10 | /* Free space */ |
11 | GList *primary_mounts; |
12 | @@ -115,7 +114,6 @@ |
13 | GDBusProxy *pk_proxy; |
14 | GDBusProxy *pk_transaction_proxy; |
15 | GDBusProxy *hostnamed_proxy; |
16 | - GSettings *session_settings; |
17 | |
18 | GraphicsData *graphics_data; |
19 | }; |
20 | @@ -431,10 +429,10 @@ |
21 | tmp = g_match_info_fetch (match, 1); |
22 | pretty_tmp = prettify_info (tmp); |
23 | g_free (tmp); |
24 | - /* Translators: VESA is an techncial acronym, don't translate it. */ |
25 | - result = g_strdup_printf (_("VESA: %s"), pretty_tmp); |
26 | + result = g_strdup_printf ("VESA: %s", pretty_tmp); |
27 | g_free (pretty_tmp); |
28 | } |
29 | + g_free (log_contents); |
30 | g_match_info_free (match); |
31 | g_regex_unref (re); |
32 | |
33 | @@ -461,65 +459,6 @@ |
34 | return result; |
35 | } |
36 | |
37 | -static gboolean |
38 | -get_current_is_fallback (CcInfoPanel *self) |
39 | -{ |
40 | - GError *error; |
41 | - GVariant *reply; |
42 | - GVariant *reply_str; |
43 | - gboolean is_fallback; |
44 | - |
45 | - error = NULL; |
46 | - if (!(reply = g_dbus_connection_call_sync (self->priv->session_bus, |
47 | - "org.gnome.SessionManager", |
48 | - "/org/gnome/SessionManager", |
49 | - "org.freedesktop.DBus.Properties", |
50 | - "Get", |
51 | - g_variant_new ("(ss)", "org.gnome.SessionManager", "session-name"), |
52 | - (GVariantType*)"(v)", |
53 | - 0, |
54 | - -1, |
55 | - NULL, &error))) |
56 | - { |
57 | - g_warning ("Failed to get fallback mode: %s", error->message); |
58 | - g_clear_error (&error); |
59 | - return FALSE; |
60 | - } |
61 | - |
62 | - g_variant_get (reply, "(v)", &reply_str); |
63 | - is_fallback = g_strcmp0 ("gnome-fallback", g_variant_get_string (reply_str, NULL)) == 0; |
64 | - g_variant_unref (reply_str); |
65 | - g_variant_unref (reply); |
66 | - |
67 | - return is_fallback; |
68 | -} |
69 | - |
70 | -static void |
71 | -cc_info_panel_get_property (GObject *object, |
72 | - guint property_id, |
73 | - GValue *value, |
74 | - GParamSpec *pspec) |
75 | -{ |
76 | - switch (property_id) |
77 | - { |
78 | - default: |
79 | - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); |
80 | - } |
81 | -} |
82 | - |
83 | -static void |
84 | -cc_info_panel_set_property (GObject *object, |
85 | - guint property_id, |
86 | - const GValue *value, |
87 | - GParamSpec *pspec) |
88 | -{ |
89 | - switch (property_id) |
90 | - { |
91 | - default: |
92 | - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); |
93 | - } |
94 | -} |
95 | - |
96 | static void |
97 | cc_info_panel_dispose (GObject *object) |
98 | { |
99 | @@ -557,32 +496,13 @@ |
100 | { |
101 | CcInfoPanelPrivate *priv = CC_INFO_PANEL (object)->priv; |
102 | |
103 | - if (priv->cancellable != NULL) |
104 | - { |
105 | - g_cancellable_cancel (priv->cancellable); |
106 | - priv->cancellable = NULL; |
107 | - } |
108 | + g_clear_pointer (&priv->cancellable, g_cancellable_cancel); |
109 | g_free (priv->gnome_version); |
110 | g_free (priv->gnome_date); |
111 | g_free (priv->gnome_distributor); |
112 | |
113 | - if (priv->hostnamed_proxy != NULL) |
114 | - { |
115 | - g_object_unref (priv->hostnamed_proxy); |
116 | - priv->hostnamed_proxy = NULL; |
117 | - } |
118 | - |
119 | - if (priv->media_settings != NULL) |
120 | - { |
121 | - g_object_unref (priv->media_settings); |
122 | - priv->media_settings = NULL; |
123 | - } |
124 | - |
125 | - if (priv->session_settings != NULL) |
126 | - { |
127 | - g_object_unref (priv->session_settings); |
128 | - priv->session_settings = NULL; |
129 | - } |
130 | + g_clear_object (&priv->hostnamed_proxy); |
131 | + g_clear_object (&priv->media_settings); |
132 | |
133 | G_OBJECT_CLASS (cc_info_panel_parent_class)->finalize (object); |
134 | } |
135 | @@ -594,8 +514,6 @@ |
136 | |
137 | g_type_class_add_private (klass, sizeof (CcInfoPanelPrivate)); |
138 | |
139 | - object_class->get_property = cc_info_panel_get_property; |
140 | - object_class->set_property = cc_info_panel_set_property; |
141 | object_class->dispose = cc_info_panel_dispose; |
142 | object_class->finalize = cc_info_panel_finalize; |
143 | } |
144 | @@ -758,7 +676,7 @@ |
145 | /* count duplicates */ |
146 | for (i = 0; i != info->ncpu; ++i) |
147 | { |
148 | - const char * const keys[] = { "model name", "cpu" }; |
149 | + const char * const keys[] = { "model name", "cpu", "Processor" }; |
150 | char *model; |
151 | int *count; |
152 | |
153 | @@ -771,7 +689,7 @@ |
154 | } |
155 | |
156 | if (model == NULL) |
157 | - model = _("Unknown model"); |
158 | + continue; |
159 | |
160 | count = g_hash_table_lookup (counts, model); |
161 | if (count == NULL) |
162 | @@ -832,96 +750,6 @@ |
163 | gtk_tree_path_free (path); |
164 | } |
165 | |
166 | -static gboolean |
167 | -switch_fallback_get_mapping (GValue *value, |
168 | - GVariant *variant, |
169 | - gpointer data) |
170 | -{ |
171 | - const char *setting; |
172 | - |
173 | - setting = g_variant_get_string (variant, NULL); |
174 | - g_value_set_boolean (value, strcmp (setting, "gnome") != 0); |
175 | - return TRUE; |
176 | -} |
177 | - |
178 | -static void |
179 | -toggle_fallback_warning_label (CcInfoPanel *self, |
180 | - gboolean visible) |
181 | -{ |
182 | - GtkWidget *widget; |
183 | - const char *text; |
184 | - |
185 | - widget = WID ("graphics_logout_warning_label"); |
186 | - |
187 | - if (self->priv->is_fallback) |
188 | - text = _("The next login will attempt to use the standard experience."); |
189 | - else |
190 | - text = _("The next login will use the fallback mode intended for unsupported graphics hardware."); |
191 | - |
192 | - gtk_label_set_text (GTK_LABEL (widget), text); |
193 | - |
194 | - if (visible) |
195 | - gtk_widget_show (widget); |
196 | - else |
197 | - gtk_widget_hide (widget); |
198 | -} |
199 | - |
200 | -static GVariant * |
201 | -switch_fallback_set_mapping (const GValue *value, |
202 | - const GVariantType *expected_type, |
203 | - gpointer data) |
204 | -{ |
205 | - CcInfoPanel *self = data; |
206 | - gboolean is_set; |
207 | - |
208 | - is_set = g_value_get_boolean (value); |
209 | - if (is_set != self->priv->is_fallback) |
210 | - toggle_fallback_warning_label (self, TRUE); |
211 | - else |
212 | - toggle_fallback_warning_label (self, FALSE); |
213 | - |
214 | - return g_variant_new_string (is_set ? "gnome-fallback" : "gnome"); |
215 | -} |
216 | - |
217 | -static void |
218 | -info_panel_setup_graphics (CcInfoPanel *self) |
219 | -{ |
220 | - GtkWidget *widget; |
221 | - GtkSwitch *sw; |
222 | - char *text; |
223 | - |
224 | - widget = WID ("graphics_driver_label"); |
225 | - gtk_label_set_markup (GTK_LABEL (widget), self->priv->graphics_data->hardware_string); |
226 | - |
227 | - self->priv->is_fallback = get_current_is_fallback (self); |
228 | - if (self->priv->is_fallback) |
229 | - { |
230 | - /* translators: The hardware is not able to run GNOME 3's |
231 | - * shell, so we use the GNOME "Fallback" session */ |
232 | - text = g_strdup (C_("Experience", "Fallback")); |
233 | - } |
234 | - else |
235 | - { |
236 | - /* translators: The hardware is able to run GNOME 3's |
237 | - * shell, also called "Standard" experience */ |
238 | - text = g_strdup (C_("Experience", "Standard")); |
239 | - } |
240 | - widget = WID ("graphics_experience_label"); |
241 | - gtk_label_set_markup (GTK_LABEL (widget), text ? text : ""); |
242 | - g_free (text); |
243 | - |
244 | - widget = WID ("graphics_fallback_switch_box"); |
245 | - sw = GTK_SWITCH (gtk_switch_new ()); |
246 | - g_settings_bind_with_mapping (self->priv->session_settings, KEY_SESSION_NAME, |
247 | - sw, "active", 0, |
248 | - switch_fallback_get_mapping, |
249 | - switch_fallback_set_mapping, self, NULL); |
250 | - gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (sw), FALSE, FALSE, 0); |
251 | - gtk_widget_show_all (GTK_WIDGET (sw)); |
252 | - widget = WID ("fallback-label"); |
253 | - gtk_label_set_mnemonic_widget (GTK_LABEL (widget), GTK_WIDGET (sw)); |
254 | -} |
255 | - |
256 | static gboolean |
257 | url_nav_callback (WebKitWebView *web_view, |
258 | WebKitWebFrame *frame, |
259 | @@ -975,6 +803,11 @@ |
260 | g_error_free (error); |
261 | error = NULL; |
262 | } |
263 | + else |
264 | + { |
265 | + g_debug ("Set '%s' as the default handler for '%s'", |
266 | + g_app_info_get_name (info), app_data->content_type); |
267 | + } |
268 | |
269 | if (app_data->extra_type_filter) |
270 | { |
271 | @@ -996,6 +829,11 @@ |
272 | g_app_info_get_name (info), mime_types[i], error->message); |
273 | g_error_free (error); |
274 | } |
275 | + else |
276 | + { |
277 | + g_debug ("Set '%s' as the default handler for '%s'", |
278 | + g_app_info_get_name (info), mime_types[i]); |
279 | + } |
280 | } |
281 | |
282 | g_pattern_spec_free (pattern); |
283 | @@ -1008,23 +846,20 @@ |
284 | info_panel_setup_default_app (CcInfoPanel *self, |
285 | DefaultAppData *data, |
286 | guint left_attach, |
287 | - guint right_attach, |
288 | - guint top_attach, |
289 | - guint bottom_attach) |
290 | + guint top_attach) |
291 | { |
292 | GtkWidget *button; |
293 | - GtkWidget *table; |
294 | + GtkWidget *grid; |
295 | GtkWidget *label; |
296 | |
297 | - table = WID ("default_apps_table"); |
298 | + grid = WID ("default_apps_grid"); |
299 | |
300 | button = gtk_app_chooser_button_new (data->content_type); |
301 | g_object_set_data (G_OBJECT (button), "cc-default-app-data", data); |
302 | |
303 | gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (button), TRUE); |
304 | - gtk_table_attach (GTK_TABLE (table), button, |
305 | - left_attach, right_attach, |
306 | - top_attach, bottom_attach, GTK_FILL, 0, 0, 0); |
307 | + gtk_grid_attach (GTK_GRID (grid), button, left_attach, top_attach, |
308 | + 1, 1); |
309 | g_signal_connect (G_OBJECT (button), "changed", |
310 | G_CALLBACK (default_app_changed), self); |
311 | gtk_widget_show (button); |
312 | @@ -1054,7 +889,7 @@ |
313 | for (i = 0; i < G_N_ELEMENTS(preferred_app_infos); i++) |
314 | { |
315 | info_panel_setup_default_app (self, &preferred_app_infos[i], |
316 | - 1, 2, i, i+1); |
317 | + 1, i); |
318 | } |
319 | } |
320 | |
321 | @@ -1584,11 +1419,6 @@ |
322 | _("Removable Media"), |
323 | -1); |
324 | |
325 | - gtk_list_store_append (model, &iter); |
326 | - gtk_list_store_set (model, &iter, section_name_column, |
327 | - _("Graphics"), |
328 | - -1); |
329 | - |
330 | if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) |
331 | { |
332 | gtk_list_store_append (model, &iter); |
333 | @@ -2005,6 +1835,86 @@ |
334 | } |
335 | } |
336 | |
337 | +static gboolean |
338 | +get_pk_version_property (GDBusProxy *pk_proxy, |
339 | + const char *property, |
340 | + guint32 *retval) |
341 | +{ |
342 | + GVariant *v; |
343 | + |
344 | + v = g_dbus_proxy_get_cached_property (pk_proxy, property); |
345 | + if (!v) |
346 | + return FALSE; |
347 | + |
348 | + g_variant_get (v, "u", retval); |
349 | + g_variant_unref (v); |
350 | + return TRUE; |
351 | +} |
352 | + |
353 | +static void |
354 | +got_pk_proxy_cb (GObject *source_object, |
355 | + GAsyncResult *res, |
356 | + CcInfoPanel *self) |
357 | +{ |
358 | + GError *error = NULL; |
359 | + guint32 major, minor, micro; |
360 | + |
361 | + self->priv->pk_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); |
362 | + |
363 | + if (self->priv->pk_proxy == NULL) |
364 | + { |
365 | + g_warning ("Unable to get PackageKit proxy object: %s", error->message); |
366 | + g_error_free (error); |
367 | + self->priv->updates_state = PK_NOT_AVAILABLE; |
368 | + refresh_update_button (self); |
369 | + return; |
370 | + } |
371 | + |
372 | + if (!get_pk_version_property(self->priv->pk_proxy, "VersionMajor", &major) || |
373 | + !get_pk_version_property(self->priv->pk_proxy, "VersionMinor", &minor) || |
374 | + !get_pk_version_property(self->priv->pk_proxy, "VersionMicro", µ)) |
375 | + { |
376 | + g_warning ("Unable to get PackageKit version"); |
377 | + g_clear_object (&self->priv->pk_proxy); |
378 | + self->priv->updates_state = PK_NOT_AVAILABLE; |
379 | + refresh_update_button (self); |
380 | + return; |
381 | + } |
382 | + |
383 | + if (major != 0 || minor != 8) |
384 | + { |
385 | + g_warning ("PackageKit version %u.%u.%u not supported", major, minor, micro); |
386 | + g_clear_object (&self->priv->pk_proxy); |
387 | + self->priv->updates_state = PK_NOT_AVAILABLE; |
388 | + refresh_update_button (self); |
389 | + } |
390 | + else |
391 | + { |
392 | + g_signal_connect (self->priv->pk_proxy, |
393 | + "g-signal", |
394 | + G_CALLBACK (on_pk_signal), |
395 | + self); |
396 | + refresh_updates (self); |
397 | + } |
398 | +} |
399 | + |
400 | +static void |
401 | +info_panel_setup_updates (CcInfoPanel *self) |
402 | +{ |
403 | + self->priv->updates_state = CHECKING_UPDATES; |
404 | + refresh_update_button (self); |
405 | + |
406 | + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, |
407 | + G_DBUS_PROXY_FLAGS_NONE, |
408 | + NULL, |
409 | + "org.freedesktop.PackageKit", |
410 | + "/org/freedesktop/PackageKit", |
411 | + "org.freedesktop.PackageKit", |
412 | + NULL, |
413 | + (GAsyncReadyCallback) got_pk_proxy_cb, |
414 | + self); |
415 | +} |
416 | + |
417 | static void |
418 | cc_info_panel_init (CcInfoPanel *self) |
419 | { |
420 | @@ -2015,62 +1925,15 @@ |
421 | |
422 | self->priv->builder = gtk_builder_new (); |
423 | |
424 | - self->priv->session_settings = g_settings_new (GNOME_SESSION_MANAGER_SCHEMA); |
425 | self->priv->media_settings = g_settings_new (MEDIA_HANDLING_SCHEMA); |
426 | |
427 | self->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); |
428 | |
429 | g_assert (self->priv->session_bus); |
430 | |
431 | - self->priv->pk_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, |
432 | - G_DBUS_PROXY_FLAGS_NONE, |
433 | - NULL, |
434 | - "org.freedesktop.PackageKit", |
435 | - "/org/freedesktop/PackageKit", |
436 | - "org.freedesktop.PackageKit", |
437 | - NULL, |
438 | - NULL); |
439 | - if (self->priv->pk_proxy == NULL) |
440 | - { |
441 | - g_warning ("Unable to get PackageKit proxy object"); |
442 | - self->priv->updates_state = PK_NOT_AVAILABLE; |
443 | - } |
444 | - else |
445 | - { |
446 | - GVariant *v; |
447 | - guint32 major, minor, micro; |
448 | - |
449 | - v = g_dbus_proxy_get_cached_property (self->priv->pk_proxy, "VersionMajor"); |
450 | - g_variant_get (v, "u", &major); |
451 | - g_variant_unref (v); |
452 | - v = g_dbus_proxy_get_cached_property (self->priv->pk_proxy, "VersionMinor"); |
453 | - g_variant_get (v, "u", &minor); |
454 | - g_variant_unref (v); |
455 | - v = g_dbus_proxy_get_cached_property (self->priv->pk_proxy, "VersionMicro"); |
456 | - g_variant_get (v, "u", µ); |
457 | - g_variant_unref (v); |
458 | - |
459 | - if (major != 0 || minor != 8) |
460 | - { |
461 | - g_warning ("PackageKit version %u.%u.%u not supported", major, minor, micro); |
462 | - g_clear_object (&self->priv->pk_proxy); |
463 | - self->priv->updates_state = PK_NOT_AVAILABLE; |
464 | - } |
465 | - else |
466 | - { |
467 | - g_signal_connect (self->priv->pk_proxy, |
468 | - "g-signal", |
469 | - G_CALLBACK (on_pk_signal), |
470 | - self); |
471 | - refresh_updates (self); |
472 | - } |
473 | - } |
474 | - |
475 | - gtk_builder_add_from_file (self->priv->builder, |
476 | - GNOMECC_UI_DIR "/info.ui", |
477 | - &error); |
478 | - |
479 | - if (error != NULL) |
480 | + if (gtk_builder_add_from_file (self->priv->builder, |
481 | + GNOMECC_UI_DIR "/info.ui", |
482 | + &error) == 0) |
483 | { |
484 | g_warning ("Could not load interface file: %s", error->message); |
485 | g_error_free (error); |
486 | @@ -2082,11 +1945,11 @@ |
487 | widget = WID ("updates_button"); |
488 | g_signal_connect (widget, "clicked", G_CALLBACK (on_updates_button_clicked), self); |
489 | |
490 | + info_panel_setup_updates (self); |
491 | info_panel_setup_selector (self); |
492 | info_panel_setup_overview (self); |
493 | info_panel_setup_default_apps (self); |
494 | info_panel_setup_media (self); |
495 | - info_panel_setup_graphics (self); |
496 | if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) |
497 | info_panel_setup_notice (self); |
498 | } |
499 | |
500 | === modified file 'panels/info/info.ui' |
501 | --- panels/info/info.ui 2013-11-28 04:38:55 +0000 |
502 | +++ panels/info/info.ui 2014-02-20 17:20:19 +0000 |
503 | @@ -1,6 +1,6 @@ |
504 | <?xml version="1.0" encoding="UTF-8"?> |
505 | <interface> |
506 | - <requires lib="gtk+" version="2.16"/> |
507 | + <!-- interface-requires gtk+ 3.0 --> |
508 | <object class="GtkDialog" id="extra_options_dialog"> |
509 | <property name="can_focus">False</property> |
510 | <property name="border_width">10</property> |
511 | @@ -409,7 +409,7 @@ |
512 | <property name="visible">True</property> |
513 | <property name="can_focus">False</property> |
514 | <property name="xalign">0</property> |
515 | - <property name="label" translatable="yes">Calculating...</property> |
516 | + <property name="label" translatable="yes">Calculating…</property> |
517 | <property name="selectable">True</property> |
518 | </object> |
519 | <packing> |
520 | @@ -593,13 +593,9 @@ |
521 | <property name="spacing">10</property> |
522 | <property name="orientation">vertical</property> |
523 | <child> |
524 | - <object class="GtkTable" id="default_apps_table"> |
525 | + <object class="GtkGrid" id="default_apps_grid"> |
526 | <property name="visible">True</property> |
527 | <property name="can_focus">False</property> |
528 | - <property name="halign">start</property> |
529 | - <property name="valign">start</property> |
530 | - <property name="n_rows">6</property> |
531 | - <property name="n_columns">3</property> |
532 | <property name="column_spacing">12</property> |
533 | <property name="row_spacing">12</property> |
534 | <child> |
535 | @@ -627,7 +623,7 @@ |
536 | </object> |
537 | <packing> |
538 | <property name="top_attach">1</property> |
539 | - <property name="bottom_attach">2</property> |
540 | + <property name="left_attach">0</property> |
541 | </packing> |
542 | </child> |
543 | <child> |
544 | @@ -643,7 +639,7 @@ |
545 | </object> |
546 | <packing> |
547 | <property name="top_attach">2</property> |
548 | - <property name="bottom_attach">3</property> |
549 | + <property name="left_attach">0</property> |
550 | </packing> |
551 | </child> |
552 | <child> |
553 | @@ -659,7 +655,7 @@ |
554 | </object> |
555 | <packing> |
556 | <property name="top_attach">3</property> |
557 | - <property name="bottom_attach">4</property> |
558 | + <property name="left_attach">0</property> |
559 | </packing> |
560 | </child> |
561 | <child> |
562 | @@ -675,7 +671,7 @@ |
563 | </object> |
564 | <packing> |
565 | <property name="top_attach">4</property> |
566 | - <property name="bottom_attach">5</property> |
567 | + <property name="left_attach">0</property> |
568 | </packing> |
569 | </child> |
570 | <child> |
571 | @@ -686,8 +682,7 @@ |
572 | </object> |
573 | <packing> |
574 | <property name="left_attach">2</property> |
575 | - <property name="right_attach">3</property> |
576 | - <property name="x_options">GTK_FILL</property> |
577 | + <property name="top_attach">0</property> |
578 | </packing> |
579 | </child> |
580 | <child> |
581 | @@ -698,10 +693,7 @@ |
582 | </object> |
583 | <packing> |
584 | <property name="left_attach">2</property> |
585 | - <property name="right_attach">3</property> |
586 | <property name="top_attach">1</property> |
587 | - <property name="bottom_attach">2</property> |
588 | - <property name="x_options">GTK_FILL</property> |
589 | </packing> |
590 | </child> |
591 | <child> |
592 | @@ -712,10 +704,7 @@ |
593 | </object> |
594 | <packing> |
595 | <property name="left_attach">2</property> |
596 | - <property name="right_attach">3</property> |
597 | <property name="top_attach">2</property> |
598 | - <property name="bottom_attach">3</property> |
599 | - <property name="x_options">GTK_FILL</property> |
600 | </packing> |
601 | </child> |
602 | <child> |
603 | @@ -726,10 +715,7 @@ |
604 | </object> |
605 | <packing> |
606 | <property name="left_attach">2</property> |
607 | - <property name="right_attach">3</property> |
608 | <property name="top_attach">3</property> |
609 | - <property name="bottom_attach">4</property> |
610 | - <property name="x_options">GTK_FILL</property> |
611 | </packing> |
612 | </child> |
613 | <child> |
614 | @@ -740,10 +726,7 @@ |
615 | </object> |
616 | <packing> |
617 | <property name="left_attach">2</property> |
618 | - <property name="right_attach">3</property> |
619 | <property name="top_attach">4</property> |
620 | - <property name="bottom_attach">5</property> |
621 | - <property name="x_options">GTK_FILL</property> |
622 | </packing> |
623 | </child> |
624 | <child> |
625 | @@ -759,7 +742,7 @@ |
626 | </object> |
627 | <packing> |
628 | <property name="top_attach">5</property> |
629 | - <property name="bottom_attach">6</property> |
630 | + <property name="left_attach">0</property> |
631 | </packing> |
632 | </child> |
633 | <child> |
634 | @@ -770,10 +753,7 @@ |
635 | </object> |
636 | <packing> |
637 | <property name="left_attach">2</property> |
638 | - <property name="right_attach">3</property> |
639 | <property name="top_attach">5</property> |
640 | - <property name="bottom_attach">6</property> |
641 | - <property name="x_options">GTK_FILL</property> |
642 | </packing> |
643 | </child> |
644 | <child> |
645 | @@ -1061,7 +1041,7 @@ |
646 | <property name="orientation">horizontal</property> |
647 | <child> |
648 | <object class="GtkButton" id="extra_options_button"> |
649 | - <property name="label" translatable="yes">_Other Media...</property> |
650 | + <property name="label" translatable="yes">_Other Media…</property> |
651 | <property name="visible">True</property> |
652 | <property name="can_focus">True</property> |
653 | <property name="receives_default">True</property> |
654 | @@ -1150,169 +1130,10 @@ |
655 | </packing> |
656 | </child> |
657 | <child> |
658 | - <object class="GtkAlignment" id="graphics_detail_container"> |
659 | - <property name="visible">True</property> |
660 | - <property name="can_focus">False</property> |
661 | - <property name="top_padding">20</property> |
662 | - <child> |
663 | - <object class="GtkTable" id="table2"> |
664 | - <property name="visible">True</property> |
665 | - <property name="can_focus">False</property> |
666 | - <property name="n_rows">4</property> |
667 | - <property name="n_columns">2</property> |
668 | - <property name="column_spacing">12</property> |
669 | - <property name="row_spacing">10</property> |
670 | - <child> |
671 | - <object class="GtkLabel" id="label17"> |
672 | - <property name="visible">True</property> |
673 | - <property name="can_focus">False</property> |
674 | - <property name="xalign">1</property> |
675 | - <property name="label" translatable="yes">Driver</property> |
676 | - <style> |
677 | - <class name="dim-label"/> |
678 | - </style> |
679 | - </object> |
680 | - <packing> |
681 | - <property name="x_options">GTK_FILL</property> |
682 | - <property name="y_options">GTK_FILL</property> |
683 | - </packing> |
684 | - </child> |
685 | - <child> |
686 | - <object class="GtkLabel" id="label19"> |
687 | - <property name="visible">True</property> |
688 | - <property name="can_focus">False</property> |
689 | - <property name="xalign">1</property> |
690 | - <property name="label" translatable="yes">Experience</property> |
691 | - <style> |
692 | - <class name="dim-label"/> |
693 | - </style> |
694 | - </object> |
695 | - <packing> |
696 | - <property name="top_attach">1</property> |
697 | - <property name="bottom_attach">2</property> |
698 | - <property name="x_options">GTK_FILL</property> |
699 | - <property name="y_options">GTK_FILL</property> |
700 | - </packing> |
701 | - </child> |
702 | - <child> |
703 | - <object class="GtkLabel" id="fallback-label"> |
704 | - <property name="visible">False</property> |
705 | - <property name="can_focus">False</property> |
706 | - <property name="xalign">1</property> |
707 | - <property name="label" translatable="yes" comments="Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.">Forced _Fallback Mode</property> |
708 | - <property name="use_underline">True</property> |
709 | - <property name="justify">right</property> |
710 | - <style> |
711 | - <class name="dim-label"/> |
712 | - </style> |
713 | - </object> |
714 | - <packing> |
715 | - <property name="top_attach">2</property> |
716 | - <property name="bottom_attach">3</property> |
717 | - <property name="x_options">GTK_FILL</property> |
718 | - <property name="y_options">GTK_FILL</property> |
719 | - </packing> |
720 | - </child> |
721 | - <child> |
722 | - <object class="GtkLabel" id="graphics_driver_label"> |
723 | - <property name="visible">True</property> |
724 | - <property name="can_focus">False</property> |
725 | - <property name="xalign">0</property> |
726 | - <property name="label">Unknown</property> |
727 | - <property name="selectable">True</property> |
728 | - </object> |
729 | - <packing> |
730 | - <property name="left_attach">1</property> |
731 | - <property name="right_attach">2</property> |
732 | - <property name="y_options">GTK_FILL</property> |
733 | - </packing> |
734 | - </child> |
735 | - <child> |
736 | - <object class="GtkLabel" id="graphics_experience_label"> |
737 | - <property name="visible">True</property> |
738 | - <property name="can_focus">False</property> |
739 | - <property name="xalign">0</property> |
740 | - <property name="label">Unknown</property> |
741 | - <property name="selectable">True</property> |
742 | - </object> |
743 | - <packing> |
744 | - <property name="left_attach">1</property> |
745 | - <property name="right_attach">2</property> |
746 | - <property name="top_attach">1</property> |
747 | - <property name="bottom_attach">2</property> |
748 | - <property name="y_options">GTK_FILL</property> |
749 | - </packing> |
750 | - </child> |
751 | - <child> |
752 | - <object class="GtkBox" id="graphics_fallback_switch_box"> |
753 | - <property name="visible">False</property> |
754 | - <property name="can_focus">False</property> |
755 | - <property name="halign">start</property> |
756 | - <property name="valign">center</property> |
757 | - <property name="orientation">horizontal</property> |
758 | - <child> |
759 | - <placeholder/> |
760 | - </child> |
761 | - </object> |
762 | - <packing> |
763 | - <property name="left_attach">1</property> |
764 | - <property name="right_attach">2</property> |
765 | - <property name="top_attach">2</property> |
766 | - <property name="bottom_attach">3</property> |
767 | - <property name="y_options">GTK_FILL</property> |
768 | - </packing> |
769 | - </child> |
770 | - <child> |
771 | - <object class="GtkLabel" id="graphics_logout_warning_label"> |
772 | - <property name="can_focus">False</property> |
773 | - <property name="no_show_all">True</property> |
774 | - <property name="xalign">0</property> |
775 | - <property name="yalign">0</property> |
776 | - <property name="label">The next login will use the fallback mode intended for unsupported graphics hardware.</property> |
777 | - <property name="wrap">True</property> |
778 | - <property name="selectable">True</property> |
779 | - <attributes> |
780 | - <attribute name="weight" value="bold"/> |
781 | - </attributes> |
782 | - </object> |
783 | - <packing> |
784 | - <property name="left_attach">1</property> |
785 | - <property name="right_attach">2</property> |
786 | - <property name="top_attach">3</property> |
787 | - <property name="bottom_attach">4</property> |
788 | - </packing> |
789 | - </child> |
790 | - <child> |
791 | - <object class="GtkLabel" id="label34"> |
792 | - <property name="visible">True</property> |
793 | - <property name="can_focus">False</property> |
794 | - <property name="xalign">1</property> |
795 | - <property name="justify">right</property> |
796 | - </object> |
797 | - <packing> |
798 | - <property name="top_attach">3</property> |
799 | - <property name="bottom_attach">4</property> |
800 | - <property name="x_options">GTK_FILL</property> |
801 | - </packing> |
802 | - </child> |
803 | - </object> |
804 | - </child> |
805 | - </object> |
806 | - <packing> |
807 | - <property name="position">3</property> |
808 | - </packing> |
809 | + <placeholder/> |
810 | </child> |
811 | <child type="tab"> |
812 | - <object class="GtkLabel" id="label2"> |
813 | - <property name="visible">True</property> |
814 | - <property name="can_focus">False</property> |
815 | - <property name="label" translatable="yes">Graphics</property> |
816 | - <property name="mnemonic_widget">graphics_label</property> |
817 | - </object> |
818 | - <packing> |
819 | - <property name="position">3</property> |
820 | - <property name="tab_fill">False</property> |
821 | - </packing> |
822 | + <placeholder/> |
823 | </child> |
824 | </object> |
825 | <packing> |
826 | |
827 | === modified file 'panels/info/unity-info-panel.desktop.in.in' |
828 | --- panels/info/unity-info-panel.desktop.in.in 2013-12-02 04:30:50 +0000 |
829 | +++ panels/info/unity-info-panel.desktop.in.in 2014-02-20 17:20:19 +0000 |
830 | @@ -12,4 +12,4 @@ |
831 | # Translators: those are keywords for the System Information panel |
832 | # "Preferred Applications" is the old name for the preference, so make |
833 | # sure that you use the same "translation" for those keywords |
834 | -_Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; |
835 | +_Keywords=device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; |
The changes there are basically:
- some extra debugging code
- some cleanups of old/used code
- dropped the "fallback" switch (we were already hidding it for Unity, upstream dropped it)
- dropped the "graphics" section since the graphics info are in the summary and without "fallback" nothing was left there