-
-
Notifications
You must be signed in to change notification settings - Fork 954
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update check retry button & message #279
Conversation
…ck for updates upon startup
# Conflicts: # main/ant-kit/pom.xml # main/commons-test/pom.xml # main/commons/pom.xml # main/filesystem-api/pom.xml # main/filesystem-charsets/pom.xml # main/filesystem-crypto-integration-tests/pom.xml # main/filesystem-crypto/pom.xml # main/filesystem-inmemory/pom.xml # main/filesystem-invariants-tests/pom.xml # main/filesystem-nameshortening/pom.xml # main/filesystem-nio/pom.xml # main/filesystem-stats/pom.xml # main/frontend-api/pom.xml # main/frontend-webdav/pom.xml # main/jacoco-report/pom.xml # main/pom.xml # main/uber-jar/pom.xml # main/ui/pom.xml
# Conflicts: # main/ant-kit/pom.xml # main/commons-test/pom.xml # main/commons/pom.xml # main/filesystem-api/pom.xml # main/filesystem-charsets/pom.xml # main/filesystem-crypto-integration-tests/pom.xml # main/filesystem-crypto/pom.xml # main/filesystem-inmemory/pom.xml # main/filesystem-invariants-tests/pom.xml # main/filesystem-nameshortening/pom.xml # main/filesystem-nio/pom.xml # main/filesystem-stats/pom.xml # main/frontend-api/pom.xml # main/frontend-webdav/pom.xml # main/jacoco-report/pom.xml # main/pom.xml # main/uber-jar/pom.xml # main/ui/pom.xml
Changes Unknown when pulling 0520a53 on jncharon:develop into * on cryptomator:feature/update-check-retry*. |
@@ -24,6 +24,14 @@ | |||
<HBox alignment="CENTER" spacing="5.0" cacheShape="true" cache="true"> | |||
<Label fx:id="checkForUpdatesStatus" cacheShape="true" cache="true" /> | |||
<ProgressIndicator fx:id="checkForUpdatesIndicator" progress="-1" prefWidth="15.0" prefHeight="15.0" cacheShape="true" cache="true" cacheHint="SPEED" /> | |||
<Label fx:id="checkForUpdatesErrorLabel" /> | |||
<Button fx:id="checkForUpdatesRetryButton" cache="true" cacheShape="true" defaultButton="true" onAction="#executeCheckForUpdates" text="%welcome.checkForUpdates.retry"> | |||
<graphic> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't use a png for this, we have imported the ionicons font for these purposes:
<graphic><Label text="" styleClass="ionicons"/></graphic>
Whats the deal with the |
All my pom.xml files had So they conflicted when I merged upstream/develop in origin/develop |
But why did you create a completely new pom.xml that is otherwise unrelated to the project? I think this is a mistake. I'm talking about the one in 0520a53. |
Ok I see the mistake. Please do the following:
|
I did not create poms, I guess intellij did ? |
Update check retry button displayed if there's no internet connection