ruby-pass-qt 2.0.0 → 2.0.1

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

@@ -1,111 +1,109 @@
-module PassQt
-  class BrowseStoresDialog < RubyQt6::Bando::QDialog
-    DataItem = Struct.new(:tablewidgetitem)
-
-    q_object do
-      signal "stores_changed()"
-      slot "_on_list_add_button_clicked()"
-      slot "_on_list_remove_button_clicked()"
-    end
+class BrowseStoresDialog < RubyQt6::Bando::QDialog
+  DataItem = Struct.new(:tablewidgetitem)
 
-    def initialize
-      super
+  q_object do
+    signal "stores_changed()"
+    slot "_on_list_add_button_clicked()"
+    slot "_on_list_remove_button_clicked()"
+  end
 
-      @dataitems = {}
+  def initialize
+    super
 
-      initialize_toolbar
-      initialize_tablewidget
+    @dataitems = {}
 
-      mainlayout = QVBoxLayout.new(self)
-      mainlayout.add_stretch
-      mainlayout.add_widget(@toolbar)
-      mainlayout.add_widget(@tablewidget)
-      mainlayout.add_stretch
+    initialize_toolbar
+    initialize_tablewidget
 
-      set_attribute(Qt::WA_DeleteOnClose)
-      set_modal(true)
-    end
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_stretch
+    mainlayout.add_widget(@toolbar)
+    mainlayout.add_widget(@tablewidget)
+    mainlayout.add_stretch
 
-    private
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  end
 
-    def initialize_toolbar
-      @toolbar = QWidget.new
+  private
 
-      btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListAdd), "Add")
-      btn.clicked.connect(self, :_on_list_add_button_clicked)
+  def initialize_toolbar
+    @toolbar = QWidget.new
 
-      qhboxlayout = QHBoxLayout.new(@toolbar)
-      qhboxlayout.add_widget(QLabel.new("Password Stores"))
-      qhboxlayout.add_stretch
-      qhboxlayout.add_widget(btn)
-    end
+    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListAdd), "Add")
+    btn.clicked.connect(self, :_on_list_add_button_clicked)
 
-    def initialize_tablewidget
-      @tablewidget = QWidget.new
-      @tablewidget.set_object_name("browsestoresdialog_tablewidget")
-      @tablewidget.set_style_sheet("
-        #browsestoresdialog_tablewidget {
-          min-width: 600px;
-          background: white;
-        }
-      ")
-
-      QVBoxLayout.new(@tablewidget)
-      PassQt.settings.GET_stores.each do |store|
-        update_tablewidget_addtableitem(store["fullpath"])
-      end
-    end
+    qhboxlayout = QHBoxLayout.new(@toolbar)
+    qhboxlayout.add_widget(QLabel.new("Password Stores"))
+    qhboxlayout.add_stretch
+    qhboxlayout.add_widget(btn)
+  end
 
-    def update_tablewidget_addtableitem(fullpath)
-      tableitem = QWidget.new
-      tableitemlayout = QHBoxLayout.new(tableitem)
+  def initialize_tablewidget
+    @tablewidget = QWidget.new
+    @tablewidget.set_object_name("browsestoresdialog_tablewidget")
+    @tablewidget.set_style_sheet("
+      #browsestoresdialog_tablewidget {
+        min-width: 600px;
+        background: white;
+      }
+    ")
+
+    QVBoxLayout.new(@tablewidget)
+    PassQt.settings.GET_stores.each do |store|
+      update_tablewidget_addtableitem(store["fullpath"])
+    end
+  end
 
-      label = QLabel.new(fullpath)
-      tableitemlayout.add_widget(label)
-      tableitemlayout.add_stretch
+  def update_tablewidget_addtableitem(fullpath)
+    tableitem = QWidget.new
+    tableitemlayout = QHBoxLayout.new(tableitem)
 
-      btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListRemove), "Remove")
-      btn.clicked.connect(self, :_on_list_remove_button_clicked)
-      tableitemlayout.add_widget(btn)
+    label = QLabel.new(fullpath)
+    tableitemlayout.add_widget(label)
+    tableitemlayout.add_stretch
 
