diff --git a/src/View/About/Window.py b/src/View/About/Window.py index 24931a084e2adae44eaddf7cc3ccd656d0886fe3..aa6eab08faa3b7ac63166b7326cb552c5073d199 100644 --- a/src/View/About/Window.py +++ b/src/View/About/Window.py @@ -67,5 +67,5 @@ class AboutWindow(PamhyrDialog): label = f"\n - {author}" + label except StopIteration: label = _translate("About", "Contributors: ") + label - label = "Copyright © 2022-2024 INRAE\n" + label + # label = "Copyright © 2022-2024 INRAE\n" + label self.set_label_text("label_copyright", label) diff --git a/src/View/ui/about.ui b/src/View/ui/about.ui index 36f0efd799fd67ecf35783cdb455c7918c73e76c..1b1041bb4461f6797dfab46942f18a4f9d00a8e2 100644 --- a/src/View/ui/about.ui +++ b/src/View/ui/about.ui @@ -17,8 +17,35 @@ <locale language="English" country="Europe"/> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="1"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QLabel" name="label_logo_pamhyr2"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap>ressources/Pamhyr2_logo.png</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_logo_inrae"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap>ressources/Logo-INRAE.png</pixmap> + </property> + </widget> + </item> + </layout> + </item> + <item row="0" column="2"> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> <widget class="QLabel" name="label_title"> <property name="font"> @@ -34,33 +61,212 @@ </widget> </item> <item> - <widget class="QLabel" name="label_copyright"> - <property name="text"> - <string>...</string> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> </item> <item> - <widget class="QLabel" name="label_version"> - <property name="text"> - <string>Version: @version</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Copyright © 2022-2024 INRAE</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_8"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> <item> - <widget class="QLabel" name="label_license"> - <property name="text"> - <string>License: GPLv3+</string> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_version"> + <property name="text"> + <string>Version: @version</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_license"> + <property name="text"> + <string>License: GPLv3+</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_logo_gpl"> + <property name="maximumSize"> + <size> + <width>100</width> + <height>50</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap>ressources/GPLv3_Logo.png</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> </item> <item> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="label_copyright"> <property name="text"> - <string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string> + <string>...</string> </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> </widget> </item> @@ -79,16 +285,6 @@ </item> </layout> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_logo_pamhyr2"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap>ressources/Pamhyr2_logo.png</pixmap> - </property> - </widget> - </item> </layout> </widget> <resources/> diff --git a/src/View/ui/ressources/GPLv3_Logo.png b/src/View/ui/ressources/GPLv3_Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1f6ddf89ad8e956bf674a98e9f0cb08d0f29e651 Binary files /dev/null and b/src/View/ui/ressources/GPLv3_Logo.png differ