From eb5261da229fbbd08f2f60f603b723aabc8cc157 Mon Sep 17 00:00:00 2001
From: soramimi <fi7s-fct@asahi-net.or.jp>
Date: Tue, 16 Jan 2024 22:48:29 +0900
Subject: [PATCH] =?UTF-8?q?GPG=E5=AF=BE=E5=BF=9C=20(wip)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CommitPropertyDialog.cpp | 12 +++----
 src/CommitPropertyDialog.ui  | 68 ++++++++++++++++++++++--------------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/CommitPropertyDialog.cpp b/src/CommitPropertyDialog.cpp
index 6ef8ca6b..8c16ebb8 100644
--- a/src/CommitPropertyDialog.cpp
+++ b/src/CommitPropertyDialog.cpp
@@ -77,10 +77,10 @@ void CommitPropertyDialog::init(MainWindow *mw)
 	auto s = mainwindow()->git()->log_show_signature(m->commit.commit_id);
 	if (s) {
 		sig = *s;
-		int n = sig.fingerprint.size();
-		if (n > 0) {
-			QList<gpg::Data> keys;
-			if (gpg::listKeys(global->appsettings.gpg_command, &keys)) {
+		QList<gpg::Data> keys;
+		if (gpg::listKeys(global->appsettings.gpg_command, &keys)) {
+			int n = sig.fingerprint.size();
+			if (n > 0) {
 				for (gpg::Data const &key : keys) {
 					if (n == key.fingerprint.size()) {
 						auto const *p1 = sig.fingerprint.data();
@@ -135,8 +135,8 @@ void CommitPropertyDialog::updateAvatar(bool request)
 			widget->setVisible(false);
 		}
 	};
-	// SetAvatar(ui->lineEdit_mail->text(), ui->widget_user_avatar);
-	// SetAvatar(ui->lineEdit_sign_mail->text(), ui->widget_sign_avatar);
+	SetAvatar(ui->lineEdit_mail->text(), ui->widget_user_avatar);
+	SetAvatar(ui->lineEdit_sign_mail->text(), ui->widget_sign_avatar);
 }
 
 void CommitPropertyDialog::avatarReady()
diff --git a/src/CommitPropertyDialog.ui b/src/CommitPropertyDialog.ui
index 6f6e6373..61d96c5e 100644
--- a/src/CommitPropertyDialog.ui
+++ b/src/CommitPropertyDialog.ui
@@ -131,37 +131,51 @@
           </widget>
          </item>
          <item>
-          <layout class="QFormLayout" name="formLayout_2">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>ID</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="ReadOnlyLineEdit" name="lineEdit_sign_id"/>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>Name</string>
-             </property>
-            </widget>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <layout class="QFormLayout" name="formLayout_2">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>ID</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="ReadOnlyLineEdit" name="lineEdit_sign_id"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_7">
+               <property name="text">
+                <string>Name</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="ReadOnlyLineEdit" name="lineEdit_sign_name"/>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_8">
+               <property name="text">
+                <string>Mail</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="ReadOnlyLineEdit" name="lineEdit_sign_mail"/>
+             </item>
+            </layout>
            </item>
-           <item row="1" column="1">
-            <widget class="ReadOnlyLineEdit" name="lineEdit_sign_name"/>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_8">
-             <property name="text">
-              <string>Mail</string>
+           <item>
+            <widget class="SimpleImageWidget" name="widget_sign_avatar" native="true">
+             <property name="minimumSize">
+              <size>
+               <width>80</width>
+               <height>80</height>
+              </size>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="ReadOnlyLineEdit" name="lineEdit_sign_mail"/>
-           </item>
           </layout>
          </item>
         </layout>