qtimetrap 0.1.1 → 0.1.3

data/app/components/entries/list_state_helpers.rb

@@ -15,11 +15,22 @@ module QTimetrap
         @expanded = {}
         @current_nodes = []
         @branch_bindings = {}
+        initialize_task_editor_state!
+        @active_task_container_key = nil
         @leaf_labels = []
         @entry_rows = []
+        @theme_style_queue = []
         @rendering = false
       end
 
+      def initialize_task_editor_state!
+        @task_containers = {}
+        @task_display_inputs = {}
+        @task_editors = {}
+        @task_editor_line_edits = {}
+        @task_editor_configs = {}
+      end
+
       def initialize_time_filter_state!
         @time_filter_from_toggle = nil
         @time_filter_to_toggle = nil
@@ -31,8 +42,8 @@ module QTimetrap
 
       def set_time_filter_state(toggle:, input:, value:)
         enabled = !value.nil?
-        toggle.set_checked(enabled)
-        input.set_date_time(value) if enabled
+        toggle.checked = enabled
+        input.date_time = value if enabled
       end
 
       def syncing_time_filters?
@@ -49,11 +60,73 @@ module QTimetrap
 
       def build_time_filter_debounce_timer
         QTimer.new(parent).tap do |timer|
-          timer.set_single_shot(true)
-          timer.set_interval(self.class::TIME_FILTER_DEBOUNCE_MS)
+          timer.single_shot = true
+          timer.interval = self.class::TIME_FILTER_DEBOUNCE_MS
           timer.connect('timeout') { |_| emit_time_range_filter_changed }
         end
       end
+
+      def register_task_widgets(task_container, display_input, editor, line_edit)
+        container_key = task_container_key(task_container)
+        task_containers[container_key] = task_container
+        task_display_inputs[container_key] = display_input
+        register_task_editor_widgets(task_container, editor, line_edit) if editor
+      end
+
+      def register_task_editor_config(task_container, node:, task_name:)
+        task_editor_configs[task_container_key(task_container)] = { node: node, task_name: task_name }
+      end
+
+      def register_task_editor_widgets(task_container, editor, line_edit)
+        container_key = task_container_key(task_container)
+        task_editors[container_key] = editor
+        task_editor_line_edits[task_editor_key(editor)] = line_edit
+      end
+
+      def task_editor_config_for(task_container)
+        task_editor_configs[task_container_key(task_container)]
+      end
+
+      def task_container_key(task_container)
+        task_container.handle.address
+      end
+
+      def task_editor_key(editor)
+        editor.handle.address
+      end
+
+      def task_container_matches?(left, right)
+        task_container_key(left) == task_container_key(right)
+      end
+
+      def task_container_for_key(key)
+        task_containers[key]
+      end
+
+      def active_task_container
+        task_container_for_key(active_task_container_key)
+      end
+
+      def active_task_container=(task_container)
+        @active_task_container_key = task_container ? task_container_key(task_container) : nil
+      end
+
+      def task_display_input_for(task_container)
+        task_display_inputs[task_container_key(task_container)]
+      end
+
+      def task_editor_for(task_container)
+        task_editors[task_container_key(task_container)]
+      end
+
+      def task_editor_line_edit_for(editor)
+        return unless editor
+
+        task_editor_line_edits[task_editor_key(editor)]
+      end
+
+      attr_reader :task_containers, :task_display_inputs, :task_editors, :task_editor_line_edits,
+                  :active_task_container_key, :task_editor_configs
     end
   end
 end

data/app/components/entries/list_task_editor_helpers.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module QTimetrap
+  module Entries
+    # Public helpers for active task editor lifecycle.
+    module ListTaskEditorHelpers
+      def close_active_task_editor
+        return unless active_task_container
+
+        handle_entry_task_focus_out(active_task_container)
+      end
+
+      def task_editor_widget?(widget)
+        return false unless widget
+
+        task_editor_widget_names.include?(widget.object_name)
+      end
+
+      private
+
+      def task_editor_widget_names
+        %w[
+          entry_node_entry_task_container
+          entry_node_entry_task
+          entry_node_entry_task_editor
+          entry_node_entry_task_editor_input
+        ]
+      end
+    end
+  end
+end

