From 0c8e09d0a1b2743b28972a89796ae77f9aaa3862 Mon Sep 17 00:00:00 2001
From: Janmejay Singh <singh.janmejay@gmail.com>
Date: Sun, 20 Oct 2024 19:50:17 +0530
Subject: [PATCH] Rename Config::vi to Config::navigation_style

---
 src/app/clipboardserver.cpp      | 2 +-
 src/common/appconfig.h           | 4 ++--
 src/gui/configurationmanager.cpp | 2 +-
 src/gui/mainwindow.cpp           | 2 +-
 src/ui/configtabgeneral.ui       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/clipboardserver.cpp b/src/app/clipboardserver.cpp
index 66eff6a15..295b9bc88 100644
--- a/src/app/clipboardserver.cpp
+++ b/src/app/clipboardserver.cpp
@@ -684,7 +684,7 @@ void ClipboardServer::loadSettings(AppConfig *appConfig)
     m_sharedData->editor = appConfig->option<Config::editor>();
     m_sharedData->maxItems = appConfig->option<Config::maxitems>();
     m_sharedData->textWrap = appConfig->option<Config::text_wrap>();
-    m_sharedData->navigationStyle = appConfig->option<Config::vi>();
+    m_sharedData->navigationStyle = appConfig->option<Config::navigation_style>();
     m_sharedData->saveOnReturnKey = !appConfig->option<Config::edit_ctrl_return>();
     m_sharedData->moveItemOnReturnKey = appConfig->option<Config::move>();
     m_sharedData->showSimpleItems = appConfig->option<Config::show_simple_items>();
diff --git a/src/common/appconfig.h b/src/common/appconfig.h
index 3185206a5..c229d895d 100644
--- a/src/common/appconfig.h
+++ b/src/common/appconfig.h
@@ -121,8 +121,8 @@ struct confirm_exit : Config<bool> {
     static Value defaultValue() { return true; }
 };
 
-struct vi : Config<NavigationStyle> {
-    static QString name() { return QStringLiteral("vi"); }
+struct navigation_style : Config<NavigationStyle> {
+    static QString name() { return QStringLiteral("navigation_style"); }
 };
 
 struct save_filter_history : Config<bool> {
diff --git a/src/gui/configurationmanager.cpp b/src/gui/configurationmanager.cpp
index dde280dd6..40cd3daa5 100644
--- a/src/gui/configurationmanager.cpp
+++ b/src/gui/configurationmanager.cpp
@@ -257,7 +257,7 @@ void ConfigurationManager::initOptions()
     bind<Config::move>(m_tabHistory->checkBoxMove);
     bind<Config::check_clipboard>(m_tabGeneral->checkBoxClip);
     bind<Config::confirm_exit>(m_tabGeneral->checkBoxConfirmExit);
-    bind<Config::vi>(m_tabGeneral->comboBoxNavigationStyle);
+    bind<Config::navigation_style>(m_tabGeneral->comboBoxNavigationStyle);
     bind<Config::save_filter_history>(m_tabGeneral->checkBoxSaveFilterHistory);
     bind<Config::autocompletion>(m_tabGeneral->checkBoxAutocompleteCommands);
     bind<Config::always_on_top>(m_tabGeneral->checkBoxAlwaysOnTop);
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 98f61fa1d..7090165d4 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -2714,7 +2714,7 @@ void MainWindow::loadSettings(QSettings &settings, AppConfig *appConfig)
     setAlwaysOnTop(this, alwaysOnTop);
     setAlwaysOnTop(m_commandDialog.data(), alwaysOnTop);
 
-    m_options.navigationStyle = appConfig->option<Config::vi>();
+    m_options.navigationStyle = appConfig->option<Config::navigation_style>();
     m_trayMenu->setNavigationStyle(m_options.navigationStyle);
     m_menu->setNavigationStyle(m_options.navigationStyle);
 
diff --git a/src/ui/configtabgeneral.ui b/src/ui/configtabgeneral.ui
index 60f117725..5ff2b7d70 100644
--- a/src/ui/configtabgeneral.ui
+++ b/src/ui/configtabgeneral.ui
@@ -156,7 +156,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="QLabel" name="label">
+         <widget class="QLabel" name="label_nav_style">
           <property name="text">
            <string>Navigation style / Keymap:</string>
           </property>