Mercurial > octave
diff 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 |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.h Sun May 12 15:33:05 2013 -0400 +++ b/libgui/qterminal/libqterminal/QTerminal.h Sun May 12 16:17:48 2013 -0400 @@ -26,7 +26,9 @@ #include <QSettings> #include <QtGlobal> #include <QWidget> +#include <QStringList> #include <QColor> +#include <QList> #include <QMenu> class QTerminal : public QWidget @@ -37,6 +39,10 @@ static QTerminal *create (QWidget *xparent = 0); + static QList<QColor> default_colors (void); + + static QStringList color_names (void); + virtual ~QTerminal (void) { } virtual void setTerminalFont(const QFont& font) = 0;