Mercurial > octave
diff libgui/src/workspace-model.cc @ 16641:64f9a3e301d3
don't store default values in resource manager class
* QTerminal.h, QTerminal.cc (QTerminal::default_colors,
QTerminal::color_names): New functions.
(QTerminal::notice_settings): Call default_colors.
* workspace-model.h, workspace-model.cc
(workspace_model::storage_class_default_colors,
workspace_model::storage_class_names): New functions.
* resource-manager.cc (resource_manager::storage_class_names,
resource_manager::storage_class_default_colors): Get values from
workspace_model.
(resource_manager::terminal_color_names,
resource_manager::terminal_default_colors): Get values from QTerminal.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 12 May 2013 16:17:48 -0400 |
| parents | a1f613e5066d |
| children | d63878346099 |
line wrap: on
line diff
--- a/libgui/src/workspace-model.cc Sun May 12 15:33:05 2013 -0400 +++ b/libgui/src/workspace-model.cc Sun May 12 16:17:48 2013 -0400 @@ -46,6 +46,43 @@ } +QList<QColor> +workspace_model::storage_class_default_colors (void) +{ + QList<QColor> colors; + + if (colors.isEmpty ()) + { + colors << QColor (190,255,255) + << QColor (220,255,220) + << QColor (220,220,255) + << QColor (255,255,190) + << QColor (255,220,220) + << QColor (255,190,255); + } + + return colors; +} + + +QStringList +workspace_model::storage_class_names (void) +{ + QStringList names; + + if (names.isEmpty ()) + { + names << QObject::tr ("automatic") + << QObject::tr ("function") + << QObject::tr ("global") + << QObject::tr ("hidden") + << QObject::tr ("inherited") + << QObject::tr ("persistent"); + } + + return names; +} + int workspace_model::rowCount (const QModelIndex&) const {