X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=f5be69d8705981d52300008499046662675ebafc;hb=e339b2ca72d77a076566856e9357781d49cd983c;hp=240356f294cb87f3b6239e752bcafed70314b2c5;hpb=404bd133ab1d8d446564100debb606fd2786371f;p=pspp
diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 240356f294..f5be69d870 100644
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -14,15 +14,23 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
+/* This file implements a GtkTreeModel. It allows GtkComboBox and
+ GtkTreeView to display the names and non-empty cell ranges of the
+ sheets aka "Tables" of spreadsheet files.
+ It doesn't take any notice of the spreadsheet data itself.
+*/
#include
#include
-#include "psppire-spreadsheet-model.h"
+#include
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+#include "psppire-spreadsheet-model.h"
#include "data/spreadsheet-reader.h"
-#include "data/gnumeric-reader.h"
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
@@ -217,7 +225,7 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
if (iter == NULL)
return FALSE;
- if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1)
+ if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
{
iter->user_data = NULL;
iter->stamp = 0;
@@ -245,17 +253,19 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
{
const char *x =
- gnumeric_get_sheet_name (spreadsheetModel->spreadsheet,
+ spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
+
g_value_set_string (value, x);
}
break;
case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
{
char *x =
- gnumeric_get_sheet_range (spreadsheetModel->spreadsheet,
+ spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
- g_value_set_string (value, x);
+
+ g_value_set_string (value, x ? x : _("(empty)"));
g_free (x);
}
break;
@@ -276,7 +286,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
if (parent)
return FALSE;
- if (n >= spreadsheetModel->spreadsheet->sheets)
+ if (n >= spreadsheetModel->spreadsheet->n_sheets)
return FALSE;
iter->stamp = spreadsheetModel->stamp;
@@ -292,7 +302,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
PSPPIRE_SPREADSHEET_MODEL (model);
if (iter == NULL)
- return spreadsheetModel->spreadsheet->sheets;
+ return spreadsheetModel->spreadsheet->n_sheets;
return 0;
}