aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-01-19 21:26:50 +0100
committerChristian Grothoff <christian@grothoff.org>2022-01-19 21:26:50 +0100
commitf60427ebc5369faa43b9ad721d15dbbd6e92baf8 (patch)
treeb6eb0b0d68e045ab681ecf55ea1e1ff2e8b0acc0
parent187c76c01f7810d7058251c0e76f7a48b179f196 (diff)
downloadanastasis-gtk-f60427ebc5369faa43b9ad721d15dbbd6e92baf8.tar.gz
anastasis-gtk-f60427ebc5369faa43b9ad721d15dbbd6e92baf8.zip
-redesign of secret selection dialog --- breaks anastasis-gtk as the C logic is not matching the glade file right now
Diffstat
-rw-r--r--contrib/anastasis_gtk_main_window.glade312
1 files changed, 157 insertions, 155 deletions
diff --git a/contrib/anastasis_gtk_main_window.glade b/contrib/anastasis_gtk_main_window.glade
index e78e4d8..c7edb2b 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -28,6 +28,11 @@ Author: Christian Grothoff, Dennis Neufeld
28 <!-- interface-description Key backup and recovery --> 28 <!-- interface-description Key backup and recovery -->
29 <!-- interface-copyright 2019-2021 Anastasis SARL --> 29 <!-- interface-copyright 2019-2021 Anastasis SARL -->
30 <!-- interface-authors Christian Grothoff, Dennis Neufeld --> 30 <!-- interface-authors Christian Grothoff, Dennis Neufeld -->
31 <object class="GtkImage" id="add_image">
32 <property name="visible">True</property>
33 <property name="can-focus">False</property>
34 <property name="stock">gtk-add</property>
35 </object>
31 <object class="GtkListStore" id="anastasis_gtk_backup_progress_liststore"> 36 <object class="GtkListStore" id="anastasis_gtk_backup_progress_liststore">
32 <columns> 37 <columns>
33 <!-- column-name description --> 38 <!-- column-name description -->
@@ -382,6 +387,32 @@ Author: Christian Grothoff, Dennis Neufeld
382 <property name="step-increment">1</property> 387 <property name="step-increment">1</property>
383 <property name="page-increment">10</property> 388 <property name="page-increment">10</property>
384 </object> 389 </object>
390 <object class="GtkAdjustment" id="secret_selection_h_adjustment">
391 <property name="upper">100</property>
392 <property name="step-increment">1</property>
393 <property name="page-increment">10</property>
394 </object>
395 <object class="GtkListStore" id="secret_selection_liststore">
396 <columns>
397 <!-- column-name provider_url -->
398 <column type="gchararray"/>
399 <!-- column-name version -->
400 <column type="gint"/>
401 <!-- column-name attribute_mask -->
402 <column type="gint"/>
403 <!-- column-name secret_name -->
404 <column type="gchararray"/>
405 <!-- column-name secret_date_string -->
406 <column type="gchararray"/>
407 <!-- column-name secret_date_numeric -->
408 <column type="guint64"/>
409 </columns>
410 </object>
411 <object class="GtkAdjustment" id="secret_selection_v_adjustment">
412 <property name="upper">100</property>
413 <property name="step-increment">1</property>
414 <property name="page-increment">10</property>
415 </object>
385 <object class="GtkListStore" id="unpaid_qrcodes_liststore"> 416 <object class="GtkListStore" id="unpaid_qrcodes_liststore">
386 <columns> 417 <columns>
387 <!-- column-name qr --> 418 <!-- column-name qr -->
@@ -3457,189 +3488,160 @@ date of your secret's recovery data.</property>
3457 <property name="orientation">vertical</property> 3488 <property name="orientation">vertical</property>
3458 <property name="spacing">10</property> 3489 <property name="spacing">10</property>
3459 <child> 3490 <child>
3460 <object class="GtkBox" id="provider_selection_vbox"> 3491 <object class="GtkBox">
3461 <property name="visible">True</property> 3492 <property name="visible">True</property>
3462 <property name="can-focus">False</property> 3493 <property name="can-focus">False</property>
3463 <property name="halign">start</property>
3464 <property name="orientation">vertical</property> 3494 <property name="orientation">vertical</property>
3465 <property name="spacing">5</property>
3466 <child>
3467 <object class="GtkLabel" id="anastasis_gtk_provider_url_label">
3468 <property name="visible">True</property>
3469 <property name="can-focus">False</property>
3470 <property name="tooltip-text" translatable="yes">This is the URL of the provider from which we downloaded the recovery document.</property>
3471 <property name="halign">start</property>
3472 <property name="label" translatable="yes">Select a provider</property>
3473 </object>
3474 <packing>
3475 <property name="expand">False</property>
3476 <property name="fill">False</property>
3477 <property name="padding">5</property>
3478 <property name="position">0</property>
3479 </packing>
3480 </child>
3481 <child> 3495 <child>
3482 <object class="GtkComboBoxText" id="anastasis_gtk_provider_url_combo_box_text"> 3496 <object class="GtkScrolledWindow" id="anastasis_secret_selection_scrolled_window">
3483 <property name="visible">True</property> 3497 <property name="visible">True</property>
3484 <property name="can-focus">False</property> 3498 <property name="can-focus">True</property>
3485 <property name="margin-left">5</property> 3499 <property name="hadjustment">secret_selection_h_adjustment</property>
3486 <property name="margin-right">5</property> 3500 <property name="vadjustment">secret_selection_v_adjustment</property>
3487 <property name="margin-start">5</property> 3501 <property name="shadow-type">in</property>
3488 <property name="margin-end">5</property> 3502 <child>
3489 <property name="margin-top">5</property> 3503 <object class="GtkViewport" id="anastasis_secret_selection_viewport">
3490 <property name="margin-bottom">5</property> 3504 <property name="visible">True</property>
3491 <property name="has-entry">True</property> 3505 <property name="can-focus">False</property>
3492 <child internal-child="entry"> 3506 <property name="hadjustment">secret_selection_h_adjustment</property>
3493 <object class="GtkEntry" id="anastasis_gtk_provider_url_entry"> 3507 <property name="vadjustment">secret_selection_v_adjustment</property>
3494 <property name="can-focus">True</property> 3508 <child>
3495 <property name="max-length">1024</property> 3509 <object class="GtkTreeView" id="anastasis_secret_selection_treeview">
3496 <property name="width-chars">32</property> 3510 <property name="visible">True</property>
3497 <property name="placeholder-text" translatable="yes">https://</property> 3511 <property name="can-focus">True</property>
3498 <property name="input-purpose">url</property> 3512 <property name="hadjustment">secret_selection_h_adjustment</property>
3499 <signal name="changed" handler="anastasis_gtk_provider_url_entry_changed_cb" swapped="no"/> 3513 <property name="vadjustment">secret_selection_v_adjustment</property>
3514 <property name="model">secret_selection_liststore</property>
3515 <child internal-child="selection">
3516 <object class="GtkTreeSelection" id="anastasis_gtk_secret_selection_treeselection">
3517 <signal name="changed" handler="anastasis_gtk_secret_selection_treeselection_changed_cb" swapped="no"/>
3518 </object>
3519 </child>
3520 <child>
3521 <object class="GtkTreeViewColumn" id="secret_name_column">
3522 <property name="resizable">True</property>
3523 <property name="sizing">autosize</property>
3524 <property name="title" translatable="yes">Secret name</property>
3525 <property name="clickable">True</property>
3526 <property name="sort-indicator">True</property>
3527 <property name="sort-column-id">3</property>
3528 <child>
3529 <object class="GtkCellRendererText" id="backup_name_renderer"/>
3530 <attributes>
3531 <attribute name="text">3</attribute>
3532 </attributes>
3533 </child>
3534 </object>
3535 </child>
3536 <child>
3537 <object class="GtkTreeViewColumn" id="backup_time_column">
3538 <property name="sizing">fixed</property>
3539 <property name="title" translatable="yes">Backup time</property>
3540 <property name="clickable">True</property>
3541 <property name="sort-indicator">True</property>
3542 <property name="sort-column-id">5</property>
3543 <child>
3544 <object class="GtkCellRendererText" id="backup_time_renderer"/>
3545 <attributes>
3546 <attribute name="text">4</attribute>
3547 </attributes>
3548 </child>
3549 </object>
3550 </child>
3551 <child>
3552 <object class="GtkTreeViewColumn" id="backup_version_column">
3553 <property name="visible">False</property>
3554 <property name="title" translatable="yes">Version</property>
3555 <property name="clickable">True</property>
3556 <property name="sort-indicator">True</property>
3557 <property name="sort-order">descending</property>
3558 <property name="sort-column-id">1</property>
3559 <child>
3560 <object class="GtkCellRendererText" id="backup_version_renderer">
3561 <property name="visible">False</property>
3562 </object>
3563 <attributes>
3564 <attribute name="text">1</attribute>
3565 </attributes>
3566 </child>
3567 </object>
3568 </child>
3569 <child>
3570 <object class="GtkTreeViewColumn" id="provider_url_column1">
3571 <property name="visible">False</property>
3572 <property name="resizable">True</property>
3573 <property name="title" translatable="yes">Provider</property>
3574 <property name="clickable">True</property>
3575 <child>
3576 <object class="GtkCellRendererText" id="provider_url_renderer">
3577 <property name="visible">False</property>
3578 </object>
3579 <attributes>
3580 <attribute name="text">0</attribute>
3581 </attributes>
3582 </child>
3583 </object>
3584 </child>
3585 </object>
3586 </child>
3500 </object> 3587 </object>
3501 </child> 3588 </child>
3502 </object> 3589 </object>
3503 <packing> 3590 <packing>
3504 <property name="expand">True</property> 3591 <property name="expand">True</property>
3505 <property name="fill">True</property> 3592 <property name="fill">True</property>
3506 <property name="padding">5</property>
3507 <property name="position">1</property>
3508 </packing>
3509 </child>
3510 </object>
3511 <packing>
3512 <property name="expand">False</property>
3513 <property name="fill">True</property>
3514 <property name="padding">20</property>
3515 <property name="position">0</property>
3516 </packing>
3517 </child>
3518 <child>
3519 <object class="GtkBox" id="backup_version_selection_vbox">
3520 <property name="visible">True</property>
3521 <property name="can-focus">False</property>
3522 <property name="halign">start</property>
3523 <property name="orientation">vertical</property>
3524 <child>
3525 <object class="GtkLabel" id="anastasis_gtk_backup_version_label">
3526 <property name="visible">True</property>
3527 <property name="can-focus">False</property>
3528 <property name="tooltip-text" translatable="yes">This is the version of the backup at the provider. By default, the latest available backup version is obtained.</property>
3529 <property name="halign">start</property>
3530 <property name="label" translatable="yes">Select a backup version</property>
3531 </object>
3532 <packing>
3533 <property name="expand">False</property>
3534 <property name="fill">True</property>
3535 <property name="position">0</property>
3536 </packing>
3537 </child>
3538 <child>
3539 <object class="GtkSpinButton" id="anastasis_gtk_policy_version_spin_button">
3540 <property name="visible">True</property>
3541 <property name="can-focus">True</property>
3542 <property name="margin-right">5</property>
3543 <property name="margin-end">5</property>
3544 <property name="text" translatable="yes">0</property>
3545 <property name="input-purpose">number</property>
3546 <property name="adjustment">policy_version_adjustment</property>
3547 <property name="climb-rate">1</property>
3548 <property name="numeric">True</property>
3549 <signal name="changed" handler="anastasis_gtk_policy_version_spin_button_changed_cb" swapped="no"/>
3550 </object>
3551 <packing>
3552 <property name="expand">False</property>
3553 <property name="fill">False</property>
3554 <property name="padding">5</property>
3555 <property name="position">1</property>
3556 </packing>
3557 </child>
3558 <child>
3559 <object class="GtkLabel" id="backup_version_explainer_label">
3560 <property name="visible">True</property>
3561 <property name="can-focus">False</property>
3562 <property name="label" translatable="yes">To see other backup versions,
3563choose a different provider.</property>
3564 <attributes>
3565 <attribute name="weight" value="normal"/>
3566 <attribute name="foreground" value="#777776767b7b"/>
3567 </attributes>
3568 </object>
3569 <packing>
3570 <property name="expand">False</property>
3571 <property name="fill">True</property>
3572 <property name="padding">10</property>
3573 <property name="position">2</property>
3574 </packing>
3575 </child>
3576 </object>
3577 <packing>
3578 <property name="expand">False</property>
3579 <property name="fill">True</property>
3580 <property name="position">1</property>
3581 </packing>
3582 </child>
3583 <child>
3584 <object class="GtkBox" id="anastasis_gtk_secret_identification_vbox">
3585 <property name="visible">True</property>
3586 <property name="can-focus">False</property>
3587 <property name="halign">start</property>
3588 <property name="orientation">vertical</property>
3589 <property name="spacing">5</property>
3590 <child>
3591 <object class="GtkLabel" id="secret_name_explainer_label">
3592 <property name="visible">True</property>
3593 <property name="can-focus">False</property>
3594 <property name="halign">start</property>
3595 <property name="label" translatable="yes">The secret name associated with this backup version is:</property>
3596 </object>
3597 <packing>
3598 <property name="expand">False</property>
3599 <property name="fill">True</property>
3600 <property name="padding">5</property>
3601 <property name="position">0</property> 3593 <property name="position">0</property>
3602 </packing> 3594 </packing>
3603 </child> 3595 </child>
3604 <child> 3596 <child>
3605 <object class="GtkLabel" id="anastasis_gtk_secret_name_label"> 3597 <object class="GtkBox">
3606 <property name="visible">True</property>
3607 <property name="can-focus">False</property>
3608 <property name="label">COMPUTATIONALLY GENERATED</property>
3609 <attributes>
3610 <attribute name="weight" value="bold"/>
3611 </attributes>
3612 </object>
3613 <packing>
3614 <property name="expand">False</property>
3615 <property name="fill">True</property>
3616 <property name="position">1</property>
3617 </packing>
3618 </child>
3619 <child>
3620 <object class="GtkLabel" id="secret_recovery_change_explainer_label">
3621 <property name="visible">True</property> 3598 <property name="visible">True</property>
3622 <property name="can-focus">False</property> 3599 <property name="can-focus">False</property>
3623 <property name="halign">start</property> 3600 <child>
3624 <property name="label" translatable="yes">If this is not the secret you want to recover, 3601 <object class="GtkLabel" id="select_secret_hint_label">
3625select a different provider or backup version.</property> 3602 <property name="visible">True</property>
3626 <attributes> 3603 <property name="can-focus">False</property>
3627 <attribute name="foreground" value="#777776767b7b"/> 3604 <property name="halign">start</property>
3628 </attributes> 3605 <property name="label" translatable="yes">Select a secret to recover from the list below. If no secrets are listed,
3606you need to either go back and correct your personal information or
3607explicitly add the provider which you used before for the backup.</property>
3608 </object>
3609 <packing>
3610 <property name="expand">True</property>
3611 <property name="fill">True</property>
3612 <property name="padding">10</property>
3613 <property name="position">0</property>
3614 </packing>
3615 </child>
3616 <child>
3617 <object class="GtkButton" id="anastasis_gtk_add_provider_button">
3618 <property name="label" translatable="yes">Add provider</property>
3619 <property name="visible">True</property>
3620 <property name="can-focus">True</property>
3621 <property name="receives-default">True</property>
3622 <property name="image">add_image</property>
3623 <signal name="clicked" handler="anastasis_gtk_add_provider_button_clicked_cb" swapped="no"/>
3624 </object>
3625 <packing>
3626 <property name="expand">False</property>
3627 <property name="fill">True</property>
3628 <property name="padding">5</property>
3629 <property name="position">1</property>
3630 </packing>
3631 </child>
3629 </object> 3632 </object>
3630 <packing> 3633 <packing>
3631 <property name="expand">False</property> 3634 <property name="expand">False</property>
3632 <property name="fill">True</property> 3635 <property name="fill">True</property>
3633 <property name="padding">5</property> 3636 <property name="padding">5</property>
3634 <property name="position">2</property> 3637 <property name="position">5</property>
3635 </packing> 3638 </packing>
3636 </child> 3639 </child>
3637 </object> 3640 </object>
3638 <packing> 3641 <packing>
3639 <property name="expand">False</property> 3642 <property name="expand">False</property>
3640 <property name="fill">True</property> 3643 <property name="fill">True</property>
3641 <property name="padding">20</property> 3644 <property name="position">0</property>
3642 <property name="position">2</property>
3643 </packing> 3645 </packing>
3644 </child> 3646 </child>
3645 </object> 3647 </object>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:59:21 +0000