data/app/components/entries/render_helpers.rb

@@ -7,10 +7,10 @@ module QTimetrap
       private
 
       def with_widget_updates_suspended
-        widget.set_updates_enabled(false)
+        widget.updates_enabled = false
         yield
       ensure
-        widget.set_updates_enabled(true)
+        widget.updates_enabled = true
         widget.update
       end
 

data/app/components/entries/tree_helpers.rb

@@ -7,6 +7,8 @@ module QTimetrap
       include BranchHierarchyHelpers
       include LeafArchiveHelpers
       include LeafNoteHelpers
+      include LeafTaskDisplayHelpers
+      include LeafTaskEditorStateHelpers
       include LeafTaskHelpers
       include LeafTimeHelpers
       include NodePresentationHelpers
@@ -19,8 +21,8 @@ module QTimetrap
       end
 
       def set_initial_filter_ui_state
-        time_filter_from_toggle.set_checked(false)
-        time_filter_to_toggle.set_checked(false)
+        time_filter_from_toggle.checked = false
+        time_filter_to_toggle.checked = false
       end
 
       def emit_time_range_filter_changed
@@ -103,10 +105,10 @@ module QTimetrap
 
       def render_default_leaf_node(node, level, parent_widget:, layout:)
         label = QLabel.new(parent_widget)
-        label.set_object_name(object_name_for(node))
-        label.set_text("#{indent(level)}#{node.fetch(:label)}")
-        label.set_fixed_width(branch_button_width)
-        label.set_fixed_height(32)
+        label.object_name = object_name_for(node)
+        label.text = "#{indent(level)}#{node.fetch(:label)}"
+        label.fixed_width = branch_button_width
+        label.fixed_height = 32
         leaf_labels << label
         layout.add_widget(label)
       end
@@ -123,7 +125,7 @@ module QTimetrap
       def build_branch_button(node, level, expanded_state, parent_widget:)
         text = branch_button_text(level, node.fetch(:label), expanded_state)
         button = build_button(parent_widget, object_name_for(node), text, 0, 32)
-        button.set_fixed_width(branch_button_width)
+        button.fixed_width = branch_button_width
         node_id = node.fetch(:id)
         button.connect('clicked') { |_| toggle_node(node_id) }
         button

data/app/components/entries/tree_toolbar_helpers.rb

@@ -8,7 +8,7 @@ module QTimetrap
 
       def build_toolbar(parent_widget:)
         toolbar = QWidget.new(parent_widget)
-        toolbar.set_object_name('entries_toolbar')
+        toolbar.object_name = 'entries_toolbar'
         layout = build_toolbar_layout(toolbar)
         add_tree_toolbar_buttons(layout, toolbar)
         add_time_filter_controls(layout, toolbar)
@@ -20,7 +20,7 @@ module QTimetrap
       def build_toolbar_layout(toolbar)
         QHBoxLayout.new(toolbar).tap do |layout|
           layout.set_contents_margins(0, 0, 0, 0)
-          layout.set_spacing(8)
+          layout.spacing = 8
         end
       end
 
@@ -74,22 +74,22 @@ module QTimetrap
 
       def build_filter_toggle(parent_widget, name, text)
         QCheckBox.new(parent_widget).tap do |checkbox|
-          checkbox.set_object_name(name)
-          checkbox.set_text(text)
-          checkbox.set_focus_policy(Qt::NoFocus)
-          checkbox.set_fixed_height(28)
+          checkbox.object_name = name
+          checkbox.text = text
+          checkbox.focus_policy = Qt::NoFocus
+          checkbox.fixed_height = 28
           checkbox.connect('clicked') { |_| on_filter_toggle_changed }
         end
       end
 
       def build_filter_input(parent_widget, name)
         QDateTimeEdit.new(parent_widget).tap do |input|
