Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Julian Merlin
bitmask-vpn
Commits
58b15c89
Unverified
Commit
58b15c89
authored
3 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[bug] avoid inconsistent states
parent
f0889825
Branches
master
Branches containing commit
Tags
0.20.4
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gui/components/Preferences.qml
+4
-3
4 additions, 3 deletions
gui/components/Preferences.qml
gui/main.qml
+13
-0
13 additions, 0 deletions
gui/main.qml
with
17 additions
and
3 deletions
gui/components/Preferences.qml
+
4
−
3
View file @
58b15c89
...
@@ -248,15 +248,16 @@ ThemedPage {
...
@@ -248,15 +248,16 @@ ThemedPage {
}
}
Component.onCompleted
:
{
Component.onCompleted
:
{
if
(
ctx
&&
ctx
.
transport
==
"
obfs4
"
)
{
useBridgesCheckBox
.
checked
=
true
}
if
(
ctx
&&
ctx
.
offersUdp
==
"
false
"
)
{
if
(
ctx
&&
ctx
.
offersUdp
==
"
false
"
)
{
useUDP
.
enabled
=
false
useUDP
.
enabled
=
false
}
}
if
(
ctx
&&
ctx
.
offersUdp
&&
ctx
.
udp
==
"
true
"
)
{
if
(
ctx
&&
ctx
.
offersUdp
&&
ctx
.
udp
==
"
true
"
)
{
useUDP
.
checked
=
true
useUDP
.
checked
=
true
}
}
if
(
ctx
&&
ctx
.
transport
==
"
obfs4
"
)
{
useBridgesCheckBox
.
checked
=
true
useUDP
.
enabled
=
false
}
// disabled for now, will be on next release
// disabled for now, will be on next release
/*
/*
if (ctx && ctx.hasTor == "true") {
if (ctx && ctx.hasTor == "true") {
...
...
This diff is collapsed.
Click to expand it.
gui/main.qml
+
13
−
0
View file @
58b15c89
...
@@ -111,6 +111,9 @@ ApplicationWindow {
...
@@ -111,6 +111,9 @@ ApplicationWindow {
if
(
ctx
.
donateDialog
==
'
true
'
)
{
if
(
ctx
.
donateDialog
==
'
true
'
)
{
showDonationReminder
=
true
showDonationReminder
=
true
}
}
if
(
isAutoLocation
())
{
root
.
selectedGateway
=
"
auto
"
}
// TODO check donation
// TODO check donation
//if (needsDonate && !shownDonate) {
//if (needsDonate && !shownDonate) {
...
@@ -149,6 +152,16 @@ ApplicationWindow {
...
@@ -149,6 +152,16 @@ ApplicationWindow {
return
Array
.
from
(
arr
,
(
k
,
_
)
=>
k
.
key
);
return
Array
.
from
(
arr
,
(
k
,
_
)
=>
k
.
key
);
}
}
function
isAutoLocation
()
{
// FIXME there's something weird going on with newyork location...
// it gets marked as auto, which from europe is a bug.
let
best
=
ctx
.
locationLabels
[
ctx
.
bestLocation
]
if
(
best
==
undefined
)
{
return
false
}
return
(
best
[
0
]
==
ctx
.
currentLocation
)
}
function
bringToFront
()
{
function
bringToFront
()
{
// FIXME does not work properly, at least on linux
// FIXME does not work properly, at least on linux
if
(
visibility
==
3
)
{
if
(
visibility
==
3
)
{
...
...
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