qtimetrap 0.1.1 → 0.1.3

data/app/components/tracker_controls/layout_helpers.rb

@@ -19,17 +19,18 @@ module QTimetrap
       def build_root_layout
         QVBoxLayout.new(widget).tap do |layout|
           layout.set_contents_margins(0, 8, 0, 0)
-          layout.set_spacing(14)
+          layout.spacing = 14
         end
       end
 
       def configure_topbar_layout(layout, topbar)
         layout.set_contents_margins(16, 8, 16, 8)
-        layout.set_spacing(8)
-        layout.add_widget(build_label(topbar, 'title_label', random_title_slogan))
+        layout.spacing = 8
+        @title_label = build_label(topbar, 'title_label', random_title_slogan)
+        layout.add_widget(@title_label)
         layout.add_stretch(1)
         @clock_label = build_label(topbar, 'clock_label', nil, width: 220)
-        @clock_label.set_alignment(Qt::AlignCenter)
+        @clock_label.alignment = Qt::AlignCenter
         layout.add_widget(@clock_label)
       end
 
@@ -37,7 +38,7 @@ module QTimetrap
         @task_input = build_task_input(row)
         @project_input = build_project_input(row)
         @timer_label = build_label(row, 'timer_label', '00:00:00', width: 120)
-        @timer_label.set_alignment(Qt::AlignCenter)
+        @timer_label.alignment = Qt::AlignCenter
         @start_button = build_button(row, 'start_button', 'START', 64, 48)
         @stop_button = build_button(row, 'stop_button', 'STOP', 64, 48)
         @stop_button.hide
@@ -47,7 +48,7 @@ module QTimetrap
 
       def add_actions_row_widgets(layout, row)
         @summary_label = build_label(row, 'summary_label', nil, height: 42)
-        @summary_label.set_alignment(Qt::AlignCenter)
+        @summary_label.alignment = Qt::AlignCenter
         @theme_button = build_button(row, 'theme_button', 'THEME', 112, 34)
         refresh_button = build_button(row, 'refresh_button', 'REFRESH', 110, 34)
         layout.add_widget(@summary_label)

data/app/services/archived_entries_store.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'set'
 require 'yaml'
 
 module QTimetrap
@@ -12,7 +13,7 @@ module QTimetrap
       end
 
       def archived_ids
-        read_ids
+        read_ids.to_a.sort
       end
 
       def archived?(entry_id)
@@ -47,19 +48,23 @@ module QTimetrap
       attr_reader :path
 
       def read_ids
-        return [] unless File.exist?(path)
+        return @ids_cache if @ids_cache
+        return @ids_cache = Set.new unless File.exist?(path)
 
         payload = YAML.safe_load_file(path, permitted_classes: [], aliases: false)
-        return [] unless payload.is_a?(Hash)
+        return @ids_cache = Set.new unless payload.is_a?(Hash)
 
-        Array(payload['archived_entry_ids']).filter_map { |value| Integer(value) }.uniq.sort
+        values = Array(payload['archived_entry_ids']).filter_map { |value| Integer(value) }.uniq
+        @ids_cache = Set.new(values)
       rescue Psych::SyntaxError, ArgumentError, TypeError
-        []
+        @ids_cache = Set.new
       end
 
       def write_ids(ids)
         FileUtils.mkdir_p(File.dirname(path))
-        File.write(path, { 'archived_entry_ids' => ids.uniq.sort }.to_yaml)
+        normalized_ids = ids.uniq.sort
+        File.write(path, { 'archived_entry_ids' => normalized_ids }.to_yaml)
+        @ids_cache = Set.new(normalized_ids)
       end
 
       def default_path

data/app/styles/themes/dark/entries_list.qss

@@ -190,21 +190,29 @@ QLineEdit#entry_node_entry_note:focus {
   padding-left: 6px;
 }
 
-QComboBox#entry_node_entry_task {
+QLabel#entry_node_entry_task {
   color: #94a3b8;
   font-size: 12px;
   background: transparent;
-  border: 0px;
   padding-left: 2px;
 }
 
-QComboBox#entry_node_entry_task:focus {
+QComboBox#entry_node_entry_task_editor {
+  color: #94a3b8;
+  font-size: 12px;
+  background-color: #111827;
+  border: 1px solid #334155;
+  border-radius: 6px;
+  padding-left: 2px;
+}
+
+QComboBox#entry_node_entry_task_editor:focus {
   background-color: #111827;
   border: 1px solid #334155;
   border-radius: 6px;
 }
 