-          input.set_object_name(name)
-          input.set_focus_policy(Qt::ClickFocus)
-          input.set_fixed_width(172)
-          input.set_calendar_popup(true)
-          input.set_display_format('yyyy-MM-dd HH:mm')
-          input.set_date_time(Time.now)
+          input.object_name = name
+          input.focus_policy = Qt::ClickFocus
+          input.fixed_width = 172
+          input.calendar_popup = true
+          input.display_format = 'yyyy-MM-dd HH:mm'
+          input.date_time = Time.now
           input.connect('dateTimeChanged(QDateTime)') { |_| schedule_time_range_filter_changed }
         end
       end

data/app/components/project_sidebar/archive_toggle_helpers.rb

@@ -8,12 +8,12 @@ module QTimetrap
 
       def build_archive_toggle_button
         QPushButton.new(widget).tap do |button|
-          button.set_object_name('sidebar_archive_toggle')
-          button.set_checkable(true)
-          button.set_focus_policy(Qt::NoFocus)
-          button.set_fixed_height(30)
-          button.set_text("\u{1F5C3}")
-          button.set_tool_tip('Show archived entries only')
+          button.object_name = 'sidebar_archive_toggle'
+          button.checkable = true
+          button.focus_policy = Qt::NoFocus
+          button.fixed_height = 30
+          button.text = "\u{1F5C3}"
+          button.tool_tip = 'Show archived entries only'
           button.connect('clicked') { |_| on_archive_mode_toggled&.call(button.is_checked) }
         end
       end

data/app/components/project_sidebar/component.rb

@@ -31,7 +31,18 @@ module QTimetrap
         selection = selection_state(selection)
         render_projects(projects: values, selection: selection)
         render_tasks(tasks: tasks, selected_project: selection.fetch(:selected_project), selected_task: selected_task)
-        archive_toggle_button.set_checked(archive_mode)
+        archive_toggle_button.checked = archive_mode
+      end
+
+      def update_tasks(tasks:, selected_project:, selected_task:)
+        render_tasks(tasks: tasks, selected_project: selected_project, selected_task: selected_task)
+      end
+
+      def theme_style_targets(stylesheet)
+        widgets = [@logo_text, @heading, tasks_heading, archive_toggle_button]
+        widgets.concat(buttons.map { |slot| slot.fetch(:view) })
+        widgets.concat(task_buttons)
+        widgets.compact.map { |target| [target, stylesheet] }
       end
 
       private
@@ -41,7 +52,7 @@ module QTimetrap
 
       def build
         @widget = QWidget.new(parent)
-        widget.set_object_name('sidebar_panel')
+        widget.object_name = 'sidebar_panel'
         layout = build_root_layout
         add_static_sidebar_sections(layout)
         @buttons_layout = build_buttons_layout
@@ -56,9 +67,9 @@ module QTimetrap
         slot[:project] = project
         view = slot[:view]
 
-        view.set_text(project[0, 24])
-        view.set_disabled(false)
-        view.set_checked(selected_project_indices.include?(index))
+        view.text = project[0, 24]
+        view.disabled = false
+        view.checked = selected_project_indices.include?(index)
         view.show
       end
 
@@ -78,7 +89,7 @@ module QTimetrap
       def build_root_layout
         QVBoxLayout.new(widget).tap do |layout|
           layout.set_contents_margins(12, 12, 12, 12)
-          layout.set_spacing(8)
+          layout.spacing = 8
         end
       end
 
@@ -117,7 +128,7 @@ module QTimetrap
       def build_buttons_layout
         QVBoxLayout.new.tap do |layout|
           layout.set_contents_margins(0, 0, 0, 0)
-          layout.set_spacing(8)
+          layout.spacing = 8
         end
       end
     end

data/app/components/project_sidebar/logo_helpers.rb

@@ -8,10 +8,10 @@ module QTimetrap
 
       def build_logo
         QWidget.new(widget).tap do |container|
-          container.set_object_name('sidebar_logo')
+          container.object_name = 'sidebar_logo'
           layout = QHBoxLayout.new(container)
           layout.set_contents_margins(0, 0, 0, 0)
