Mercurial > octave-nkf
comparison libgui/qterminal/libqterminal/QTerminalInterface.h @ 16620:818eef7b2618
allow terminal colors to be set from preferences dialog
* QTerminalInterface.h (QTerminalInterface::setBackgroundColor,
QTerminalInterface::setForeroundColor,
QTerminalInterface::setSelectionColor,
QTerminalInterface::setCursorColor): New functions.
* QUnixTerminalImpl.h, QUnixTerminalImpl.cpp
QUnixTerminalImpl::setBackgroundColor,
QUnixTerminalImpl::setForeroundColor,
QUnixTerminalImpl::setSelectionColor,
QUnixTerminalImpl::setCursorColor): New functions.
* QWinTerminalImpl.h, QWinTerminalImpl.cpp
(QConsolePrivate::setCursorColor): New argument, useForegroundColor.
(QConsolePrivate::m_selectionColor, QConsolePrivate::m_cursorColor):
New member variablebs.
(QConsolePrivate::selectionColor, QConsolePrivate::cursorColor,
QConsolePrivate::setSelectionColor, QConsolePrivate::setCursorColor):
Use member variables instead of Windows console color map.
(QConsolePrivate::cursorColor): Return foreground color if stored
color is invalid.
(QConsolePrivate::setCursorColor): Store invalid color if
useForegroundcolor.
(QConsolePrivate::QConsolePrivate): Set default selection and cursor
colors.
* QTerminal.cc (QTerminal::notice_settings): Handle terminal color
settings.
* resource-manager.h, resource-manager.cc
(resource_manager::terminal_color_names,
resource_manager::terminal_default_colors,
resource_manager::terminal_color_chars): New functions.
* settings-dialog.h, settings-dialog.cc
(settings_dialog::read_terminal_colors): New function.
(settings_dialog::settings_dialog): Call read_terminal_colors. Read
valud for using foreground color for cursor color.
(settings_dialog::write_terminal_colors): New function.
(settings_dialog::write_changed_settings): Call
write_terminal_colors. Handle setting for using foreground color for
cursor color.
* settings-dialog.ui: Add color selection to terminal settings
dialog.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 May 2013 06:00:44 -0400 |
parents | 9cd14e53e906 |
children |
comparison
equal
deleted
inserted
replaced
16619:db31d1e77d7b | 16620:818eef7b2618 |
---|---|
22 | 22 |
23 #ifndef QTERMINALINTERFACE_H | 23 #ifndef QTERMINALINTERFACE_H |
24 #define QTERMINALINTERFACE_H | 24 #define QTERMINALINTERFACE_H |
25 | 25 |
26 #include <QWidget> | 26 #include <QWidget> |
27 #include <QColor> | |
27 #include <QMenu> | 28 #include <QMenu> |
28 | 29 |
29 class QTerminalInterface : public QWidget | 30 class QTerminalInterface : public QWidget |
30 { | 31 { |
31 Q_OBJECT | 32 Q_OBJECT |
59 // Provide empty default impl in order to avoid conflicts with the win impl. | 60 // Provide empty default impl in order to avoid conflicts with the win impl. |
60 Q_UNUSED(type); | 61 Q_UNUSED(type); |
61 Q_UNUSED(blinking); | 62 Q_UNUSED(blinking); |
62 } | 63 } |
63 | 64 |
64 public slots: | 65 virtual void setBackgroundColor (const QColor& color) = 0; |
66 virtual void setForegroundColor (const QColor& color) = 0; | |
67 virtual void setSelectionColor (const QColor& color) = 0; | |
68 virtual void setCursorColor (bool useForegroundColor, | |
69 const QColor& color) = 0; | |
70 | |
71 public slots: | |
65 virtual void copyClipboard() = 0; | 72 virtual void copyClipboard() = 0; |
66 virtual void pasteClipboard() = 0; | 73 virtual void pasteClipboard() = 0; |
67 | 74 |
68 virtual void handleCustomContextMenuRequested(QPoint at) { | 75 virtual void handleCustomContextMenuRequested(QPoint at) { |
69 _contextMenu->move (mapToGlobal(at)); | 76 _contextMenu->move (mapToGlobal(at)); |