-      @dataitems[fullpath] = DataItem.new(tableitem)
-      @tablewidget.layout.add_widget(tableitem)
-    end
+    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListRemove), "Remove")
+    btn.clicked.connect(self, :_on_list_remove_button_clicked)
+    tableitemlayout.add_widget(btn)
 
-    def update_tablewidget_removetableitem(tableitem)
-      @dataitems.delete_if { |_, item| item.tablewidgetitem == tableitem }
-      tableitem.delete_now
-    end
-
-    def h_put_stores
-      stores = @dataitems.map { |fullpath, _| {"fullpath" => fullpath} }
-      PassQt.settings.PUT_stores(stores)
-      stores_changed.emit
-    end
+    @dataitems[fullpath] = DataItem.new(tableitem)
+    @tablewidget.layout.add_widget(tableitem)
+  end
 
-    def _on_list_add_button_clicked
-      dir = QFileDialog.get_existing_directory(self, "", QDir.home_path)
-      return if dir.empty?
+  def update_tablewidget_removetableitem(tableitem)
+    @dataitems.delete_if { |_, item| item.tablewidgetitem == tableitem }
+    tableitem.delete_now
+  end
 
-      if @dataitems.key?(dir)
-        message = "<p>The following store already exists.</p>#{dir}"
-        QMessageBox.critical(self, "", message)
-        return
-      end
+  def h_put_stores
+    stores = @dataitems.map { |fullpath, _| {"fullpath" => fullpath} }
+    PassQt.settings.PUT_stores(stores)
+    stores_changed.emit
+  end
 
-      unless QDir.new(dir).exists(".gpg-id")
-        message = "<p>The following store is invalid, because the .gpg-id file is missing.</p>#{dir}"
-        QMessageBox.critical(self, "", message)
-        return
-      end
+  def _on_list_add_button_clicked
+    dir = QFileDialog.get_existing_directory(self, "", QDir.home_path)
+    return if dir.empty?
 
-      update_tablewidget_addtableitem(dir)
-      h_put_stores
+    if @dataitems.key?(dir)
+      message = "<p>The following store already exists.</p>#{dir}"
+      QMessageBox.critical(self, "", message)
+      return
     end
 
-    def _on_list_remove_button_clicked
-      update_tablewidget_removetableitem(sender.parent)
-      h_put_stores
+    unless QDir.new(dir).exists(".gpg-id")
+      message = "<p>The following store is invalid, because the .gpg-id file is missing.</p>#{dir}"
+      QMessageBox.critical(self, "", message)
+      return
     end
+
+    update_tablewidget_addtableitem(dir)
+    h_put_stores
+  end
+
+  def _on_list_remove_button_clicked
+    update_tablewidget_removetableitem(sender.parent)
+    h_put_stores
   end
 end

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