-          layout.set_spacing(8)
+          layout.spacing = 8
           layout.add_stretch(1)
           layout.add_widget(build_logo_icon(container))
           layout.add_widget(build_logo_text(container))
@@ -21,31 +21,31 @@ module QTimetrap
 
       def build_logo_icon(parent_widget)
         QLabel.new(parent_widget).tap do |label|
-          label.set_object_name('sidebar_logo_icon')
-          label.set_alignment(Qt::AlignCenter)
+          label.object_name = 'sidebar_logo_icon'
+          label.alignment = Qt::AlignCenter
           label.set_fixed_size(66, 66)
           icon_path = File.join(Application.root, 'app', 'assets', 'icons', 'qtimetrap-icon-128.png')
-          label.set_text("<img src='#{icon_path}' width='64' height='64'/>")
+          label.text = "<img src='#{icon_path}' width='64' height='64'/>"
         end
       end
 
       def build_logo_text(parent_widget)
-        QLabel.new(parent_widget).tap do |label|
-          label.set_object_name('sidebar_logo_text')
-          label.set_alignment(Qt::AlignCenter)
-          label.set_text('QTimetrap')
+        @logo_text = QLabel.new(parent_widget).tap do |label|
+          label.object_name = 'sidebar_logo_text'
+          label.alignment = Qt::AlignCenter
+          label.text = 'QTimetrap'
         end
       end
 
       def build_logo_spacer
-        QWidget.new(widget).tap { |spacer| spacer.set_fixed_height(6) }
+        QWidget.new(widget).tap { |spacer| spacer.fixed_height = 6 }
       end
 
       def build_heading
-        QLabel.new(widget).tap do |label|
-          label.set_object_name('sidebar_heading')
-          label.set_alignment(Qt::AlignCenter)
-          label.set_text('PROJECTS')
+        @heading = QLabel.new(widget).tap do |label|
+          label.object_name = 'sidebar_heading'
+          label.alignment = Qt::AlignCenter
+          label.text = 'PROJECTS'
         end
       end
     end

data/app/components/project_sidebar/project_button_helpers.rb

@@ -29,18 +29,18 @@ module QTimetrap
         slot[:project] = project
         view = slot[:view]
 
-        view.set_text(project[0, 24])
-        view.set_disabled(false)
-        view.set_checked(selected_project_indices.include?(index))
+        view.text = project[0, 24]
+        view.disabled = false
+        view.checked = selected_project_indices.include?(index)
         view.show
       end
 
       def build_project_button
         QPushButton.new(widget).tap do |button|
-          button.set_object_name('project_button')
-          button.set_checkable(true)
-          button.set_focus_policy(Qt::NoFocus)
-          button.set_fixed_height(30)
+          button.object_name = 'project_button'
+          button.checkable = true
+          button.focus_policy = Qt::NoFocus
+          button.fixed_height = 30
           button.connect('clicked') { |_| on_button_clicked(button) }
         end
       end

data/app/components/project_sidebar/task_helpers.rb

@@ -11,7 +11,7 @@ module QTimetrap
       def render_tasks(tasks:, selected_project:, selected_task:)
         values = Array(tasks)
         visible = tasks_visible?(selected_project, values)
-        tasks_heading.set_visible(visible)
+        tasks_heading.visible = visible
         sync_task_buttons(visible ? values.size : 0)
         return clear_task_state unless visible
 
@@ -34,18 +34,18 @@ module QTimetrap
 
       def build_tasks_heading
         QLabel.new(widget).tap do |label|
-          label.set_object_name('sidebar_tasks_heading')
-          label.set_alignment(Qt::AlignCenter)
-          label.set_text('TASKS')
+          label.object_name = 'sidebar_tasks_heading'
+          label.alignment = Qt::AlignCenter
+          label.text = 'TASKS'
         end
       end
 
       def build_task_button
         QPushButton.new(widget).tap do |button|
