mirror of
https://github.com/pbek/QOwnNotes.git
synced 2025-06-28 21:09:52 +00:00
#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:
parent
3bb98fb253
commit
aba4516bfe
4 changed files with 287 additions and 237 deletions
|
@ -1,5 +1,11 @@
|
||||||
# QOwnNotes Changelog
|
# 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
|
## 25.6.4
|
||||||
|
|
||||||
- Support for **libgit2** was added to QOwnNotes, so it can be built with git support
|
- Support for **libgit2** was added to QOwnNotes, so it can be built with git support
|
||||||
|
|
|
@ -118,6 +118,12 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
|
||||||
ui->automaticNoteFolderDatabaseClosingCheckBox->hide();
|
ui->automaticNoteFolderDatabaseClosingCheckBox->hide();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_LIBGIT2
|
||||||
|
ui->gitClientGroupBox->hide();
|
||||||
|
#else
|
||||||
|
ui->gitLibraryGroupBox->hide();
|
||||||
|
#endif
|
||||||
|
|
||||||
readSettings();
|
readSettings();
|
||||||
|
|
||||||
// initializes the main splitter
|
// initializes the main splitter
|
||||||
|
|
|
@ -5700,7 +5700,7 @@ Just test yourself if you get sync conflicts and set a higher value if so.</stri
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1" rowspan="2">
|
<item row="0" column="1" rowspan="2">
|
||||||
<widget class="QGroupBox" name="groupBox_20">
|
<widget class="QGroupBox" name="gitClientGroupBox">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Git client</string>
|
<string>Git client</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -5779,6 +5779,29 @@ git config --global user.name "Your name"</string>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="panelsPage">
|
<widget class="QWidget" name="panelsPage">
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue