Commit Graph

818 Commits

Author SHA1 Message Date
Miguel Jacq
325980eede
Remove second arg from two calls to strings() 2018-10-15 17:33:21 +11:00
Miguel Jacq
86b537a4a6
Fix conflicts 2018-10-11 13:04:48 +11:00
Micah Lee
235fb84dfc
Fix various bugs so local GUI tests pass again after merges 2018-10-10 18:45:55 -07:00
Micah Lee
ac10b8899f
Merge branch '780_improved_ui' into 690_language_dropdown 2018-10-10 18:32:01 -07:00
Micah Lee
c541288227
Merge branch 'develop' into 690_language_dropdown 2018-10-10 18:25:28 -07:00
Micah Lee
753380663b
Final few tweaks to make this look perfect in macOS 2018-10-10 18:16:08 -07:00
Miguel Jacq
beda37df06
Remove commented out obsolete code 2018-10-10 18:09:43 +11:00
Miguel Jacq
85de803fda
Raise minimumHeight again to account for overlap issues on MacOS caused by Mac's Qt widget padding 2018-10-10 16:49:42 +11:00
Micah Lee
56e5c8b908
Add "download started" date/time to download history progress bars 2018-10-09 22:21:03 -07:00
Micah Lee
18f83589aa
Merge in develop 2018-10-09 21:32:28 -07:00
Micah Lee
90172c913b
Stop hiding the share mode info label when tor breaks 2018-10-09 21:18:26 -07:00
Micah Lee
b982a9a248
Actually, the window needs to be taller 2018-10-09 21:15:42 -07:00
Micah Lee
6227c6cbc5
Set min width and height so everything always looks good, and change onion address to monospace font 2018-10-09 20:51:10 -07:00
Micah Lee
9aa982563b
Remove one more reference to resize_window 2018-10-07 22:09:57 -07:00
Micah Lee
5a2ca669a1
Rip out all of the adjust size logic and let Qt just handle it 2018-10-07 22:07:19 -07:00
Micah Lee
50c0d91c57
Missing imports 2018-10-07 21:57:45 -07:00
Miguel Jacq
49e371d503
adjust widget sizes when switching mode 2018-10-07 21:47:28 -07:00
Micah Lee
bc8759bc77
Properly close items inside the item list, instead of just hiding them 2018-10-07 21:46:16 -07:00
Micah Lee
656784dfa9
Remove obsolete ReceiveModeInfo file 2018-10-07 21:28:10 -07:00
Micah Lee
c9beb694f2
Update ReceiveMode to use History directly, and now all GUI tests pass 2018-10-07 21:14:20 -07:00
Micah Lee
38e62d8528
The History header is now only shown if there are items again, and the clear history button resets everything. Also, reset hides individual items because, for some reason, they still show up otherwise. 2018-10-07 18:20:32 -07:00
Micah Lee
bc573209d9
Delete Info widget, and move completed and in progress widgets into the header of history 2018-10-07 18:09:02 -07:00
Micah Lee
484c33902f
Make ShareMode just use a History object directly, instead of defining its own Downloads class 2018-10-07 17:35:15 -07:00
Micah Lee
5a8cb2ac9d
In ShareMode, remove the ShareModeInfo widget and replace with a customized ToggleHistory widget 2018-10-07 15:20:22 -07:00
Micah Lee
801d8b965c
Move ShareMode and ReceiveMode into Mode module 2018-10-07 14:54:51 -07:00
Micah Lee
7c61483ae9
Move Mode module into its own folder 2018-10-07 14:48:15 -07:00
Miguel Jacq
3f32db2cca
Fix logic for handling an upload still in progress when timer runs out. Show thankyou page for last uploader post-timer expiry 2018-10-01 18:42:53 +10:00
Miguel Jacq
f653e8cc04
Merge develop in and fix upload/timer functionality so that it works as described. Still needs fixing to not throw a connection error to the lucky last uploader after their upload completes and server stops due to expiry having passed 2018-10-01 16:42:54 +10:00
Miguel Jacq
7e8a76be8a
Load default settings before parsing for any alternate config. Reload strings if an alternate config was passed in after 2018-10-01 15:32:53 +10:00
Miguel Jacq
9aa9dc39a1
Move Alert dialog about restart into the conditional that fires only if locale was changed 2018-10-01 13:32:09 +10:00
Miguel Jacq
c43d882a65
Explicitly set true/false values for settings that need it 2018-10-01 12:53:10 +10:00
Micah Lee
a1f5b5964a
Remove the useless gui=True arg getting passed intro strings._ all over the place 2018-09-30 17:47:10 -07:00
Micah Lee
c4f776c42a
Set OnionShare language based on the locale stored in settings, and prompt user to restart OnionShare after changing their language 2018-09-30 17:06:29 -07:00
Micah Lee
23c55bc95b
Change how language selection setting looks 2018-09-30 16:23:46 -07:00
Micah Lee
9a19a7aecd
Allow switching locales from the settings dialog 2018-09-30 16:14:14 -07:00
Miguel Jacq
4ffc0ddb82
Ignore attribute error when optimistically trying to cancel compression (we may have no ZipWriter object yet) 2018-09-30 16:52:48 +10:00
Micah Lee
39dd0862d4
Increase minimum window with to 460, and store it in a variable to stop repeating myself 2018-09-29 15:12:05 -07:00
Micah Lee
8ca34fadd9
Fix crash when clicking Help from the systray 2018-09-29 14:49:06 -07:00
Micah Lee
b4de634b7a
Fix indicator label display for receive mode 2018-09-29 14:43:13 -07:00
Micah Lee
4b3a68bb65
Got the indicator label to display in the correct location for share mode 2018-09-29 14:40:55 -07:00
Micah Lee
fa4ebbf263
Convert Uploads to a QScrollArea also 2018-09-29 13:47:00 -07:00
Micah Lee
d87115d21e
Fix Downloads scroll area so internal widget is always the right size 2018-09-29 13:41:12 -07:00
Micah Lee
ffad77930f
Switch Downloads from QListWidget to QScrollArea 2018-09-29 12:19:01 -07:00
Micah Lee
4aed7c0f9d
Use correct variable name for Downloads 2018-09-29 12:00:22 -07:00
Micah Lee
709eeeac5f
Starting to implement the new Uploads UI, but not done 2018-09-28 22:03:48 -07:00
Micah Lee
e87263353f
Added an indicator count for share mode 2018-09-28 19:54:46 -07:00
Micah Lee
9a05eef494
Slightly improve Downloads progress bar style, but still needs spacing 2018-09-28 19:05:26 -07:00
Micah Lee
71149c2937
Refactor Downloads to use an internal QListWidget to list the progess bars 2018-09-28 18:48:12 -07:00
Micah Lee
a5b549770a
Got empty Downloads looking good 2018-09-28 18:30:32 -07:00
Micah Lee
c0e6968b2b
Attempting to redesign Downloads 2018-09-28 17:01:48 -07:00
Micah Lee
08ac4137c7
Process Qt events once more, to prevent weird size issues before adjusting size 2018-09-28 16:06:14 -07:00
Micah Lee
35065106ef
Refactor receive mode into using an info widget too 2018-09-28 16:00:22 -07:00
Micah Lee
f056ce576e
Refactor share mode info widget into its own file and custom class, and run .show_more() and .show_less() instead of .show() and .hide() 2018-09-28 15:47:49 -07:00
Micah Lee
cddc8c06d4
Modes now get to choose a new minimum window width when resizing 2018-09-28 15:30:37 -07:00
Micah Lee
e29bb99f16
OnionShareGui.adjust_size now recursively runs adjustSize() on all widgets 2018-09-28 15:05:43 -07:00
Micah Lee
4bec79f494
Toggle showing uploads and downloads for both share and receive modes 2018-09-28 13:43:10 -07:00
Micah Lee
edbbe9377c
Add a toggle downloads button to share mode, and add new toggle upload and download images 2018-09-28 13:24:44 -07:00
Micah Lee
ddcbed451c
Hide the uploads and downloads by default, and make the mode switcher hide before showing, to prevent weird window resizing 2018-09-28 13:18:18 -07:00
Micah Lee
fc1902c1ee
Refactor how Mode layouts work, so the downstream Mode has more control over the UI 2018-09-28 12:51:30 -07:00
Micah Lee
8b4ef277b5
Merge branch 'gui_tests' of https://github.com/mig5/onionshare into mig5-gui_tests 2018-09-27 16:44:06 -07:00
Miguel Jacq
201f351279
Pass --local-only down to the ServerStatus and Mode so that we can set shorter timeouts for local GUI tests. Update the tests to use a very short timeout 2018-09-27 15:43:59 +10:00
Micah Lee
d3410e7843
Merge pull request #789 from mig5/show_v3_onion_support
Show whether Tor version supports next-gen onion support
2018-09-26 17:09:34 -07:00
Miguel Jacq
3ed04bf5ec
Show whether Tor version supports next-gen onion support 2018-09-25 15:26:19 +10:00
Miguel Jacq
d34364530d
Analyse the right file size to determine if the download has finished in the UI (in order to decide whether to stop server yet) 2018-09-25 14:40:10 +10:00
Micah Lee
017a4ebe31
Merge branch 'develop' into 663_zip_away 2018-09-21 16:23:49 -07:00
Micah Lee
09ccbf4a60
Dynamically figure out the total size of the download based on the whether or not the client making the http request accepts gzip 2018-09-21 16:22:37 -07:00
Micah Lee
2a309af680
If only sharing one file, compress it with gzip, and serve it with gzip compression if the browser supports it 2018-09-21 12:29:23 -07:00
Micah Lee
28fd67cbcc
Move more mode-specific logic out of the Web class and into the approprate mode web classes 2018-09-21 11:36:19 -07:00
Micah Lee
cc9f646f8b
Refactor web even more to all of the share and receive web logic into ShareModeWeb and ReceiveModeWeb classes 2018-09-21 11:14:32 -07:00
Micah Lee
81fa5e052c
Only add the download_filename to cleanup_filenames (which get deleted) if the file is zipped up. Otherwise, OnionShare deletes the original file 2018-09-20 23:18:17 -07:00
Micah Lee
5bc8e0a5e5
Smoothly quit when Ctrl-C is pressed 2018-09-20 23:09:14 -07:00
Micah Lee
ea938e2439
Change more references to web.zip_filesize to be refer to web.download_filesize 2018-09-20 12:25:07 -07:00
Micah Lee
324538bdd3
When there is only 1 file being shared, don't zip it 2018-09-20 09:14:56 -07:00
Micah Lee
5a96bcc77b
Remove adjustSize that was causing issues 2018-09-19 20:17:23 -07:00
Micah Lee
beeebce631
Set minimum width for whole application 2018-09-19 19:39:59 -07:00
Micah Lee
871135cc75
Only add a stretch at the bottom of the layout in receive mode, not share mode 2018-09-19 19:38:29 -07:00
Micah Lee
1314ddf1be
Remove upload/download toggle buttons 2018-09-19 19:36:16 -07:00
Micah Lee
499f7b1638
Always show uploads and downloads 2018-09-19 19:00:12 -07:00
Micah Lee
59003635a2
Add a horizontal layout wrapper around the vertical layout, in order to optionally add horizontal widgets to Modes 2018-09-19 18:50:42 -07:00
Micah Lee
2b9791e07f
Merge branch 'develop' of github.com:micahflee/onionshare into develop 2018-09-19 18:40:14 -07:00
Micah Lee
286979952a
Merge branch 'send_public_mode_arg_to_web_start' of https://github.com/mig5/onionshare into mig5-send_public_mode_arg_to_web_start 2018-09-19 18:39:07 -07:00
Micah Lee
093cf9bd85
Merge pull request #766 from mig5/clear_history_button
Add 'clear history' button to downloads and uploads windows
2018-09-19 18:36:50 -07:00
Micah Lee
d0d4d61008
Merge pull request #762 from mig5/textwrap_upload_filename_widget
#704 wrap the upload filename label if too long
2018-09-19 18:33:30 -07:00
Micah Lee
fc7afecb7b
Choose a port *before* starting the web service 2018-09-19 18:14:42 -07:00
Miguel Jacq
8b704a0070
Start the WebThread earlier than the Onion service. This gives it a chance to generate its slug before the Onion Service finishes starting up, which can otherwise lead to a crash 2018-09-19 15:07:04 +10:00
Miguel Jacq
20c97a61ab
Send the public_mode argument to web.start in the WebThread 2018-09-19 14:40:30 +10:00
Miguel Jacq
28674bf023
Add 'clear history' button to downloads and uploads windows 2018-09-19 14:37:07 +10:00
Miguel Jacq
f45eae5768
Fix syntax for opening explorer and selecting the filename. Fix a bug in the downloads_dir for Windows (need to use a backslash) 2018-09-19 12:12:18 +10:00
Miguel Jacq
388f968556
fix function name for windows 2018-09-19 11:27:36 +10:00
Miguel Jacq
41b4cea673
Open folder containing uploads with the file selected, in macOS and Windows 2018-09-19 11:24:19 +10:00
Miguel Jacq
62804dfdce
Merge pull request #758 from micahflee/665_cancel_compression
Fix zip progress bar not canceling problem
2018-09-19 10:59:11 +10:00
Micah Lee
3743a1b0ec
Merge pull request #756 from mig5/reset_uploads_on_share_restart
Close the upload widget on reset so that it properly disappears from the Uploads window
2018-09-18 17:58:25 -07:00
Miguel Jacq
c08f6f3db1
#704 wrap the upload filename label if too long 2018-09-19 10:57:12 +10:00
Micah Lee
6ac1ca3784
Merge pull request #755 from mig5/upload_icon_updating
Increment/decrement the upload counters
2018-09-18 17:50:39 -07:00
Micah Lee
d63808f419
Import onion exceptions that were missing 2018-09-18 17:44:54 -07:00
Micah Lee
72f76bf659
We shouldn't call CompressThread.cancel() there because it's already called in a signal 2018-09-18 13:39:09 -07:00
Micah Lee
174de57405
Refactor all of the threading.Threads into QThreads, and quit them all when canceling the server. When canceling the compression thread, specifically mass a cancel message into the Web and ZipWriter objects to make the bail out on compression early 2018-09-17 20:55:54 -07:00
Miguel Jacq
d54b52691c
Fix the auto-scrolling to bottom of Download and Upload windows 2018-09-18 12:59:01 +10:00
Miguel Jacq
bf6de202b0
Close the upload widget on reset so that it properly disappears from the Uploads window. 2018-09-18 11:51:32 +10:00
Miguel Jacq
c8fd40c3b0
Increment/decrement the upload counters 2018-09-18 11:19:20 +10:00
Miguel Jacq
c3755389dd
Fix conflict 2018-09-18 10:26:16 +10:00
Micah Lee
359e470383
Make what's this links use the same string, and change their style 2018-09-17 16:11:52 -07:00
Micah Lee
cddc7f8c57
Merge branch 'prop224_receiver_mode' of https://github.com/mig5/onionshare into mig5-prop224_receiver_mode 2018-09-17 15:57:15 -07:00
Miguel Jacq
7e875e021a
Remove unnecessary loop. Remove the Close route/setting which can DoS another running upload. Fix detecting whether any uploads are still in progress before terminating the service after timer expires. Don't register 404s for uploads after expiry has finished (throw a 403 instead)" 2018-09-18 08:36:07 +10:00
Miguel Jacq
953727419c
Use the term 'upload' rather than 'download' in the Receive mode tooltip icons 2018-09-17 18:48:22 +10:00
Miguel Jacq
b06fd8af26
Hold a share open if its timer hsa expired but a file is still uploading. Don't allow other uploads during this time 2018-09-17 17:42:04 +10:00
Miguel Jacq
6ed5c94df7
Hide the legacy settings if legacy mode is not enabled. Fix unrelated bug regarding displaying the HidServAuth copy button/label 2018-09-17 09:12:13 +10:00
Miguel Jacq
6c01d7a2da
Add 'what's this' labels to each General Setting 2018-09-17 09:01:30 +10:00
Miguel Jacq
7c55f0adae
Reorder the general settings 2018-09-17 08:44:56 +10:00
Micah Lee
4777c45ad8
Fix suppressing the shutdown_slug message 2018-09-16 13:50:30 -07:00
Miguel Jacq
7bd897d19e
Don't show the Flash shutdown slug route in the status bar as if it were an unexpected 404 route 2018-09-16 15:15:40 +10:00
Miguel Jacq
026322b458
Fix margins on HBoxLayouts in settings 2018-09-16 14:06:55 +10:00
Miguel Jacq
95f097eae3
Move the hyperlink labels into HBox layouts with the checkboxes 2018-09-16 14:00:41 +10:00
Miguel Jacq
d8566c2d78
Move stealth to general options, and add hyperlinks for more info for this and legacy addresses 2018-09-16 13:54:47 +10:00
Miguel Jacq
3a7ae401af
Fix conflicts 2018-09-16 13:37:22 +10:00
Miguel Jacq
30ee2290d7
Fix bug where lack of stealth mode re-enabled v2 legacy checkbox even if persistence was still enabled 2018-09-15 16:07:08 +10:00
Miguel Jacq
8bb75cc530
Fix conflict in tests 2018-09-15 12:07:01 +10:00
Micah Lee
8312058fcc
Merge branch 'develop' into receiver-mode-gui 2018-09-14 18:59:36 -07:00
Micah Lee
db63b4c9c3
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
2605967011
Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks 2018-09-14 18:40:26 -07:00
Micah Lee
fbb55e36dc
Merge branch 'upload_widget_overlap' of https://github.com/mig5/onionshare into mig5-upload_widget_overlap 2018-09-14 18:33:51 -07:00
Micah Lee
4c87393550
Merge branch 'fix_invalid_version_alert' of https://github.com/mig5/onionshare into mig5-fix_invalid_version_alert 2018-09-14 18:32:32 -07:00
Miguel Jacq
85fa44a01f
Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
45a5a2ae63
Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
11bf059015
Fix conflict from receiver-mode-gui branch 2018-09-04 11:48:39 +10:00
Miguel Jacq
45d6a94d38
Fix conflict from develop branch 2018-09-04 11:43:35 +10:00
Micah Lee
eb0419f2d9
Merge branch 'fix_spelling_grammar_receiver_mode' of https://github.com/mig5/onionshare into mig5-fix_spelling_grammar_receiver_mode 2018-09-02 22:59:06 -07:00
Micah Lee
e1976fdca0
Merge branch '707_fix_receive_mode_on_tor_disconnect' of https://github.com/mig5/onionshare into mig5-707_fix_receive_mode_on_tor_disconnect 2018-09-02 22:56:39 -07:00
Micah Lee
52c82f9b16
Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues 2018-09-02 13:33:35 -07:00
Miguel Jacq
808c5a3333
Truncate the length of the uploaded file name if it is longer than the width of the Upload window 2018-09-01 09:20:50 +10:00
Miguel Jacq
2fd2cf3e2e
Fix the passing of the latest version returned to the UI if it is an invalid version 2018-08-30 15:18:29 +10:00
Miguel Jacq
7879697ec6
Only wrap the v3 onion if the window is too small to show it unwrapped 2018-08-28 09:33:49 +10:00
Miguel Jacq
47fc55aac1
Don't try and parse Tor version in order whether or not to show v2-only features. Just note in the QLabel what is v2-only. Still force v2 legacy mode on when using persistence or stealth. 2018-08-23 11:02:28 +10:00
Miguel Jacq
5c8b0d7796
Rather than hide persistence/stealth mode altogether if the Tor version is high enough for v3, give the user the option to 'use legacy v2 onions' in Settings dialog, so that they may continue to use persistence etc 2018-08-22 11:45:08 +10:00
Miguel Jacq
2de9359629
Introduce v3 onion support 2018-08-21 19:31:02 +10:00
Miguel Jacq
3b45f93dbe
Expand 'public mode' (optional slugs) to be possible for sharing too, not just receiving, with no rate-limiting/self-destruct on invalid routes. 2018-07-21 17:06:11 +10:00
Miguel Jacq
a830eb57fe
#691 remove meek_lite Amazon 2018-07-21 15:52:11 +10:00
Miguel Jacq
f6b031bc2c
Fix another two places where Alert was called without passing the common object 2018-07-21 15:50:37 +10:00
Miguel Jacq
69ae29272c
Fix minor spelling/grammar issues 2018-07-14 16:43:21 +10:00
Miguel Jacq
89e341c8ec
#707 Hide/show the primary action in Receive Mode when tor connection is lost/regained 2018-07-14 16:19:16 +10:00
Miguel Jacq
a4f0b5e8f8
Remove duplicate line 2018-07-13 15:50:17 +10:00
irykoon
09ce97147a
Merge branch 'develop' of https://github.com/micahflee/onionshare into develop 2018-07-12 06:31:49 +00:00
Micah Lee
1ad68c46d4
Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
9344fbd274
Update OnionShare copyright year to 2018 2018-06-17 16:53:44 -07:00
Miguel Jacq
7e7611bc34
Fix some lingering attribute/module references that had not been updated to use their new names/paths 2018-05-28 15:52:43 +10:00
Micah Lee
4fd93636da
Remove TODO comment 2018-05-20 15:33:13 -07:00
Micah Lee
f5ce069031
Make it so the open folder button works in Linux, with nautilus 2018-05-20 14:40:27 -07:00
Micah Lee
b20ba6fc86
Rename uploaded files 2018-05-20 14:12:53 -07:00
Micah Lee
451e07269f
Fixed "RuntimeError: dictionary changed size during iteration" exception while updating upload progress 2018-05-20 14:05:34 -07:00
Micah Lee
18573ba49c
Remove REQUEST_UPLOAD_NEW_FILE_STARTED event, because it's not actually needed 2018-05-20 12:07:15 -07:00