← Back to branch summary

~ubuntu-branches/ubuntu/precise/zenity/precise-updates

« back to all changes in this revision

Viewing changes to src/option.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-03-29 14:50:15 UTC
  • mfrom: (1.1.45)
  • Revision ID: package-import@ubuntu.com-20120329145015-p6jkb44cf19r2qyi
Tags: 3.4.0-0ubuntu1
* New upstream release:
  - Add support for lists and trees with --forms
  - Fix warning reading list from stdin
* debian/zenity-common.install:
  - Doesn't install omf files anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/option.c
128
128
 
129
129
/* Forms Dialog Options */
130
130
static gboolean zenity_forms_active;
 
131
static gboolean zenity_forms_show_header;
131
132
static gchar   *zenity_forms_date_format;
 
133
//static gchar   *zenity_forms_hide_column;
 
134
static gchar  **zenity_forms_list_values;
 
135
static gchar  **zenity_forms_column_values;
132
136
 
133
137
/* Miscelaneus Options */
134
138
static gboolean zenity_misc_about;
957
961
    N_("Calendar field name")
958
962
  },
959
963
  {
 
964
    "add-list",
 
965
    '\0',
 
966
    0,
 
967
    G_OPTION_ARG_CALLBACK,
 
968
    zenity_forms_callback,
 
969
    N_("Add a new List in forms dialog"),
 
970
    N_("List field and header name")
 
971
  },
 
972
  {
 
973
    "list-values",
 
974
    '\0',
 
975
    0,
 
976
    G_OPTION_ARG_STRING_ARRAY,
 
977
    &zenity_forms_list_values,
 
978
    N_("List of values for List"),
 
979
    N_("List of values separated by |")
 
980
  },
 
981
  {
 
982
    "column-values",
 
983
    '\0',
 
984
    0,
 
985
    G_OPTION_ARG_STRING_ARRAY,
 
986
    &zenity_forms_column_values,
 
987
    N_("List of values for columns"),
 
988
    N_("List of values separated by |")
 
989
  },
 
990
 /* TODO: Implement how to hide specifc column 
 
991
  {
 
992
    "hide-column",
 
993
    '\0',
 
994
    0,
 
995
    G_OPTION_ARG_STRING,
 
996
    &zenity_forms_hide_column,
 
997
    N_("Hide a specific column"),
 
998
    N_("NUMBER")
 
999
  },*/
 
1000
  {
 
1001
    "show-header",
 
1002
    '\0',
 
1003
    0,
 
1004
    G_OPTION_ARG_NONE,
 
1005
    &zenity_forms_show_header,
 
1006
    N_("Show the columns header"),
 
1007
    NULL
 
1008
  },
 
1009
  {
960
1010
    "text",
961
1011
    '\0',
962
1012
    G_OPTION_FLAG_NOALIAS,
1117
1167
 
1118
1168
  if (zenity_forms_date_format)
1119
1169
    g_free (zenity_forms_date_format);
1120
 
 
 
1170
  if (zenity_forms_list_values)
 
1171
    g_strfreev (zenity_forms_list_values);
 
1172
  if (zenity_forms_column_values)
 
1173
    g_strfreev (zenity_forms_column_values);
 
1174
//  if (zenity_forms_hide_column)
 
1175
//    g_free (zenity_forms_hide_column);
1121
1176
  if (zenity_entry_entry_text)
1122
1177
    g_free (zenity_entry_entry_text);
1123
1178
 
1173
1228
                       GError **error)
1174
1229
{
1175
1230
  ZenityFormsValue *forms_value = g_new0 (ZenityFormsValue, 1);
1176
 
  forms_value->option_value = g_strdup(value);
1177
 
  if (g_strcmp0(option_name, "--add-entry") == 0)
 
1231
 
 
1232
  forms_value->option_value = g_strdup (value);
 
1233
 
 
1234
  if (g_strcmp0 (option_name, "--add-entry") == 0)
1178
1235
    forms_value->type = ZENITY_FORMS_ENTRY;
1179
 
  else if (g_strcmp0(option_name, "--add-calendar") == 0)
 
1236
  else if (g_strcmp0 (option_name, "--add-calendar") == 0)
1180
1237
    forms_value->type = ZENITY_FORMS_CALENDAR;
1181
 
  else if (g_strcmp0(option_name, "--add-password") == 0)
 
1238
  else if (g_strcmp0 (option_name, "--add-password") == 0)
1182
1239
    forms_value->type = ZENITY_FORMS_PASSWORD;
 
1240
  else if (g_strcmp0 (option_name, "--add-list") == 0)
 
1241
    forms_value->type = ZENITY_FORMS_LIST;
1183
1242
 
1184
1243
  results->forms_data->list = g_slist_append(results->forms_data->list, forms_value);
1185
1244
 
1420
1479
                           GError        **error)
1421
1480
{
1422
1481
  zenity_forms_active = FALSE;
 
1482
  zenity_forms_show_header = FALSE;
1423
1483
  zenity_forms_date_format = NULL;
 
1484
//  zenity_forms_hide_column = NULL;
1424
1485
  return TRUE;
1425
1486
}
1426
1487
 
1833
1894
                            gpointer        data,
1834
1895
                            GError        **error)
1835
1896
{
 
1897
  gchar *values;
 
1898
  int i = 0;
 
1899
 
1836
1900
  zenity_option_set_dialog_mode (zenity_forms_active, MODE_FORMS);
1837
1901
  if (results->mode == MODE_FORMS) {
1838
1902
    results->forms_data->dialog_text = zenity_general_dialog_text;
1839
1903
    results->forms_data->separator = zenity_general_separator;
 
1904
//    results->forms_data->hide_column = zenity_forms_hide_column;
 
1905
    results->forms_data->show_header = zenity_forms_show_header;
 
1906
 
 
1907
    if (zenity_forms_list_values) {
 
1908
      values = zenity_forms_list_values[0];
 
1909
      while (values != NULL) {
 
1910
        results->forms_data->list_values = g_slist_append (results->forms_data->list_values, values);
 
1911
        values = zenity_forms_list_values[++i];
 
1912
      }
 
1913
    }
 
1914
    if (zenity_forms_column_values) {
 
1915
      i = 0;
 
1916
      values = zenity_forms_column_values[0];
 
1917
      while (values != NULL) {
 
1918
        results->forms_data->column_values = g_slist_append (results->forms_data->column_values, values);
 
1919
        values = zenity_forms_list_values[++i];
 
1920
      }
 
1921
    }
1840
1922
    if (zenity_forms_date_format)
1841
1923
      results->forms_data->date_format = zenity_forms_date_format;
1842
1924
    else
1845
1927
    if (zenity_forms_date_format)
1846
1928
      zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_date_format),
1847
1929
                           ERROR_SUPPORT);
 
1930
    if (zenity_forms_list_values)
 
1931
      zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_list_values),
 
1932
                           ERROR_SUPPORT);
 
1933
//    if (zenity_forms_hide_column)
 
1934
//      zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_hide_column),
 
1935
//                          ERROR_SUPPORT);
 
1936
    if (zenity_forms_column_values)
 
1937
      zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_column_values),
 
1938
                          ERROR_SUPPORT);
 
1939
    if (zenity_forms_show_header)
 
1940
      zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_show_header),
 
1941
                          ERROR_SUPPORT);
1848
1942
  }
1849
1943
 
1850
1944
  return TRUE;