Mercurial > octave-nkf
comparison 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 |
comparison
equal
deleted
inserted
replaced
16640:0ee7b4d1b940 | 16641:64f9a3e301d3 |
---|---|
27 #include <QAbstractTableModel> | 27 #include <QAbstractTableModel> |
28 #include <QVector> | 28 #include <QVector> |
29 #include <QSemaphore> | 29 #include <QSemaphore> |
30 #include <QStringList> | 30 #include <QStringList> |
31 #include <QChar> | 31 #include <QChar> |
32 #include <QList> | |
32 #include <QColor> | 33 #include <QColor> |
33 #include <QSettings> | 34 #include <QSettings> |
34 | 35 |
35 class workspace_model | 36 class workspace_model |
36 : public QAbstractTableModel | 37 : public QAbstractTableModel |
40 public: | 41 public: |
41 | 42 |
42 workspace_model (QObject *parent = 0); | 43 workspace_model (QObject *parent = 0); |
43 | 44 |
44 ~workspace_model (void) { } | 45 ~workspace_model (void) { } |
46 | |
47 static QList<QColor> storage_class_default_colors (void); | |
48 | |
49 static QStringList storage_class_names (void); | |
45 | 50 |
46 QVariant data (const QModelIndex& index, int role) const; | 51 QVariant data (const QModelIndex& index, int role) const; |
47 | 52 |
48 bool setData (const QModelIndex& index, const QVariant& value, | 53 bool setData (const QModelIndex& index, const QVariant& value, |
49 int role = Qt::EditRole); | 54 int role = Qt::EditRole); |