feat: add list of contributors in 'About Grabber' window

Bionus · Jul 30, 2022 · 156d4a1 · 156d4a1
1 parent 98c5b37
commit 156d4a1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -59,6 +59,15 @@ if(USE_QSCINTILLA)
 	endif()
 endif()
 
+find_program(JQ_EXISTS "jq")
+if(JQ_EXISTS)
+	execute_process(COMMAND jq -r "[.contributors[].login] | @tsv" "${CMAKE_CURRENT_LIST_DIR}/../../.all-contributorsrc" OUTPUT_VARIABLE CONTRIBUTORS)
+	string(STRIP "${CONTRIBUTORS}" CONTRIBUTORS)
+else()
+	message(WARNING "No contributors list passed and 'jq' not found")
+endif()
+add_definitions(-DCONTRIBUTORS="${CONTRIBUTORS}")
+
 # Input
 file(GLOB SOURCES
 	"src/main/main.cpp"

diff --git a/src/gui/src/about-window.cpp b/src/gui/src/about-window.cpp
@@ -22,7 +22,12 @@ AboutWindow::AboutWindow(const QString &version, QWidget *parent)
 	ui->labelCurrent->setText(labelVersion);
 
 	ui->labelCreator->setText(ui->labelCreator->text().replace("{website}", PROJECT_WEBSITE_URL));
-	setFixedSize(400, 228);
+
+	// List contributors
+	const QString contributors = QString(CONTRIBUTORS).replace('\t', ", ");
+	ui->labelContributors->setText(ui->labelContributors->text().replace("{contributors}", contributors));
+
+	setFixedSize(600, heightForWidth(600));
 
 	connect(&m_updater, &ProgramUpdater::finished, this, &AboutWindow::finished);
 	m_updater.checkForUpdates();
@@ -37,4 +42,6 @@ void AboutWindow::finished(const QString &newVersion, bool available)
 {
 	const QString msg = available ? tr("A new version is available: %1").arg(newVersion) : tr("Grabber is up to date");
 	ui->labelMessage->setText("<p style=\"font-size:8pt; font-style:italic; color:#808080;\">" + msg + "</p>");
+
+	setFixedSize(600, heightForWidth(600));
 }
diff --git a/src/gui/src/about-window.ui b/src/gui/src/about-window.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>272</height>
+    <width>600</width>
+    <height>295</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -74,7 +74,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="labelThanks">
        <property name="text">
         <string>Special thanks to all contributors for their help improving the program over the years, be it by providing to the code, translations, or reporting issues and suggesting new features.</string>
        </property>
@@ -83,6 +83,16 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="labelContributors">
+       <property name="text">
+        <string>&lt;u&gt;Contributors:&lt;/u&gt; {contributors}</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>