-QComboBox#entry_node_entry_task QAbstractItemView {
+QComboBox#entry_node_entry_task_editor QAbstractItemView {
   background-color: #111827;
   color: #e2e8f0;
   border: 1px solid #334155;

data/app/styles/themes/light/entries_list.qss

@@ -190,21 +190,29 @@ QLineEdit#entry_node_entry_note:focus {
   padding-left: 6px;
 }
 
-QComboBox#entry_node_entry_task {
+QLabel#entry_node_entry_task {
   color: #334155;
   font-size: 12px;
   background: transparent;
-  border: 0px;
   padding-left: 2px;
 }
 
-QComboBox#entry_node_entry_task:focus {
+QComboBox#entry_node_entry_task_editor {
+  color: #334155;
+  font-size: 12px;
+  background-color: #ffffff;
+  border: 1px solid #d8e0ea;
+  border-radius: 6px;
+  padding-left: 2px;
+}
+
+QComboBox#entry_node_entry_task_editor:focus {
   background-color: #ffffff;
   border: 1px solid #d8e0ea;
   border-radius: 6px;
 }
 
-QComboBox#entry_node_entry_task QAbstractItemView {
+QComboBox#entry_node_entry_task_editor QAbstractItemView {
   background-color: #ffffff;
   color: #334155;
   border: 1px solid #d8e0ea;

data/app/view_models/main_view_model.rb

@@ -93,6 +93,10 @@ module QTimetrap
         EntryNodesBuilder.new(entries: filtered_entries, selected_project: selected_project).build
       end
 
+      def all_entry_nodes
+        EntryNodesBuilder.new(entries: entries, selected_project: '* ALL').build
+      end
+
       private
 
       attr_reader :gateway, :archived_entries_store

data/app/views/main_window.rb

@@ -46,7 +46,6 @@ module QTimetrap
         @window = build_base_window
         restore_window_geometry
         set_window_icon
-        window.set_style_sheet(theme.application_stylesheet)
         ui = MainWindowLayoutBuilder.new(
           window: window,
           callbacks: layout_callbacks
@@ -54,11 +53,12 @@ module QTimetrap
         @sidebar = ui.fetch(:sidebar)
         @controls = ui.fetch(:controls)
         @entries = ui.fetch(:entries)
+        apply_theme_styles
       end
 
       def connect_heartbeat
         @heartbeat = QTimer.new(window)
-        heartbeat.set_interval(HEARTBEAT_MS)
+        heartbeat.interval = HEARTBEAT_MS
         heartbeat.connect('timeout') { |_| on_tick }
         heartbeat.start
       end
@@ -67,7 +67,6 @@ module QTimetrap
         window.on(:key_press) { |event| on_key_press(event) }
         register_blur_click_source(window)
         register_blur_click_source(sidebar.widget)
-        register_blur_click_source(controls.widget)
         register_blur_click_source(entries.widget)
       end
 

data/app/views/main_window_layout_builder.rb

@@ -18,7 +18,7 @@ module QTimetrap
       def build
         root = QHBoxLayout.new(window)
         root.set_contents_margins(0, 0, 0, 0)
-        root.set_spacing(0)
+        root.spacing = 0
         splitter, sidebar, controls, entries = build_splitter_and_content
         root.add_widget(splitter)
         { sidebar: sidebar, controls: controls, entries: entries }
@@ -30,8 +30,8 @@ module QTimetrap
 
       def build_splitter_and_content
         splitter = QSplitter.new(window)
-        splitter.set_orientation(Qt::Horizontal)
-        splitter.set_mouse_tracking(true)
+        splitter.orientation = Qt::Horizontal
+        splitter.mouse_tracking = true
         sidebar = build_sidebar(parent: splitter)
         content, controls, entries = build_content(parent: splitter)
         splitter.add_widget(sidebar.widget)
@@ -56,8 +56,8 @@ module QTimetrap
           on_archive_mode_toggled: callbacks.fetch(:on_archive_mode_toggled)
         ).tap do |component|
           component.widget.set_base_size(SIDEBAR_WIDTH, 0)
-          component.widget.set_minimum_width(SIDEBAR_MIN_WIDTH)
-          component.widget.set_maximum_width(SIDEBAR_MAX_WIDTH)
+          component.widget.minimum_width = SIDEBAR_MIN_WIDTH
+          component.widget.maximum_width = SIDEBAR_MAX_WIDTH
         end
       end
 
@@ -93,7 +93,7 @@ module QTimetrap
         content = QWidget.new(parent)
         layout = QVBoxLayout.new(content)
         layout.set_contents_margins(14, 8, 14, 8)
-        layout.set_spacing(10)
+        layout.spacing = 10
         [content, layout]
       end
 

