Author: lslezak
Date: Fri Jan 11 10:19:08 2008
New Revision: 43555
URL: http://svn.opensuse.org/viewcvs/yast?rev=43555&view=rev
Log:
- GPG key management - use WizardHW module for the main dialog, display
more details about the selected GPG key (fingerprint)
Modified:
trunk/packager/src/include/key_manager_dialogs.ycp
Modified: trunk/packager/src/include/key_manager_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/key_manager_dialogs.ycp?rev=43555&r1=43554&r2=43555&view=diff
==============================================================================
--- trunk/packager/src/include/key_manager_dialogs.ycp (original)
+++ trunk/packager/src/include/key_manager_dialogs.ycp Fri Jan 11 10:19:08 2008
@@ -13,29 +13,38 @@
textdomain "packager";
import "Wizard";
+import "WizardHW";
import "Label";
import "Popup";
import "KeyManager";
-
+import "String";
boolean gpg_mgr_standalone_mode = false;
/**
+ * Creates a summary table with GPG key configuration
* @return list table contents
*/
-list createTableItems()
+list > createHWTable()
{
- list ret = [];
+ list > ret = [];
foreach(map key, KeyManager::GetKeys(),
{
- term item = `item(`id(key["id"]:""),
- key["trusted"]:false ? UI::Glyph (`CheckMark) : "",
- key["id"]:"",
- key["name"]:""
- );
+ list<string> descr = [];
+
+ // escape <> characters in the name
+ descr = add(descr, sformat(_("Name: %1"), String::EscapeTags(key["name"]:"")));
+ descr = add(descr, sformat(_("Finger Print: %1"), key["fingerprint"]:""));
+
+ map r = $[
+ "id" : key["id"]:"",
+ "table_descr" : [ key["trusted"]:false ? UI::Glyph (`CheckMark) : "",
+ key["id"]:"", key["name"]:"" ],
+ "rich_descr" : WizardHW::CreateRichTextDescription(sformat(_("Key: %1"), key["id"]:""), descr)
+ ];
- ret = add(ret, item);
+ ret = add(ret, r);
}
);
@@ -44,14 +53,21 @@
return ret;
}
-void RefreshKeyTable(string current_item)
+/**
+ * Set/refresh the table content
+ */
+void SetItems(string selected_key)
{
- list items = createTableItems();
- UI::ChangeWidget(`id(`table), `Items, items);
+ // create description for WizardHW
+ list > items = createHWTable();
+ y2debug("items: %1", items);
- if (current_item != nil)
+ WizardHW::SetContents(items);
+
+ if (selected_key != nil)
{
- UI::ChangeWidget(`id(`table), `CurrentItem, current_item);
+ // set the previously selected key
+ WizardHW::SetSelectedItem(selected_key);
}
}
@@ -73,7 +89,9 @@
return ret;
}
-
+/**
+ * Display a dialog for editing the properties of the selected GPG key
+ */
boolean EditKeyProperties(map key)
{
UI::OpenDialog(
@@ -122,6 +140,9 @@
// the details are displayed in NewKeySummary()
map added_key = $[];
+/**
+ * Display a dialog for adding a GPG key
+ */
symbol AddGPGKey()
{
term contents = `VBox(
@@ -214,27 +235,13 @@
return `next;
}
-
+/**
+ * Display the main dialog for GPG key management
+ */
symbol KeySummary()
{
y2milestone ("Running Summary dialog");
- list items = createTableItems();
-
- term contents = `VBox(
- `Table(`id(`table),
- // table header
- `header(`Center(_("Trusted")), `Right(_("Key ID")), _("Name")), items
- ),
- `VSpacing(0.3),
- `HBox(
- `PushButton(`id(`add),`opt(`key_F3), Label::AddButton()),
- `PushButton(`id(`edit), `opt(`key_F4), Label::EditButton()),
- `PushButton(`id(`delete), `opt(`key_F5), Label::DeleteButton())
- ),
- `VSpacing( 0.5 )
- );
-
// dialog caption
string title = _("GPG Public Key Management");
@@ -255,34 +262,46 @@
</p>
");
- // check the mode
- Wizard::SetNextButton(`next, gpg_mgr_standalone_mode ? Label::FinishButton() : Label::OKButton());
- Wizard::SetContents(title, contents, help_text, !gpg_mgr_standalone_mode, true);
+ // table header
+ WizardHW::CreateHWDialog(title, help_text, [_("Trusted"), _("Key ID"), _("Name")], []);
+
+ // set the navigation keys according to the current mode
+ if (gpg_mgr_standalone_mode)
+ {
+ Wizard::DisableBackButton();
+ Wizard::SetNextButton(`next, Label::FinishButton());
+ }
+ else
+ {
+ Wizard::EnableBackButton();
+ Wizard::SetNextButton(`next, Label::OKButton());
+ }
symbol ret = nil;
+ // set the table content
+ SetItems(nil);
+
do
{
- map event = UI::WaitForEvent();
- ret = event["ID"]:`nothing;
+ map ev = WizardHW::WaitForEvent();
+ y2milestone("WaitForEvent: %1", ev);
+
+ ret = (symbol)ev["event","ID"]:nil;
+
+ // the selected key
+ string key_id = ev["selected"]:"";
- string key_id = (string)UI::QueryWidget(`id(`table), `CurrentItem);
y2milestone("Selected key: %1, action: %2", key_id, ret);
- // add a new key
- if (ret == `add)
- {
- // add a new key
- // TODO
- }
// change key properties
- else if (ret == `edit)
+ if (ret == `edit)
{
map key = SearchGPGKey(key_id);
if (key != nil && EditKeyProperties(key))
{
- RefreshKeyTable(key_id);
+ SetItems(key_id);
}
}
// remove the key
@@ -294,17 +313,18 @@
'%2'?"), key_id, key["name"]:"")))
{
KeyManager::DeleteKey(key_id);
- RefreshKeyTable(nil);
+ SetItems(nil);
}
}
}
while (!contains([`back, `abort, `next, `add], ret));
- Wizard::RestoreNextButton();
-
return ret;
}
+/**
+ * Run the GPG key management workflow
+ */
symbol RunGPGKeyMgmt(boolean standalone)
{
gpg_mgr_standalone_mode = standalone;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
