[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 01/01: changed meaning of enable-action as there is a popup command now

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

schuellerf pushed a commit to branch master
in repository panel-plugins/xfce4-clipman-plugin.

commit 8b88b5115e9ae83ac03da2e1ae2f8af3b52d7555
Author: Florian Schüller <florian.schueller at gmail.com>
Date:   Wed Jun 1 23:30:12 2016 +0200

    changed meaning of enable-action as there is a popup command now
---
 panel-plugin/settings-dialog.ui       |  7 ++++---
 panel-plugin/xfce4-clipman-settings.c | 17 -----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui
index d678492..c761f0b 100644
--- a/panel-plugin/settings-dialog.ui
+++ b/panel-plugin/settings-dialog.ui
@@ -504,7 +504,7 @@
     <property name="step_increment">5</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="XfceTitledDialog" id="settings-dialog">
+  <object class="GtkDialog" id="settings-dialog">
     <property name="can_focus">False</property>
     <property name="title">Clipman</property>
     <property name="window_position">center</property>
@@ -802,7 +802,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Enable actions</property>
+                        <property name="label" translatable="yes">_Enable automatic actions</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                       </object>
@@ -816,7 +816,8 @@
                       <object class="GtkSwitch" id="enable-actions">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, the clipboard texts will be matched against regular expressions and a menu will display possible actions</property>
+                        <property name="tooltip_text" translatable="yes">If checked, the clipboard texts will be matched against regular expressions and a menu will display possible actions automatically.
+Otherwise the menu will only appear when calling "xfce4-popup-clipman-actions" (and a match was found)</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/panel-plugin/xfce4-clipman-settings.c b/panel-plugin/xfce4-clipman-settings.c
index 4e65673..e0b17b4 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -38,9 +38,6 @@ static void             cb_show_help                    (GtkButton *button);
 static void             setup_actions_treeview          (GtkTreeView *treeview);
 static void             refresh_actions_treeview        (GtkTreeView *treeview);
 static void             apply_action                    (const gchar *original_action_name);
-static void             cb_enable_actions               (GtkSwitch *enable_actions,
-                                                         gboolean state,
-                                                         gpointer user_data);
 static void             cb_actions_selection_changed    (GtkTreeSelection *selection);
 static void             cb_add_action                   (GtkButton *button);
 static void             cb_edit_action                  (GtkButton *button);
@@ -75,7 +72,6 @@ prop_dialog_run (void)
 {
   GtkWidget *action_dialog;
   GtkWidget *combobox;
-  GtkWidget *enable_actions;
 
   /* Dialogs */
   action_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "action-dialog"));
@@ -119,8 +115,6 @@ prop_dialog_run (void)
   xfconf_g_property_bind (xfconf_channel, "/settings/enable-actions", G_TYPE_BOOLEAN,
                           gtk_builder_get_object (builder, "enable-actions"), "active");
 
-  enable_actions = GTK_WIDGET (gtk_builder_get_object (builder, "enable-actions"));
-  g_signal_connect (GTK_WIDGET (enable_actions), "state-set", G_CALLBACK (cb_enable_actions), NULL);
   g_signal_connect (gtk_builder_get_object (builder, "button-add-action"), "clicked", G_CALLBACK (cb_add_action), NULL);
   g_signal_connect (gtk_builder_get_object (builder, "button-edit-action"), "clicked", G_CALLBACK (cb_edit_action), NULL);
   g_signal_connect (gtk_builder_get_object (builder, "button-delete-action"), "clicked", G_CALLBACK (cb_delete_action), NULL);
@@ -138,7 +132,6 @@ prop_dialog_run (void)
 
   setup_actions_treeview (GTK_TREE_VIEW (gtk_builder_get_object (builder, "actions")));
   setup_commands_treeview (GTK_TREE_VIEW (gtk_builder_get_object (builder, "commands")));
-  cb_enable_actions (GTK_SWITCH (enable_actions), gtk_switch_get_state(GTK_SWITCH(enable_actions)), NULL);
   setup_test_regex_dialog ();
 
   /* Callbacks for the OK button sensitivity in the edit action dialog */
@@ -384,16 +377,6 @@ apply_action (const gchar *original_action_name)
 }
 
 static void
-cb_enable_actions (GtkSwitch *enable_actions, gboolean state, gpointer user_data)
-{
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "actions")), state);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "button-add-action")), state);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "button-edit-action")), state);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "button-delete-action")), state);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "button-reset-actions")), state);
-}
-
-static void
 cb_actions_selection_changed (GtkTreeSelection *selection)
 {
   GtkTreeModel *model;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.