Mercurial > octave
diff libgui/graphics/EditControl.cc @ 18498:2e7cad6f180c gui-release
Initial integration of QtHandles.
* configure.ac: Check for QtOpenGL module.
* libgui/Makefile.am: Include libgui/graphics/module.mk.
(liboctgui_la_LIBADD): Include graphics/libgui-graphics.la in the
list.
(rcc-command): Pass "-name DIR" to rcc command.
* main-window.cc (main_window::construct): Install qt functions and
register qt toolkit.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include
$(FONTCONFIG_CPPFLAGS) and -I$(srcdir)/graphics in the list.
* graphics.cc (gtk_manager::gtk_manager): Make qt the default toolkit
if it is available.
* libgui/graphics/Backend.cc, libgui/graphics/Backend.h,
libgui/graphics/BaseControl.cc, libgui/graphics/BaseControl.h,
libgui/graphics/ButtonControl.cc, libgui/graphics/ButtonControl.h,
libgui/graphics/Canvas.cc, libgui/graphics/Canvas.h,
libgui/graphics/CheckBoxControl.cc, libgui/graphics/CheckBoxControl.h,
libgui/graphics/Container.cc, libgui/graphics/Container.h,
libgui/graphics/ContextMenu.cc, libgui/graphics/ContextMenu.h,
libgui/graphics/EditControl.cc, libgui/graphics/EditControl.h,
libgui/graphics/Figure.cc, libgui/graphics/Figure.h,
libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h,
libgui/graphics/GLCanvas.cc, libgui/graphics/GLCanvas.h, ,
libgui/graphics/GenericEventNotify.h, libgui/graphics/KeyMap.cc,
libgui/graphics/KeyMap.h, libgui/graphics/ListBoxControl.cc,
libgui/graphics/ListBoxControl.h, libgui/graphics/Logger.cc,
libgui/graphics/Logger.h, libgui/graphics/Menu.cc,
libgui/graphics/Menu.h, libgui/graphics/MenuContainer.h,
libgui/graphics/MouseModeActionGroup.cc,
libgui/graphics/MouseModeActionGroup.h, libgui/graphics/Object.cc,
libgui/graphics/Object.h, libgui/graphics/ObjectFactory.cc,
libgui/graphics/ObjectFactory.h, libgui/graphics/ObjectProxy.cc,
libgui/graphics/ObjectProxy.h, libgui/graphics/Panel.cc,
libgui/graphics/Panel.h, libgui/graphics/PopupMenuControl.cc,
libgui/graphics/PopupMenuControl.h,
libgui/graphics/PushButtonControl.cc,
libgui/graphics/PushButtonControl.h, libgui/graphics/PushTool.cc,
libgui/graphics/PushTool.h, libgui/graphics/RadioButtonControl.cc,
libgui/graphics/RadioButtonControl.h,
libgui/graphics/SliderControl.cc, libgui/graphics/SliderControl.h,
libgui/graphics/TextControl.cc, libgui/graphics/TextControl.h,
libgui/graphics/TextEdit.cc, libgui/graphics/TextEdit.h,
libgui/graphics/ToggleButtonControl.cc,
libgui/graphics/ToggleButtonControl.h, libgui/graphics/ToggleTool.cc,
libgui/graphics/ToggleTool.h, libgui/graphics/ToolBar.cc,
libgui/graphics/ToolBar.h, libgui/graphics/ToolBarButton.cc,
libgui/graphics/ToolBarButton.h, libgui/graphics/Utils.cc,
libgui/graphics/Utils.h, libgui/graphics/__init_qt__.cc,
libgui/graphics/__init_qt__.h, libgui/graphics/gl-select.cc,
libgui/graphics/gl-select.h, libgui/graphics/images/README,
libgui/graphics/images/pan.png, libgui/graphics/images/rotate.png,
libgui/graphics/images/select.png, libgui/graphics/images/zoom.png,
libgui/graphics/module.mk, libgui/graphics/qthandles.qrc:
New files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Feb 2014 14:05:45 -0500 |
parents | |
children | 49877d3be064 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/EditControl.cc Thu Feb 20 14:05:45 2014 -0500 @@ -0,0 +1,248 @@ +/* + +Copyright (C) 2011 Michael Goffioul. + +This file is part of QtHandles. + +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. + +QtHandles 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/>. + +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <QLineEdit> + +#include "Container.h" +#include "EditControl.h" +#include "TextEdit.h" +#include "Utils.h" + +////////////////////////////////////////////////////////////////////////////// + +namespace QtHandles +{ + +////////////////////////////////////////////////////////////////////////////// + +EditControl* EditControl::create (const graphics_object& go) +{ + Object* parent = Object::parentObject (go); + + if (parent) + { + Container* container = parent->innerContainer (); + + if (container) + { + uicontrol::properties& up = Utils::properties<uicontrol> (go); + + if ((up.get_max () - up.get_min ()) > 1) + return new EditControl (go, new TextEdit (container)); + else + return new EditControl (go, new QLineEdit (container)); + } + } + + return 0; +} + +////////////////////////////////////////////////////////////////////////////// + +EditControl::EditControl (const graphics_object& go, QLineEdit* edit) + : BaseControl (go, edit), m_multiLine (false), m_textChanged (false) +{ + init (edit); +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::init (QLineEdit* edit, bool callBase) +{ + if (callBase) + BaseControl::init (edit, callBase); + + m_multiLine = false; + initCommon (edit); + + uicontrol::properties& up = properties<uicontrol> (); + + edit->setText (Utils::fromStdString (up.get_string_string ())); + edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), + up.get_verticalalignment ())); + + connect (edit, SIGNAL (textEdited (const QString&)), + SLOT (textChanged (void))); + connect (edit, SIGNAL (editingFinished (void)), + SLOT (editingFinished (void))); +} + +////////////////////////////////////////////////////////////////////////////// + +EditControl::EditControl (const graphics_object& go, TextEdit* edit) + : BaseControl (go, edit), m_multiLine (true), m_textChanged (false) +{ + init (edit); +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::init (TextEdit* edit, bool callBase) +{ + if (callBase) + BaseControl::init (edit, callBase); + + m_multiLine = true; + initCommon (edit); + + uicontrol::properties& up = properties<uicontrol> (); + + edit->setAcceptRichText (false); + // FIXME: support string_vector + edit->setPlainText (Utils::fromStdString (up.get_string_string ())); + + connect (edit, SIGNAL (textChanged (void)), + SLOT (textChanged (void))); + connect (edit, SIGNAL (editingFinished (void)), + SLOT (editingFinished (void))); +} + +////////////////////////////////////////////////////////////////////////////// + +EditControl::~EditControl (void) +{ +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::initCommon (QWidget*) +{ + m_textChanged = false; +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::update (int pId) +{ + bool handled = false; + + if (m_multiLine) + handled = updateMultiLine (pId); + else + handled = updateSingleLine (pId); + + if (! handled) + { + switch (pId) + { + default: + BaseControl::update (pId); + break; + } + } +} + +////////////////////////////////////////////////////////////////////////////// + +bool EditControl::updateSingleLine (int pId) +{ + uicontrol::properties& up = properties<uicontrol> (); + QLineEdit* edit = qWidget<QLineEdit> (); + + switch (pId) + { + case uicontrol::properties::ID_STRING: + edit->setText (Utils::fromStdString (up.get_string_string ())); + return true; + case uicontrol::properties::ID_HORIZONTALALIGNMENT: + case uicontrol::properties::ID_VERTICALALIGNMENT: + edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), + up.get_verticalalignment ())); + return true; + case uicontrol::properties::ID_MIN: + case uicontrol::properties::ID_MAX: + if ((up.get_max () - up.get_min ()) > 1) + { + QWidget* container = edit->parentWidget (); + + delete edit; + init (new TextEdit (container), true); + } + return true; + default: + break; + } + + return false; +} + +////////////////////////////////////////////////////////////////////////////// + +bool EditControl::updateMultiLine (int pId) +{ + uicontrol::properties& up = properties<uicontrol> (); + TextEdit* edit = qWidget<TextEdit> (); + + switch (pId) + { + case uicontrol::properties::ID_STRING: + edit->setPlainText (Utils::fromStdString (up.get_string_string ())); + return true; + case uicontrol::properties::ID_MIN: + case uicontrol::properties::ID_MAX: + if ((up.get_max () - up.get_min ()) <= 1) + { + QWidget* container = edit->parentWidget (); + + delete edit; + init (new QLineEdit (container), true); + } + return true; + default: + break; + } + + return false; +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::textChanged (void) +{ + m_textChanged = true; +} + +////////////////////////////////////////////////////////////////////////////// + +void EditControl::editingFinished (void) +{ + if (m_textChanged) + { + QString txt = (m_multiLine + ? qWidget<TextEdit> ()->toPlainText () + : qWidget<QLineEdit> ()->text ()); + + gh_manager::post_set (m_handle, "string", Utils::toStdString (txt), false); + gh_manager::post_callback (m_handle, "callback"); + + m_textChanged = false; + } +} + +////////////////////////////////////////////////////////////////////////////// + +}; // namespace QtHandles + +//////////////////////////////////////////////////////////////////////////////