@@ -1,80 +1,78 @@
-module PassQt
-  class MainWindow < RubyQt6::Bando::QMainWindow
-    q_object do
-      slot "_on_browse_action_triggered()"
-      slot "_on_browsestoresdialog_stores_changed()"
-      slot "_on_passlistwidget_store_changed(QString)"
-      slot "_on_passlistwidget_passfile_selected(QString,QString)"
-      slot "_on_passlistwidget_passfolder_selected(QString,QString)"
-    end
-
-    def initialize
-      super
-
-      initialize_toolbar
-      initialize_central_widget
-
-      set_context_menu_policy(Qt::NoContextMenu)
-      PassQt.settings.GET_mainwindow_geometry_and_restore_to(self)
-    end
-
-    def close_event(evt)
-      PassQt.settings.PUT_mainwindow_geometry(self)
-
-      _close_event(evt)
-    end
-
-    private
-
-    def initialize_toolbar
-      browse_action = QAction.new(QIcon.from_theme(QIcon::ThemeIcon::Computer), "Browse")
-      browse_action.set_tool_tip("Browse password stores")
-      browse_action.triggered.connect(self, :_on_browse_action_triggered)
-
-      toolbar = add_tool_bar("ToolBar")
-      toolbar.set_object_name("mainwindow_toolbar")
-      toolbar.set_movable(false)
-      toolbar.add_action(browse_action)
-    end
-
-    def initialize_central_widget
-      @passlistwidget = PassListWidget.new
-      @passlistwidget.store_changed.connect(self, :_on_passlistwidget_store_changed)
-      @passlistwidget.passfile_selected.connect(self, :_on_passlistwidget_passfile_selected)
-      @passlistwidget.passfolder_selected.connect(self, :_on_passlistwidget_passfolder_selected)
-
-      @passinfowidget = PassInfoWidget.new
-
-      centralwidget = QWidget.new
-      mainlayout = QHBoxLayout.new(centralwidget)
-      mainlayout.add_widget(@passlistwidget)
-      mainlayout.add_widget(@passinfowidget)
-      mainlayout.set_stretch(0, 2)
-      mainlayout.set_stretch(1, 3)
-
-      set_central_widget(centralwidget)
-    end
-
-    def _on_browse_action_triggered
-      dialog = BrowseStoresDialog.new
-      dialog.stores_changed.connect(self, :_on_browsestoresdialog_stores_changed)
-      dialog.show
-    end
-
-    def _on_browsestoresdialog_stores_changed
-      @passlistwidget.reinitialize_stores
-    end
-
-    def _on_passlistwidget_store_changed(store)
-      @passinfowidget.reinitialize_infoframe
-    end
-
-    def _on_passlistwidget_passfile_selected(store, passname)
-      @passinfowidget.reinitialize_passfile(store, passname)
-    end
-
-    def _on_passlistwidget_passfolder_selected(store, passname)
-      @passinfowidget.reinitialize_passfolder(store, passname)
-    end
+class MainWindow < RubyQt6::Bando::QMainWindow
+  q_object do
+    slot "_on_browse_action_triggered()"
+    slot "_on_browsestoresdialog_stores_changed()"
+    slot "_on_passlistwidget_store_changed(QString)"
+    slot "_on_passlistwidget_passfile_selected(QString,QString)"
+    slot "_on_passlistwidget_passfolder_selected(QString,QString)"
+  end
+
+  def initialize
+    super
+
+    initialize_toolbar
+    initialize_central_widget
+
+    set_context_menu_policy(Qt::NoContextMenu)
+    PassQt.settings.GET_mainwindow_geometry_and_restore_to(self)
+  end
+
+  def close_event(evt)
+    PassQt.settings.PUT_mainwindow_geometry(self)
+
+    _close_event(evt)
+  end
+
+  private
+
+  def initialize_toolbar
+    browse_action = QAction.new(QIcon.from_theme(QIcon::ThemeIcon::Computer), "Browse")
+    browse_action.set_tool_tip("Browse password stores")
+    browse_action.triggered.connect(self, :_on_browse_action_triggered)
+
+    toolbar = add_tool_bar("ToolBar")
+    toolbar.set_object_name("mainwindow_toolbar")
+    toolbar.set_movable(false)
+    toolbar.add_action(browse_action)
+  end
+
+  def initialize_central_widget
+    @passlistwidget = PassListWidget.new
+    @passlistwidget.store_changed.connect(self, :_on_passlistwidget_store_changed)
+    @passlistwidget.passfile_selected.connect(self, :_on_passlistwidget_passfile_selected)
+    @passlistwidget.passfolder_selected.connect(self, :_on_passlistwidget_passfolder_selected)
+
+    @passinfowidget = PassInfoWidget.new
+
+    centralwidget = QWidget.new
+    mainlayout = QHBoxLayout.new(centralwidget)
+    mainlayout.add_widget(@passlistwidget)
+    mainlayout.add_widget(@passinfowidget)
+    mainlayout.set_stretch(0, 2)
+    mainlayout.set_stretch(1, 3)
+
+    set_central_widget(centralwidget)
+  end
+
+  def _on_browse_action_triggered
+    dialog = BrowseStoresDialog.new
+    dialog.stores_changed.connect(self, :_on_browsestoresdialog_stores_changed)
+    dialog.show
+  end
+
+  def _on_browsestoresdialog_stores_changed
+    @passlistwidget.reinitialize_stores
+  end
+
+  def _on_passlistwidget_store_changed(store)
+    @passinfowidget.reinitialize_infoframe
+  end
+
+  def _on_passlistwidget_passfile_selected(store, passname)
+    @passinfowidget.reinitialize_passfile(store, passname)
+  end
+
+  def _on_passlistwidget_passfolder_selected(store, passname)
+    @passinfowidget.reinitialize_passfolder(store, passname)
   end
 end

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

