Permalink
Browse files

added tab icons

  • Loading branch information...
pulpofred
pulpofred committed Nov 18, 2015
1 parent 16b229f commit 6622ff2293b283fedf6adaccb2986a6d93eb8d53
@@ -168,7 +168,7 @@ proc github-create-release {gituser gitpass} {
proc github-upload-artifacts {upload_url gituser gitpass} {
set artifacts {}
foreach file [concat [glob dist/linux-*/*.deb] [glob dist/linux-*/*.rpm]] {
foreach file [concat [glob dist/linux-*/*$::FRUHO_VERSION*.deb] [glob dist/linux-*/*$::FRUHO_VERSION*.rpm]] {
set filename [file tail $file]
set uurl $upload_url?name=$filename
set uploaded [exec -ignorestderr curl -XPOST --header "Content-Type: application/zip" --data-binary @$file $uurl -u "$gituser:$gitpass"]
@@ -232,10 +232,9 @@ proc push-update {os arch tohost} {
# zip the bundle
set zip $updatedir/update.zip
ex rm $zip
ex rm -f $zip
ex zip -j $zip $fc $fc.sig $fd $fd.sig
# ssh push
set remotezip /tmp/fruho-update-$::FRUHO_VERSION-$os-$arch-update.zip
puts "Uploading $remotezip to $tohost"
@@ -244,7 +243,7 @@ proc push-update {os arch tohost} {
set ::FRUHO_VERSION 0.0.7
set ::FRUHO_VERSION 0.0.9
prepare-lib sklib 0.0.0
#build-total
#package require i18n
@@ -254,6 +253,10 @@ build-fruho linux [this-arch]
build-fruhod linux [this-arch]
build-deb-rpm [this-arch]
#build-fruho linux ix86
#build-fruhod linux ix86
#build-deb-rpm ix86
#push-update linux [this-arch] vbox_123
#release hypatia2
@@ -109,6 +109,7 @@ proc ::airvpn::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
@@ -111,6 +111,7 @@ proc ::from_file::ImportClicked {tab name} {
set plan [dict create name $newprofilename timelimit [dict create start 0 period month nop 1000000] trafficlimit [dict create used 0 quota 1000000000] slist $slist]
dict set ::model::Profiles $profileid plans [dict create plainid $plan]
dict set ::model::Profiles $profileid profilename $newprofilename
dict set ::model::Profiles $profileid provider $name
go update-bulk-sitem $profileid
@@ -117,6 +117,7 @@ proc ::hideipvpn::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
@@ -101,6 +101,7 @@ proc ::mullvad::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
@@ -108,6 +108,7 @@ proc ::securitykiss::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
@@ -108,6 +108,7 @@ proc ::vpnbook::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
@@ -110,6 +110,7 @@ proc ::vyprvpn::ImportClicked {tab} {
dict set ::model::Profiles $profileid vpapi_host $host
dict set ::model::Profiles $profileid vpapi_port $port
dict set ::model::Profiles $profileid vpapi_path_plans $path_plans
dict set ::model::Profiles $profileid provider $name
puts stderr "VPAPI-PLANS-DIRECT completed"
BIN +691 Bytes fruho/images/16/add.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1739,7 +1739,7 @@ proc frame-usage-meter {p} {
proc frame-toolbar {p} {
set tb [ttk::frame $p.tb -borderwidth 0 -relief raised]
hypertext $tb.improve "Help improve this program. Provide your <https://fruho.com/geo><feedback.> We listen."
hypertext $tb.improve "Help improve this program. Provide your <https://fruho.com/contact><feedback.> We listen."
button $tb.options -relief flat -command OptionsClicked
img place 24/options $tb.options
label $tb.bang
@@ -1820,9 +1820,10 @@ proc tabset-profiles {p} {
set tab [frame-profile $nb $profileid]
set pdict [dict get $::model::Profiles $profileid]
set tabname [dict-pop $pdict profilename $profileid]
$nb add $tab -text $tabname -sticky news
set provider [dict-pop $pdict provider ""]
$nb add $tab -compound left -text $tabname -image [img load 16/logo_$provider]
}
$nb add [frame-addvpnprovider $nb] -text "Add VPN Provider..."
$nb add [frame-addvpnprovider $nb] -compound left -text "Add VPN Provider..." -image [img load 16/add]
grid $nb -sticky news -padx 10 -pady 10
select-profile $nb
set now [model now]
@@ -3166,7 +3167,7 @@ proc connstatus-loop {} {
log "newstatus: $newstatus"
model connstatus $newstatus
if {$newstatus eq "connected"} {
trigger-geo-loc 1000
trigger-geo-loc $::model::geo_loc_delay
# this cancels the timeout
set chtimeout $empty_channel
}
@@ -3219,7 +3220,7 @@ proc connection-windup {} {
set ::model::Previous_totalup {}
set ::model::Previous_totaldown {}
set ::model::Previous_total_tstamp {}
trigger-geo-loc 1000
trigger-geo-loc $::model::geo_loc_delay
ffwrite stop
}
@@ -52,21 +52,12 @@ namespace eval ::model {
# latest fruho version to upgrade from check-for-updates
variable Latest_version 0
# The built-in interim profile Fruho
# while profile may contain multiple plans/slists, we need to store current slist as well since it depends on current time (through active plan selection)
if 0 { variable Profiles [dict create fruho {
profilename Fruho
plans {id1 {name INTERIM timelimit {start 123456789 period month nop 3} trafficlimit {used 50000000 quota 400000000} slist {{id 1 ccode DE country Germany city Darmstadt ip 46.165.221.230 ovses {{proto udp port 123} {proto tcp port 443}}} {id 4 ccode FR country France city Paris ip 37.59.65.55 ovses {{proto udp port 56789}}}} selected_sitem_id ""}}
}]
}
# !!! Be careful in operating on model::Profiles (iterating, listing, etc). Prevent shimmering.
# Internally it should be represented as a dictionary in order to properly save in inicfg::save
# You can use defensive copy [dict replace $::model::Profiles]
# Always use [dict for] instead of [foreach]
variable Profiles [dict create fruho [dict create profilename Fruho]]
variable Profiles [dict create fruho [dict create profilename Fruho provider fruho]]
# profile ids marked as removed
variable removed_profiles {}
@@ -111,6 +102,9 @@ if 0 { variable Profiles [dict create fruho {
variable Geo_loc ""
# delay in requesting /loc external IP info - must be adjustable by the user
variable geo_loc_delay 1000
variable Mainstatusline [dict create]
variable Mainstatusline_spin empty
variable Mainstatusline_link ""

0 comments on commit 6622ff2

Please sign in to comment.