Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
79b906f1
Commit
79b906f1
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
donation: update end date for donation campaign
Change-Id: Ib694bfb4bc194e7d6b24bf23f52949715e2efa11
parent
92522d5c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/appsettingsmanager.h
+1
-1
1 addition, 1 deletion
src/app/appsettingsmanager.h
src/app/constant/JamiQmlUtils.qml
+1
-1
1 addition, 1 deletion
src/app/constant/JamiQmlUtils.qml
src/app/utilsadapter.cpp
+1
-1
1 addition, 1 deletion
src/app/utilsadapter.cpp
with
3 additions
and
3 deletions
src/app/appsettingsmanager.h
+
1
−
1
View file @
79b906f1
...
...
@@ -75,7 +75,7 @@ extern const QString defaultDownloadPath;
#define KEYS COMMON_KEYS \
X(Donation2023VisibleDate, "2023-11-27 05:00") \
X(IsDonationVisible, true) \
X(Donation2023EndDate, "2024-0
1-3
1 00:00")
X(Donation2023EndDate
2
, "2024-0
4-0
1 00:00")
#endif
/*
...
...
This diff is collapsed.
Click to expand it.
src/app/constant/JamiQmlUtils.qml
+
1
−
1
View file @
79b906f1
...
...
@@ -89,7 +89,7 @@ Item {
// The banner is visible if the current date is after the date set in the settings and before the end date
// And if the donation toggle is checked
const
isVisible
=
UtilsAdapter
.
getAppValue
(
Settings
.
Key
.
IsDonationVisible
);
const
endDate
=
Date
.
parse
(
UtilsAdapter
.
getAppValue
(
Settings
.
Key
.
Donation2023EndDate
));
const
endDate
=
Date
.
parse
(
UtilsAdapter
.
getAppValue
(
Settings
.
Key
.
Donation2023EndDate
2
));
const
startDate
=
Date
.
parse
(
UtilsAdapter
.
getAppValue
(
Settings
.
Key
.
Donation2023VisibleDate
));
const
now
=
new
Date
();
return
isVisible
&&
now
<
endDate
&&
now
>=
startDate
;
...
...
This diff is collapsed.
Click to expand it.
src/app/utilsadapter.cpp
+
1
−
1
View file @
79b906f1
...
...
@@ -98,7 +98,7 @@ UtilsAdapter::setAppValue(const Settings::Key key, const QVariant& value)
// Any donation campaign-related keys can trigger a donation campaign check
else
if
(
key
==
Settings
::
Key
::
IsDonationVisible
||
key
==
Settings
::
Key
::
Donation2023VisibleDate
||
key
==
Settings
::
Key
::
Donation2023EndDate
)
||
key
==
Settings
::
Key
::
Donation2023EndDate
2
)
Q_EMIT
donationCampaignSettingsChanged
();
#endif
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment