Commit Graph

614 Commits

Author SHA1 Message Date
Micah Lee
a232cfdbde
Hide Receive Files button while share server is active 2018-04-24 08:51:39 -07:00
Micah Lee
bda82bc7a0
Fix crash when canceling while compressing files, and also prevent canceled share from starting when compressing finishes 2018-04-24 08:48:17 -07:00
Micah Lee
9b2b815525
Moving more of the logic into ShareMode, but still have much more testing to do 2018-04-23 22:08:51 -07:00
Micah Lee
ac67f6be6a
Move a lot of code from OnionShareGui into ShareMode, but none of it runs yet 2018-04-23 21:34:29 -07:00
Micah Lee
b349471c30
Add empty ShareMode and ReceiveMode widgets, and show and hide them when switching modes 2018-04-23 21:24:12 -07:00
Micah Lee
86fa0215d8
Fix small --local-only bug that causes a crash when canceling settings 2018-04-23 21:16:10 -07:00
Micah Lee
ac13790673
Flip between modes when clicking mode buttons, and some css 2018-04-23 21:15:30 -07:00
Micah Lee
b4c31573ba
Remove the margin from the mode switcher 2018-04-23 21:08:03 -07:00
Micah Lee
6c91d8977a
Begin to add the mode switcher (between "Share Files" and "Receive Files", with the settings button) 2018-04-23 19:51:51 -07:00
Micah Lee
4af80de17b
Merge branch 'develop' into receiver-mode 2018-04-23 08:52:48 -07:00
Micah Lee
91536ea571
Fix a few bugs that I missed when merging in develop 2018-04-22 17:46:14 -07:00
Micah Lee
8c89a05fd9
Merge branch 'develop' into receiver-mode 2018-04-22 17:38:28 -07:00
Micah Lee
a53d3188dd
Put test Tor button in a so it can be left-aligned 2018-04-22 17:20:58 -07:00
Micah Lee
87d29a9171
Rearrange some widgets in the settings dialog, specifically move the bridge options above the test Tor settings button 2018-04-22 17:15:15 -07:00
Micah Lee
1201205dee
Merge branch 'hide_primary_action_on_tor_disconnection' of https://github.com/mig5/onionshare into develop 2018-04-22 16:09:32 -07:00
Micah Lee
3584e57c5d
Merge branch 'local_only_gui' of https://github.com/mig5/onionshare into mig5-local_only_gui 2018-04-22 15:41:10 -07:00
Micah Lee
aaa860921a
Merge branch '657_meek_warning' of https://github.com/mig5/onionshare into mig5-657_meek_warning 2018-04-22 15:31:45 -07:00
Micah Lee
16eab5e850
Add a stretch at the bottom of the downloads window, so that progess bars are always lined up at the top 2018-04-22 15:25:28 -07:00
Micah Lee
359bd59828
Merge branch 'downloads_window' of https://github.com/mig5/onionshare into mig5-downloads_window 2018-04-22 14:48:57 -07:00
Micah Lee
929ad58ebd
Fix bug with validating filenames from args in GUI 2018-03-14 08:34:43 -07:00
Miguel Jacq
b1b28f4fa5
Hide the primary_action when Tor gets disconnected 2018-03-14 18:31:07 +11:00
Micah Lee
76d299a6c9
Move settings into the Common object, so the settings are available to all objects (including Web, which is required for receive mode) 2018-03-13 03:28:47 -07:00
Micah Lee
50409167d4
Completely refactor common to make a Common class, and pass that class down into all parts of the program 2018-03-08 10:18:31 -08:00
Micah Lee
49e352d131
Rename close_after_seconds class to ShutdownTimer 2018-03-08 05:50:23 -08:00
Miguel Jacq
46a9a2a0a1
#662 Allow local-only mode in GUI 2018-03-07 16:13:22 +11:00
Micah Lee
4a0c6e8dcd
Refactor OnionShareGui to use new Web class 2018-03-06 00:56:40 -08:00
Micah Lee
0cec696055
Refactor web.py to move all the web logic into the Web class, and refactor onionshare (cli) to work with it -- but onionshare_gui is currently broken 2018-03-05 11:06:59 -08:00
Micah Lee
cd1a1d9638
Web needs to know about receive mode, not the OnionShare object 2018-03-05 08:48:04 -08:00
Micah Lee
18ac830a9e
Add command line flag for receive mode 2018-03-05 07:45:10 -08:00
Miguel Jacq
a71786d024
Warn about the costs of using meek_lite bridges 2018-03-05 13:52:50 +11:00
Baccount
9da1b82e5a
Update onionshare_gui.py 2018-03-02 18:45:36 -08:00
Miguel Jacq
fa9e5748a3
Make downloads window scrollable again. Reset to original size when starting a fresh share 2018-02-28 09:48:23 +11:00
Miguel Jacq
fffc420cb1
re-show the 'No downloads yet' label when resetting the counters (e.g starting a new share) 2018-02-27 18:20:05 +11:00
Miguel Jacq
ee5c35d502
Move downloads into their own window that can be toggled on/off 2018-02-27 17:59:46 +11:00
Miguel Jacq
022ed03287
Uninstantiated system variable 2018-02-26 14:02:15 +11:00
Miguel Jacq
b513c59542
Hide the meek_lite options on macOS and Windows, as the obfs4proxy binary in TorBrowser is too old to support it 2018-02-26 13:48:28 +11:00
Micah Lee
49fa2805e7
Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share 2018-02-25 16:14:59 -08:00
Miguel Jacq
fce26c4286
Add ability to abort but not exit SettingsDialog/reconnect to Tor, on invalid settings. Do this for invalid bridges 2018-02-25 19:42:38 +11:00
Miguel Jacq
096c202362
Add ability to cancel a share 2018-02-25 17:44:27 +11:00
Micah Lee
3797e9e203
When using <img>, put the src in quotes. Otherwise the filename is likely to have spaces in it, and the <img> src will break. Also, in Windows use backslashes for local resources instead of forward slashes 2018-02-24 18:38:40 -08:00
Micah Lee
f41ad976ea
Rename in_progress_download to in_progress_downloads (plural) everywhere, to be consistent with completed_downloads 2018-02-24 18:37:19 -08:00
Miguel Jacq
cff267c09c Revert the cancel feature that causes issues at least on macOS (#637) 2018-02-25 12:31:32 +11:00
Miguel Jacq
9f0adc0fb9 Revert "Fix updating primary action and re-enabling drag-n-drop when a share is canceled"
This reverts commit 9da3e2d8b0.
2018-02-25 12:27:20 +11:00
Micah Lee
b75237dcea
Fix typo bug that is only triggered if obfs4proxy binary is not found 2018-02-24 14:09:42 -08:00
Miguel Jacq
dface51dd0
Merge pull request #588 from micahflee/ux-update
Major user experience update
2018-02-25 08:27:46 +11:00
Micah Lee
928de64171
Give settings button a fixed width to avoid it getting squished in macOS 2018-02-24 12:34:46 -08:00
Miguel Jacq
7e175cb7e3
Re-work the UI widgets to make it smaller on Macbook Pro and other smaller screens 2018-02-24 15:38:45 +11:00
Micah Lee
7bf9c5adfd
Change how FileSelection.update tells if items are selected to correctly show and hide the delete button 2018-02-23 14:18:57 -08:00
Micah Lee
a83a920051
Merge branch '523_try_update_check_via_v3_onion' of https://github.com/mig5/onionshare into mig5-523_try_update_check_via_v3_onion 2018-02-23 11:53:55 -08:00
Miguel Jacq
161e7e380b
Fix get_num_files() to count the items in the QListWidget, not in the FileSelection QVBoxLayout widget 2018-02-23 12:46:18 +11:00
Miguel Jacq
ade9a452a3
Remove our custom stylesheeting, and just trim long names, allowing them to untrim as the window resizes 2018-02-23 10:49:43 +11:00
Micah Lee
1967d50707
Make the item-info boxes have an obvious style 2018-02-22 10:02:52 -08:00
Micah Lee
22c301fd9c
Stop trimming filenames, and instead create item info with a white background 2018-02-22 09:55:04 -08:00
Miguel Jacq
6998aec50a
Force a scrollbar on the file list widget. Not pretty but avoids weird text disappearance on resize when scrollbar otherwise activates 2018-02-22 14:44:00 +11:00
Miguel Jacq
9215651582
Remove the item_name QLabel widget and just let the QListWidgetItem text() display as title. Trim super-long filenames 2018-02-22 14:37:31 +11:00
Miguel Jacq
6815665f1d
Instantiate empty filenames list 2018-02-21 15:47:21 +11:00
Miguel Jacq
fd4bc51ec2
fix appending of filenames when checking that a file hasn't already been added to the list 2018-02-21 15:29:56 +11:00
Miguel Jacq
21b08252d3
Use the QListWidgetItems for building lists of filenames. Set, but avoid displaying, the QString from Qt.DisplayRole which is necessary for correct sorting in the list 2018-02-21 15:19:18 +11:00
Micah Lee
6ac4584d2a
Merge branch 'info_widget_visibility_fixes' of https://github.com/mig5/onionshare into mig5-info_widget_visibility_fixes 2018-02-20 17:48:50 -08:00
Miguel Jacq
2dd1d13957
Make the appearance of the download status icons occur consistently with the file info label 2018-02-20 15:30:55 +11:00
Miguel Jacq
9da3e2d8b0
Fix updating primary action and re-enabling drag-n-drop when a share is canceled 2018-02-20 14:49:17 +11:00
irykoon
53510bf43e
Take care of custom vanilla bridges
Thank you @mig5 for pointing this out.
2018-02-20 03:25:43 +00:00
Micah Lee
3d1c0eabc4
Merge branch 'develop' into mig5-info_widgets_download_info 2018-02-19 18:02:51 -08:00
Micah Lee
cb69ae89fc
Merge branch 'info_widgets_download_info' of https://github.com/mig5/onionshare into mig5-info_widgets_download_info 2018-02-19 17:55:03 -08:00
Micah Lee
0eef5cdba0
Merge branch 'increase_file_list_minimum_height' of https://github.com/mig5/onionshare into mig5-increase_file_list_minimum_height 2018-02-19 17:39:47 -08:00
irykoon
d03ad0ab30
Adopt a more robust RE for custom obfs4 IPV6 bridges 2018-02-20 01:33:58 +00:00
irykoon
2cdfcea241
Adopt a more robust RE for custom obfs4 bridges 2018-02-20 01:26:02 +00:00
irykoon
02c16ce179
Add meek_lite support for custom bridges 2018-02-20 01:24:44 +00:00
Miguel Jacq
b7df7f8dc9
merge ux-update in, and fix conflict 2018-02-20 07:47:21 +11:00
Miguel Jacq
20c0ca02d3
Add download status widgets to info bar 2018-02-19 08:33:47 +11:00
Miguel Jacq
f0b3c25ce4
Increase the MinimumHeight of the FileList widget to avoid disappearing icons 2018-02-18 16:22:04 +11:00
irykoon
b2c310f2e0
Support meek_lite Pluggable Transport
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
Micah Lee
24b025419a
Fix bug where persistent tooltips were not displaying 2018-02-13 17:50:10 -08:00
Micah Lee
a32778397a
Merge branch 'url_label_tooltips' of https://github.com/mig5/onionshare into mig5-url_label_tooltips 2018-02-13 17:31:25 -08:00
Micah Lee
127d097e96
Merge branch 'clear_messages_on_server_button_click' of https://github.com/mig5/onionshare into mig5-clear_messages_on_server_button_click 2018-02-13 17:28:03 -08:00
Micah Lee
6903e9bad6
Merge branch 'copy_urls_moved_to_desktop_notifications' of https://github.com/mig5/onionshare into mig5-copy_urls_moved_to_desktop_notifications 2018-02-13 17:21:40 -08:00
Micah Lee
e20e8d5181
Switch to 12 hour clock 2018-02-13 17:20:10 -08:00
Miguel Jacq
779ca76553
Set URL label tooltips 2018-02-11 18:32:18 +11:00
Miguel Jacq
b8cf692cd8
actually show those messages in the system tray, not still in the statusbar, and with the mandatory titles 2018-02-11 17:52:14 +11:00
Miguel Jacq
5e4a4f6613
Move the copy URL/HidServAuth notifications to desktop notifications instead of statusbar 2018-02-11 17:42:07 +11:00
Miguel Jacq
14ece50807
Clear statusBar messages when the server button is clicked 2018-02-11 17:32:45 +11:00
Miguel Jacq
afc9568f30
Adjust width of window to fit status bar messages, unwrapped, to avoid squishing widgets.
Add pluralisation of filemanager total file(s)

Use 'timer expired' rather than 'timeout reached'
2018-02-11 17:16:59 +11:00
Miguel Jacq
ed179922d4
Merge branch 'ux-update' of https://github.com/micahflee/onionshare into ux_update_fix_shutdown_timer 2018-02-11 17:15:52 +11:00
Micah Lee
dbe0210104
Make the drop count adjust size based on its sizeHint 2018-02-10 18:36:38 -08:00
Micah Lee
b41b89add8
Designed file list items to look better, prevent scrolling horizintally, and ensuring the delete button does not overlap the filename 2018-02-10 18:15:44 -08:00
Miguel Jacq
ef994ea012
Use just one share status QLabel widget and update the text accordingly 2018-02-11 09:54:22 +11:00
Micah Lee
fe24c543cc
Added an info label to file selection, to show the total count and size 2018-02-10 11:48:14 -08:00
Micah Lee
532d5d5cf0
Instead of disabling the settings button when share is active, hide it, and show it again when the share stops 2018-02-10 10:59:01 -08:00
Micah Lee
72b3970405
Merge branch 'persistent_url_label_tooltip' of https://github.com/mig5/onionshare into mig5-persistent_url_label_tooltip 2018-02-10 10:46:03 -08:00
Miguel Jacq
39954c6ee8
Allow the user to cancel a share that is still starting up 2018-02-09 18:43:57 +11:00
Miguel Jacq
bc2417c65e
Set the URL label to explicitly mention when persistent. Remove older Persistence warning to save clutter. Add ToolTip to explain what Persistence means 2018-02-09 07:55:22 +11:00
Miguel Jacq
d0f180fdc5
set MinimumSize on the word-wrapped QLabels in the SettingsDialog, which prevents them getting squished when parent is resized smaller 2018-02-08 16:02:00 +11:00
Miguel Jacq
3e5d51a858
Make status bar styling consistent 2018-02-08 12:25:30 +11:00
Miguel Jacq
4d68b1a3dd
Friendlier datetime format for the shutdown timer 2018-02-08 11:53:56 +11:00
Miguel Jacq
749ca6312d
Fix shutdown timer and insert larger messages as word-wrapped widgets into the Status Bar 2018-02-08 11:32:34 +11:00
Micah Lee
05633673fc
Move auto-stop timer into settings, so its UI does not show up unless the user specifically enables that feature 2018-02-07 09:55:55 -08:00
Micah Lee
23668baa09
Fix bug when stopping server 2018-02-07 09:48:34 -08:00
Micah Lee
4639420dfc
Refactor what happens to FileList when the server starts or stops, and also prevent selections when the server starts 2018-02-07 09:16:55 -08:00
Micah Lee
acf5c1bb88
Merge branch 'disable_delete_buttons_on_running_server' of https://github.com/mig5/onionshare into mig5-disable_delete_buttons_on_running_server 2018-02-07 09:05:40 -08:00
Miguel Jacq
cdf14e2600
Fix comment to reflect what we're doing with the file list buttons 2018-02-07 19:18:20 +11:00
Miguel Jacq
2b15020e7d
Leave the FileList enabled, but hide the item buttons when the server is working or started 2018-02-07 17:34:36 +11:00
Miguel Jacq
d1ce17cf5f
Merge pull request #585 from torbsd/openbsd-port-patches-2
Second attempt at patches for an OpenBSD port
2018-02-07 16:54:00 +11:00
Miguel Jacq
0b18129947
Set the File List widget to readonly while running, so items can't be deleted mid-share 2018-02-07 16:40:45 +11:00
Miguel Jacq
cf6d11816f
Call update_primary_action when server is stopped. Because it runs adjustSize(), it will shrink the window back down to a sane size once the URL label widgets get hidden, instead of growing the FileList widget to fill up the space 2018-02-07 16:00:48 +11:00
Miguel Jacq
6cff5e06b8
allow word wrap of URL QLabels, and set MinimumHeight so they don't get shrunk in the layout 2018-02-07 15:59:13 +11:00
Micah Lee
f93ed86283
Move server status indicator to the status bar at the bottom 2018-02-06 19:31:02 -08:00
Micah Lee
69fe7f0d98
Move version label into settings dialog 2018-02-06 19:05:02 -08:00
Micah Lee
a1aa25c792
Start with a narrower width 2018-02-06 18:35:35 -08:00
Micah Lee
8f77603182
Improve the UI of the quit warning 2018-02-06 17:47:05 -08:00
Micah Lee
ab1d6a65dd
Update color and style of progress bars 2018-02-06 17:10:42 -08:00
Micah Lee
5ca4bb0157
Give server button rounded corners. Change style of persistent URL label 2018-02-06 16:14:56 -08:00
Micah Lee
2a23b02f98
Increase minimum width, and remove word wrap, to fix QLabel squishing problem 2018-02-06 16:11:48 -08:00
Micah Lee
24a672dac9
Make the server button and URL display much nicer, and replace string "URL" with "address" for usability 2018-02-06 16:01:59 -08:00
Micah Lee
f23e2a8a90
Progressively hide shutdown timer-related UI, so only relevant widgets are shown at any time 2018-02-05 18:20:09 -08:00
attila
ae494c8e33 Second attempt at patches for an OpenBSD port, this time based off of 1.2
and after feedback from the upstream and other contributors at
https://github.com/micahflee/onionshare/pull/489
2018-02-05 18:06:37 -05:00
Micah Lee
5dad0e81a3
Increase minimum window width 2018-02-05 09:46:22 -08:00
Micah Lee
021c1ddc24
Stylize the server button 2018-02-05 09:44:17 -08:00
Micah Lee
5328a6f7f6
Resize the window when adding new files 2018-02-05 09:33:31 -08:00
Micah Lee
fd089f8803
Move autostop timer checkbox below the start sharing button 2018-02-05 09:29:28 -08:00
Micah Lee
83c9cd4e00
Show or hide primary action layout section the first time, in case filenames are passed in from the cli 2018-02-05 09:26:05 -08:00
Micah Lee
cf1ff97ce9
Create a "primary action" layout, and only show it when there are files in the file list 2018-02-05 09:24:43 -08:00
Micah Lee
8dd9b045cc
Add delete button back, but only show it when files are selected 2018-02-04 21:45:35 -08:00
Micah Lee
0bb9bf649d
Remove delete button, use delete X's instead 2018-02-04 21:18:41 -08:00
Micah Lee
e17dbd4fdd
Only do the fake item hack if there are items in the list 2018-02-04 20:50:24 -08:00
Micah Lee
d892213db1
Move DropHereLabel and DropCountLabel classes out of FileList 2018-02-04 20:36:34 -08:00
Micah Lee
52d080d2a3
Give file items widgets, so they can soon contain working delete buttons 2018-02-04 20:09:51 -08:00
Micah Lee
ea7420e0cf
When dragging files into the window, highlight the drop area in blue and show a count of files to be added 2018-02-04 19:28:42 -08:00
Micah Lee
ae2140ceb8
Update drag and drop look and instructions 2018-02-04 13:13:38 -08:00
Micah Lee
cedfd5deff
Merge branch '535_force_update_check_via_qthread' of https://github.com/mig5/onionshare into mig5-535_force_update_check_via_qthread 2018-01-30 21:28:25 -08:00
Miguel Jacq
8cc651a370
#523 prioritise connecting to the v3 onionshare site when checking for updates, if Tor version is >= 0.3.2.9 2018-01-24 11:37:48 +11:00
Miguel Jacq
a28f427c0c
reinstate the emitted signals for invalid version/error checking for updates 2018-01-23 16:51:13 +11:00
Miguel Jacq
70a624c331
#535 do the forced update check via a (non-blocking) QThread 2018-01-23 16:32:14 +11:00
Miguel Jacq
9a3bcb9834
stricter regex of IPv4 as well as IPv6 IPs in custom bridges 2018-01-22 16:24:26 +11:00
Miguel Jacq
16bd3291e3
Support for obfs4 in custom bridges 2018-01-19 15:31:11 +11:00
Micah Lee
713e45084a
Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges 2018-01-17 16:19:30 -08:00
Micah Lee
53e15096e3
Merge branch 'save_autoupdate_setting' of https://github.com/mig5/onionshare into mig5-save_autoupdate_setting 2018-01-17 16:02:03 -08:00
Miguel Jacq
bbb6c8ddf8
Re-load the settings in the UpdateCheck thread before saving, in case settings have changed in between starting thread and saving, so we don't clobber them 2018-01-18 08:43:14 +11:00
Miguel Jacq
4b5319bb4e
Save the use_autoupdate setting 2018-01-18 07:54:19 +11:00
Miguel Jacq
fc2dcafafc
Clarify that obfs4 bridges can't be used as custom bridges, and that obfs4proxy is needed for obfs4 bridges 2018-01-17 16:30:12 +11:00
Miguel Jacq
76cf0ae107
Fix conflicts arising from the reuse_private_key branch 2018-01-16 15:30:36 +11:00
Micah Lee
c29259cdea
Merge branch '528_disable_check_for_updates_if_disconnected' of https://github.com/mig5/onionshare into mig5-528_disable_check_for_updates_if_disconnected 2018-01-14 19:00:39 -08:00
Micah Lee
808c4cfac2
Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file 2018-01-14 18:54:48 -08:00
Miguel Jacq
284213aa2d
support obfs4 via obfs4proxy on macOS 2018-01-15 12:49:29 +11:00
Miguel Jacq
82b1860dac
add missing 'toggled' connect for obfs4 radio. Remove the enabling/disabling of radios for bridges, it obstructs normal UX 2018-01-15 11:25:08 +11:00
Miguel Jacq
55c390eb7f
remove the adjustSize stuff which causes more problems than it solves. Revert the change to positioning of the Test Tor button. Set maximum height for custom bridges QPlainTextEdit widget, seems to help with overlap issues 2018-01-15 10:49:17 +11:00
Miguel Jacq
3e7d4c64ff
Save the slug when using a persistent private key 2018-01-15 10:01:34 +11:00
Miguel Jacq
d9e6650a19 Merge branch 'master' into check_is_valid_file 2018-01-14 20:24:02 +11:00
Miguel Jacq
bf01fcaa6e
Validate syntax of custom bridges 2018-01-14 20:12:24 +11:00
Miguel Jacq
011b635cae
ensure custom bridges hyperlink opens a browser as per #520 2018-01-14 18:57:52 +11:00
Miguel Jacq
bdb10b7eeb
Resolve conflict with upstream's onion.py 2018-01-14 18:53:46 +11:00