[gimp/tito: 1/3] Bug 708174 - A text based intent driving tool for GIMP (Tito)
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/tito: 1/3] Bug 708174 - A text based intent driving tool for GIMP (Tito)
- Date: Thu, 30 Jan 2014 04:35:55 +0000 (UTC)
commit 2156c020e7a72720e940edd06baceb21faba4a96
Author: Srihari <ssvz visishta net>
Date: Sat Mar 10 11:46:44 2012 +0530
Bug 708174 - A text based intent driving tool for GIMP (Tito)
app/actions/dialogs-actions.c | 8 +-
app/dialogs/Makefile.am | 2 +
app/dialogs/action-search-dialog.c | 1143 ++++++++++++++++++++++++++++++++++++
app/dialogs/action-search-dialog.h | 24 +
app/dialogs/dialogs-constructors.c | 10 +
app/dialogs/dialogs-constructors.h | 4 +
app/dialogs/dialogs.c | 2 +
app/gui/gui.c | 7 +
app/widgets/gimphelp-ids.h | 1 +
menus/image-menu.xml.in | 2 +
10 files changed, 1202 insertions(+), 1 deletions(-)
---
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index c7686f8..7358256 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -267,7 +267,13 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
NULL,
NC_("dialogs-action", "About GIMP"),
"gimp-about-dialog",
- GIMP_HELP_ABOUT_DIALOG }
+ GIMP_HELP_ABOUT_DIALOG },
+
+ { "dialogs-action-search", GTK_STOCK_FIND,
+ NC_("dialogs-action", "_Search and Run a Command"), NULL,
+ NC_("dialogs-action", "Search commands by keyword, and run them"),
+ "gimp-action-search-dialog",
+ GIMP_HELP_ACTION_SEARCH_DIALOG }
};
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 63fdb64..69ec717 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -13,6 +13,8 @@ AM_CPPFLAGS = \
noinst_LIBRARIES = libappdialogs.a
libappdialogs_a_sources = \
+ action-search-dialog.c \
+ action-search-dialog.h \
dialogs-types.h \
dialogs.c \
dialogs.h \
diff --git a/app/dialogs/action-search-dialog.c b/app/dialogs/action-search-dialog.c
new file mode 100644
index 0000000..9c0f1b1
--- /dev/null
+++ b/app/dialogs/action-search-dialog.c
@@ -0,0 +1,1143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2012-2013 Srihari Sriraman, Suhas V, Vidyashree K, Zeeshan Ali Ansari
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+
+#include <glib/gstdio.h>
+
+#include <gtk/gtk.h>
+
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "dialogs-types.h"
+
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpaction.h"
+
+#include "action-search-dialog.h"
+
+#include "gimp-intl.h"
+
+#define MAX_HISTORY_ACTIONS 20
+#define DEFAULT_HEIGHT 1
+
+gboolean action_search_run_result_action (void);
+static GtkWidget * action_search_setup_results_list (void);
+static gboolean action_search_search_dialog (void);
+static gboolean action_search_is_action_match (GtkAction *action,
+ const gchar* keyword);
+static void action_search_add_to_results_list (const gchar *label,
+ const gchar *tooltip,
+ GtkAction* action);
+static void action_search_search_history_and_actions (const gchar *keyword);
+
+static void action_search_update_history (GtkAction *action);
+static void action_search_read_history (void);
+static void action_search_fill_history (void);
+static void action_search_clear_history (void);
+
+static void action_search_preferences_dialog (void);
+static void action_search_set_default_preferences (void);
+static void action_search_update_preferences (void);
+static void action_search_write_preferences (void);
+static void action_search_read_preferences (void);
+static void action_search_set_prefereces_ui_values (void);
+
+gboolean action_search_initializer (void);
+void action_search_finalizer (void);
+static void action_search_context_menu (void);
+
+static GtkWidget * action_search_dialog;
+static GtkWidget * results_list;
+static GtkWidget * keyword_entry;
+
+static gchar *history_file_path;
+static gchar *preference_file_path;
+static gint cur_no_of_his_actions;
+static gboolean first_time = TRUE;
+static gint tmp_x, tmp_y;
+static gint par_x, par_y;
+static gint par_height, par_width;
+
+enum RES_COL {
+ RESULT_ICON,
+ RESULT_DATA,
+ RESULT_ACTION,
+ IS_SENSITIVE,
+ N_COL
+};
+
+static struct HISTORY {
+ GtkAction *history_action;
+ gint count;
+} history[MAX_HISTORY_ACTIONS];
+
+static struct HISTORY_ACTION_NAME {
+ char *action_name;
+ gint no;
+} name[MAX_HISTORY_ACTIONS];
+
+static struct PREFERENCES {
+ gint POSITION;
+ gfloat POSITION_X;
+ gfloat POSITION_Y;
+ gint NO_OF_RESULTS;
+ gfloat WIDTH;
+ gboolean SHOW_INSENSITIVE;
+ gdouble OPACITY;
+} PREF;
+
+static struct ACTION_SEARCH_PREF_UI {
+ GtkWidget *specify_radio;
+ GtkWidget *pos_x_hbox;
+ GtkWidget *pos_y_hbox;
+ GtkWidget *right_top_radio;
+ GtkWidget *middle_radio;
+ GtkWidget *pos_x_spin_button;
+ GtkWidget *pos_y_spin_button;
+ GtkWidget *no_of_results_spin_button;
+ GtkWidget *width_spin_button;
+ GtkWidget *opacity_spin_button;
+ GtkWidget *show_insensitive_check_button;
+} PREF_UI;
+
+GtkWidget *
+action_search_dialog_create (void)
+{
+ if (! action_search_initializer ())
+ g_message ("Tito action_search_initializer failed");
+
+ action_search_search_dialog ();
+ return action_search_dialog;
+}
+
+static void
+modify_position_spins (void)
+{
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (PREF_UI.specify_radio)))
+ {
+ gtk_widget_set_sensitive (PREF_UI.pos_x_hbox, TRUE);
+ gtk_widget_set_sensitive (PREF_UI.pos_y_hbox, TRUE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (PREF_UI.pos_x_hbox, FALSE);
+ gtk_widget_set_sensitive (PREF_UI.pos_y_hbox, FALSE);
+ }
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (PREF_UI.pos_x_spin_button),
+ (gdouble) (PREF.POSITION_X/par_width * 100));
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (PREF_UI.pos_y_spin_button),
+ (gdouble) (PREF.POSITION_Y/par_height * 100));
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (PREF_UI.pos_x_spin_button),
+ (gdouble) 0,
+ (gdouble) (100 - gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON
(PREF_UI.width_spin_button))));
+}
+
+static void
+action_search_clear_history_button_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ action_search_clear_history ();
+}
+
+static void
+restore_defaults_button_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ action_search_set_default_preferences ();
+ action_search_set_prefereces_ui_values ();
+}
+
+static void
+action_search_set_prefereces_ui_values (void)
+{
+ if (PREF.POSITION == 0)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (PREF_UI.right_top_radio), TRUE);
+ else if (PREF.POSITION == 1)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (PREF_UI.middle_radio), TRUE);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (PREF_UI.specify_radio), TRUE);
+
+ modify_position_spins ();
+
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (PREF_UI.no_of_results_spin_button), (gdouble)
PREF.NO_OF_RESULTS);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (PREF_UI.width_spin_button), (gdouble) PREF.WIDTH);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (PREF_UI.opacity_spin_button), (gdouble) PREF.OPACITY * 100);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (PREF_UI.show_insensitive_check_button),
PREF.SHOW_INSENSITIVE);
+
+}
+
+static gboolean
+on_focus_out (GtkWidget *widget,
+ GdkEventFocus *event,
+ gpointer data)
+{
+ if (! gtk_widget_is_focus (GTK_WIDGET (data)))
+ action_search_finalizer ();
+
+ return TRUE;
+}
+
+
+static void
+key_released (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer func_data)
+{
+ const gchar *entry_text;
+ GtkWidget *list_view = GTK_WIDGET (func_data);
+
+ entry_text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+
+ switch (event->keyval)
+ {
+ case GDK_Escape:
+ {
+ action_search_finalizer ();
+ return;
+ }
+ case GDK_Return:
+ {
+ action_search_run_result_action ();
+ return;
+ }
+ }
+
+ if (strcmp (entry_text, "") != 0)
+ {
+ gtk_window_resize (GTK_WINDOW (action_search_dialog), (PREF.WIDTH * par_width) / 100,
+ PREF.NO_OF_RESULTS * 40 + 100);
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (results_list))));
+ gtk_widget_show_all (list_view);
+ action_search_search_history_and_actions (entry_text);
+ gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (results_list)),
+ gtk_tree_path_new_from_string ("0"));
+ }
+ else if (strcmp (entry_text, "") == 0 && (event->keyval == GDK_Down) )
+ {
+ gtk_window_resize (GTK_WINDOW (action_search_dialog), (PREF.WIDTH * par_width) / 100,
+ PREF.NO_OF_RESULTS * 40 + 100);
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (results_list))));
+ gtk_widget_show_all (list_view);
+ action_search_search_history_and_actions (" ");
+ gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (results_list)),
+ gtk_tree_path_new_from_string ("0"));
+
+ }
+ else
+ {
+ gtk_widget_hide (list_view);
+ gtk_window_resize (GTK_WINDOW (action_search_dialog),
+ (PREF.WIDTH * par_width) / 100,
+ DEFAULT_HEIGHT);
+ }
+}
+
+static gboolean
+result_selected (GtkWidget *widget,
+ GdkEventKey *pKey,
+ gpointer func_data)
+{
+ if (pKey->type == GDK_KEY_PRESS)
+ {
+ switch (pKey->keyval)
+ {
+ case GDK_Return:
+ {
+ action_search_run_result_action ();
+ break;
+ }
+ case GDK_Escape:
+ {
+ action_search_finalizer ();
+ return TRUE;
+ }
+ case GDK_Up:
+ {
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (results_list));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ path = gtk_tree_model_get_path (model, &iter);
+
+ if (strcmp (gtk_tree_path_to_string (path), "0") == 0)
+ {
+ gtk_widget_grab_focus ((GTK_WIDGET (keyword_entry)));
+ return TRUE;
+ }
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+
+static void
+row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *col,
+ gpointer userdata)
+{
+ action_search_run_result_action ();
+}
+
+static gboolean
+action_search_action_view_accel_find_func (GtkAccelKey *key,
+ GClosure *closure,
+ gpointer data)
+{
+ return (GClosure *) data == closure;
+}
+
+static gchar*
+find_accel_label (GtkAction *action)
+{
+ guint accel_key = 0;
+ GdkModifierType accel_mask = 0;
+ GClosure *accel_closure = NULL;
+ gchar *accel_string;
+ GtkAccelGroup *accel_group;
+ GimpUIManager *manager;
+
+ manager = gimp_ui_managers_from_name ("<Image>")->data;
+ accel_group = gtk_ui_manager_get_accel_group (GTK_UI_MANAGER (manager));
+ accel_closure = gtk_action_get_accel_closure (action);
+
+ if (accel_closure)
+ {
+ GtkAccelKey *key;
+ key = gtk_accel_group_find (accel_group,
+ action_search_action_view_accel_find_func,
+ accel_closure);
+ if (key &&
+ key->accel_key &&
+ key->accel_flags & GTK_ACCEL_VISIBLE)
+ {
+ accel_key = key->accel_key;
+ accel_mask = key->accel_mods;
+ }
+ }
+
+ accel_string = gtk_accelerator_get_label (accel_key, accel_mask);
+
+ return (strcmp (accel_string, "") == 0)? accel_string : NULL;
+}
+
+
+static void
+action_search_add_to_results_list (const gchar *label,
+ const gchar *tooltip,
+ GtkAction *action)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *markuptxt;
+ gchar *accel_string = find_accel_label (action);
+ const gchar *stock_id = gtk_action_get_stock_id (action);
+ char *data = g_new (char, 1024);
+ char shortcut[1024] = "";
+
+ if (data == NULL ||
+ strchr (label, '@') != NULL ||
+ strchr (label, '&') != NULL)
+ return;
+
+ if (GTK_IS_TOGGLE_ACTION (action))
+ {
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ stock_id = GTK_STOCK_OK;
+ else
+ stock_id = GTK_STOCK_NO;
+ }
+
+ if (accel_string == NULL)
+ strcpy (shortcut, "");
+ else if (strchr (accel_string, '<') != NULL)
+ strcpy (shortcut, "");
+ else
+ {
+ strcpy (shortcut, " | ");
+ strcat (shortcut, accel_string);
+ }
+
+ if (tooltip == NULL)
+ strcpy (data, "");
+ else if (strchr (tooltip, '<') != NULL)
+ strcpy (data, "");
+ else
+ {
+ strcpy (data, "\n");
+ strcat (data, tooltip);
+ }
+
+ markuptxt = g_strdup_printf ("%s<small>%s<span weight='light'>%s</span></small>",
+ label, shortcut, data);
+ store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (results_list)));
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ RESULT_ICON, stock_id,
+ RESULT_DATA, markuptxt,
+ RESULT_ACTION, action,
+ IS_SENSITIVE, gtk_action_get_sensitive (action),
+ -1);
+ g_free (data);
+}
+
+gboolean
+action_search_run_result_action (void)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (results_list));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ GtkAction *action;
+
+ gtk_tree_model_get (model, &iter, RESULT_ACTION, &action, -1);
+
+ if (! gtk_action_get_sensitive (action))
+ return FALSE;
+
+ gtk_widget_hide (action_search_dialog);
+ gtk_action_activate (action);
+ action_search_finalizer ();
+ action_search_update_history (action);
+ }
+
+ return TRUE;
+}
+
+
+void
+action_search_search_history_and_actions (const gchar *keyword)
+{
+ GList *list;
+ GimpUIManager *manager;
+ gint i = 0;
+
+ manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+ if (strcmp (keyword, "") == 0)
+ return;
+
+ for (i = 0;i<cur_no_of_his_actions;i++)
+ {
+ if (history[i].history_action != NULL)
+ {
+ if (action_search_is_action_match (history[i].history_action, keyword))
+ action_search_add_to_results_list (gimp_strip_uline (gtk_action_get_label
(history[i].history_action)),
+ gtk_action_get_tooltip (history[i].history_action),
+ history[i].history_action );
+ }
+ }
+
+ for (list = gtk_ui_manager_get_action_groups (GTK_UI_MANAGER (manager));
+ list;
+ list = g_list_next (list))
+ {
+ GimpActionGroup *group = list->data;
+ GList *actions;
+ GList *list2;
+
+
+ actions = gtk_action_group_list_actions (GTK_ACTION_GROUP (group));
+ actions = g_list_sort (actions, (GCompareFunc) gimp_action_name_compare);
+
+ for (list2 = actions; list2; list2 = g_list_next (list2))
+ {
+ GtkAction *action = list2->data;
+ const gchar *name;
+ gboolean is_redundant = FALSE;
+ name = gtk_action_get_name (action);
+
+
+ if (strstr (name, "-menu") ||
+ strstr (name, "-popup") ||
+ strstr (name, "context") ||
+ strstr (name, "edit-undo") ||
+ name[0] == '<')
+ continue;
+
+ if (! gtk_action_get_sensitive (action) && ! (PREF.SHOW_INSENSITIVE) )
+ continue;
+
+ for (i = 0;i<cur_no_of_his_actions;i++)
+ {
+ if (history[i].history_action != NULL)
+ {
+ if (strcmp (gtk_action_get_name (history[i].history_action), name) == 0)
+ {
+ is_redundant = TRUE;
+ break;
+ }
+ }
+ }
+
+ if (is_redundant)
+ continue;
+
+ if (action_search_is_action_match (action, keyword))
+ {
+ action_search_add_to_results_list (gimp_strip_uline (gtk_action_get_label (action)),
+ gtk_action_get_tooltip (action),
+ action);
+ }
+ }
+ g_list_free (actions);
+ }
+}
+
+static void action_search_fill_history (void)
+{
+ GList *list;
+ GimpUIManager *manager;
+ gint i = 0;
+ manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+ for (list = gtk_ui_manager_get_action_groups (GTK_UI_MANAGER (manager));
+ list;
+ list = g_list_next (list))
+ {
+ GimpActionGroup *group = list->data;
+ GList *actions;
+ GList *list2;
+
+ actions = gtk_action_group_list_actions (GTK_ACTION_GROUP (group));
+ actions = g_list_sort (actions, (GCompareFunc) gimp_action_name_compare);
+
+ for (list2 = actions; list2; list2 = g_list_next (list2))
+ {
+ GtkAction *action = list2->data;
+ const gchar *action_name;
+ action_name = gtk_action_get_name (action);
+
+ if (strstr (action_name, "-menu") ||
+ strstr (action_name, "-popup") ||
+ strstr (action_name, "context") ||
+ action_name[0] == '<')
+ continue;
+
+ for (i = 0;i<cur_no_of_his_actions;i++)
+ {
+ if (name[i].action_name != NULL)
+ {
+ if (strcmp (name[i].action_name, action_name) == 0)
+ {
+ history[i].history_action = action;
+ history[i].count = name[i].no;
+ }
+ }
+ }
+ }
+ }
+}
+
+static gboolean
+fuzzy_search (gchar *string,
+ gchar *key)
+{
+ gchar *remaining_string = string;
+ if (strlen (key) == 0 )
+ return TRUE;
+
+ if ((remaining_string = strchr (string, key[0])) != NULL )
+ return fuzzy_search (remaining_string+1, key+1 );
+ else
+ return FALSE;
+}
+
+static gboolean
+action_search_is_action_match (GtkAction *action,
+ const gchar* keyword)
+{
+ gchar *label, *tooltip, *key;
+ gint i;
+ gchar* space_pos;
+ label = g_new (gchar, 1024);
+ key = g_new (gchar, 1024);
+ tooltip = g_new (gchar, 1024);
+
+ strcpy (label, gimp_strip_uline (gtk_action_get_label (action)));
+ strcpy (key, keyword);
+
+ for (i = 0;i<strlen (label);i++)
+ label[i] = tolower (label[i]);
+ for (i = 0;i<strlen (key);i++)
+ key[i] = tolower (key[i]);
+ if (strlen (key) == 2)
+ {
+ space_pos = strchr (label, ' ');
+ if (space_pos!= NULL)
+ {
+ space_pos++;
+ if (key[0] == label[0] && key[1] == *space_pos)
+ return TRUE;
+ }
+ }
+
+ if (strstr (label, key))
+ return TRUE;
+
+ if (fuzzy_search (label, key))
+ return TRUE;
+
+ if (strlen (key)>2 || strcmp (key, " ") == 0)
+ {
+ if (gtk_action_get_tooltip (action)!= NULL)
+ {
+ strcpy (tooltip, gtk_action_get_tooltip (action));
+ for (i = 0;i<strlen (tooltip);i++)
+ tooltip[i] = tolower (tooltip[i]);
+
+ if (strstr (tooltip, key))
+ return TRUE;
+ }
+ }
+
+ g_free (label);
+ g_free (key);
+ g_free (tooltip);
+
+ return FALSE;
+}
+
+static void
+action_search_read_history (void)
+{
+ gint i;
+ FILE *fp;
+ cur_no_of_his_actions = 0;
+
+ fp = fopen (history_file_path, "r");
+ if (fp == NULL)
+ return;
+
+ for (i = 0;i<MAX_HISTORY_ACTIONS;i++)
+ {
+ if (fscanf (fp, "%s %d", name[i].action_name, &name[i].no) == EOF)
+ break;
+ cur_no_of_his_actions++;
+ }
+
+ fclose (fp);
+ action_search_fill_history ();
+}
+
+static gint
+compare (const void * a,
+ const void * b)
+{
+ struct HISTORY *p = (struct HISTORY *)a;
+ struct HISTORY *q = (struct HISTORY *)b;
+ return (q->count - p->count);
+}
+
+static void
+action_search_update_history (GtkAction *action)
+{
+ gint i;
+ FILE *fp;
+ gboolean is_present = FALSE;
+
+ fp = fopen (history_file_path, "w");
+ if (fp == NULL)
+ {
+ g_message ("Unable to open history file to write");
+ return;
+ }
+
+ for (i = 0;i<cur_no_of_his_actions;i++)
+ {
+ if (strcmp (gtk_action_get_name (action), gtk_action_get_name (history[i].history_action)) == 0)
+ {
+ history[i].count++;
+ is_present = TRUE;
+ break;
+ }
+ }
+
+ if (! is_present)
+ {
+ if (cur_no_of_his_actions == MAX_HISTORY_ACTIONS)
+ {
+ history[MAX_HISTORY_ACTIONS-1].history_action = action;
+ history[MAX_HISTORY_ACTIONS-1].count = 1;
+ }
+ else
+ {
+ history[cur_no_of_his_actions].history_action = action;
+ history[cur_no_of_his_actions++].count = 1;
+ }
+ }
+
+ qsort (history, cur_no_of_his_actions, sizeof (struct HISTORY), compare);
+
+ for (i = 0;i<cur_no_of_his_actions;i++)
+ {
+ if (history[i].history_action != NULL)
+ fprintf (fp, "%s %d \n", gtk_action_get_name (history[i].history_action),
+ history[i].count);
+ }
+
+ fclose (fp);
+}
+
+static void
+action_search_update_position (void)
+{
+ if (PREF.POSITION == 0)
+ {
+ PREF.POSITION_X = (1-PREF.WIDTH/100)*par_width+par_x;
+ PREF.POSITION_Y = 0.04*par_height+par_y;
+ }
+ else if (PREF.POSITION == 1)
+ {
+ PREF.POSITION_X = (par_width- PREF.WIDTH*par_width*.01)/2 + par_x;
+ PREF.POSITION_Y = 0.2*par_height + par_y;
+ }
+ else
+ {
+ PREF.POSITION_X = tmp_x*par_width/100 + par_x;
+ PREF.POSITION_Y = tmp_y*par_height/100 + par_y;
+ }
+ gtk_window_move (GTK_WINDOW (action_search_dialog), PREF.POSITION_X, PREF.POSITION_Y);
+}
+
+void
+action_search_finalizer (void)
+{
+ gtk_widget_destroy (action_search_dialog);
+}
+
+static void
+initialize_storage (void)
+{
+ gchar *dir_filename = g_build_filename (gimp_directory (), "tito", NULL);
+
+ g_mkdir (dir_filename,
+ S_IRUSR | S_IWUSR | S_IXUSR |
+ S_IRGRP | S_IXGRP |
+ S_IROTH | S_IXOTH);
+
+ history_file_path = g_new (gchar, 1024);
+ strcpy (history_file_path, dir_filename);
+
+ preference_file_path = g_new (gchar, 1024);
+ strcpy (preference_file_path, dir_filename);
+
+ strcat (history_file_path, "/history");
+ strcat (preference_file_path, "/preferences");
+
+ g_free (dir_filename);
+}
+
+gboolean
+action_search_initializer (void)
+{
+ gint i = 0;
+ GdkWindow *par_window = gdk_screen_get_active_window (gdk_screen_get_default ());
+
+ gdk_window_get_geometry (par_window, &par_x, &par_y, &par_width, &par_height, NULL);
+
+ if (first_time)
+ {
+ initialize_storage ();
+
+ for (i = 0;i<MAX_HISTORY_ACTIONS;i++)
+ {
+ name[i].action_name = g_new (char, 100);
+ strcpy (name[i].action_name, "");
+ name[i].no = 0;
+ }
+ first_time = FALSE;
+ }
+ action_search_read_preferences ();
+ action_search_read_history ();
+ gtk_accel_map_change_entry ("<Actions>/dialogs/dialogs-action-search", 'd', 0, FALSE);
+ return TRUE;
+}
+
+static void
+action_search_clear_history (void)
+{
+ FILE *fp;
+ fp = fopen (history_file_path, "w");
+ if (fp == NULL)
+ {
+ g_message ("file not created");
+ return;
+ }
+ fclose (fp);
+}
+
+static void
+action_search_set_default_preferences (void)
+{
+ PREF.POSITION = 1;
+ PREF.WIDTH = 40;
+ PREF.POSITION_X = (1-0.4)*par_width+par_x;
+ PREF.POSITION_Y = 0.04*par_height+par_y;
+ PREF.NO_OF_RESULTS = 4;
+ PREF.SHOW_INSENSITIVE = FALSE;
+ PREF.OPACITY = 1;
+ action_search_write_preferences ();
+}
+
+static void
+action_search_update_preferences (void)
+{
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (PREF_UI.right_top_radio)))
+ PREF.POSITION = 0;
+ else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (PREF_UI.middle_radio)))
+ PREF.POSITION = 1;
+ else
+ {
+ PREF.POSITION = 2;
+ tmp_x = (gfloat) gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PREF_UI.pos_x_spin_button));
+ tmp_y = (gfloat) gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PREF_UI.pos_y_spin_button));
+ }
+
+ PREF.NO_OF_RESULTS = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON
(PREF_UI.no_of_results_spin_button));
+ PREF.WIDTH = (gfloat)gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON
(PREF_UI.width_spin_button));
+ PREF.OPACITY = (gdouble)gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON
(PREF_UI.opacity_spin_button))/100;
+ PREF.SHOW_INSENSITIVE = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(PREF_UI.show_insensitive_check_button));
+
+ action_search_update_position ();
+ action_search_write_preferences ();
+ action_search_finalizer ();
+}
+
+static void
+action_search_write_preferences (void)
+{
+ FILE *fp;
+ fp = fopen (preference_file_path, "w");
+
+ if (fp == NULL)
+ {
+ g_message ("Unable to open preferences file to write");
+ return;
+ }
+
+ if (fp == NULL)
+ return;
+ fprintf (fp, "%d %f %f %d %f %d %lf", PREF.POSITION, PREF.POSITION_X, PREF.POSITION_Y,
+ PREF.NO_OF_RESULTS, PREF.WIDTH, PREF.SHOW_INSENSITIVE, PREF.OPACITY);
+ fclose (fp);
+}
+
+static void
+action_search_read_preferences (void)
+{
+ FILE *fp;
+
+ fp = fopen (preference_file_path, "r");
+
+ if (fp == NULL)
+ {
+ action_search_set_default_preferences ();
+ return;
+ }
+
+ if (fscanf (fp, "%d %f %f %d %f %d %lf",
+ &PREF.POSITION, &PREF.POSITION_X, &PREF.POSITION_Y,
+ &PREF.NO_OF_RESULTS, &PREF.WIDTH, &PREF.SHOW_INSENSITIVE,
+ &PREF.OPACITY) == 0)
+ action_search_set_default_preferences ();
+
+ fclose (fp);
+}
+
+static gboolean
+context_menu_invoked (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ action_search_context_menu ();
+ return TRUE;
+}
+
+static void
+context_menu_handler (GtkMenuItem* menuitem,
+ gpointer *data)
+{
+ if (strchr (gtk_menu_item_get_label (menuitem), 'r') != NULL)
+ action_search_preferences_dialog ();
+ else
+ gtk_widget_destroy (action_search_dialog);
+}
+
+static void
+action_search_context_menu (void)
+{
+ GtkWidget *preferences_menuitem;
+ GtkWidget *close_menuitem;
+ GtkWidget *context_menu;
+
+ context_menu = gtk_menu_new ();
+ preferences_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL);
+ close_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, NULL);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (context_menu), preferences_menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (context_menu), close_menuitem);
+
+ gtk_widget_show (context_menu);
+ gtk_widget_show (preferences_menuitem);
+ gtk_widget_show (close_menuitem);
+
+ g_signal_connect (preferences_menuitem, "activate", G_CALLBACK (context_menu_handler), NULL);
+ g_signal_connect (close_menuitem, "activate", G_CALLBACK (context_menu_handler), NULL);
+
+ gtk_menu_popup (GTK_MENU (context_menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
+}
+
+static void
+action_search_preferences_dialog (void)
+{
+ GtkWidget *pref_dialog;
+ GtkWidget *top_hbox;
+
+ GtkWidget *position_frame;
+ GtkWidget *position_vbox;
+ GtkWidget *pos_x_label;
+ GtkWidget *pos_y_label;
+ GtkWidget *specify_alignment_x;
+ GtkWidget *specify_alignment_y;
+
+ GtkWidget *display_frame;
+ GtkWidget *display_vbox;
+ GtkWidget *no_of_results_hbox;
+ GtkWidget *width_hbox;
+ GtkWidget *opacity_hbox;
+ GtkWidget *no_of_results_label;
+ GtkWidget *width_label;
+ GtkWidget *opacity_label;
+
+ GtkWidget *bottom_hbox;
+ GtkWidget *action_search_clear_history_button;
+ GtkWidget *restore_defaults_button;
+
+ pref_dialog = gtk_dialog_new_with_buttons ("Tito preferences",
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ NULL);
+
+ gtk_window_set_position (GTK_WINDOW (pref_dialog), GTK_WIN_POS_CENTER_ALWAYS);
+ top_hbox = gtk_hbox_new (FALSE, 10);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pref_dialog))), top_hbox, FALSE,
FALSE, 2);
+
+ position_frame = gtk_frame_new ("Postion");
+ position_vbox = gtk_vbox_new (TRUE, 2);
+
+ gtk_frame_set_shadow_type (GTK_FRAME (position_frame), GTK_SHADOW_ETCHED_IN);
+
+ PREF_UI.right_top_radio = gtk_radio_button_new_with_label (NULL, "Right-Top");
+ PREF_UI.middle_radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON
(PREF_UI.right_top_radio), "Middle");
+ PREF_UI.specify_radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON
(PREF_UI.right_top_radio), "Specify");
+ PREF_UI.pos_x_hbox = gtk_hbox_new (FALSE, 1);
+ PREF_UI.pos_y_hbox = gtk_hbox_new (FALSE, 1);
+ specify_alignment_x = gtk_alignment_new (1, 0, 0, 0);
+ specify_alignment_y = gtk_alignment_new (1, 0, 0, 0);
+ pos_x_label = gtk_label_new ("x:");
+ pos_y_label = gtk_label_new ("y:");
+ PREF_UI.pos_x_spin_button = gtk_spin_button_new_with_range (0, 100-PREF.WIDTH, 1);
+ PREF_UI.pos_y_spin_button = gtk_spin_button_new_with_range (0, 50, 1);
+
+ gtk_box_pack_start (GTK_BOX (top_hbox), position_frame, FALSE, FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (position_frame), position_vbox);
+ gtk_box_pack_start (GTK_BOX (position_vbox), PREF_UI.right_top_radio, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (position_vbox), PREF_UI.middle_radio, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (position_vbox), PREF_UI.specify_radio, TRUE, TRUE, 2);
+
+ gtk_box_pack_start (GTK_BOX (position_vbox), specify_alignment_x, TRUE, TRUE, 1);
+ gtk_container_add (GTK_CONTAINER (specify_alignment_x), PREF_UI.pos_x_hbox);
+ gtk_box_pack_start (GTK_BOX (PREF_UI.pos_x_hbox), pos_x_label, TRUE, TRUE, 1);
+ gtk_box_pack_start (GTK_BOX (PREF_UI.pos_x_hbox), PREF_UI.pos_x_spin_button, TRUE, TRUE, 1);
+
+ gtk_box_pack_start (GTK_BOX (position_vbox), specify_alignment_y, TRUE, TRUE, 1);
+ gtk_container_add (GTK_CONTAINER (specify_alignment_y), PREF_UI.pos_y_hbox);
+ gtk_box_pack_start (GTK_BOX (PREF_UI.pos_y_hbox), pos_y_label, TRUE, TRUE, 1);
+ gtk_box_pack_start (GTK_BOX (PREF_UI.pos_y_hbox), PREF_UI.pos_y_spin_button, TRUE, TRUE, 1);
+
+ display_frame = gtk_frame_new ("Display");
+ display_vbox = gtk_vbox_new (TRUE, 2);
+
+ gtk_frame_set_shadow_type (GTK_FRAME (display_frame), GTK_SHADOW_ETCHED_IN);
+
+ no_of_results_hbox = gtk_hbox_new (FALSE, 2);
+ width_hbox = gtk_hbox_new (FALSE, 2);
+ opacity_hbox = gtk_hbox_new (FALSE, 2);
+ no_of_results_label = gtk_label_new ("Results height:");
+ PREF_UI.no_of_results_spin_button = gtk_spin_button_new_with_range (2, 10, 1);
+ width_label = gtk_label_new ("Tito Width:");
+ PREF_UI.width_spin_button = gtk_spin_button_new_with_range (20, 60, 1);
+ opacity_label = gtk_label_new ("Tito Opacity:");
+ PREF_UI.opacity_spin_button = gtk_spin_button_new_with_range (40, 100, 10);
+ PREF_UI.show_insensitive_check_button = gtk_check_button_new_with_label ("Show unavailable actions");
+ action_search_clear_history_button = gtk_button_new_with_label ("Clear history");
+ restore_defaults_button = gtk_button_new_with_label ("Restore defaults");
+
+ gtk_box_pack_start (GTK_BOX (top_hbox), display_frame, FALSE, FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (display_frame), display_vbox);
+ gtk_box_pack_start (GTK_BOX (display_vbox), no_of_results_hbox, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (no_of_results_hbox), no_of_results_label, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (no_of_results_hbox), PREF_UI.no_of_results_spin_button, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (display_vbox), width_hbox, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (width_hbox), width_label, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (width_hbox), PREF_UI.width_spin_button, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (display_vbox), opacity_hbox, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (opacity_hbox), opacity_label, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (opacity_hbox), PREF_UI.opacity_spin_button, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (display_vbox), PREF_UI.show_insensitive_check_button, TRUE, TRUE, 2);
+
+ bottom_hbox = gtk_hbox_new (TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pref_dialog))), bottom_hbox, FALSE,
FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (bottom_hbox), action_search_clear_history_button, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (bottom_hbox), restore_defaults_button, TRUE, TRUE, 2);
+
+ action_search_set_prefereces_ui_values ();
+ gtk_widget_show_all (pref_dialog);
+
+ g_signal_connect (PREF_UI.right_top_radio, "toggled", G_CALLBACK (modify_position_spins), NULL);
+ g_signal_connect (PREF_UI.middle_radio, "toggled", G_CALLBACK (modify_position_spins), NULL);
+ g_signal_connect (PREF_UI.specify_radio, "toggled", G_CALLBACK (modify_position_spins), NULL);
+ g_signal_connect (action_search_clear_history_button, "clicked", G_CALLBACK
(action_search_clear_history_button_clicked), NULL);
+ g_signal_connect (restore_defaults_button, "clicked", G_CALLBACK (restore_defaults_button_clicked), NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (pref_dialog)) == GTK_RESPONSE_ACCEPT)
+ action_search_update_preferences ();
+
+ gtk_widget_destroy (pref_dialog);
+}
+
+static GtkWidget*
+action_search_setup_results_list (void)
+{
+ gint wid1 = 100;
+ GtkWidget *sc_win;
+ GtkListStore *store;
+ GtkCellRenderer *cell1;
+ GtkCellRenderer *cell_renderer;
+ GtkTreeViewColumn *column1, *column2;
+
+ sc_win = gtk_scrolled_window_new (NULL, NULL);
+ store = gtk_list_store_new (N_COL, G_TYPE_STRING, G_TYPE_STRING, GTK_TYPE_ACTION, G_TYPE_BOOLEAN);
+ results_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (results_list), FALSE);
+
+ cell1 = gtk_cell_renderer_pixbuf_new ();
+ column1 = gtk_tree_view_column_new_with_attributes (NULL,
+ cell1,
+ "stock_id", RESULT_ICON,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (results_list), column1);
+ gtk_tree_view_column_add_attribute (column1, cell1, "sensitive", IS_SENSITIVE);
+ gtk_tree_view_column_set_min_width (column1, 22);
+
+ cell_renderer = gtk_cell_renderer_text_new ();
+ column2 = gtk_tree_view_column_new_with_attributes (NULL,
+ cell_renderer,
+ "markup", RESULT_DATA,
+ NULL);
+ gtk_tree_view_column_add_attribute (column2, cell_renderer, "sensitive", IS_SENSITIVE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (results_list), column2);
+ gtk_tree_view_column_set_max_width (column2, wid1);
+
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sc_win),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+
+ gtk_container_add (GTK_CONTAINER (sc_win), results_list);
+ g_object_unref (G_OBJECT (store));
+
+ return sc_win;
+}
+
+static gboolean
+action_search_search_dialog (void)
+{
+ GtkWidget *main_vbox, *main_hbox;
+ GtkWidget *preferences_image;
+ GtkWidget *preferences_button;
+ GtkWidget *list_view;
+
+ action_search_dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+ gtk_window_set_decorated (GTK_WINDOW (action_search_dialog), FALSE);
+ gtk_window_set_default_size (GTK_WINDOW (action_search_dialog), (PREF.WIDTH/100)*par_width,
DEFAULT_HEIGHT);
+ action_search_update_position ();
+ gtk_window_set_opacity (GTK_WINDOW (action_search_dialog), PREF.OPACITY);
+
+ main_vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (action_search_dialog), main_vbox);
+ gtk_widget_show (main_vbox);
+
+ main_hbox = gtk_hbox_new (FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, FALSE, TRUE, 0);
+ gtk_widget_show (main_hbox);
+
+ keyword_entry = gtk_entry_new ();
+ gtk_entry_set_has_frame (GTK_ENTRY (keyword_entry), FALSE);
+ gtk_entry_set_icon_from_stock (GTK_ENTRY (keyword_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
+ gtk_widget_show (keyword_entry);
+ gtk_box_pack_start (GTK_BOX (main_hbox), keyword_entry, TRUE, TRUE, 0);
+
+ preferences_image = gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU);
+ preferences_button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (preferences_button), preferences_image);
+ gtk_widget_show (preferences_image);
+ gtk_widget_show (preferences_button);
+ gtk_box_pack_end (GTK_BOX (main_hbox), preferences_button, FALSE, TRUE, 0);
+
+ list_view = action_search_setup_results_list ();
+ gtk_box_pack_start (GTK_BOX (main_vbox), list_view, TRUE, TRUE, 0);
+
+
+ gtk_widget_set_events (action_search_dialog, GDK_KEY_RELEASE_MASK);
+ gtk_widget_set_events (action_search_dialog, GDK_KEY_PRESS_MASK);
+ gtk_widget_set_events (action_search_dialog, GDK_BUTTON_PRESS_MASK);
+ gtk_widget_set_events (preferences_button, GDK_BUTTON_PRESS_MASK);
+
+ g_signal_connect (results_list, "row-activated", (GCallback) row_activated, NULL);
+ g_signal_connect (keyword_entry, "key-release-event", G_CALLBACK (key_released), list_view);
+ g_signal_connect (results_list, "key_press_event", G_CALLBACK (result_selected), NULL);
+ g_signal_connect (preferences_button, "clicked", G_CALLBACK (context_menu_invoked), NULL);
+ g_signal_connect (action_search_dialog, "focus-out-event", G_CALLBACK (on_focus_out), preferences_button);
+
+ gtk_widget_show (action_search_dialog);
+
+ return TRUE;
+}
diff --git a/app/dialogs/action-search-dialog.h b/app/dialogs/action-search-dialog.h
new file mode 100644
index 0000000..162efe4
--- /dev/null
+++ b/app/dialogs/action-search-dialog.h
@@ -0,0 +1,24 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2012 Srihari Sriraman, Suhas Bharadwaj, Vidyashree K, Zeeshan Ali Ansari
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ACTION_SEARCH_DIALOG_H__
+#define __ACTION_SEARCH_DIALOG_H__
+
+
+GtkWidget * action_search_dialog_create (void);
+
+#endif /* __ACTION_SEARCH_DIALOG_H__ */
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
index 4db485f..09e2448 100644
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@@ -78,6 +78,7 @@
#include "preferences-dialog.h"
#include "quit-dialog.h"
#include "tips-dialog.h"
+#include "action-search-dialog.h"
#include "gimp-intl.h"
@@ -195,6 +196,15 @@ dialogs_about_get (GimpDialogFactory *factory,
}
GtkWidget *
+dialogs_action_search_get (GimpDialogFactory *factory,
+ GimpContext *context,
+ GimpUIManager *ui_manager,
+ gint view_size)
+{
+ return action_search_dialog_create ();
+}
+
+GtkWidget *
dialogs_error_get (GimpDialogFactory *factory,
GimpContext *context,
GimpUIManager *ui_manager,
diff --git a/app/dialogs/dialogs-constructors.h b/app/dialogs/dialogs-constructors.h
index f868728..53b8d53 100644
--- a/app/dialogs/dialogs-constructors.h
+++ b/app/dialogs/dialogs-constructors.h
@@ -69,6 +69,10 @@ GtkWidget * dialogs_about_get (GimpDialogFactory *factory,
GimpContext *context,
GimpUIManager *ui_manager,
gint view_size);
+GtkWidget * dialogs_action_search_get (GimpDialogFactory *factory,
+ GimpContext *context,
+ GimpUIManager *ui_manager,
+ gint view_size);
GtkWidget * dialogs_error_get (GimpDialogFactory *factory,
GimpContext *context,
GimpUIManager *ui_manager,
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 9bd1607..9a4f393 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -278,6 +278,8 @@ static const GimpDialogFactoryEntry entries[] =
dialogs_tips_get, TRUE, FALSE, FALSE),
TOPLEVEL ("gimp-about-dialog",
dialogs_about_get, TRUE, FALSE, FALSE),
+ TOPLEVEL ("gimp-action-search-dialog",
+ dialogs_action_search_get, TRUE, FALSE, FALSE),
TOPLEVEL ("gimp-error-dialog",
dialogs_error_get, TRUE, FALSE, FALSE),
TOPLEVEL ("gimp-close-all-dialog",
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 7d9983d..40e471e 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -527,6 +527,13 @@ gui_restore_after_callback (Gimp *gimp,
#undef PREFERENCES
+ gui_add_to_app_menu (image_ui_manager, group,
+ "/dummy-menubar/image-popup/Help/dialogs-search-action",
+ _("Search and Run a Command"));
+
+ /* the preferences group */
+ group = ige_mac_menu_add_app_menu_group ();
+
item = gtk_separator_menu_item_new ();
gtkosx_application_insert_app_menu_item (osx_app, item, 7);
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index e3cd977..e5fe99f 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -508,6 +508,7 @@
#define GIMP_HELP_DOCK_SHOW_BUTTON_BAR "gimp-dock-show-button-bar"
#define GIMP_HELP_ABOUT_DIALOG "gimp-about-dialog"
+#define GIMP_HELP_ACTION_SEARCH_DIALOG "gimp-action-search-dialog"
#define GIMP_HELP_COLOR_DIALOG "gimp-color-dialog"
#define GIMP_HELP_DEVICE_STATUS_DIALOG "gimp-device-status-dialog"
#define GIMP_HELP_DISPLAY_FILTER_DIALOG "gimp-display-filter-dialog"
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index b28539f..5fffd97 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -750,6 +750,8 @@
<menuitem action="dialogs-tips" />
<menuitem action="dialogs-about" />
<separator />
+ <menuitem action="dialogs-action-search" />
+ <separator />
<placeholder name="Programming" />
<separator />
</menu>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
