Commit Graph

337 Commits

Author SHA1 Message Date
Micah Lee
2a4e1f0de0
Merge branch '520_fix_hyperlink_qlabel' of https://github.com/mig5/onionshare into mig5-520_fix_hyperlink_qlabel 2018-01-13 16:59:24 -08:00
Micah Lee
c387a2a7c5
Merge branch 'disable_start_share_on_no_files' of https://github.com/mig5/onionshare into mig5-disable_start_share_on_no_files 2018-01-13 16:41:06 -08:00
Micah Lee
04d2f0c0e1
Merge branch '495_clear_status_bar_early' of https://github.com/mig5/onionshare into mig5-495_clear_status_bar_early 2018-01-13 16:09:11 -08:00
Micah Lee
d42369a0f9
Merge branch '453_catch_oserror_on_crunching_files' of https://github.com/mig5/onionshare into mig5-453_catch_oserror_on_crunching_files 2018-01-13 15:58:15 -08:00
Miguel Jacq
25a83e4edf
#520 trigger browser action properly in QLabel hyperlink 2017-12-27 20:08:38 +11:00
Miguel Jacq
96d758e8e1
Emit the files_updated signal when deleting files. This will ensure that the share button gets disabled when there are no files in the list 2017-12-27 11:37:06 +11:00
Miguel Jacq
95f7b0d8df
Clear the status bar messages earlier when starting a new share 2017-12-20 07:39:55 +11:00
Miguel Jacq
4f768e8b77
Catch OSError when preparing the zip file during server start. Fixes #453 2017-12-12 17:02:11 +11:00
Miguel Jacq
a12f9ed4d8
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor 2017-12-07 16:10:52 +11:00
Micah Lee
ed2c55c097
Merge branch 'no_available_port_error' of https://github.com/mig5/onionshare into mig5-no_available_port_error 2017-12-06 16:14:21 -08:00
Miguel Jacq
0aacfae925
Raise an error if we were unable to obtain a random port 2017-12-07 08:49:10 +11:00
Miguel Jacq
d500069398
Actually still uncheck the timer when the server stops, but *only* when it stops 2017-12-06 10:21:39 +11:00
Miguel Jacq
bddb9596d1
Don't uncheck the auto-stop timer when the server stops (adding new files before starting the share will otherwise uncheck it) 2017-12-06 10:02:22 +11:00
Micah Lee
58ec047a53
Merge branch '447_reload_tor_if_not_connected_and_settings_cancelled' of https://github.com/mig5/onionshare into mig5-447_reload_tor_if_not_connected_and_settings_cancelled 2017-12-05 14:05:16 -08:00
Micah Lee
44b5474249
Merge branch 'mig5-shutdown_timer' 2017-12-05 13:58:16 -08:00
Miguel Jacq
eaa37206e5
Let the timer stop the share if there were no downloads, or all downloads are done 2017-12-05 11:18:26 +11:00
Miguel Jacq
fe311f591f
#447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected 2017-12-04 18:43:40 +11:00
Miguel Jacq
17ba97becc
#431 Set minimum height of FileList to prevent resize bug affecting scrolling/visibility of bottom rows 2017-12-04 16:39:22 +11:00
Miguel Jacq
884d8389ed
Update comment to reflect that we don't hide the timer checkbox when checked anymore 2017-12-04 15:22:46 +11:00
Miguel Jacq
91a0c60189
Better fix for preventing timeout firing if a download is not yet done (works for CLI as well as GUI) 2017-12-04 15:03:28 +11:00
Miguel Jacq
2eb7bca242
Merge master branch and fix conflicts 2017-12-03 17:06:33 +11:00
Miguel Jacq
3b52f584a1
Don't auto-stop the share if a download is still in progress 2017-12-03 13:21:25 +11:00
Miguel Jacq
6ad2737d08
Properly stop the server when the timeout is reached (and reset the interface so we can share again) 2017-12-02 14:53:38 +11:00
Miguel Jacq
454a6a638b
Always show the shutdown timer checkbox, in case the user changes their mind and wants to unset it 2017-12-02 14:48:44 +11:00
Micah Lee
c664a9d3aa
Merge branch '468_canceled_feedback_on_stopped_server' of https://github.com/mig5/onionshare into mig5-468_canceled_feedback_on_stopped_server 2017-12-01 11:44:33 -08:00
Miguel Jacq
966beb9406
add missing arg to onion.connect() (config) which broke the Tor Connection progress dialog (regression from b19f8f) 2017-11-12 17:53:40 +11:00
Miguel Jacq
624028e49f
Format the argparser output better, to deal with the longer argument names 2017-11-12 10:40:04 +11:00
Miguel Jacq
275f345604
better metavar for --shutdown-timeout arg 2017-11-11 17:12:10 +11:00
Miguel Jacq
f220058c63
No longer treating shutdown_timeout as a float, but an int of seconds 2017-11-09 19:50:50 +11:00
Miguel Jacq
882057eafc
only prevent the share from starting when the timeout has expired, if the timeout feature was even set at all 2017-11-09 18:23:11 +11:00
Miguel Jacq
ac0e375a4b
Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired 2017-11-09 17:26:32 +11:00
Miguel Jacq
9aabc51edc
On subsequent shares, the default time should nudge 5 minutes ahead of the current time again, instead of 5 minutes since the time OnionShare was opened 2017-11-09 12:52:44 +11:00
Miguel Jacq
b618d8c15d
Calculate the time difference in a more appropriate spot (rather than on clicking Start, but when the server is ready, as it may have taken some time, but should still stop at the nominated time) 2017-11-09 12:35:38 +11:00
Miguel Jacq
44fb6c69ae
set the timeout default to 5 minutes into the future for convenience 2017-11-09 11:56:02 +11:00
Miguel Jacq
2dd6c5527d
ensure the timeout checkbox is always shown if the server is stopped and it was not already checked 2017-11-09 11:49:01 +11:00
Miguel Jacq
d49e7cf1d1
more UI fixes - hide checkbox if server is working/started and it was not checked. Ensure we only set the timer if the timeout checkbox was checked to begin with 2017-11-09 11:46:26 +11:00
Miguel Jacq
9657df282e
ensure the shutdown timeout can't go backwards in time 2017-11-09 11:34:59 +11:00
Miguel Jacq
481f33c822
use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share 2017-11-09 11:29:55 +11:00
Miguel Jacq
a4b8a71c68
remove shutdown_timeout logic in the web server, it's not actually needed 2017-11-09 07:12:00 +11:00
Miguel Jacq
32108dcca2
Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours 2017-11-08 20:25:59 +11:00
Miguel Jacq
5edd4dd22c
#468 If the server is stopped before a download is completed, emit the Canceled message in the progress bar 2017-11-03 12:58:45 +11:00
Micah Lee
4387589b4f
Merge branch 'mig5-440_settings_menu_button_disable' 2017-07-09 14:19:08 -07:00
Micah Lee
5435a4b046
Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Micah Lee
882ade94c7
Merge branch 'mig5-custom_config' 2017-07-09 14:12:49 -07:00
Micah Lee
dee616e8cb
Merge branch 'mig5-433_reset_downloads_on_fresh_share' 2017-07-09 13:19:26 -07:00
Miguel Jacq
fccec9737d
Need to actually ensure the dark settings icon is set back once server inactive again 2017-06-03 19:04:21 +10:00
Miguel Jacq
e9120fd87e
fix the settings icon so it only switches to inactive icon when server is active 2017-06-03 19:01:40 +10:00
Miguel Jacq
22971fc205
#440 disable the Settings menu action when server is active 2017-06-03 18:55:09 +10:00
Miguel Jacq
6626e7d67e
#438 Make settings icon lighter grey when inactive 2017-06-02 11:34:19 +10:00
Miguel Jacq
b19f8fce52
Make it possible to supply a custom json settings file from somewhere else 2017-06-01 17:35:27 +10:00