This is an automated email from the git hooks/post-receive script. andrzejr pushed a commit to branch xfce-4.12 in repository xfce/xfce4-panel.
commit 1118b1adb339f1ab3a201cf832322318aa44dfa8 Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Sat Aug 8 15:16:20 2015 +0200 When it is installed, show launcher for xfpanel-switch in the preferences --- panel/panel-preferences-dialog.c | 31 +++++++++++++++++++++++++++++++ panel/panel-preferences-dialog.glade | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c index 5104985..29d3610 100644 --- a/panel/panel-preferences-dialog.c +++ b/panel/panel-preferences-dialog.c @@ -74,6 +74,8 @@ static void panel_preferences_dialog_panel_add PanelPreferencesDialog *dialog); static void panel_preferences_dialog_panel_remove (GtkWidget *widget, PanelPreferencesDialog *dialog); +static void panel_preferences_dialog_panel_switch (GtkWidget *widget, + PanelPreferencesDialog *dialog); static XfcePanelPluginProvider *panel_preferences_dialog_item_get_selected (PanelPreferencesDialog *dialog, GtkTreeIter *return_iter); static void panel_preferences_dialog_item_store_rebuild (GtkWidget *itembar, @@ -179,6 +181,7 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog) GtkTreeViewColumn *column; GtkCellRenderer *renderer; GtkTreeSelection *selection; + gchar *path; dialog->bindings = NULL; dialog->application = panel_application_get (); @@ -206,6 +209,14 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog) connect_signal ("panel-remove", "clicked", panel_preferences_dialog_panel_remove); connect_signal ("panel-combobox", "changed", panel_preferences_dialog_panel_combobox_changed); + /* check if panel-switch is installed and if so show button */ + object = gtk_builder_get_object (GTK_BUILDER (dialog), "panel-switch"); + path = g_find_program_in_path ("xfpanel-switch"); + if (path == NULL) + gtk_widget_set_visible (GTK_WIDGET (object), FALSE); + + connect_signal ("panel-switch", "clicked", panel_preferences_dialog_panel_switch); + /* style tab */ object = gtk_builder_get_object (GTK_BUILDER (dialog), "background-style"); panel_return_if_fail (G_IS_OBJECT (object)); @@ -929,6 +940,26 @@ panel_preferences_dialog_panel_remove (GtkWidget *widget, +static void +panel_preferences_dialog_panel_switch (GtkWidget *widget, PanelPreferencesDialog *dialog) +{ + GtkWidget *toplevel; + gchar *path; + GError *error = NULL; + + path = g_find_program_in_path ("xfpanel-switch"); + if (path == NULL) + return; + + /* close the preferences dialog */ + toplevel = gtk_widget_get_toplevel (widget); + panel_preferences_dialog_response (toplevel, 0, dialog); + + /* run xfpanel-switch */ + g_spawn_command_line_async (path, &error); +} + + static XfcePanelPluginProvider * panel_preferences_dialog_item_get_selected (PanelPreferencesDialog *dialog, GtkTreeIter *return_iter) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index b211436..e949d09 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -109,6 +109,11 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">package-x-generic</property> + </object> <object class="GtkSizeGroup" id="display-sizegroup"> <widgets> <widget name="label13"/> @@ -203,6 +208,32 @@ </packing> </child> <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="panel-switch"> + <property name="label">Backup and restore</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Switch between panel presets</property> + <property name="image">image10</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="sensitive">False</property> @@ -1066,7 +1097,7 @@ </child> </object> <packing> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits