ruby-pass-qt 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1816007968467bc6ee9d3fcd9a69bb648a10cde931ebc809a09e76b82bd15109
-  data.tar.gz: 752af79c37a068739aa9751a8015da3c7e08901f8b39442441e502cdb3495149
+  metadata.gz: caa3f891a54d25ed7d77c7df0a1e8993539d3c57f4963a51731a1f830b5900ba
+  data.tar.gz: d52c014f5f5999aa279d053ebb07720892e65f8f0c4633ae5c3fb5fd28a1feb4
 SHA512:
-  metadata.gz: 727ccfc09d7df169abdf1b6512d27fe82f0931a0c2f6e43deadcf6eb9c2ec829c8e36cd5a09acfc46d5ac568866710ae386963685b0dbab0c676431bb0a946ca
-  data.tar.gz: 6400d7a320dfb687a6e1ba0a8b1cdf819e3bb42b966f3161073e081202f2bae428f4c3cc28883e24a37c93a3b760e0605c01708adeefc1d739b9e52f858a5cea
+  metadata.gz: '080717935f157f132f2a315e292e7b1791858a80f8d55622ec5928afeed8f6ba463fb791044363bd481764650b4aedbd4cc6f324554cca8f307f47d03ee94d6c'
+  data.tar.gz: 4bba3d81519da0fe36ef97fc00d808941ac2d06ed6e2b89b72361a2e6c8dfb85efb8adeac13554d2d7c0be700e45be616dfd2da232ff36e650dac00fcd5734ba

data/lib/pass-qt/app/components/passlistwidget/treewidget/treefilter.rb

@@ -1,7 +1,9 @@
 class PassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     class TreeFilter
-      def perform(_treewidget, dataitems, text)
+      def perform(treewidget, dataitems, text)
+        treewidget.set_current_item(nil)
+
         if text.empty?
           dataitems.each do |_, item|
             item.treewidgetitem.set_hidden(false)

data/lib/pass-qt/app/components/passlistwidget/treewidget.rb

@@ -5,9 +5,10 @@ require_relative "treewidget/treefilter"
 class PassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     q_object do
+      signal "nil_selected(QString)"
       signal "passfile_selected(QString,QString)"
       signal "passfolder_selected(QString,QString)"
-      slot "_on_item_clicked(QTreeWidgetItem*,int)"
+      slot "_on_current_item_changed(QTreeWidgetItem*,QTreeWidgetItem*)"
       slot "_on_new_password_action_triggered()"
       slot "_on_new_otp_action_triggered()"
       slot "_on_delete_action_triggered()"
@@ -23,7 +24,7 @@ class PassListWidget < RubyQt6::Bando::QWidget
 
       initialize_actions
 
-      item_clicked.connect(self, :_on_item_clicked)
+      current_item_changed.connect(self, :_on_current_item_changed)
     end
 
     def context_menu_event(evt)
@@ -52,9 +53,12 @@ class PassListWidget < RubyQt6::Bando::QWidget
       builder.perform(self, @store, @dataitems)
 
       expand_all
-      @dataitems.each do |_, item|
-        if item.passname == selected_passname
-          item.treewidgetitem.set_selected(true)
+      if selected_passname.nil?
+        set_current_item(nil)
+      else
+        @dataitems.each do |_, item|
+          next if item.passname != selected_passname
+          set_current_item(item.treewidgetitem)
           break
         end
       end
@@ -81,8 +85,13 @@ class PassListWidget < RubyQt6::Bando::QWidget
       action
     end
 
-    def _on_item_clicked(item, _column)
-      filepath = item.data(1, Qt::DisplayRole).value
+    def _on_current_item_changed(curr, _prev)
+      if curr.nil?
+        nil_selected.emit(@store)
+        return
+      end
+
+      filepath = curr.data(1, Qt::DisplayRole).value
       dataitem = @dataitems[filepath]
       Helpers.passfile?(filepath) ?
         passfile_selected.emit(@store, dataitem.passname) :

data/lib/pass-qt/app/components/passlistwidget.rb

@@ -3,6 +3,7 @@ require_relative "passlistwidget/treewidget"
 class PassListWidget < RubyQt6::Bando::QWidget
   q_object do
     signal "store_changed(QString)"
+    signal "nil_selected(QString)"
     signal "passfile_selected(QString,QString)"
     signal "passfolder_selected(QString,QString)"
     slot "_on_combobox_current_text_changed(QString)"
@@ -57,6 +58,7 @@ class PassListWidget < RubyQt6::Bando::QWidget
   def initialize_treewidget
     @treewidget = TreeWidget.new
     @treewidget.set_header_hidden(true)
+    @treewidget.nil_selected.connect(self, :nil_selected)
     @treewidget.passfile_selected.connect(self, :passfile_selected)
     @treewidget.passfolder_selected.connect(self, :passfolder_selected)
   end

data/lib/pass-qt/app/views/mainwindow.rb

@@ -3,6 +3,7 @@ class MainWindow < RubyQt6::Bando::QMainWindow
     slot "_on_browse_action_triggered()"
     slot "_on_browsestoresdialog_stores_changed()"
     slot "_on_passlistwidget_store_changed(QString)"
+    slot "_on_passlistwidget_nil_selected(QString)"
     slot "_on_passlistwidget_passfile_selected(QString,QString)"
     slot "_on_passlistwidget_passfolder_selected(QString,QString)"
   end
@@ -39,6 +40,7 @@ class MainWindow < RubyQt6::Bando::QMainWindow
   def initialize_central_widget
     @passlistwidget = PassListWidget.new
     @passlistwidget.store_changed.connect(self, :_on_passlistwidget_store_changed)
+    @passlistwidget.nil_selected.connect(self, :_on_passlistwidget_nil_selected)
     @passlistwidget.passfile_selected.connect(self, :_on_passlistwidget_passfile_selected)
     @passlistwidget.passfolder_selected.connect(self, :_on_passlistwidget_passfolder_selected)
 
@@ -64,7 +66,11 @@ class MainWindow < RubyQt6::Bando::QMainWindow
     @passlistwidget.refresh
   end
 
-  def _on_passlistwidget_store_changed(store)
+  def _on_passlistwidget_store_changed(_store)
+    @passinfowidget.use_infocard
+  end
+
+  def _on_passlistwidget_nil_selected(_store)
     @passinfowidget.use_infocard
   end
 

data/lib/pass-qt/app/views/newonetimepassworddialog.rb

@@ -71,17 +71,17 @@ class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
   end
 
   def initialize_btngroup
-    @okbutton = QPushButton.new("Create")
-    @okbutton.clicked.connect(self, :_on_okbutton_clicked)
+    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
+    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
+    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
 
-    @cancelbutton = QPushButton.new("Cancel")
-    @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
+    okbutton = @btngroup.button(QDialogButtonBox::Ok)
+    okbutton.set_text("Create")
+    okbutton.set_default(true)
+    okbutton.set_auto_default(true)
 
-    @btngroup = QWidget.new
-    layout = QHBoxLayout.new(@btngroup)
-    layout.add_stretch
-    layout.add_widget(@okbutton)
-    layout.add_widget(@cancelbutton)
+    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
+    cancelbutton.set_auto_default(true)
   end
 
   def update_form_errinfo(info)

data/lib/pass-qt/app/views/newpassworddialog.rb

@@ -93,17 +93,17 @@ class NewPasswordDialog < RubyQt6::Bando::QDialog
   end
 
   def initialize_btngroup
-    @okbutton = QPushButton.new("Create")
-    @okbutton.clicked.connect(self, :_on_okbutton_clicked)
+    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
+    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
+    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
 
-    @cancelbutton = QPushButton.new("Cancel")
-    @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
+    okbutton = @btngroup.button(QDialogButtonBox::Ok)
+    okbutton.set_text("Create")
+    okbutton.set_default(true)
+    okbutton.set_auto_default(true)
 
-    @btngroup = QWidget.new
-    layout = QHBoxLayout.new(@btngroup)
-    layout.add_stretch
-    layout.add_widget(@okbutton)
-    layout.add_widget(@cancelbutton)
+    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
+    cancelbutton.set_auto_default(true)
   end
 
   def update_form_errinfo(info)

data/lib/pass-qt/version.rb

@@ -1,3 +1,3 @@
 module PassQt
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pass-qt
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - John Doe
@@ -23,7 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-description: A simple GUI for pass on Linux.
 email:
 - johndoe@example.com
 executables:
@@ -68,11 +67,9 @@ files:
 - lib/pass-qt/version.rb
 - misc/screenshots/mainwindow.png
 homepage: https://github.com/souk4711/ruby-pass-qt
-licenses: []
-metadata:
-  homepage_uri: https://github.com/souk4711/ruby-pass-qt
-  source_code_uri: https://github.com/souk4711/ruby-pass-qt
-  changelog_uri: https://github.com/souk4711/ruby-pass-qt
+licenses:
+- GPL-3.0-only
+metadata: {}
 rdoc_options: []
 require_paths:
 - lib