1
0
Fork 0

- [GUI] increased width of entries in import certificates dialog window.

This commit is contained in:
cage 2023-03-25 16:46:46 +01:00
parent 3da987012c
commit 6a771507c5
1 changed files with 59 additions and 52 deletions

View File

@ -137,58 +137,65 @@
(setf url-entry (make-instance 'gui:entry
:master object
:text (strcat gemini-constants:+gemini-scheme+ "://")))
(setf certificate-entry
(make-instance 'gui-mw:autocomplete-entry
:master object
:autocomplete-function (autocomplete-file-cb)))
(setf key-entry
(make-instance 'gui-mw:autocomplete-entry
:master object
:autocomplete-function (autocomplete-file-cb)))
(let ((inner-entry-certificate (gui-mw:autocomplete-entry-widget certificate-entry))
(inner-entry-key (gui-mw:autocomplete-entry-widget key-entry))
(url-label (make-instance 'gui:label
:master object
:text "Gemini address"))
(cert-label (make-instance 'gui:label
:master object
:text "Certificate file"))
(key-label (make-instance 'gui:label
:master object
:text "Key file"))
(buttons-frame (make-instance 'gui:frame
:master object)))
(setf certificate-choose-button
(make-instance 'gui:button
:image icons:*folder*
:master object
:command
(on-file-choosen-clsr inner-entry-certificate object ".")))
(setf key-choose-button
(make-instance 'gui:button
:image icons:*folder*
:master object
:command (on-file-choosen-clsr inner-entry-key object)))
(setf ok-button (make-instance 'gui:button
:text "OK"
:master buttons-frame
:command
(import-certificate-clsr object certificate-frame)))
(setf cancel-button (make-instance 'gui:button
:text (_ "Cancel")
:master buttons-frame
:command (lambda () (gui:break-mainloop))))
(gui:grid url-label 0 0)
(gui:grid url-entry 1 0)
(gui:grid cert-label 3 0)
(gui:grid certificate-entry 4 0)
(gui:grid certificate-choose-button 4 1)
(gui:grid key-label 5 0)
(gui:grid key-entry 6 0)
(gui:grid key-choose-button 6 1)
(gui:grid buttons-frame 7 0)
(gui:grid ok-button 0 0)
(gui:grid cancel-button 0 1))))
(let* ((screen-width-in-pixel (/ (gui:screen-width) 2))
(font (gui:cget url-entry :font))
(zero-char-width (gui:font-measure font "0"))
(entries-width (truncate (/ screen-width-in-pixel zero-char-width))))
(setf certificate-entry
(make-instance 'gui-mw:autocomplete-entry
:master object
:autocomplete-function (autocomplete-file-cb)))
(setf key-entry
(make-instance 'gui-mw:autocomplete-entry
:master object
:autocomplete-function (autocomplete-file-cb)))
(gui:configure url-entry :width entries-width)
(gui:configure certificate-entry :width entries-width)
(gui:configure key-entry :width entries-width)
(let ((inner-entry-certificate (gui-mw:autocomplete-entry-widget certificate-entry))
(inner-entry-key (gui-mw:autocomplete-entry-widget key-entry))
(url-label (make-instance 'gui:label
:master object
:text "Gemini address"))
(cert-label (make-instance 'gui:label
:master object
:text "Certificate file"))
(key-label (make-instance 'gui:label
:master object
:text "Key file"))
(buttons-frame (make-instance 'gui:frame
:master object)))
(setf certificate-choose-button
(make-instance 'gui:button
:image icons:*folder*
:master object
:command
(on-file-choosen-clsr inner-entry-certificate object ".")))
(setf key-choose-button
(make-instance 'gui:button
:image icons:*folder*
:master object
:command (on-file-choosen-clsr inner-entry-key object)))
(setf ok-button (make-instance 'gui:button
:text "OK"
:master buttons-frame
:command
(import-certificate-clsr object certificate-frame)))
(setf cancel-button (make-instance 'gui:button
:text (_ "Cancel")
:master buttons-frame
:command (lambda () (gui:break-mainloop))))
(gui:grid url-label 0 0)
(gui:grid url-entry 1 0)
(gui:grid cert-label 3 0)
(gui:grid certificate-entry 4 0)
(gui:grid certificate-choose-button 4 1)
(gui:grid key-label 5 0)
(gui:grid key-entry 6 0)
(gui:grid key-choose-button 6 1)
(gui:grid buttons-frame 7 0)
(gui:grid ok-button 0 0)
(gui:grid cancel-button 0 1)))))
(defun make-import-certificates-win-clsr (certificate-frame master)
(lambda ()