summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArx Cruz <arxcruz@gnome.org>2011-12-21 10:20:29 -0200
committerArx Cruz <arxcruz@gnome.org>2011-12-21 10:22:34 -0200
commit82d09a41f2d7f6c13f207d05f2c594f3657fc599 (patch)
tree57639cc1a0dc682d6f079a01ca68c77b998a1805
parentd565e9a77f400c62c6e7d7a97dfb83f95b273888 (diff)
Added support to lists on zenity --forms
-rw-r--r--src/forms.c144
-rw-r--r--src/option.c104
-rw-r--r--src/zenity.h7
3 files changed, 247 insertions, 8 deletions
diff --git a/src/forms.c b/src/forms.c
index c2b9f85..f8f1db5 100644
--- a/src/forms.c
+++ b/src/forms.c
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 121 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
- * Authors: Arx Cruz <arxcruz@gmail.com>
+ * Authors: Arx Cruz <arxcruz@gnome.org>
*/
#include "config.h"
@@ -27,9 +27,124 @@
#include "util.h"
static ZenityData *zen_data;
-
+static GSList *selected;
static void zenity_forms_dialog_response (GtkWidget *widget, int response, gpointer data);
+static void zenity_forms_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf, GtkTreeIter *iter, GtkTreeView *tree_view)
+{
+ gint n_columns = 0;
+ gint i = 0;
+
+ n_columns = gtk_tree_model_get_n_columns (model);
+ GValue value = {0, };
+ for (i = 0; i < n_columns; i++) {
+ gtk_tree_model_get_value (model, iter, i, &value);
+ selected = g_slist_append (selected, g_value_dup_string (&value));
+ g_value_unset (&value);
+ }
+}
+
+static void zenity_forms_dialog_output (void)
+{
+ GSList *tmp;
+
+ for (tmp = selected; tmp; tmp = tmp->next) {
+ if (tmp->next != NULL) {
+ g_print ("%s,", (gchar *) tmp->data);
+ }
+ else
+ g_print ("%s", (gchar *) tmp->data);
+ }
+
+ g_slist_foreach (selected, (GFunc) g_free, NULL);
+ selected = NULL;
+}
+
+static GtkWidget *
+zenity_forms_create_and_fill_list (ZenityFormsData *forms_data,
+ int list_number, gchar *header)
+{
+ GtkListStore *list_store;
+ GtkWidget *tree_view;
+ GtkWidget *scrolled_window;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ GType *column_types = NULL;
+ gchar *list_values;
+ gchar *column_values;
+
+ gint i = 0;
+ /* If no column names available, default is one */
+ gint n_columns = 1;
+ gint column_index = 0;
+
+ tree_view = gtk_tree_view_new ();
+
+ if (forms_data->column_values) {
+ column_values = g_slist_nth_data (forms_data->column_values, list_number);
+ if (column_values) {
+ gchar **values = g_strsplit_set (column_values, "|", -1);
+ if (values) {
+ n_columns = g_strv_length (values);
+ column_types = g_new (GType, n_columns);
+ for (i = 0; i < n_columns; i++)
+ column_types[i] = G_TYPE_STRING;
+
+ for (i = 0; i < n_columns; i++) {
+ gchar *column_name = values[i];
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (column_name,
+ renderer,
+ "text", column_index,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+ column_index++;
+ }
+ }
+ }
+ }
+
+ list_store = g_object_new (GTK_TYPE_LIST_STORE, NULL);
+
+ gtk_list_store_set_column_types (list_store, n_columns, column_types);
+
+ if (forms_data->list_values) {
+ list_values = g_slist_nth_data (forms_data->list_values, list_number);
+ if (list_values) {
+ gchar **row_values = g_strsplit_set (list_values, "|", -1);
+ if (row_values) {
+ GtkTreeIter iter;
+ gchar *row = row_values[0];
+ gint position = -1;
+ i = 0;
+
+ while (row != NULL) {
+ if (position >= n_columns || position == -1) {
+ position = 0;
+ gtk_list_store_append (list_store, &iter);
+ }
+ gtk_list_store_set (list_store, &iter, position, row, -1);
+ position++;
+ row = row_values[++i];
+ }
+ g_strfreev (row_values);
+ }
+ g_free (list_values);
+ }
+ }
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (list_store));
+ g_object_unref (list_store);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ //gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
+ // GTK_WIDGET (tree_view));
+ gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (tree_view));
+ gtk_widget_set_size_request (GTK_WIDGET (scrolled_window), -1, 100);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), forms_data->show_header);
+
+ return scrolled_window;
+}
+
void zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data)
{
GtkBuilder *builder = NULL;
@@ -41,6 +156,7 @@ void zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data)
GSList *tmp;
gint number_of_widgets = g_slist_length (forms_data->list);
+ int list_count = 0;
zen_data = data;
@@ -156,6 +272,22 @@ void zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data)
0,
0);
break;
+ case ZENITY_FORMS_LIST:
+ zenity_value->forms_widget = zenity_forms_create_and_fill_list (forms_data, list_count,
+ zenity_value->option_value);
+ gtk_alignment_set (GTK_ALIGNMENT (align), 0.0, 0.02, 0.0, 0.0);
+ gtk_table_attach (GTK_TABLE (table),
+ GTK_WIDGET (zenity_value->forms_widget),
+ 1,
+ 2,
+ i,
+ i+1,
+ GTK_EXPAND | GTK_FILL,
+ GTK_EXPAND | GTK_FILL,
+ 0,
+ 0);
+ list_count++;
+ break;
default:
zenity_value->forms_widget = gtk_entry_new();
gtk_table_attach (GTK_TABLE (table),
@@ -193,6 +325,7 @@ zenity_forms_dialog_response (GtkWidget *widget, int response, gpointer data)
guint day, year, month;
GDate *date = NULL;
gchar time_string[128];
+ GtkTreeSelection *selection;
switch (response) {
case GTK_RESPONSE_OK:
@@ -204,6 +337,13 @@ zenity_forms_dialog_response (GtkWidget *widget, int response, gpointer data)
case ZENITY_FORMS_ENTRY:
g_print("%s", gtk_entry_get_text (GTK_ENTRY (zenity_value->forms_widget)));
break;
+ case ZENITY_FORMS_LIST:
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_bin_get_child (GTK_BIN (zenity_value->forms_widget))));
+ gtk_tree_selection_selected_foreach (selection,
+ (GtkTreeSelectionForeachFunc) zenity_forms_dialog_get_selected,
+ GTK_TREE_VIEW (gtk_bin_get_child (GTK_BIN (zenity_value->forms_widget))));
+ zenity_forms_dialog_output ();
+ break;
case ZENITY_FORMS_CALENDAR:
gtk_calendar_get_date (GTK_CALENDAR (zenity_value->forms_widget), &day, &month, &year);
date = g_date_new_dmy (year, month + 1, day);
diff --git a/src/option.c b/src/option.c
index e9d370d..7fdb7f1 100644
--- a/src/option.c
+++ b/src/option.c
@@ -128,7 +128,11 @@ static gboolean zenity_password_show_username;
/* Forms Dialog Options */
static gboolean zenity_forms_active;
+static gboolean zenity_forms_show_header;
static gchar *zenity_forms_date_format;
+//static gchar *zenity_forms_hide_column;
+static gchar **zenity_forms_list_values;
+static gchar **zenity_forms_column_values;
/* Miscelaneus Options */
static gboolean zenity_misc_about;
@@ -957,6 +961,52 @@ static GOptionEntry forms_dialog_options[] = {
N_("Calendar field name")
},
{
+ "add-list",
+ '\0',
+ 0,
+ G_OPTION_ARG_CALLBACK,
+ zenity_forms_callback,
+ N_("Add a new List in forms dialog"),
+ N_("List field and header name")
+ },
+ {
+ "list-values",
+ '\0',
+ 0,
+ G_OPTION_ARG_STRING_ARRAY,
+ &zenity_forms_list_values,
+ N_("List of values for List"),
+ N_("List of values separated by |")
+ },
+ {
+ "column-values",
+ '\0',
+ 0,
+ G_OPTION_ARG_STRING_ARRAY,
+ &zenity_forms_column_values,
+ N_("List of values for columns"),
+ N_("List of values separated by |")
+ },
+ /* TODO: Implement how to hide specifc column
+ {
+ "hide-column",
+ '\0',
+ 0,
+ G_OPTION_ARG_STRING,
+ &zenity_forms_hide_column,
+ N_("Hide a specific column"),
+ N_("NUMBER")
+ },*/
+ {
+ "show-header",
+ '\0',
+ 0,
+ G_OPTION_ARG_NONE,
+ &zenity_forms_show_header,
+ N_("Show the columns header"),
+ NULL
+ },
+ {
"text",
'\0',
G_OPTION_FLAG_NOALIAS,
@@ -1117,7 +1167,12 @@ zenity_option_free (void) {
if (zenity_forms_date_format)
g_free (zenity_forms_date_format);
-
+ if (zenity_forms_list_values)
+ g_strfreev (zenity_forms_list_values);
+ if (zenity_forms_column_values)
+ g_strfreev (zenity_forms_column_values);
+// if (zenity_forms_hide_column)
+// g_free (zenity_forms_hide_column);
if (zenity_entry_entry_text)
g_free (zenity_entry_entry_text);
@@ -1173,13 +1228,17 @@ zenity_forms_callback (const gchar *option_name,
GError **error)
{
ZenityFormsValue *forms_value = g_new0 (ZenityFormsValue, 1);
- forms_value->option_value = g_strdup(value);
- if (g_strcmp0(option_name, "--add-entry") == 0)
+
+ forms_value->option_value = g_strdup (value);
+
+ if (g_strcmp0 (option_name, "--add-entry") == 0)
forms_value->type = ZENITY_FORMS_ENTRY;
- else if (g_strcmp0(option_name, "--add-calendar") == 0)
+ else if (g_strcmp0 (option_name, "--add-calendar") == 0)
forms_value->type = ZENITY_FORMS_CALENDAR;
- else if (g_strcmp0(option_name, "--add-password") == 0)
+ else if (g_strcmp0 (option_name, "--add-password") == 0)
forms_value->type = ZENITY_FORMS_PASSWORD;
+ else if (g_strcmp0 (option_name, "--add-list") == 0)
+ forms_value->type = ZENITY_FORMS_LIST;
results->forms_data->list = g_slist_append(results->forms_data->list, forms_value);
@@ -1420,7 +1479,9 @@ zenity_forms_pre_callback (GOptionContext *context,
GError **error)
{
zenity_forms_active = FALSE;
+ zenity_forms_show_header = FALSE;
zenity_forms_date_format = NULL;
+// zenity_forms_hide_column = NULL;
return TRUE;
}
@@ -1833,10 +1894,31 @@ zenity_forms_post_callback (GOptionContext *context,
gpointer data,
GError **error)
{
+ gchar *values;
+ int i = 0;
+
zenity_option_set_dialog_mode (zenity_forms_active, MODE_FORMS);
if (results->mode == MODE_FORMS) {
results->forms_data->dialog_text = zenity_general_dialog_text;
results->forms_data->separator = zenity_general_separator;
+// results->forms_data->hide_column = zenity_forms_hide_column;
+ results->forms_data->show_header = zenity_forms_show_header;
+
+ if (zenity_forms_list_values) {
+ values = zenity_forms_list_values[0];
+ while (values != NULL) {
+ results->forms_data->list_values = g_slist_append (results->forms_data->list_values, values);
+ values = zenity_forms_list_values[++i];
+ }
+ }
+ if (zenity_forms_column_values) {
+ i = 0;
+ values = zenity_forms_column_values[0];
+ while (values != NULL) {
+ results->forms_data->column_values = g_slist_append (results->forms_data->column_values, values);
+ values = zenity_forms_list_values[++i];
+ }
+ }
if (zenity_forms_date_format)
results->forms_data->date_format = zenity_forms_date_format;
else
@@ -1845,6 +1927,18 @@ zenity_forms_post_callback (GOptionContext *context,
if (zenity_forms_date_format)
zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_date_format),
ERROR_SUPPORT);
+ if (zenity_forms_list_values)
+ zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_list_values),
+ ERROR_SUPPORT);
+// if (zenity_forms_hide_column)
+// zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_hide_column),
+// ERROR_SUPPORT);
+ if (zenity_forms_column_values)
+ zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_column_values),
+ ERROR_SUPPORT);
+ if (zenity_forms_show_header)
+ zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_show_header),
+ ERROR_SUPPORT);
}
return TRUE;
diff --git a/src/zenity.h b/src/zenity.h
index 4d1e27d..c5414fe 100644
--- a/src/zenity.h
+++ b/src/zenity.h
@@ -144,15 +144,20 @@ typedef struct {
typedef struct {
GSList *list;
GSList *list_widgets;
+ GSList *list_values;
+ GSList *column_values;
gchar *dialog_text;
gchar *separator;
gchar *date_format;
+// gchar *hide_column;
+ gboolean show_header;
} ZenityFormsData;
typedef enum {
ZENITY_FORMS_ENTRY,
ZENITY_FORMS_PASSWORD,
- ZENITY_FORMS_CALENDAR
+ ZENITY_FORMS_CALENDAR,
+ ZENITY_FORMS_LIST
} ZenityFormsType;
typedef struct {