🚧 km-window: add sorting for the columns

fixes #47

Author: vnepogodin

src/km-window.cpp

@@ -26,9 +26,10 @@
 #include <algorithm>   // for any_of, find_if
 #include <filesystem>  // for exists
 #include <future>
-#include <ranges>  // for ranges::*
-#include <span>    // for span
-#include <thread>  // for this_thread
+#include <ranges>       // for ranges::*
+#include <span>         // for span
+#include <string_view>  // for string_view
+#include <thread>       // for this_thread
 
 #include <fmt/core.h>
 
@@ -87,7 +88,7 @@ bool is_kernels_change_state(alpm_handle_t* handle, std::span<std::string_view>
 
 void init_kernels_tree_widget(QTreeWidget* tree_kernels, std::span<Kernel> kernels) noexcept {
     for (auto& kernel : kernels) {
-        auto* widget_item = new QTreeWidgetItem(tree_kernels);
+        auto* widget_item = new KernelTreeWidgetItem(tree_kernels);
         widget_item->setCheckState(TreeCol::Check, Qt::Unchecked);
         widget_item->setText(TreeCol::PkgName, kernel.get_raw());
         widget_item->setText(TreeCol::Version, QString::fromStdString(kernel.version()));
@@ -386,4 +387,27 @@ void MainWindow::on_schedext_config() noexcept {
     m_sched_window->show();
 }
 
+bool KernelTreeWidgetItem::operator<(const QTreeWidgetItem& other) const {
+    const auto sort_col = treeWidget()->sortColumn();
+    if (sort_col != TreeCol::Version) {
+        return QTreeWidgetItem::operator<(other);
+    }
+
+    auto get_comparable_version = [](QString&& version_string) {
+        using namespace std::string_view_literals;
+        auto std_str = std::move(version_string).toStdString();
+        for (auto&& prefix : {"∨"sv, "∧"sv}) {
+            if (std_str.starts_with(prefix)) {
+                return std_str.substr(prefix.size());
+            }
+        }
+        return std_str;
+    };
+
+    const auto& version_a = get_comparable_version(text(sort_col));
+    const auto& version_b = get_comparable_version(other.text(sort_col));
+
+    return alpm_pkg_vercmp(version_a.c_str(), version_b.c_str()) < 0;
+}
+
 // NOLINTEND(bugprone-unhandled-exception-at-new)

src/km-window.hpp

@@ -93,6 +93,13 @@ enum { Check,
     Immutable };
 }
 
+class KernelTreeWidgetItem : public QTreeWidgetItem {
+ public:
+    using QTreeWidgetItem::QTreeWidgetItem;
+
+    bool operator<(const QTreeWidgetItem& other) const override;
+};
+
 class MainWindow final : public QMainWindow {
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(MainWindow)
@@ -130,10 +137,10 @@ class MainWindow final : public QMainWindow {
     Work* m_worker{nullptr};
 
     alpm_errno_t m_err{};
-    alpm_handle_t* m_handle                        = utils::parse_alpm("/", "/var/lib/pacman/", &m_err);
-    std::vector<Kernel> m_kernels                  = Kernel::get_kernels(m_handle);
-    std::unique_ptr<Ui::MainWindow> m_ui           = std::make_unique<Ui::MainWindow>();
-    std::unique_ptr<ConfWindow> m_conf_window      = std::make_unique<ConfWindow>();
+    alpm_handle_t* m_handle                                = utils::parse_alpm("/", "/var/lib/pacman/", &m_err);
+    std::vector<Kernel> m_kernels                          = Kernel::get_kernels(m_handle);
+    std::unique_ptr<Ui::MainWindow> m_ui                   = std::make_unique<Ui::MainWindow>();
+    std::unique_ptr<ConfWindow> m_conf_window              = std::make_unique<ConfWindow>();
     std::unique_ptr<scxctl::SchedExtWindow> m_sched_window = std::make_unique<scxctl::SchedExtWindow>();
 
     void build_change_list(QTreeWidgetItem* item) noexcept;

src/km-window.ui

@@ -3,7 +3,7 @@
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="windowModality">
-   <enum>Qt::NonModal</enum>
+   <enum>Qt::WindowModality::NonModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -17,8 +17,7 @@
    <string>CachyOS Kernel Manager</string>
   </property>
   <property name="windowIcon">
-   <iconset theme="cachyos-kernel-manager">
-    <normaloff>.</normaloff>.</iconset>
+   <iconset theme="cachyos-kernel-manager"/>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -38,7 +37,7 @@
     <item>
      <spacer name="horizontalSpacer_3">
       <property name="orientation">
-       <enum>Qt::Horizontal</enum>
+       <enum>Qt::Orientation::Horizontal</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
@@ -51,13 +50,16 @@
     <item>
      <widget class="QTreeWidget" name="treeKernels">
       <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+       <enum>QFrame::Shadow::Raised</enum>
       </property>
       <property name="tabKeyNavigation">
        <bool>true</bool>
       </property>
       <property name="selectionMode">
-       <enum>QAbstractItemView::SingleSelection</enum>
+       <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
       </property>
       <column>
        <property name="text">
@@ -87,7 +89,7 @@
        <item>
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -100,7 +102,7 @@
        <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>