octave: libgui/graphics/EditControl.cc comparison

comparison libgui/graphics/EditControl.cc @ 31648:29d734430e5f stable

maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.

author	John W. Eaton <jwe@octave.org>
date	Tue, 06 Dec 2022 14:53:00 -0500
parents	c6d54dd31a7e
children	deb553ac2c54 597f3ee61a48

comparison

equal deleted inserted replaced

-:c6d54dd31a7e
+:29d734430e5f
 #include "octave-qobject.h"
 OCTAVE_BEGIN_NAMESPACE(octave)
 EditControl *
 EditControl::create (octave::base_qobject& oct_qobj,
 octave::interpreter& interp, const graphics_object& go)
 {
 Object *parent = parentObject (interp, 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 (oct_qobj, interp, go,
 new TextEdit (container));
 else
 return new EditControl (oct_qobj, interp, go,
 new QLineEdit (container));
 }
 }
 return nullptr;
 }
 EditControl::EditControl (octave::base_qobject& oct_qobj,
 octave::interpreter& interp,
 const graphics_object& go, QLineEdit *edit)
 : BaseControl (oct_qobj, interp, 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> ();
 if (up.enable_is ("inactive"))
 edit->setReadOnly (true);
 else
 edit->setEnabled (up.enable_is ("on"));
 edit->setText (Utils::fromStdString (up.get_string_string ()));
 edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
 up.get_verticalalignment ()));
 connect (edit, &QLineEdit::textEdited,
 this, &EditControl::textChanged);
 connect (edit, &QLineEdit::editingFinished,
 this, &EditControl::editingFinished);
 connect (edit, &QLineEdit::returnPressed,
 this, &EditControl::returnPressed);
 }
 EditControl::EditControl (octave::base_qobject& oct_qobj,
 octave::interpreter& interp,
 const graphics_object& go, TextEdit *edit)
 : BaseControl (oct_qobj, interp, 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> ();
 if (up.enable_is ("inactive"))
 edit->setReadOnly (true);
 else
 edit->setEnabled (up.enable_is ("on"));
 edit->setAcceptRichText (false);
 edit->setPlainText (Utils::fromStringVector
 (up.get_string_vector ()).join ("\n"));
 edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
 up.get_verticalalignment ()));
 connect (edit, &TextEdit::textChanged,
 this, &EditControl::textChanged);
 connect (edit, &TextEdit::editingFinished,
 this, &EditControl::editingFinished);
 connect (edit, &TextEdit::returnPressed,
 this, &EditControl::returnPressed);
 }
 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_ENABLE:
 if (up.enable_is ("inactive"))
 edit->setReadOnly (true);
 else
 {
 edit->setReadOnly (false);
 edit->setEnabled (up.enable_is ("on"));
 }
 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::fromStringVector
 (up.get_string_vector ()).join ("\n"));
 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_ENABLE:
 if (up.enable_is ("inactive"))
 edit->setReadOnly (true);
 else
 {
 edit->setReadOnly (false);
 edit->setEnabled (up.enable_is ("on"));
 }
 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::returnPressed (void)
 {
 QString txt = (m_multiLine
 ? qWidget<TextEdit> ()->toPlainText ()
 : qWidget<QLineEdit> ()->text ());
 if (m_textChanged)
 {
 if (m_multiLine)
 emit gh_set_event (m_handle, "string",
 Utils::toCellString (txt.split ("\n")), false);
 else
 emit gh_set_event (m_handle, "string",
 Utils::toStdString (txt), false);
 m_textChanged = false;
 }
 if (txt.length () > 0)
+emit gh_callback_event (m_handle, "callback");
+}
+void
+EditControl::editingFinished (void)
+{
+if (m_textChanged)
+{
+QString txt = (m_multiLine
+? qWidget<TextEdit> ()->toPlainText ()
+: qWidget<QLineEdit> ()->text ());
+if (m_multiLine)
+emit gh_set_event (m_handle, "string",
+Utils::toCellString (txt.split ("\n")), false);
+else
+emit gh_set_event (m_handle, "string", Utils::toStdString (txt),
+false);
 emit gh_callback_event (m_handle, "callback");
-}
+m_textChanged = false;
-void
+}
-EditControl::editingFinished (void)
+}
-{
-if (m_textChanged)
-{
-QString txt = (m_multiLine
-? qWidget<TextEdit> ()->toPlainText ()
-: qWidget<QLineEdit> ()->text ());
-if (m_multiLine)
-emit gh_set_event (m_handle, "string",
-Utils::toCellString (txt.split ("\n")), false);
-else
-emit gh_set_event (m_handle, "string", Utils::toStdString (txt),
-false);
-emit gh_callback_event (m_handle, "callback");
-m_textChanged = false;
-}
-}
 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

comparison libgui/graphics/EditControl.cc @ 31648:29d734430e5f stable