Review changes

Author: glebmish

src/appleseed.studio/CMakeLists.txt

@@ -218,8 +218,6 @@ source_group ("mainwindow\\project" FILES
 )
 
 set (mainwindow_pythonconsole_sources
-    mainwindow/pythonconsole/fontsizechangeable.cpp
-    mainwindow/pythonconsole/fontsizechangeable.h
     mainwindow/pythonconsole/linenumberarea.cpp
     mainwindow/pythonconsole/linenumberarea.h
     mainwindow/pythonconsole/outputredirector.cpp
@@ -232,6 +230,8 @@ set (mainwindow_pythonconsole_sources
     mainwindow/pythonconsole/pythonhighlighter.h
     mainwindow/pythonconsole/pythonoutput.cpp
     mainwindow/pythonconsole/pythonoutput.h
+    mainwindow/pythonconsole/zoomableplaintextedit.cpp
+    mainwindow/pythonconsole/zoomableplaintextedit.h
     )
 list (APPEND appleseed.studio_sources
     ${mainwindow_pythonconsole_sources}

src/appleseed.studio/mainwindow/pythonconsole/pythonconsolewidget.cpp

@@ -76,8 +76,8 @@ PythonConsoleWidget::PythonConsoleWidget(QWidget* parent)
 
     m_output = new PythonOutput(console_body);
 
-    console_body->addWidget(m_input);
     console_body->addWidget(m_output);
+    console_body->addWidget(m_input);
 
     m_action_new_file =
         new QAction(load_icons("project_new"), "New Python Script", this);
@@ -193,7 +193,7 @@ void PythonConsoleWidget::slot_clear_output()
 
 void PythonConsoleWidget::slot_change_exec_selection_button_state()
 {
-    bool is_enabled = m_input->textCursor().selection().isEmpty();
+    const bool is_enabled = m_input->textCursor().selection().isEmpty();
     m_action_execute_selection->setEnabled(is_enabled);
 }
 

src/appleseed.studio/mainwindow/pythonconsole/pythoneditor.cpp

@@ -44,7 +44,7 @@ namespace appleseed {
 namespace studio {
 
 PythonEditor::PythonEditor(QWidget* parent)
-  : FontSizeChangeable(parent)
+  : ZoomablePlainTextEdit(parent)
 {
     setObjectName("python_editor");
     setUndoRedoEnabled(true);
@@ -80,7 +80,7 @@ void PythonEditor::keyPressEvent(QKeyEvent* event)
     {
         if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
             event->setModifiers(event->modifiers() & ~Qt::ShiftModifier);
-        FontSizeChangeable::keyPressEvent(event);
+        ZoomablePlainTextEdit::keyPressEvent(event);
         if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
             indent();
     }

src/appleseed.studio/mainwindow/pythonconsole/pythoneditor.h

@@ -30,7 +30,7 @@
 #define APPLESEED_STUDIO_MAINWINDOW_PYTHONCONSOLE_PYTHONEDITOR_H
 
 // appleseed.studio headers.
-#include "mainwindow/pythonconsole/fontsizechangeable.h"
+#include "mainwindow/pythonconsole/zoomableplaintextedit.h"
 
 // Qt headers.
 #include <QObject>
@@ -48,7 +48,7 @@ namespace appleseed {
 namespace studio {
 
 class PythonEditor
-  : public FontSizeChangeable
+  : public ZoomablePlainTextEdit
 {
     Q_OBJECT
 

src/appleseed.studio/mainwindow/pythonconsole/pythonoutput.cpp

@@ -33,7 +33,7 @@ namespace appleseed {
 namespace studio {
 
 PythonOutput::PythonOutput(QWidget* parent)
-  : FontSizeChangeable(parent)
+  : ZoomablePlainTextEdit(parent)
 {
     setObjectName("python_output");
     setUndoRedoEnabled(false);

src/appleseed.studio/mainwindow/pythonconsole/pythonoutput.h

@@ -30,7 +30,7 @@
 #define APPLESEED_STUDIO_MAINWINDOW_PYTHONCONSOLE_PYTHONOUTPUT_H
 
 // appleseed.studio headers.
-#include "mainwindow/pythonconsole/fontsizechangeable.h"
+#include "mainwindow/pythonconsole/zoomableplaintextedit.h"
 
 // Qt headers.
 #include <QObject>
@@ -43,7 +43,7 @@ namespace appleseed {
 namespace studio {
 
 class PythonOutput
-    : public FontSizeChangeable
+    : public ZoomablePlainTextEdit
 {
     Q_OBJECT
 

…dow/pythonconsole/fontsizechangeable.cpp …/pythonconsole/zoomableplaintextedit.cppsrc/appleseed.studio/mainwindow/pythonconsole/fontsizechangeable.cpp renamed to src/appleseed.studio/mainwindow/pythonconsole/zoomableplaintextedit.cpp src/appleseed.studio/mainwindow/pythonconsole/fontsizechangeable.cpp renamed to src/appleseed.studio/mainwindow/pythonconsole/zoomableplaintextedit.cpp

@@ -27,17 +27,17 @@
 //
 
 // Interface header.
-#include "fontsizechangeable.h"
+#include "zoomableplaintextedit.h"
 
 namespace appleseed {
 namespace studio {
 
-FontSizeChangeable::FontSizeChangeable(QWidget* parent)
+ZoomablePlainTextEdit::ZoomablePlainTextEdit(QWidget* parent)
   : QPlainTextEdit(parent)
 {
 }
 
-void FontSizeChangeable::keyPressEvent(QKeyEvent* event)
+void ZoomablePlainTextEdit::keyPressEvent(QKeyEvent* event)
 {
     if (event->modifiers() & Qt::ControlModifier &&
         (event->key() == Qt::Key_Plus || event->key() == Qt::Key_Equal))
@@ -50,17 +50,15 @@ void FontSizeChangeable::keyPressEvent(QKeyEvent* event)
         QPlainTextEdit::keyPressEvent(event);
 }
 
-void FontSizeChangeable::wheelEvent(QWheelEvent* event)
+void ZoomablePlainTextEdit::wheelEvent(QWheelEvent* event)
 {
     if (event->modifiers() & Qt::ControlModifier)
-        // Minus here because if you turn wheel up delta is negative
-        // while font should be incremented.
-        change_font_size(- event->delta() / 120);
+        change_font_size(event->delta() / 120);
     else
         QPlainTextEdit::wheelEvent(event);
 }
 
-void FontSizeChangeable::change_font_size(const int delta)
+void ZoomablePlainTextEdit::change_font_size(const int delta)
 {
     int new_font_size = font().pointSize() + delta;
     QFont new_font = font();

…indow/pythonconsole/fontsizechangeable.h …ow/pythonconsole/zoomableplaintextedit.hsrc/appleseed.studio/mainwindow/pythonconsole/fontsizechangeable.h renamed to src/appleseed.studio/mainwindow/pythonconsole/zoomableplaintextedit.h src/appleseed.studio/mainwindow/pythonconsole/fontsizechangeable.h renamed to src/appleseed.studio/mainwindow/pythonconsole/zoomableplaintextedit.h

@@ -36,13 +36,13 @@
 namespace appleseed {
 namespace studio {
 
-class FontSizeChangeable
+class ZoomablePlainTextEdit
     : public QPlainTextEdit
 {
     Q_OBJECT
 
   public:
-    FontSizeChangeable(QWidget* parent);
+    ZoomablePlainTextEdit(QWidget* parent);
 
   protected:
     void keyPressEvent(QKeyEvent* event);