← Back to branch summary

~noskcaj/ubuntu/vivid/xfce4-panel/4.11.2

« back to all changes in this revision

Viewing changes to panel/panel-preferences-dialog.c

  • Committer: Jackson Doak
  • Date: 2015-01-04 19:22:07 UTC
  • mfrom: (1.1.39)
  • Revision ID: noskcaj@ubuntu.com-20150104192207-sgjnl2zb61bomm6f
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel/panel-preferences-dialog.c
1
1
/*
2
2
 * Copyright (C) 2008-2010 Nick Schermer <nick@xfce.org>
 
3
 * Copyright (C) 2014 Jannis Pohlmann <jannis@xfce.org>
3
4
 *
4
5
 * This program is free software; you can redistribute it and/or modify
5
6
 * it under the terms of the GNU General Public License as published by
59
60
static void                     panel_preferences_dialog_bindings_update        (PanelPreferencesDialog *dialog);
60
61
static void                     panel_preferences_dialog_output_changed         (GtkComboBox            *combobox,
61
62
                                                                                 PanelPreferencesDialog *dialog);
 
63
static void                     panel_preferences_dialog_autohide_changed       (GtkComboBox            *combobox,
 
64
                                                                                 PanelPreferencesDialog *dialog);
62
65
static void                     panel_preferences_dialog_bg_style_changed       (PanelPreferencesDialog *dialog);
63
66
static void                     panel_preferences_dialog_bg_image_file_set      (GtkFileChooserButton   *button,
64
67
                                                                                 PanelPreferencesDialog *dialog);
279
282
      g_signal_connect (G_OBJECT (object), "changed",
280
283
                        G_CALLBACK (panel_preferences_dialog_output_changed),
281
284
                        dialog);
 
285
 
 
286
  /* connect the autohide behavior changed signal */
 
287
  object = gtk_builder_get_object (GTK_BUILDER (dialog), "autohide-behavior");
 
288
  panel_return_if_fail (GTK_IS_COMBO_BOX (object));
 
289
  g_signal_connect (G_OBJECT (object), "changed",
 
290
      G_CALLBACK (panel_preferences_dialog_autohide_changed), dialog);
282
291
}
283
292
 
284
293
 
423
432
  panel_preferences_dialog_bindings_add (dialog, "mode", "active");
424
433
  panel_preferences_dialog_bindings_add (dialog, "span-monitors", "active");
425
434
  panel_preferences_dialog_bindings_add (dialog, "position-locked", "active");
426
 
  panel_preferences_dialog_bindings_add (dialog, "autohide", "active");
 
435
  panel_preferences_dialog_bindings_add (dialog, "autohide-behavior", "active");
427
436
  panel_preferences_dialog_bindings_add (dialog, "disable-struts", "active");
428
437
  panel_preferences_dialog_bindings_add (dialog, "size", "value");
429
438
  panel_preferences_dialog_bindings_add (dialog, "nrows", "value");
567
576
  g_object_set (G_OBJECT (object), "visible", n_monitors > 1, NULL);
568
577
 
569
578
  g_free (output_name);
 
579
 
 
580
  /* update sensitivity of "don't reserve space on borders" option */
 
581
  object = gtk_builder_get_object (GTK_BUILDER (dialog), "autohide-behavior");
 
582
  panel_return_if_fail (GTK_IS_COMBO_BOX (object));
 
583
  panel_preferences_dialog_autohide_changed (GTK_COMBO_BOX (object), dialog);
570
584
}
571
585
 
572
586
 
602
616
 
603
617
 
604
618
static void
 
619
panel_preferences_dialog_autohide_changed (GtkComboBox            *combobox,
 
620
                                           PanelPreferencesDialog *dialog)
 
621
{
 
622
  GObject *object;
 
623
 
 
624
  panel_return_if_fail (GTK_IS_COMBO_BOX (combobox));
 
625
  panel_return_if_fail (PANEL_IS_PREFERENCES_DIALOG (dialog));
 
626
  panel_return_if_fail (PANEL_WINDOW (dialog->active));
 
627
 
 
628
  object = gtk_builder_get_object (GTK_BUILDER (dialog), "disable-struts");
 
629
  panel_return_if_fail (GTK_IS_WIDGET (object));
 
630
 
 
631
  /* make "don't reserve space on borders" sensitive only when autohide is disabled */
 
632
  if (gtk_combo_box_get_active (combobox) == 0)
 
633
    gtk_widget_set_sensitive (GTK_WIDGET (object), TRUE);
 
634
  else
 
635
    gtk_widget_set_sensitive (GTK_WIDGET (object), FALSE);
 
636
}
 
637
 
 
638
 
 
639
 
 
640
static void
605
641
panel_preferences_dialog_bg_style_changed (PanelPreferencesDialog *dialog)
606
642
{
607
643
  gint      active;