-          button.set_object_name('task_button')
-          button.set_checkable(true)
-          button.set_focus_policy(Qt::NoFocus)
-          button.set_fixed_height(28)
+          button.object_name = 'task_button'
+          button.checkable = true
+          button.focus_policy = Qt::NoFocus
+          button.fixed_height = 28
           button.connect('clicked') { |_| on_task_button_clicked(button) }
         end
       end
@@ -78,9 +78,9 @@ module QTimetrap
         view = slot.fetch(:view)
         slot[:task] = task
         text = task.to_s
-        view.set_text(text)
-        view.set_tool_tip(text)
-        view.set_checked(selected_task_indices.include?(index))
+        view.text = text
+        view.tool_tip = text
+        view.checked = selected_task_indices.include?(index)
         view.show
       end
 

data/app/components/qt_ui_helpers.rb

@@ -7,20 +7,20 @@ module QTimetrap
 
     def build_label(parent_widget, object_name, text, width: nil, height: nil)
       QLabel.new(parent_widget).tap do |label|
-        label.set_object_name(object_name)
-        label.set_text(text) if text
-        label.set_fixed_width(width) if width
-        label.set_fixed_height(height) if height
+        label.object_name = object_name
+        label.text = text if text
+        label.fixed_width = width if width
+        label.fixed_height = height if height
       end
     end
 
     def build_button(parent_widget, name, text, width, height)
       QPushButton.new(parent_widget).tap do |button|
-        button.set_object_name(name)
-        button.set_text(text)
-        button.set_focus_policy(Qt::NoFocus)
-        button.set_fixed_width(width) if width&.positive?
-        button.set_fixed_height(height)
+        button.object_name = name
+        button.text = text
+        button.focus_policy = Qt::NoFocus
+        button.fixed_width = width if width&.positive?
+        button.fixed_height = height
       end
     end
   end

data/app/components/tracker_controls/component.rb

@@ -17,12 +17,12 @@ module QTimetrap
       end
 
       def update_summary(text)
-        summary_label.set_text(text)
+        summary_label.text = text
       end
 
       def update_project_input(project_name)
         value = project_name.to_s.strip
-        project_input.set_text(value)
+        project_input.text = value
       end
 
       def update_task_input(text)
@@ -30,14 +30,18 @@ module QTimetrap
       end
 
       def update_theme_label(theme_name)
-        theme_button.set_text("THEME: #{theme_name.upcase}")
+        theme_button.text = "THEME: #{theme_name.upcase}"
       end
 
       def update_action_button(running:)
-        start_button.set_visible(!running)
-        stop_button.set_visible(running)
-        task_input.set_read_only(running)
-        project_input.set_read_only(running)
+        start_button.visible = !running
+        stop_button.visible = running
+        task_input.read_only = running
+        project_input.read_only = running
+      end
+
+      def theme_style_targets(stylesheet)
+        theme_widgets.compact.map { |target| [target, stylesheet] }
       end
 
       private
@@ -49,7 +53,7 @@ module QTimetrap
         available = [timer_label.width - TIMER_HORIZONTAL_PADDING, 24].max
         estimated = (available / (chars * TIMER_CHAR_WIDTH_FACTOR)).floor
         font_size = estimated.clamp(TIMER_FONT_MIN_PT, TIMER_FONT_MAX_PT)
-        timer_label.set_style_sheet("font-size: #{font_size}pt;")
+        timer_label.style_sheet = "font-size: #{font_size}pt;"
       end
 
       def build_ui(parent:, callbacks:)
@@ -69,9 +73,16 @@ module QTimetrap
         @theme_button = ui_map.fetch(:theme_button)
         @start_button = ui_map.fetch(:start_button)
         @stop_button = ui_map.fetch(:stop_button)
+        @theme_widgets = [
+          ui_map.fetch(:topbar), ui_map.fetch(:tracker_row), ui_map.fetch(:actions_row),
+          ui_map.fetch(:title_label), clock_label, timer_label, task_input, project_input,
+          summary_label, theme_button, start_button, stop_button, ui_map.fetch(:refresh_button)
+        ]
         configure_timer_font_fit!
       end
 
