GUI: change editor highlight naming

cvut · Jun 17, 2024 · 6af4d88 · 6af4d88
1 parent 07b0d79
commit 6af4d88
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/gui/mainwindow/MainWindow.ui b/src/gui/mainwindow/MainWindow.ui
@@ -17,7 +17,7 @@
    <iconset>
     <normaloff>
            :/icons/gui.png</normaloff>
-    :/icons/gui.png
+       :/icons/gui.png
    </iconset>
   </property>
   <property name="dockNestingEnabled">
@@ -54,7 +54,7 @@
      <x>0</x>
      <y>0</y>
      <width>900</width>
-     <height>32</height>
+        <height>31</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -129,8 +129,8 @@
      <string>&amp;Options</string>
     </property>
     <addaction name="actionEditorShowLineNumbers"/>
-    <addaction name="actionEditorEnableHighlight"/>
-    <addaction name="actionEditorEnableFocusChange"/>
+       <addaction name="actionEditorHighlightPC"/>
+       <addaction name="actionEditorFollowPC"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuMachine"/>
@@ -147,7 +147,7 @@
     <bool>false</bool>
    </property>
    <property name="allowedAreas">
-    <set>Qt::TopToolBarArea</set>
+       <set>Qt::ToolBarArea::TopToolBarArea</set>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -613,32 +613,32 @@
     <string>Show line number in the code editor.</string>
    </property>
   </action>
-  <action name="actionEditorEnableHighlight">
+     <action name="actionEditorHighlightPC">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Enable &amp;Highlighting</string>
+       <string>&amp;Highlight Curent Instruction</string>
    </property>
    <property name="toolTip">
-    <string>Highlight currently executed instruction in internal editor.</string>
+       <string>Highlight currently the currently executed instruction in the internal editor.</string>
    </property>
   </action>
-  <action name="actionEditorEnableFocusChange">
+     <action name="actionEditorFollowPC">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Enable &amp;Focus Change</string>
+       <string>&amp;Follow Current Instruction</string>
    </property>
    <property name="toolTip">
-    <string>Focus on currently executed instruction in internal editor.</string>
+       <string>Always focus the currently executed instruction in the internal editor.</string>
    </property>
   </action>
  </widget>

diff --git a/src/gui/mainwindow/mainwindow.cpp b/src/gui/mainwindow/mainwindow.cpp
@@ -94,11 +94,11 @@ MainWindow::MainWindow(QSettings *settings, QWidget *parent)
         ui->actionEditorShowLineNumbers, &QAction::triggered, editor_tabs.data(),
         &EditorDock::set_show_line_numbers);
     connect(
-        ui->actionEditorEnableHighlight, &QAction::triggered, editor_tabs.data(),
-        &EditorDock::set_enable_hightlight);
+        ui->actionEditorHighlightPC, &QAction::triggered, editor_tabs.data(),
+        &EditorDock::set_highlight_pc);
     connect(
-        ui->actionEditorEnableFocusChange, &QAction::triggered, editor_tabs.data(),
-        &EditorDock::set_enable_focus_change);
+        ui->actionEditorFollowPC, &QAction::triggered, editor_tabs.data(),
+        &EditorDock::set_follow_pc);
 
     bool line_numbers_visible = settings->value("EditorShowLineNumbers", true).toBool();
     editor_tabs->set_show_line_numbers(line_numbers_visible);

diff --git a/src/gui/windows/editor/editordock.cpp b/src/gui/windows/editor/editordock.cpp
@@ -161,15 +161,15 @@ void EditorDock::set_show_line_numbers(bool visible) {
     }
 }
 
-void EditorDock::set_enable_hightlight(bool enable) {
+void EditorDock::set_highlight_pc(bool enable) {
     enable_hightlight = enable;
     settings->setValue("editorEnableHighlisht", enable);
     for (int i = 0; i < this->count(); i++) {
         get_tab(i)->set_enable_highlight(enable);
     }
 }
 
-void EditorDock::set_enable_focus_change(bool enable) {
+void EditorDock::set_follow_pc(bool enable) {
     enable_focus_change = enable;
     settings->setValue("editorEnableFocusChange", enable);
     for (int i = 0; i < this->count(); i++) {

diff --git a/src/gui/windows/editor/editordock.h b/src/gui/windows/editor/editordock.h
@@ -40,8 +40,8 @@ class EditorDock : public HidingTabWidget {
 
 public slots:
     void set_show_line_numbers(bool visible);
-    void set_enable_hightlight(bool enable);
-    void set_enable_focus_change(bool enable);
+    void set_highlight_pc(bool enable);
+    void set_follow_pc(bool enable);
 
     void open_file_dialog();
     void save_tab(int index);