#3296 libgit2: don't show git client configuration if library is enabled

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
This commit is contained in:
Patrizio Bekerle 2025-06-23 19:40:34 +02:00
parent 3bb98fb253
commit aba4516bfe
No known key found for this signature in database
GPG key ID: 75960E6926556207
4 changed files with 287 additions and 237 deletions

View file

@ -1,5 +1,11 @@
# QOwnNotes Changelog
## 25.6.5
- In the _Git settings_ you now can configure a git client only if the app was not
built with libgit2 support, otherwise you will get the information that support
for the git library libgit2 is activated (for [#3296](https://github.com/pbek/QOwnNotes/issues/3296))
## 25.6.4
- Support for **libgit2** was added to QOwnNotes, so it can be built with git support

View file

@ -118,6 +118,12 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
ui->automaticNoteFolderDatabaseClosingCheckBox->hide();
#endif
#ifdef USE_LIBGIT2
ui->gitClientGroupBox->hide();
#else
ui->gitLibraryGroupBox->hide();
#endif
readSettings();
// initializes the main splitter

View file

@ -5700,7 +5700,7 @@ Just test yourself if you get sync conflicts and set a higher value if so.</stri
</widget>
</item>
<item row="0" column="1" rowspan="2">
<widget class="QGroupBox" name="groupBox_20">
<widget class="QGroupBox" name="gitClientGroupBox">
<property name="title">
<string>Git client</string>
</property>
@ -5779,6 +5779,29 @@ git config --global user.name &quot;Your name&quot;</string>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="gitLibraryGroupBox">
<property name="title">
<string>Git library</string>
</property>
<layout class="QGridLayout" name="gridLayout_90">
<item row="0" column="0">
<widget class="QLabel" name="label_39">
<property name="text">
<string>Support for the git library libgit2 is activated.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_40">
<property name="text">
<string>Don't forget to enable git support for your note folders.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="panelsPage">

File diff suppressed because it is too large Load diff