Mercurial > octave-nkf
diff libgui/src/workspace-model.h @ 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.h Sun May 12 15:33:05 2013 -0400 +++ b/libgui/src/workspace-model.h Sun May 12 16:17:48 2013 -0400 @@ -29,6 +29,7 @@ #include <QSemaphore> #include <QStringList> #include <QChar> +#include <QList> #include <QColor> #include <QSettings> @@ -43,6 +44,10 @@ ~workspace_model (void) { } + static QList<QColor> storage_class_default_colors (void); + + static QStringList storage_class_names (void); + QVariant data (const QModelIndex& index, int role) const; bool setData (const QModelIndex& index, const QVariant& value,