data/app/views/main_window_runtime.rb

@@ -22,8 +22,8 @@ module QTimetrap
       end
 
       def update_live_indicators(now)
-        controls.clock_label.set_text(now.strftime('%a %d %b %Y  %H:%M:%S'))
-        controls.timer_label.set_text(view_model.running_timer_line(now: now))
+        controls.clock_label.text = now.strftime('%a %d %b %Y  %H:%M:%S')
+        controls.timer_label.text = view_model.running_timer_line(now: now)
       end
 
       def refresh_if_needed
@@ -56,7 +56,13 @@ module QTimetrap
         update_current_fields = !view_model.running_current_sheet?
         view_model.select_projects(projects, primary_project: project, sync_current_fields: update_current_fields)
         view_model.current_project_name = project if update_current_fields && project != '* ALL'
-        render!
+        sidebar.update_tasks(
+          tasks: view_model.task_names_for_selected_project,
+          selected_project: view_model.selected_project,
+          selected_task: view_model.selected_tasks.first
+        )
+        controls.update_summary(view_model.summary_line)
+        entries.filter_to(view_model.entry_nodes)
         return unless update_current_fields
 
         controls.update_task_input(view_model.current_sheet_input)
@@ -69,8 +75,8 @@ module QTimetrap
           view_model.current_task_input = task.to_s
           controls.update_task_input(view_model.current_sheet_input)
         end
-        render_controls(sync_sheet: false)
-        entries.render(view_model.entry_nodes)
+        controls.update_summary(view_model.summary_line)
+        entries.filter_to(view_model.entry_nodes)
       end
 
       def handle_project_input(project_name)
@@ -81,12 +87,12 @@ module QTimetrap
 
       def handle_time_range_changed(from_at, to_at)
         view_model.update_time_range_filter(from_at: from_at, to_at: to_at)
-        render_controls(sync_sheet: false)
+        controls.update_summary(view_model.summary_line)
         entries.update_time_range_inputs(
           from_at: view_model.time_filter_from_at,
           to_at: view_model.time_filter_to_at
         )
-        entries.render(view_model.entry_nodes)
+        entries.filter_to(view_model.entry_nodes)
       rescue StandardError => e
         warn("[qtimetrap] update time-range failed: #{e.class}: #{e.message}")
       end
@@ -114,7 +120,7 @@ module QTimetrap
       def switch_theme!
         @theme = theme.with_name(next_theme_name)
         apply_theme
-        render!
+        controls.update_theme_label(theme.name)
       rescue StandardError => e
         warn("[qtimetrap] save theme failed: #{e.class}: #{e.message}")
       end

data/app/views/main_window_runtime_archive_helpers.rb

@@ -8,7 +8,13 @@ module QTimetrap
 
       def handle_archive_mode_toggled(enabled)
         view_model.archive_mode = enabled
-        render!(sync_sheet: false)
+        sidebar.update_tasks(
+          tasks: view_model.task_names_for_selected_project,
+          selected_project: view_model.selected_project,
+          selected_task: view_model.selected_tasks.first
+        )
+        controls.update_summary(view_model.summary_line)
+        entries.filter_to(view_model.entry_nodes)
       end
 
       def handle_entry_archived(entry_id)

data/app/views/main_window_runtime_key_helpers.rb

@@ -22,17 +22,16 @@ module QTimetrap
 
       def on_mouse_button_press(event, source_widget: window)
         focused = window.focus_widget
-        return unless editable_line_edit?(focused)
-
         target = click_target_widget(source_widget, event)
-        return if editable_line_edit?(target)
+        return if editable_input?(target) || entries.task_editor_widget?(target)
 
-        focused.clear_focus
+        blur_editable_input(focused) if editable_input?(focused)
+        entries.close_active_task_editor
       end
 
       def active_line_edit?
         focused = window.focus_widget
-        editable_line_edit?(focused)
+        editable_input?(focused)
       end
 
       def toggle_tracking_via_space
@@ -50,6 +49,26 @@ module QTimetrap
       def editable_line_edit?(widget)
         widget.is_a?(QLineEdit) && !widget.is_read_only
       end
+
+      def editable_task_combo?(widget)
+        return false unless widget.is_a?(QComboBox)
+
+        widget.object_name == 'entry_node_entry_task_editor'
+      end
+
+      def editable_input?(widget)
+        editable_line_edit?(widget) || editable_task_combo?(widget)
+      end
+
+      def blur_editable_input(widget)
+        if editable_task_combo?(widget)
+          widget.line_edit.clear_focus
+          widget.clear_focus
+          return
+        end
+
+        widget.clear_focus
+      end
     end
   end
 end