+      attr_reader :theme_widgets
+
       def configure_timer_font_fit!
         apply_timer_font_fit(TIMER_FIT_SAMPLE)
       end

data/app/components/tracker_controls/layout_builder.rb

@@ -15,11 +15,13 @@ module QTimetrap
       def build
         @widget = QWidget.new(parent)
         root = build_root_layout
-        root.add_widget(build_topbar)
+        @topbar = build_topbar
+        root.add_widget(@topbar)
         start_button, stop_button = build_tracker_row(root)
         refresh_button = build_actions_row(root)
+        @refresh_button = refresh_button
         connect_actions(start_button, stop_button, refresh_button)
-        ui_payload
+        ui_payload.merge(theme_ui_payload)
       end
 
       private
@@ -28,28 +30,28 @@ module QTimetrap
 
       def build_topbar
         topbar = QWidget.new(widget)
-        topbar.set_object_name('topbar')
+        topbar.object_name = 'topbar'
         layout = QHBoxLayout.new(topbar)
         configure_topbar_layout(layout, topbar)
         topbar
       end
 
       def build_tracker_row(root_layout)
-        row = QWidget.new(widget)
-        row.set_object_name('tracker_row')
+        row = @tracker_row = QWidget.new(widget)
+        row.object_name = 'tracker_row'
         layout = QHBoxLayout.new(row)
         layout.set_contents_margins(14, 12, 14, 12)
-        layout.set_spacing(8)
+        layout.spacing = 8
         start_button, stop_button = add_tracker_row_widgets(layout, row)
         root_layout.add_widget(row)
         [start_button, stop_button]
       end
 
       def build_actions_row(root_layout)
-        row = QWidget.new(widget)
+        row = @actions_row = QWidget.new(widget)
         layout = QHBoxLayout.new(row)
         layout.set_contents_margins(0, 0, 0, 0)
-        layout.set_spacing(8)
+        layout.spacing = 8
         refresh_button = add_actions_row_widgets(layout, row)
         root_layout.add_widget(row)
         refresh_button
@@ -57,20 +59,22 @@ module QTimetrap
 
       def build_task_input(parent_widget)
         QLineEdit.new(parent_widget).tap do |input|
-          input.set_object_name('task_input')
-          input.set_placeholder_text('What are you working on?')
-          input.set_focus_policy(Qt::ClickFocus)
+          input.object_name = 'task_input'
+          input.placeholder_text = 'What are you working on?'
+          input.focus_policy = Qt::ClickFocus
           input.text = ''
+          bind_input_focus_on_click(input)
         end
       end
 
       def build_project_input(parent_widget)
         QLineEdit.new(parent_widget).tap do |input|
-          input.set_object_name('project_input')
-          input.set_placeholder_text('your project')
-          input.set_focus_policy(Qt::ClickFocus)
+          input.object_name = 'project_input'
+          input.placeholder_text = 'your project'
+          input.focus_policy = Qt::ClickFocus
           input.text = ''
-          input.set_fixed_width(190)
+          input.fixed_width = 190
+          bind_input_focus_on_click(input)
         end
       end
 
@@ -80,6 +84,16 @@ module QTimetrap
         connect_project_input
       end
 
+      def theme_ui_payload
+        {
+          topbar: @topbar,
+          tracker_row: @tracker_row,
+          actions_row: @actions_row,
+          title_label: @title_label,
+          refresh_button: @refresh_button
+        }
+      end
+
       def connect_start_stop(start_button, stop_button)
         start_button.connect('clicked') do |_|
           callbacks.fetch(:on_start).call(@task_input.text.to_s, @project_input.text.to_s)
@@ -95,6 +109,12 @@ module QTimetrap
       def connect_project_input
         @project_input.connect('textChanged(QString)') { |text| callbacks.fetch(:on_project_change).call(text.to_s) }
       end
+
+      def bind_input_focus_on_click(input)
+        input.on(:mouse_button_press) do |_|
+          input.set_focus unless input.is_read_only
+        end
+      end
     end
   end
 end