@@ -1,133 +1,131 @@
-module PassQt
-  class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
-    q_object do
-      slot "_on_okbutton_clicked()"
-      slot "_on_cancelbutton_clicked()"
-    end
-
-    def initialize(store, folder, on_success:)
-      super()
-
-      @store = store
-      @folder = folder
-      @on_success = on_success
-
-      initialize_form
-      initialize_btngroup
+class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
+  q_object do
+    slot "_on_okbutton_clicked()"
+    slot "_on_cancelbutton_clicked()"
+  end
 
-      mainlayout = QVBoxLayout.new(self)
-      mainlayout.add_widget(@form)
-      mainlayout.add_widget(@btngroup)
+  def initialize(store, folder, on_success:)
+    super()
 
-      set_attribute(Qt::WA_DeleteOnClose)
-      set_modal(true)
-    end
+    @store = store
+    @folder = folder
+    @on_success = on_success
 
-    private
+    initialize_form
+    initialize_btngroup
 
-    def initialize_form
-      titlelabel = QLabel.new("<center><b>Insert New OTP Password</b></center>")
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_widget(@form)
+    mainlayout.add_widget(@btngroup)
 
-      @errinfolabel = QLabel.new("")
-      @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
-      @errinfolabel.set_hidden(true)
-
-      placeholder = (@folder == "") ? "github.com-otp" : "#{@folder}/github.com-otp"
-      @passnamelabel = initialize_form_label("File")
-      @passnameinput = initialize_form_inputfield(placeholder)
-      set_focus_proxy(@passnameinput)
-
-      @passwordlabel = initialize_form_label("OTP URI")
-      @passwordinput = initialize_form_inputfield("otpauth://totp/GitHub...")
-
-      @form = QWidget.new
-      @form.set_object_name("newonetimepassworddialog_form")
-      @form.set_style_sheet("
-        #newonetimepassworddialog_form {
-          min-width: 600px;
-        }
-      ")
-
-      layout = QGridLayout.new(@form)
-      layout.add_widget(titlelabel, 0, 0, 1, 2)
-      layout.set_row_minimum_height(1, 10)
-      layout.add_widget(@errinfolabel, 2, 0, 1, 2)
-      layout.add_widget(@passnamelabel, 3, 0)
-      layout.add_widget(@passnameinput, 3, 1)
-      layout.add_widget(@passwordlabel, 4, 0)
-      layout.add_widget(@passwordinput, 4, 1)
-    end
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  end
 
-    def initialize_form_label(text)
-      label = QLabel.new(text)
-      label.set_alignment(Qt::AlignRight)
-      label.set_style_sheet("min-width: 80px; padding-right: 4px;")
-      label
-    end
+  private
+
+  def initialize_form
+    titlelabel = QLabel.new("<center><b>Insert New OTP Password</b></center>")
+
+    @errinfolabel = QLabel.new("")
+    @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
+    @errinfolabel.set_hidden(true)
+
+    placeholder = (@folder == "") ? "github.com-otp" : "#{@folder}/github.com-otp"
+    @passnamelabel = initialize_form_label("File")
+    @passnameinput = initialize_form_inputfield(placeholder)
+    set_focus_proxy(@passnameinput)
+
+    @passwordlabel = initialize_form_label("OTP URI")
+    @passwordinput = initialize_form_inputfield("otpauth://totp/GitHub...")
+
+    @form = QWidget.new
+    @form.set_object_name("newonetimepassworddialog_form")
+    @form.set_style_sheet("
+      #newonetimepassworddialog_form {
+        min-width: 600px;
+      }
+    ")
+
+    layout = QGridLayout.new(@form)
+    layout.add_widget(titlelabel, 0, 0, 1, 2)
+    layout.set_row_minimum_height(1, 10)
+    layout.add_widget(@errinfolabel, 2, 0, 1, 2)
+    layout.add_widget(@passnamelabel, 3, 0)
+    layout.add_widget(@passnameinput, 3, 1)
+    layout.add_widget(@passwordlabel, 4, 0)
+    layout.add_widget(@passwordinput, 4, 1)
+  end
 
