Miguel Jacq
6d02d2ef91
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
f6763b25ef
Merge master branch and fix conflicts
2017-12-03 17:06:33 +11:00
Miguel Jacq
487cd6c799
Don't auto-stop the share if a download is still in progress
2017-12-03 13:21:25 +11:00
Miguel Jacq
501d771064
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
b0aae09f70
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
4c1a10b1d2
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
2f4d8610c8
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
bcb61f3627
Format the argparser output better, to deal with the longer argument names
2017-11-12 10:40:04 +11:00
Miguel Jacq
a4a4035e10
better metavar for --shutdown-timeout arg
2017-11-11 17:12:10 +11:00
Miguel Jacq
ee9dfb7a8b
No longer treating shutdown_timeout as a float, but an int of seconds
2017-11-09 19:50:50 +11:00
Miguel Jacq
d6324080ac
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
7ac6bfa215
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
ef92f92c40
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
16f34ca49e
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
5bc1a45a1e
set the timeout default to 5 minutes into the future for convenience
2017-11-09 11:56:02 +11:00
Miguel Jacq
daafd53446
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
abec0b037b
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
f2ae2eb778
ensure the shutdown timeout can't go backwards in time
2017-11-09 11:34:59 +11:00
Miguel Jacq
f5b45539b0
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
89129a2ca7
remove shutdown_timeout logic in the web server, it's not actually needed
2017-11-09 07:12:00 +11:00
Miguel Jacq
c6f36e2086
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
d59462fcbe
#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
6cd4b4391d
Merge branch 'mig5-440_settings_menu_button_disable'
2017-07-09 14:19:08 -07:00
Micah Lee
3333c81c77
Merge branch 'mig5-438_settings_icon_inactive'
2017-07-09 14:16:29 -07:00
Micah Lee
57a01a4f8a
Merge branch 'mig5-custom_config'
2017-07-09 14:12:49 -07:00
Micah Lee
dd3bbe9996
Merge branch 'mig5-433_reset_downloads_on_fresh_share'
2017-07-09 13:19:26 -07:00
Miguel Jacq
5d57eb5893
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
6b0d66b90d
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
f8ecac2903
#440 disable the Settings menu action when server is active
2017-06-03 18:55:09 +10:00
Miguel Jacq
b7da267d4b
#438 Make settings icon lighter grey when inactive
2017-06-02 11:34:19 +10:00
Miguel Jacq
e8304b861f
Make it possible to supply a custom json settings file from somewhere else
2017-06-01 17:35:27 +10:00
Miguel Jacq
802b90f19f
Remove debug data
2017-05-31 19:44:53 +10:00
Miguel Jacq
69fc0e522a
On a fresh share, delete any download progress bars of previous shares, and re-hide the downloads container
2017-05-31 17:35:16 +10:00
Miguel Jacq
17f18e9a8d
Ensure the self.filenames list is sorted internally.
...
This is important because even though the QListWidget UI is sorted
automatically, the list is not necessarily. Drag-drop events, depending
on the order in which items were highlighted before being dragged,
can result in a different or reversed order. This has implications for
popping the list later (e.g on delete events)
2017-05-31 11:17:15 +10:00
Micah Lee
4a6862cd9e
Merge branch 'single_add_button' of https://github.com/mig5/onionshare into mig5-single_add_button
2017-05-30 12:21:03 -07:00
Micah Lee
0a04955f6f
Merge branch 'status_bar_no_borders' of https://github.com/mig5/onionshare into mig5-status_bar_no_borders
2017-05-30 12:12:52 -07:00
Micah Lee
71e2824936
Merge branch 'pretty_progress_bar' of https://github.com/mig5/onionshare into mig5-pretty_progress_bar
2017-05-30 12:07:49 -07:00
Micah Lee
4b324be60d
Merge branch 'delete_multiple_items' of https://github.com/mig5/onionshare into mig5-delete_multiple_items
2017-05-30 12:05:35 -07:00
Miguel Jacq
a4fec7b181
Revert "Make the tor connection progressBar similarly style as the others"
...
This reverts commit 538476ca0cba05d6014d2e86750770bb2eb61978.
2017-05-29 15:46:28 +10:00
Miguel Jacq
538476ca0c
Make the tor connection progressBar similarly style as the others
2017-05-29 15:44:04 +10:00
Miguel Jacq
192fe7057f
reinstate the caption call
2017-05-29 13:50:46 +10:00
Miguel Jacq
d0216e0310
Fix file dialog by subclassing/overriding it, which allows for single selection of a file or folder, as well as multiple
2017-05-29 13:47:05 +10:00
Miguel Jacq
18bec095d3
Make adding of files/folders a single button
2017-05-29 10:22:16 +10:00
Miguel Jacq
09550ad50b
Improve the Zip progressbar style a little bit
2017-05-29 09:14:23 +10:00
Miguel Jacq
8d82c01e2a
Remove border around items in the QStatusBar
2017-05-27 20:38:46 +10:00
Miguel Jacq
10a546edf9
Style a prettier progress bar
2017-05-27 19:53:30 +10:00
Miguel Jacq
8087cebb10
Make it possible to delete multiple items from the list with a shift-select
2017-05-27 17:27:57 +10:00
Miguel Jacq
88bd86a5c9
Adds Settings and Help menu items to the systray
2017-05-27 17:14:59 +10:00
Micah Lee
2f5fbe2d3f
Remove the extra instances of the Settings object, and only use OnionShareGui.settings
2017-05-22 17:11:41 -07:00
Micah Lee
83b2b9a025
Reload Settings whenever the settings get saved in SettingsDialog
2017-05-22 17:08:05 -07:00
