changeset 17826:574ab045f70c

restore display of "persistent", "automatic", etc. removed by 53f433bae63b * workspace-model.cc (workspace_model::data): Restore display of "persistent", "automatic", etc. storage classes. Allow "complex" to be translated.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Nov 2013 15:40:19 -0400
parents 53f433bae63b
children 2de613986374
files libgui/src/workspace-model.cc
diffstat 1 files changed, 26 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/workspace-model.cc	Fri Nov 01 14:45:35 2013 -0400
+++ b/libgui/src/workspace-model.cc	Fri Nov 01 15:40:19 2013 -0400
@@ -166,9 +166,33 @@
               break;
 
             case 4:
-              retval = QVariant (_complex_flags[idx.row ()] ? "complex" : "");
+              {
+                QString sclass;
+
+                QString class_chars = resource_manager::storage_class_chars ();
+
+                int actual_class
+                  = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
+
+                if (actual_class >= 0)
+                  {
+                    QStringList class_names
+                      = resource_manager::storage_class_names ();
+
+                    sclass = class_names.at (actual_class);
+                  }
+
+                if (_complex_flags[idx.row ()])
+                  {
+                    if (sclass.isEmpty ())
+                      sclass = tr ("complex");
+                    else
+                      sclass += ", " + tr ("complex");
+                  }
+
+                retval = QVariant (sclass);
+              }
               break;
-
             }
         }
     }