-    def initialize_form_inputfield(placeholder)
-      input = QLineEdit.new
-      input.set_placeholder_text(placeholder)
-      input
-    end
+  def initialize_form_label(text)
+    label = QLabel.new(text)
+    label.set_alignment(Qt::AlignRight)
+    label.set_style_sheet("min-width: 80px; padding-right: 4px;")
+    label
+  end
 
-    def initialize_btngroup
-      @okbutton = QPushButton.new("Create")
-      @okbutton.clicked.connect(self, :_on_okbutton_clicked)
+  def initialize_form_inputfield(placeholder)
+    input = QLineEdit.new
+    input.set_placeholder_text(placeholder)
+    input
+  end
 
-      @cancelbutton = QPushButton.new("Cancel")
-      @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
+  def initialize_btngroup
+    @okbutton = QPushButton.new("Create")
+    @okbutton.clicked.connect(self, :_on_okbutton_clicked)
 
-      @btngroup = QWidget.new
-      layout = QHBoxLayout.new(@btngroup)
-      layout.add_stretch
-      layout.add_widget(@okbutton)
-      layout.add_widget(@cancelbutton)
-    end
+    @cancelbutton = QPushButton.new("Cancel")
+    @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
 
-    def update_form_errinfo(info)
-      if info.empty?
-        @errinfolabel.set_text("")
-        @errinfolabel.set_hidden(true)
-        return
-      end
+    @btngroup = QWidget.new
+    layout = QHBoxLayout.new(@btngroup)
+    layout.add_stretch
+    layout.add_widget(@okbutton)
+    layout.add_widget(@cancelbutton)
+  end
 
-      @errinfolabel.set_text(info)
-      @errinfolabel.set_hidden(false)
+  def update_form_errinfo(info)
+    if info.empty?
+      @errinfolabel.set_text("")
+      @errinfolabel.set_hidden(true)
+      return
     end
 
-    def validate_form
-      update_form_errinfo("")
+    @errinfolabel.set_text(info)
+    @errinfolabel.set_hidden(false)
+  end
 
-      {
-        "File" => @passnameinput,
-        "OTP URI" => @passwordinput
-      }.each do |k, v|
-        next unless v.text.empty?
+  def validate_form
+    update_form_errinfo("")
 
-        update_form_errinfo("#{k} can't be blank")
-        return false
-      end
+    {
+      "File" => @passnameinput,
+      "OTP URI" => @passwordinput
+    }.each do |k, v|
+      next unless v.text.empty?
 
-      true
+      update_form_errinfo("#{k} can't be blank")
+      return false
     end
 
-    def _on_okbutton_clicked
-      return unless validate_form
-
-      store = @store
-      passname = @passnameinput.text
-      password = @passwordinput.text
-      Pass.otp_insert(store, passname, password, on_success: ->(_) {
-        @on_success.call(passname)
-        close
-      }, on_failure: ->(data) {
-        update_form_errinfo(data["stderr"].strip)
-      })
-    end
+    true
+  end
+
+  def _on_okbutton_clicked
+    return unless validate_form
 
-    def _on_cancelbutton_clicked
+    store = @store
+    passname = @passnameinput.text
+    password = @passwordinput.text
+    Pass.otp_insert(store, passname, password, on_success: ->(_) {
+      @on_success.call(passname)
       close
-    end
+    }, on_failure: ->(data) {
+      update_form_errinfo(data["stderr"].strip)
+    })
+  end
+
+  def _on_cancelbutton_clicked
+    close
   end
 end