Commit Graph

658 Commits

Author SHA1 Message Date
Micah Lee
4d5f1a34cd
Move all stylesheets definitions into Common, so now we no longer have blocks of css spread across the GUI code, and it's easier to re-use stylesheets 2018-05-07 16:21:22 -07:00
Micah Lee
23821ebae6
Make ReceiveMode start using Uploads 2018-05-07 15:44:04 -07:00
Micah Lee
a0db6d0ee7
Rename Downloads method names to remove the word "download" 2018-05-04 18:08:23 -07:00
Micah Lee
be36f3a4b6
Rename some images to reuse in ReceiveMode, and make new upload window button images 2018-05-04 17:57:30 -07:00
Micah Lee
3f624a4a27
Refactor ShareMode and Downloads to remove the Downloads container widget, and make Downloads itself the QScrollArea 2018-05-04 16:57:17 -07:00
Micah Lee
7b25ae1d6b
Remove --shutdown-timeout as an option for onionshare_gui, since GUI options are set in the settings dialog. Also fixed a bug where --local-only and --shutdown-timeout were not compatible in onionshare CLI 2018-05-04 16:43:30 -07:00
Micah Lee
e32e850548
Fix stay_open regression bug. Before, it was closing automatically even when the setting wasn't set. Also, remove the --stay-open option from the GUI, since GUI settings are set in the settings dialog not cli args 2018-05-04 16:35:32 -07:00
Micah Lee
dcea459580
Start building Uploads widget 2018-05-04 16:26:54 -07:00
Micah Lee
30c9f50d2e
Refactor ReceiveMode and Downloads, to push more download-related logic into Downloads 2018-05-04 16:06:24 -07:00
Micah Lee
ed28fdf123
Make receive mode info widget show when server is stated, hide when it is not started 2018-05-04 15:53:34 -07:00
Micah Lee
07152ad969
Start creating the information widget for receive mode, and refactor for share mode 2018-05-03 09:29:54 -07:00
Micah Lee
65dff32702
Make clicking the mode switcher buttons properly adjust the size of the window 2018-05-03 09:14:16 -07:00
Micah Lee
9a076635c5
Make the "download page loaded" and "upload page loaded" messages displayed as systray notifications instead of in the status bar, and make it work for Receive Mode 2018-04-29 16:41:05 -07:00
Micah Lee
4f89082f18
Add support for receive mode's "public mode", which doesn't use a slug. Still needs more testing 2018-04-29 16:33:48 -07:00
Micah Lee
6cfb7026da
Display desktop notification to the user when the receiver closes the server, and finish up closing the server 2018-04-29 15:49:18 -07:00
Micah Lee
6632a4b426
Add two new receive mode settings: receive_allow_receiver_shutdown and receive_public_mode 2018-04-28 21:08:53 -07:00
Micah Lee
2a7f6e0d5a
Make the quit warning work in receive mode, and use a different warning string 2018-04-28 15:23:57 -07:00
Micah Lee
1a4aaa70fa
Fix a race condition where the URL was sometimes getting copied to the clipboard before it was actually generated, causing a crash 2018-04-28 15:00:23 -07:00
Micah Lee
1456361566
Generalize the handling of Tor exceptions, more logging in Web 2018-04-28 13:59:36 -07:00
Micah Lee
5d037a78fa
Remove a log line that prints each timer_callback that I missed 2018-04-28 13:48:31 -07:00
Micah Lee
c1413ad7da
ReceiveMode was overloading timer_callback instead of timer_callback_custom 2018-04-28 13:41:15 -07:00
Micah Lee
74a799f0c1
Work in progress commit, moving the timer_callback logic from ShareMode into Mode so ReceiveMode can use it as well 2018-04-28 12:03:10 -07:00
Micah Lee
406515085e
Fixed crash when starting recieve mode server 2018-04-27 23:19:46 -07:00
Micah Lee
0996e8c064
Change the URL description in receive mode 2018-04-27 23:02:04 -07:00
Micah Lee
2e4db9eb31
Connect the right signals and slots for recieve mode, and now the receive mode server starts 2018-04-27 22:32:20 -07:00
Micah Lee
87d93c097f
Fix server status indicator 2018-04-27 22:20:12 -07:00
Micah Lee
ff55d7df75
Make OnionShareGui use the proper web object 2018-04-26 10:59:38 -07:00
Micah Lee
9e9f65572b
Instead of creating a Web object and passing it into OnionShareGui, now each mode creates its own separate Web object, instantiated in its own way 2018-04-26 09:30:53 -07:00
Micah Lee
4050977899
When you start receive mode, it now runs OnionShareGui.set_server_active, to hide the appropriate mode switchers buttons 2018-04-25 23:03:57 -07:00
Micah Lee
4c6b379889
Split out customization of Mode into _custom() functions, and implement those customizations in ShareMode 2018-04-25 22:59:26 -07:00
Micah Lee
4a1995ef55
Move a lot of logic from ShareMode into generic Mode 2018-04-25 22:14:23 -07:00
Micah Lee
691db6343d
Make ShareMode and ReceiveMode inherit from the same class, Mode 2018-04-25 21:54:28 -07:00
Micah Lee
df346ad0ab
Add receive mode warning 2018-04-25 20:50:56 -07:00
Micah Lee
81382318dc
Forgot to change args passed into ServerStatus 2018-04-25 20:22:29 -07:00
Micah Lee
996f1d3a81
Make different strings for start server button for different modes 2018-04-25 20:14:27 -07:00
Micah Lee
2fc4330ee4
Add ServerStatus to ReceiveMode, and update the server status indicator to have receive statuses too 2018-04-25 09:46:49 -07:00
Micah Lee
10581b1421
Bugfix, settings was throwing an error and quitting when Tor was authenticated, not when it was not authenticated 2018-04-25 09:13:05 -07:00
Micah Lee
edd5d4f78c
Bugfix, TorConnectionDialog was getting instatiated with the wrong arguements 2018-04-25 09:08:50 -07:00
Micah Lee
f149530834
Move more logic from OnionShareGui into ShareMode, when reloading settings 2018-04-25 08:49:43 -07:00
Micah Lee
dd7d97dbbb
Allow changing downloads_dir from SettingsDialog 2018-04-25 08:43:40 -07:00
Micah Lee
a017af0748
Make ShareMode and ReceiveMode directories, and move ShareMode modules into its dir 2018-04-24 17:26:54 -07:00
Micah Lee
b6b61f753d
Update GPL copyright year 2018-04-24 10:07:59 -07:00
Micah Lee
2ee7e74236
Remove the desktop notification setting -- everyone gets them now 2018-04-24 09:26:06 -07:00
Micah Lee
1d7ec585ee
Move the share-related event logic from OnionShareGui.event_callback into ShareMode methods, and other various bugfixes related to the refactor 2018-04-24 09:21:23 -07:00
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