[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 23/37: Add settings button
noreply at xfce.org
noreply at xfce.org
Mon Mar 23 23:30:18 CET 2020
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-clipman-plugin.
commit ed492d2be30c2145232db9daed0052673ed20035
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Sat Mar 21 00:37:06 2020 +0100
Add settings button
---
panel-plugin/xfce4-clipman-history.c | 52 +++++++++++++++++++++++++++++-------
1 file changed, 43 insertions(+), 9 deletions(-)
diff --git a/panel-plugin/xfce4-clipman-history.c b/panel-plugin/xfce4-clipman-history.c
index c16267b..8b33030 100644
--- a/panel-plugin/xfce4-clipman-history.c
+++ b/panel-plugin/xfce4-clipman-history.c
@@ -250,6 +250,30 @@ clipman_history_treeview_init (MyPlugin *plugin)
}
static void
+clipman_history_settings_cb (void)
+{
+ GAppInfo *appinfo;
+ GError *error = NULL;
+
+ appinfo = g_app_info_create_from_commandline ("xfce4-clipman-settings", "Clipman Settings", G_APP_INFO_CREATE_NONE, &error);
+ if (error != NULL)
+ {
+ g_warning ("xfce4-clipman-settings could not be found. %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ if (!g_app_info_launch (appinfo, NULL, NULL, &error))
+ {
+ if (error != NULL)
+ {
+ g_warning ("xfce4-clipman-settings could not be launched. %s", error->message);
+ g_error_free (error);
+ }
+ }
+}
+
+static void
clipman_history_dialog_finalize (MyPlugin *plugin,
GtkWidget *window)
{
@@ -278,7 +302,9 @@ clipman_history_dialog_response (GtkWidget *dialog,
MyPlugin *plugin)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "clipman", NULL, NULL);
+ xfce_dialog_show_help (GTK_WINDOW (dialog), "clipman", NULL, NULL);
+ else if (response_id == GTK_RESPONSE_OK)
+ clipman_history_settings_cb ();
else
clipman_history_dialog_finalize (plugin, dialog);
}
@@ -310,21 +336,29 @@ clipman_history_dialog_init (MyPlugin *plugin)
#if LIBXFCE4UI_CHECK_VERSION (4,15,0)
xfce_titled_dialog_create_action_area (XFCE_TITLED_DIALOG (dialog));
- button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
- xfce_titled_dialog_set_default_response (XFCE_TITLED_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+ button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (dialog), _("_Help"), GTK_RESPONSE_HELP);
#else
- button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Help"), GTK_RESPONSE_HELP);
#endif
- icon = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
+ icon = gtk_image_new_from_icon_name ("help-browser", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), icon);
#if LIBXFCE4UI_CHECK_VERSION (4,15,0)
- button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (dialog), _("_Help"), GTK_RESPONSE_HELP);
+ button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (dialog), _("_Settings"), GTK_RESPONSE_OK);
#else
- button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Help"), GTK_RESPONSE_HELP);
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Settings"), GTK_RESPONSE_OK);
#endif
- icon = gtk_image_new_from_icon_name ("help-browser", GTK_ICON_SIZE_BUTTON);
+ icon = gtk_image_new_from_icon_name ("preferences-system", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (button), icon);
+
+#if LIBXFCE4UI_CHECK_VERSION (4,15,0)
+ button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
+ xfce_titled_dialog_set_default_response (XFCE_TITLED_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+#else
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+#endif
+ icon = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), icon);
box = clipman_history_treeview_init (plugin);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list