data/app/views/main_window_runtime_render_helpers.rb

@@ -30,7 +30,8 @@ module QTimetrap
           from_at: view_model.time_filter_from_at,
           to_at: view_model.time_filter_to_at
         )
-        entries.render(view_model.entry_nodes)
+        entries.render(view_model.all_entry_nodes)
+        entries.filter_to(view_model.entry_nodes)
       end
 
       def render_controls(sync_sheet:)

data/app/views/main_window_splitter_toggle_bootstrap_helpers.rb

@@ -10,7 +10,7 @@ module QTimetrap
         attempts = { count: 0 }
         context = { splitter: splitter, sidebar_widget: sidebar_widget, button: button, zone: zone }
         timer = QTimer.new(zone)
-        timer.set_interval(120)
+        timer.interval = 120
         timer.connect('timeout') do |_|
           tick_initial_reposition(
             attempts: attempts,

data/app/views/main_window_splitter_toggle_helpers.rb

@@ -39,10 +39,10 @@ module QTimetrap
 
       def build_sidebar_toggle_button(window)
         QPushButton.new(window).tap do |button|
-          button.set_object_name('sidebar_toggle_button')
-          button.set_text('◀')
-          button.set_focus_policy(Qt::NoFocus)
-          button.set_tool_tip('Collapse sidebar')
+          button.object_name = 'sidebar_toggle_button'
+          button.text = '◀'
+          button.focus_policy = Qt::NoFocus
+          button.tool_tip = 'Collapse sidebar'
           button.set_fixed_size(SIDEBAR_TOGGLE_W, SIDEBAR_TOGGLE_H)
           button.raise
           button.hide
@@ -57,9 +57,9 @@ module QTimetrap
 
       def build_sidebar_toggle_zone(window)
         QWidget.new(window).tap do |zone|
-          zone.set_object_name('sidebar_toggle_hotspot')
+          zone.object_name = 'sidebar_toggle_hotspot'
           zone.set_fixed_size(SIDEBAR_TOGGLE_ZONE_W, SIDEBAR_TOGGLE_ZONE_H)
-          zone.set_style_sheet('background: transparent;')
+          zone.style_sheet = 'background: transparent;'
           zone.raise
         end
       end
@@ -90,12 +90,12 @@ module QTimetrap
       def update_sidebar_visibility(sidebar_widget, button, collapsed:)
         if collapsed
           sidebar_widget.hide
-          button.set_text('▶')
-          button.set_tool_tip('Expand sidebar')
+          button.text = '▶'
+          button.tool_tip = 'Expand sidebar'
         else
           sidebar_widget.show
-          button.set_text('◀')
-          button.set_tool_tip('Collapse sidebar')
+          button.text = '◀'
+          button.tool_tip = 'Collapse sidebar'
         end
       end
     end

data/app/views/main_window_splitter_toggle_hover_helpers.rb

@@ -43,7 +43,7 @@ module QTimetrap
 
       def hide_toggle_button_unless_hovered(button:, state:)
         show = state[:button_hovered] || state[:zone_hovered]
-        button.set_visible(show)
+        button.visible = show
       end
 
       def schedule_toggle_hide(button:, state:)
@@ -59,7 +59,7 @@ module QTimetrap
 
       def build_toggle_hide_timer(button, state)
         QTimer.new(button).tap do |timer|
-          timer.set_interval(SIDEBAR_TOGGLE_HIDE_DELAY_MS)
+          timer.interval = SIDEBAR_TOGGLE_HIDE_DELAY_MS
           timer.connect('timeout') do |_|
             timer.stop
             hide_toggle_button_unless_hovered(button: button, state: state)

data/app/views/main_window_ui_helpers.rb

@@ -29,17 +29,45 @@ module QTimetrap
 
       def build_base_window
         QWidget.new do |widget|
-          widget.set_window_title('QTimetrap')
-          widget.set_object_name('main_window')
+          widget.window_title = 'QTimetrap'
+          widget.object_name = 'main_window'
           widget.set_geometry(40, 40, self.class::WINDOW_W, self.class::WINDOW_H)
         end
       end
 
       def apply_theme
         Application.configuration.theme_name = theme.name
-        window.set_style_sheet(theme.application_stylesheet)
+        apply_theme_styles(update_window_background: false, incremental: true)
         settings_store.write_theme_name(theme.name)
       end
+
+      def apply_theme_styles(update_window_background: true, incremental: false)
+        window.style_sheet = theme.stylesheet('application') if update_window_background
+        sidebar_stylesheet = theme.stylesheet('project_sidebar')
+        controls_stylesheet = theme.stylesheet('tracker_controls')
+        entries_stylesheet = theme.stylesheet('entries_list')
+        if incremental
+          sidebar.widget.style_sheet = stylesheet_rule(sidebar_stylesheet, 'QWidget#sidebar_panel')
+          entries.apply_theme_stylesheet(
+            entries_stylesheet,
+            external_targets: sidebar.theme_style_targets(sidebar_stylesheet) +
+                              controls.theme_style_targets(controls_stylesheet),
+            defer: true
+          )
+        else
+          sidebar.widget.style_sheet = sidebar_stylesheet
+          controls.widget.style_sheet = controls_stylesheet
+          entries.apply_theme_stylesheet(entries_stylesheet)
+        end
+      end
+
+      def stylesheet_rule(stylesheet, selector)
+        stylesheet.scan(/([^{}]+)\{([^{}]*)\}/m).find do |selectors, _declarations|
+          selectors.split(',').map(&:strip).include?(selector)
+        end&.then do |selectors, declarations|
+          "#{selectors.strip} {#{declarations}}"
+        end.to_s
+      end
     end
   end
 end

data/app/views/window_icon_loader.rb

@@ -15,7 +15,7 @@ module QTimetrap
 
         icon = QIcon.new(candidates.first)
         add_fallbacks(icon, candidates.drop(1))
-        window.set_window_icon(icon)
+        window.window_icon = icon
       end
 
       private

data/lib/qtimetrap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QTimetrap
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/rubocop/cop/qt/prefer_ruby_style_setter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Qt
+      # Enforces Ruby-style Qt property setters over set_* bridge methods.
+      #
+      # @example
+      #   # bad
+      #   widget.set_tool_tip('Hello')
+      #
+      #   # good
+      #   widget.tool_tip = 'Hello'
+      class PreferRubyStyleSetter < Base
+        extend AutoCorrector
+
+        MSG = 'Prefer Ruby-style Qt setter `%<replacement>s` over `%<original>s`.'
+        def on_send(node)
+          return unless qt_setter_call?(node)
+
+          method_name = node.method_name.to_s
+          replacement = replacement_source(node)
+          add_offense(
+            node.loc.selector,
+            message: format(MSG, replacement: replacement, original: method_name)
+          ) do |corrector|
+            corrector.replace(node.source_range, replacement)
+          end
+        end
+
+        private
+
+        def qt_setter_call?(node)
+          return false unless node.receiver
+
+          node.arguments.one? &&
+            node.method_name.to_s.start_with?('set_') &&
+            !node.setter_method?
+        end
+
+        def replacement_source(node)
+          attribute_name = node.method_name.to_s.delete_prefix('set_')
+          receiver = node.receiver.source
+          argument = node.first_argument.source
+          "#{receiver}.#{attribute_name} = #{argument}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtimetrap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Maksim Veynberg
@@ -18,7 +18,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -59,13 +60,17 @@ files:
 - app/assets/icons/qtimetrap-icon-512.png
 - app/assets/icons/qtimetrap-icon.svg
 - app/components/entries/branch_hierarchy_helpers.rb
+- app/components/entries/entry_row_render_helpers.rb
 - app/components/entries/leaf_archive_helpers.rb
 - app/components/entries/leaf_note_helpers.rb
+- app/components/entries/leaf_task_display_helpers.rb
+- app/components/entries/leaf_task_editor_state_helpers.rb
 - app/components/entries/leaf_task_helpers.rb
 - app/components/entries/leaf_time_helpers.rb
 - app/components/entries/list_component.rb
 - app/components/entries/list_host_helpers.rb
 - app/components/entries/list_state_helpers.rb
+- app/components/entries/list_task_editor_helpers.rb
 - app/components/entries/node_presentation_helpers.rb
 - app/components/entries/render_helpers.rb
 - app/components/entries/tree_helpers.rb
@@ -179,12 +184,13 @@ files:
 - lib/qtimetrap/configuration.rb
 - lib/qtimetrap/container.rb
 - lib/qtimetrap/version.rb
+- lib/rubocop/cop/qt/prefer_ruby_style_setter.rb
 homepage: https://github.com/CyJimmy264/qtimetrap
 licenses:
 - BSD-2-Clause
 metadata:
   source_code_uri: https://github.com/CyJimmy264/qtimetrap
-  changelog_uri: https://github.com/CyJimmy264/qtimetrap/releases
+  changelog_uri: https://github.com/CyJimmy264/qtimetrap/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/CyJimmy264/qtimetrap/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -201,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Desktop Timetrap UI on Qt
 test_files: []