Mercurial > octave-antonio
comparison libgui/graphics/QtHandlesUtils.h @ 20037:76c72314d905
QT Text/EditControl: support String cells (Bug 44749)
* libgui/graphics/QtHandlesUtils.cc/h
(toCellString): New function
* libgui/graphics/EditControl.cc
(EditControl::init): set text as string_vector
(EditControl::updateMultiLine): set text as string_vector
(EditControl::returnPressed): set String as cells
(EditControl::editingFinished): set String as cells
* libgui/graphics/TextControl.cc
(TextControl::TextControl): set text as string vector
(TextControl::update): set text as string vector
author | John Donoghue |
---|---|
date | Tue, 07 Apr 2015 12:12:59 -0400 |
parents | f0e61a67ad9f |
children | 248f2f2e7d48 |
comparison
equal
deleted
inserted
replaced
20036:0e712de0af4d | 20037:76c72314d905 |
---|---|
45 std::string toStdString (const QString& s); | 45 std::string toStdString (const QString& s); |
46 | 46 |
47 QStringList fromStringVector (const string_vector& v); | 47 QStringList fromStringVector (const string_vector& v); |
48 string_vector toStringVector (const QStringList& l); | 48 string_vector toStringVector (const QStringList& l); |
49 | 49 |
50 Cell toCellString (const QStringList& l); | |
51 | |
50 template <class T> | 52 template <class T> |
51 QFont computeFont (const typename T::properties& props, int height = -1); | 53 QFont computeFont (const typename T::properties& props, int height = -1); |
52 | 54 |
53 QColor fromRgb (const Matrix& rgb); | 55 QColor fromRgb (const Matrix& rgb); |
54 Matrix toRgb (const QColor& c); | 56 Matrix toRgb (const QColor& c); |