Mercurial > octave-nkf
view libgui/qterminal/libqterminal/QTerminal.cc @ 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 | d5ae5aa80d42 |
children | ba808cd9d86c |
line wrap: on
line source
/* Copyright (C) 2012 Michael Goffioul. Copyright (C) 2012 Jacob Dawid. This file is part of QTerminal. Foobar is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. QTerminal is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Foobar. If not, see <http://www.gnu.org/licenses/>. */ #include "QTerminal.h" void QTerminal::notice_settings (const QSettings *settings) { // QSettings pointer is checked before emitting. // Set terminal font: QFont term_font = QFont(); term_font.setFamily(settings->value("terminal/fontName","Courier New").toString()); term_font.setPointSize(settings->value("terminal/fontSize",10).toInt ()); setTerminalFont (term_font); QString cursorType = settings->value ("terminal/cursorType","ibeam").toString (); bool cursorBlinking = settings->value ("terminal/cursorBlinking",true).toBool (); if (cursorType == "ibeam") setCursorType(QTerminalInterface::IBeamCursor, cursorBlinking); else if (cursorType == "block") setCursorType(QTerminalInterface::BlockCursor, cursorBlinking); else if (cursorType == "underline") setCursorType(QTerminalInterface::UnderlineCursor, cursorBlinking); bool cursorUseForegroundColor = settings->value ("terminal/cursorUseForegroundColor",true).toBool (); // FIXME -- we shouldn't duplicate this information here and in the // resource manager. QList<QColor> default_colors; default_colors << QColor(0,0,0) << QColor(255,255,255) << QColor(192,192,192) << QColor(128,128,128); setForegroundColor (settings->value ("terminal/color_f", QVariant (default_colors.at (0))).value<QColor> ()); setBackgroundColor (settings->value ("terminal/color_b", QVariant (default_colors.at (1))).value<QColor> ()); setSelectionColor (settings->value ("terminal/color_s", QVariant (default_colors.at (2))).value<QColor> ()); setCursorColor (cursorUseForegroundColor, settings->value ("terminal/color_c", QVariant (default_colors.at (3))).value<QColor> ()); }