Mercurial > octave-nkf
comparison libgui/qterminal/libqterminal/QTerminal.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 | ba808cd9d86c |
children | b04413e5a811 |
comparison
equal
deleted
inserted
replaced
16640:0ee7b4d1b940 | 16641:64f9a3e301d3 |
---|---|
24 #define QTERMINAL_H | 24 #define QTERMINAL_H |
25 | 25 |
26 #include <QSettings> | 26 #include <QSettings> |
27 #include <QtGlobal> | 27 #include <QtGlobal> |
28 #include <QWidget> | 28 #include <QWidget> |
29 #include <QStringList> | |
29 #include <QColor> | 30 #include <QColor> |
31 #include <QList> | |
30 #include <QMenu> | 32 #include <QMenu> |
31 | 33 |
32 class QTerminal : public QWidget | 34 class QTerminal : public QWidget |
33 { | 35 { |
34 Q_OBJECT | 36 Q_OBJECT |
35 | 37 |
36 public: | 38 public: |
37 | 39 |
38 static QTerminal *create (QWidget *xparent = 0); | 40 static QTerminal *create (QWidget *xparent = 0); |
41 | |
42 static QList<QColor> default_colors (void); | |
43 | |
44 static QStringList color_names (void); | |
39 | 45 |
40 virtual ~QTerminal (void) { } | 46 virtual ~QTerminal (void) { } |
41 | 47 |
42 virtual void setTerminalFont(const QFont& font) = 0; | 48 virtual void setTerminalFont(const QFont& font) = 0; |
43 | 49 |