mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-03-31 16:45:27 +00:00
fix new crt label, enshort consts
This commit is contained in:
parent
1d81089d87
commit
22fd5a74db
2 changed files with 33 additions and 22 deletions
|
|
@ -28,12 +28,12 @@ class Auth
|
||||||
public Page $page;
|
public Page $page;
|
||||||
|
|
||||||
// Defaults
|
// Defaults
|
||||||
public const DIALOG_DEFAULT_RESPONSE = GtkResponseType::CANCEL;
|
public const DEFAULT_RESPONSE = GtkResponseType::CANCEL;
|
||||||
public const DIALOG_FORMAT_SECONDARY_TEXT = 'Select identity';
|
public const FORMAT_SECONDARY_TEXT = 'Select identity';
|
||||||
public const DIALOG_MESSAGE_FORMAT = 'Authorization';
|
public const MESSAGE_FORMAT = 'Authorization';
|
||||||
public const DIALOG_CONTENT_OPTION_LABEL_CREATE = 'Create new for this resource';
|
|
||||||
public const DIALOG_CONTENT_OPTION_MARGIN = 8;
|
public const MARGIN = 8;
|
||||||
public const DIALOG_CONTENT_SPACING = 1;
|
public const SPACING = 1;
|
||||||
|
|
||||||
// Extras
|
// Extras
|
||||||
private array $_options = []; // GtkRadioButton
|
private array $_options = []; // GtkRadioButton
|
||||||
|
|
@ -53,22 +53,22 @@ class Auth
|
||||||
GtkDialogFlags::MODAL,
|
GtkDialogFlags::MODAL,
|
||||||
GtkMessageType::INFO,
|
GtkMessageType::INFO,
|
||||||
GtkButtonsType::OK_CANCEL,
|
GtkButtonsType::OK_CANCEL,
|
||||||
_($this::DIALOG_MESSAGE_FORMAT)
|
_($this::MESSAGE_FORMAT)
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->gtk->format_secondary_text(
|
$this->gtk->format_secondary_text(
|
||||||
_($this::DIALOG_FORMAT_SECONDARY_TEXT)
|
_($this::FORMAT_SECONDARY_TEXT)
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->gtk->set_default_response(
|
$this->gtk->set_default_response(
|
||||||
$this::DIALOG_DEFAULT_RESPONSE
|
$this::DEFAULT_RESPONSE
|
||||||
);
|
);
|
||||||
|
|
||||||
// Init content
|
// Init content
|
||||||
$content = $this->gtk->get_content_area();
|
$content = $this->gtk->get_content_area();
|
||||||
|
|
||||||
$content->set_spacing(
|
$content->set_spacing(
|
||||||
$this::DIALOG_CONTENT_SPACING
|
$this::SPACING
|
||||||
);
|
);
|
||||||
|
|
||||||
// Init new certificate option
|
// Init new certificate option
|
||||||
|
|
@ -81,7 +81,7 @@ class Auth
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->_options[0]->setLabel(
|
$this->_options[0]->setLabel(
|
||||||
0, _($this::DIALOG_CONTENT_OPTION_LABEL_CREATE)
|
0, null
|
||||||
);
|
);
|
||||||
|
|
||||||
// Search database for auth records
|
// Search database for auth records
|
||||||
|
|
@ -145,7 +145,7 @@ class Auth
|
||||||
|
|
||||||
// Set margin
|
// Set margin
|
||||||
$option->gtk->set_margin_bottom(
|
$option->gtk->set_margin_bottom(
|
||||||
self::DIALOG_CONTENT_OPTION_MARGIN
|
self::MARGIN
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ class Identity
|
||||||
public const MARGIN = 12;
|
public const MARGIN = 12;
|
||||||
public const LABEL_DEFAULT = '#%d (%s)';
|
public const LABEL_DEFAULT = '#%d (%s)';
|
||||||
public const LABEL_NO_NAME = '#%d (no name)';
|
public const LABEL_NO_NAME = '#%d (no name)';
|
||||||
|
public const LABEL_CRT_NEW = 'Create new for this resource';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
Auth $auth
|
Auth $auth
|
||||||
|
|
@ -73,16 +74,26 @@ class Identity
|
||||||
?string $label = null
|
?string $label = null
|
||||||
): void
|
): void
|
||||||
{
|
{
|
||||||
$this->gtk->set_label(
|
if ($id)
|
||||||
$label ? sprintf(
|
{
|
||||||
$this::LABEL_DEFAULT,
|
$this->gtk->set_label(
|
||||||
$id,
|
$label ? sprintf(
|
||||||
$label
|
$this::LABEL_DEFAULT,
|
||||||
) : sprintf(
|
$id,
|
||||||
$this::LABEL_NO_NAME,
|
$label
|
||||||
$id
|
) : sprintf(
|
||||||
)
|
$this::LABEL_NO_NAME,
|
||||||
);
|
$id
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->gtk->set_label(
|
||||||
|
$this::LABEL_CRT_NEW
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setName(
|
public function setName(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue