mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-09 08:37:27 +03:00
Code Issues Projects Releases Packages Wiki Activity
8674 commits 16 branches 245 tags 256 MiB
Commit graph

1208 commits

Author SHA1 Message Date
Chocobo1
21ec8fe53f
Add allow_multiple_connections_per_ip knob. Closes #5884. 2017-08-21 16:48:38 +08:00
Chocobo1
4185209036
Add mixed_mode_algorithm knob 2017-08-21 16:48:38 +08:00
Chocobo1
6150e0c56b
Add guided_read_cache knob 
cleanup header include order
 2017-08-21 16:48:37 +08:00
sledgehammer999
b649d61e8b
Options to better memory control by libtorrent. Closes #7029. 2017-08-18 20:21:37 +03:00
Eugene Shalygin
3331526865 Use pixmap cache for file icons on Mac OS and Windows. Closes #7264. 2017-08-15 22:25:03 +02:00
vit9696
eb8ff91c5d Fix notification display on macOS 2017-08-15 21:16:37 +03:00
sledgehammer999
f98edcab5c Merge pull request #7272 from vit9696/patch-1 
Fix macOS window restoration after using hide icon
 2017-08-15 21:13:58 +03:00
sledgehammer999
e5ea3bd707 Merge pull request #7253 from briankendall/fix_objc_errors 
Fixed mac specific compiler errors and cleaned up Objective C code. Closes #7252
 2017-08-15 21:06:09 +03:00
sledgehammer999
c87c1d2359
Use simpler ifdef style. 2017-08-15 21:01:55 +03:00
sledgehammer999
25eb2edb86 Merge pull request #7273 from vit9696/borders 
Unify preference window borders across the tabs
 2017-08-15 18:14:11 +03:00
vit9696
1cb69c9b43 Unify preference window borders across the tabs 2017-08-14 20:10:28 +03:00
sledgehammer999
89d8a2fe72 Merge pull request #7251 from Chocobo1/spacing 
Add space between widgets in left side panel. Closes #7224.
 2017-08-14 19:11:54 +03:00
vit9696
16d7301046 Fix macOS window restoration after using hide icon 2017-08-14 12:38:42 +03:00
sledgehammer999
8d913d77dd Merge pull request #7266 from Chocobo1/coverity 
Fix issues found by coverity scan
 2017-08-13 20:10:04 +03:00
Vladimir Golovnev (qlassez)
cff6a64e9f
Use qUtf8Printable() for logging strings 
qDebug(), qInfo(), qWarning(), qCritical(), qFatal() expect %s arguments
to be UTF-8 encoded, while qPrintable() converts to local 8-bit encoding.
Therefore qUtf8Printable() should be used for logging strings instead of
qPrintable().
 2017-08-13 16:14:57 +03:00
Chocobo1
91b2b14ba5
Initialize variables 
Remove unused variable
 2017-08-13 15:28:36 +08:00
Brian Kendall
62b956946f Fixed mac specific compiler errors and cleaned up Objective C code 
Created new file src/gui/macutilities.mm, moved code from mainwindow.cpp and torrentcontentmodel.cpp that used the Objective C runtime into it and converted it to actual Objective C. Rewrote pixmapForExtension() so that it doesn't call into private Qt functions.
 2017-08-11 20:51:16 -04:00
Chocobo1
04552f7921
Add space between widgets in left side panel. Closes #7224. 2017-08-11 21:37:33 +08:00
sledgehammer999
593c24e5bd Merge pull request #7234 from thalieht/indentation 
Remove indentation for category/tag filter widgets in all platforms
 2017-08-11 11:25:24 +03:00
Chocobo1
78dafc9cbe
Prefill torrent name when creating a new torrent. Closes #7229. 2017-08-09 15:26:05 +08:00
thalieht
2da5800665 Remove indentation for category/tag filter widgets in all platforms 2017-08-08 23:43:23 +03:00
sledgehammer999
6270433237
Fix explicit Torrent Management Mode in Add New Torrent dialog. Closes #5602. 2017-08-07 20:01:30 +03:00
sledgehammer999
db653cbdac Merge pull request #7214 from Chocobo1/fixups 
WebUI fixups
 2017-08-07 08:11:32 +03:00
sledgehammer999
766f70c81a Merge pull request #7118 from vit9696/master 
Fixed file type icons not displaying on macOS
 2017-08-07 08:10:58 +03:00
Chocobo1
1bfb8d35cd
Move "Copy hash" menu item above "Copy magnet link" 
Fix wrong "Copy hash" icon used in webUI
Fixup of 145641ac41
 2017-08-06 17:19:55 +08:00
Tom Piccirello
145641ac41 Add copy options to webui context menu (addresses #6815) (#7036) 
* Add copy options to webui context menu
Add Copy Hash to gui (closes #6964)

* Use switch statement

* Use camel case, switch from signal to qaction.

* Rename variable

* Change variable name
 2017-08-06 16:35:12 +08:00
Eugene Shalygin
64b250903f Merge pull request #7083 from tgregerson/tags 
Improve tag selection context menu. Closes #7060
 2017-08-03 21:06:08 +02:00
Tony Gregerson
c5e73219bf Improve checkbox interface for selecting tags in the context menu. Closes #7060 2017-08-02 19:27:00 -05:00
Mike Tzou
5bc3b0138e Merge pull request #7110 from Chocobo1/plugin_signal 
Fix crash when exiting qbt with search plugin update dialog open
 2017-07-21 10:40:54 +08:00
Chocobo1
e7ee59c12f Specify context parameter in connect() 2017-07-20 13:26:36 +08:00
Chocobo1
24a69a9fe7 Fix crash when exiting qbt with search plugin dialog open 
Avoid emitting signal in destructor
 2017-07-20 13:26:36 +08:00
vit9696
7b4316ea8f Fix main menu item location on macOS 2017-07-19 23:48:42 +03:00
vit9696
6c3ab99e3c Fix file type icons not displaying on macOS 2017-07-19 21:37:38 +03:00
sledgehammer999
aa1ddc0df2
Fix typo. 2017-07-18 03:32:06 +03:00
Chocobo1
e73db85fad Use Qt5 connect syntax 2017-07-16 15:03:25 +08:00
Chocobo1
ec16525164 Fix "QObject::connect: No such slot" errors 
Fixup of d25467d3e6
 2017-07-16 15:03:25 +08:00
Chocobo1
1f9eb594e7 Trim whitespaces 2017-07-16 11:47:53 +08:00
vit9696
d25467d3e6 Various macOS UI improvements 2017-07-15 20:49:40 +03:00
Chocobo1
0532d546d7
Implement HTTP host header filtering 
This filtering is required to defend against DNS rebinding attack.
 2017-07-12 17:26:13 +03:00
Eugene Shalygin
23616d5dd0 Merge pull request #7064 from evsh/cachesettingvalue-enum 
Implement enum support in CachedSettingValue
 2017-07-11 16:03:20 +02:00
Eugene Shalygin
d397cf60fb Merge pull request #7065 from evsh/win-svg-tray-icon 
Use SVG files for monochrome tray icons. Closes #6085.
 2017-07-11 10:51:37 +02:00
Eugene Shalygin
228f82bcdc Merge pull request #6967 from thalieht/codingStyle 
Coding style for several files
 2017-07-06 18:17:02 +02:00
sledgehammer999
7a478424cc
Revert "Drop python2 support.". Closes #7005. 
This reverts commit 7d030b4cd9.
 2017-07-06 01:07:09 +03:00
Eugene Shalygin
e66dba6a2d Use SVG files for monochrome tray icons. Closes #6085. 2017-07-05 22:00:02 +02:00
Eugene Shalygin
a22d2f0139 Implement enum support in CachedSettingValue 
Enums are stored as strings, that improves configuration file
readability and maintainability. String values are obtained via
QMetaEnum, and since with Qt 5.5 QMetaEnum::fromType() includes a
static_assert, this has to be a safe method.
 2017-07-05 12:41:58 +02:00
sledgehammer999
8e6df572a8 Merge pull request #6156 from evsh/file-icons 
Use system file type specific icons in contents tab
 2017-07-03 18:06:22 +03:00
Eugene Shalygin
57493c5556 Add QFileIconProvider implementation using mime database 
If built-in QFileIconProvider does not seem to work, use custom
implementation which queries mime database.
 2017-07-03 16:49:19 +02:00
Eugene Shalygin
30bf6e958f Use system file type specific icons in contents tab 
The icon is determined via QFileIconProvider using filename extension only.
 2017-07-03 16:49:14 +02:00
Eugene Shalygin
6b65f8add8 Do not show completion when text is not being edited 2017-07-03 12:57:02 +02:00
Eugene Shalygin
8318f72a9e Follow project coding style. Issue #2192. 2017-07-03 11:42:30 +02:00
Eugene Shalygin
11f5738d99 Fix build. 2017-07-03 10:36:52 +02:00
Eugene Shalygin
62be2d7400 cmake: fix build 2017-07-03 10:36:42 +02:00
thalieht
91f528bc96 Fix coding style for several files 
trackerlist
autoexpandabledialog
previewselect
shutdownconfirmdlg
torrentcontentfiltermodel
torrentcontenttreeview
peerlistsortmodel.h
 2017-06-30 23:44:12 +03:00
Vladimir Golovnev
3181469d87 Merge pull request #6911 from tgregerson/tags 
Add a Tags system to the GUI to expand torrent organization / filtering options. Closes #13.
 2017-06-26 15:57:27 +03:00
Tony Gregerson
467e516801 Add a Tags (multi-label) feature to the GUI. Closes #13. 
See https://github.com/qbittorrent/qBittorrent/issues/13 for details.
 2017-06-25 13:53:07 -05:00
sledgehammer999
7d030b4cd9
Drop python2 support. 2017-06-25 17:20:50 +03:00
sledgehammer999
a77e1c9f36
Use qt5 connect style for searchengine, pluginselectdlg and searchwidget. 2017-06-22 18:54:30 +03:00
sledgehammer999
dee0b63cc5
Aggregate installed/updated plugin names and use a single messagebox to inform the user. 2017-06-22 18:54:29 +03:00
sledgehammer999
c2a2d306da
Use alternative method for plugin favicon validity. Drop unnecessary code. 2017-06-22 18:54:28 +03:00
sledgehammer999
34c29b78f9
Update the backend when a new plugin favicon is downloaded. 2017-06-15 22:32:43 +03:00
sledgehammer999
8c98c8cb3f
Put copyright warning message to the search plugin dialog. 2017-06-15 22:32:42 +03:00
sledgehammer999
fc543b9db6
Display instructions when no search plugin is installed. 2017-06-15 22:32:41 +03:00
Eugene Shalygin
fff6640127 Merge pull request #6820 from evsh/fspathedit-visual-feedback 
Add visual feedback for wrong paths in FileSystemPathEdit
 2017-06-10 20:19:39 +02:00
Eugene Shalygin
574fed04fc Add visual feedback for wrong paths in FileSystemPathEdit 2017-06-10 17:09:20 +02:00
Vladimir Golovnev (Glassez)
66aeafdc63 Fix crash in ArticleListWidget 
ArticleListWidget::handleArticleList() can be called inside
ArticleListWidget::handleArticleAboutToBeRemoved() and list widget
item can be removed at this point. Now we checking for it existence.
Closes #6896.
 2017-06-07 18:24:43 +03:00
Mike Tzou
6f6a17341f Merge pull request #6859 from Chocobo1/cookie_select 
Manage Cookies dialog improvements
 2017-06-05 11:58:09 +08:00
sledgehammer999
b5c0d90e9c Merge pull request #6842 from Chocobo1/countPieces 
[TorrentCreator] Show total number of pieces. Closes #6774.
 2017-06-02 08:56:10 +03:00
KingLucius
1b9882b3a3 Fetch Favicons via google 2017-05-31 22:21:25 +02:00
Mike Tzou
70d0fb741f Merge pull request #6870 from Chocobo1/ui 
Fix focusing on the previously opened dialog didn't work
 2017-05-31 12:26:27 +08:00
Chocobo1
4a4e3a13e6 Fix focusing on the previously opened dialog didn't work 
Placing modeless dialog A on top of modeless dialog B, then open dialog B again,
the expected behavior is B on top of A.
 2017-05-30 14:09:01 +08:00
Eugene Shalygin
ff80208534 Merge pull request #6868 from evsh/no-old-style-cast 
Replace C-style casts with C++ ones
 2017-05-29 17:47:01 +02:00
Vladimir Golovnev (Glassez)
a8bcc2ee52 Fix empty statusbar showed after app restarted 2017-05-29 18:38:17 +03:00
Eugene Shalygin
74cecb1b6c Replace C-style casts with C++ ones 2017-05-29 17:25:42 +02:00
Chocobo1
1ac7d779a7 Set expiration date for newly added cookie to +2 years from now, instead 
of +99 years.

This fixes the ambiguity that users could assume the date was in the
past, but in fact it's in the future.
Ex. now date is 5/28/17, +99 years = 5/28/16, +2 years = 5/28/19
 2017-05-29 14:10:47 +08:00
Chocobo1
a585b02e76 Enable alternatingRowColors for "Manage Cookie" dialog 
Set editTriggers property to AllEditTriggers for easier editing.
Now a single mouse click can initiate item editing instead of double
clicking.
 2017-05-29 14:10:47 +08:00
Chocobo1
d8083dd985 Allow to select & delete multiple entries in "Manage Cookies" dialog 2017-05-29 14:10:47 +08:00
Vladimir Golovnev
e3671050d1 Merge pull request #6840 from glassez/statusbar 
Add show/hide statusbar option (Supersede #4029)
 2017-05-27 22:22:34 +03:00
KingLucius
dedd31ada5 Fix crash when delete RSS feed 2017-05-27 13:52:32 +02:00
Eugene Shalygin
ae5932a573 Merge pull request #6848 from evsh/fix-piecebar-crash 
Fix crash in download piece bar
 2017-05-27 13:24:14 +02:00
Chocobo1
c618214061 [TorrentCreator] Show number of pieces. Closes #6774. 2017-05-27 16:37:08 +08:00
Eugene Shalygin
6d9eec0e71 Fix crash in download piece bar 
When torrent size is smaller than the image width, bytes per pixel was
set to zero and code was crashing. Set it to -1 instead, as we do when
image is empty. This will disable highliting, but our algorithm does not
work in this case anyway.
 2017-05-26 21:47:51 +02:00
Vladimir Golovnev (Glassez)
c456b9a42c Refactor and improve StatusBar 2017-05-26 18:11:26 +03:00
takiz
0940a8a764 Add show/hide statusbar option 2017-05-25 16:35:21 +03:00
Mike Tzou
1f9ccb44a3 Merge pull request #5196 from Chocobo1/creator_pr 
Revamp Torrent creator
 2017-05-24 17:40:10 +08:00
Mike Tzou
92decf83b8 Merge pull request #6330 from Chocobo1/rename 
Fix renaming files is not case sensitive on Windows platform
 2017-05-24 13:12:30 +08:00
Chocobo1
7eed1a108e Rename variables 
Add myself to authors list
 2017-05-24 11:54:42 +08:00
Chocobo1
7e87eeb2d4 Use QThread::requestInterruption() instead of m_abort flag 2017-05-24 11:54:42 +08:00
Chocobo1
60524348f0 Enlarge combobox to fix its contents 2017-05-24 11:54:42 +08:00
Chocobo1
9f2fe2b678 Move CachedSettingValue instances to header file 2017-05-24 11:54:42 +08:00
Chocobo1
a4141fd151 Simplify m_creatorThread initialization 2017-05-24 11:54:42 +08:00
Chocobo1
7de1aba092 Switch to modeless dialog 
Don't close dialog after creating torrent
Show progress bar all the time
 2017-05-24 11:54:42 +08:00
Chocobo1
d277696acc Add global.h file 2017-05-24 11:54:42 +08:00
Chocobo1
2e8c01d88c Use CachedSettingValue 2017-05-24 11:54:42 +08:00
Chocobo1
908481885c Enable drag n drop to create torrent on mainwindow 2017-05-24 11:54:42 +08:00
Chocobo1
6bab30a178 Revamp Torrent creator 2017-05-24 11:54:42 +08:00
Eugene Shalygin
b82edc561f Merge pull request #6821 from evsh/do-not-hardcode-rss-colors 
Do not use hardcoded colors in RSS feed view
 2017-05-22 10:58:02 +02:00
Eugene Shalygin
72da2e7252 Do not use hardcoded colors in RSS feed view 2017-05-21 13:02:34 +02:00
Mike Tzou
7f089db942 Merge pull request #6802 from Chocobo1/size 
[Quick Fix] Cleanup options dialog
 2017-05-20 11:17:44 +08:00
Mike Tzou
ce36a7ca62 Merge pull request #6498 from thalieht/trackerList 
Trackerlist: Add toggle columns menu
 2017-05-19 15:06:42 +08:00
Eugene Shalygin
4b48f7b8d9 Fix build error. 2017-05-18 16:41:49 +02:00
Chocobo1
2702410572 Remove useless horizontal layout widget 2017-05-18 19:48:36 +08:00
Chocobo1
e24b565857 Remove unused row in "Share Ratio Limiting" group box 2017-05-18 18:40:40 +08:00
Chocobo1
fad3af27ca Partialy revert 7320ac1bc0 
Reverts back options dialog size
Also removes unused tabstops
 2017-05-18 18:12:32 +08:00
Vladimir Golovnev
927ecc7075 Merge pull request #4266 from naikel/seed_until 
Share torrents until seeding time reaches an specific amount of minutes
 2017-05-18 07:12:24 +03:00
Vladimir Golovnev
c4ccf6b774 Merge pull request #6714 from fbriere/issue/6708-sort-categories 
Fix instances where categories where still sorted case-sensitively. Closes #6708.
 2017-05-17 21:47:20 +03:00
Naikel Aparicio
9ba00d7035 Implemented share limit by seeding time 2017-05-17 14:33:17 -04:00
Chocobo1
08a6c75227 Refactors 
Rename variables
Refactor to return early instead of introducing a scope
Revise dialog title & messages
Refactor code logic
 2017-05-17 21:28:46 +08:00
Eugene Shalygin
8ca730f0d8 Use new signal/slot syntax in options dialog 2017-05-17 12:38:27 +02:00
Vladimir Golovnev
44f8a48d73 Merge pull request #6724 from glassez/libt11 
Don't use features, deprecated in libtorrent-1.1
 2017-05-16 18:54:00 +03:00
Eugene Shalygin
954f05b4a9 Merge pull request #5375 from evsh/filename-edit-widget 
Add a widget for editing file names
 2017-05-15 09:33:28 +02:00
Chocobo1
b9403774e6 Use QBT_EXT in all places 
Cleanup headers on the way
 2017-05-13 16:20:32 +08:00
Chocobo1
b18bf48014 Improve error message reported to user 
Should not contain "file" or "folder", because it's not clear which type is selected.
 2017-05-13 16:16:59 +08:00
Chocobo1
51e3e5438b Code formatting 
Refactor
 2017-05-13 16:16:59 +08:00
Chocobo1
0939875ca8 Fix renaming files is not case sensitive on Windows platform. Closes #5128. 2017-05-13 16:16:59 +08:00
Mike Tzou
a2d5d48aff Merge pull request #6730 from Chocobo1/icontray 
Fix double click on system tray icon causing program to open and minimize immediately
 2017-05-13 02:32:37 +08:00
Eugene Shalygin
5c10a24923 Add availability column to torrent properties window 2017-05-12 17:15:00 +02:00
Eugene Shalygin
d5af8722a6 Add availability column to torrent content model 2017-05-12 17:14:59 +02:00
Eugene Shalygin
114c9a8421 Follow project coding style. Issue #2192. 2017-05-12 17:06:18 +02:00
thalieht
73c37cc460 Trackerlist: add "m_" to private members and make them camelCase 2017-05-11 19:15:00 +03:00
thalieht
14f50f1038 Trackerlist: Allow to toggle columns 2017-05-11 19:15:00 +03:00
thalieht
d9555a9e9d Trackerlist: Set text alignment of columns with numbers to the right 2017-05-11 16:53:31 +03:00
thalieht
5d33399000 TrackerList: Remove unnecessary deletes from the destructor 2017-05-11 16:53:31 +03:00
thalieht
33979cb41c TransferListWidget: Remove unnecessary deletes from the destructor 2017-05-11 16:53:31 +03:00
thalieht
e82a1522c8 Trackerlist: Change 0 to nullptr 2017-05-11 16:53:31 +03:00
thalieht
e00be240b0 PropertiesWidget: Change 0 to nullptr 2017-05-11 16:53:31 +03:00
thalieht
b360c5453b PropertiesWidget: Some coding style 2017-05-11 16:53:31 +03:00
thalieht
ce77ebdfe1 Coding style of whole trackerlist.h and a little in trackerlist.cpp 2017-05-11 16:53:31 +03:00
Eugene Shalygin
a997b7d078 Merge pull request #6770 from evsh/fix-6768 
Do not attempt to show detailed tooltips without torrent metadata. Closes #6768.
 2017-05-11 09:51:58 +02:00
Eugene Shalygin
f211b238c4 Do not attempt to show detailed tooltips without torrent metadata. Closes #6768. 
Computations for detailed tooltips are not protected against unavailable
metadata, that leads to asserts or crashes. But since those tooltips are
useless in this case, do not show them at all. Inform user that detailed
tooltip becomes available once torrent metadata are fetched.
 2017-05-11 01:10:23 +02:00
Vladimir Golovnev (Glassez)
a4d2df575e Don't use deprecated torrent_handle::set_tracker_login 2017-05-10 13:54:29 +03:00
Vladimir Golovnev (Glassez)
5dc54aa224 Don't use deprecated torrent_status fields 2017-05-10 13:54:28 +03:00
Vladimir Golovnev (Glassez)
bdca55f15c Use new Session Statistics feature 2017-05-10 13:24:51 +03:00
Vladimir Golovnev (Glassez)
8a6d8f3953 Use cached SessionStatus and CacheStatus 2017-05-10 13:24:37 +03:00
Vladimir Golovnev (Glassez)
cb678a254d Fix statsdialog.* coding style 2017-05-10 13:23:51 +03:00
Chocobo1
42c17ea5ce Fix argument name differ in definition & declaration 2017-05-09 14:12:36 +08:00
Chocobo1
b9e8cab1e5 Revise class memebers construction & destruction 
Use nullptr
Delete m_contentDelegate on close
Remove redundant deletion of m_contentModel since parent is setup
correctly
 2017-05-09 13:45:30 +08:00
Chocobo1
4d4097d819 Move editHotkey out of class definition 
Also since parent is setup correctly, remove the redundant delete
 2017-05-09 13:03:14 +08:00
Eugene Shalygin
7320ac1bc0 Use file path edit widgets in options and add torrent dialog 2017-05-08 10:08:29 +02:00
Eugene Shalygin
30081e0356 Add widget for editing filesystem paths 2017-05-08 10:08:29 +02:00
sledgehammer999
d61fc7e820 Merge pull request #3858 from Chocobo1/screen_center 
Fix dialogs didn't position on the correct screen
 2017-05-07 22:17:55 +03:00
sledgehammer999
a4d5ac4b17 Merge pull request #4739 from sledgehammer999/web_translations 
Don't duplicate translatable strings for the WebUI. Use the ones from…
 2017-05-07 16:24:53 +03:00
sledgehammer999
e177799ada
[WebUI]Make the context obligatory for translatable strings. Also delete duplicate strings from extra translations. 2017-05-05 03:46:33 +03:00
Vladimir Golovnev (Glassez)
76e3383650 Don't remove read articles from Unread list 
Revert back old behavior (incorrect but, perhaps, more user-friendly),
when Unread list populates with "unread" articles only but then it can
contain "read" articles if they become "read" when Unread list is shown.
 2017-05-04 20:37:05 +03:00
Frédéric Brière
c37d90bf6d Properly sort categories case-insensitively in filter widget. Closes #6708. 2017-05-04 10:56:45 -04:00
Frédéric Brière
722c928ab5 Turn isSpecialItem() into a CategoryFilterModel static method. 2017-05-04 10:41:36 -04:00
Vladimir Golovnev (Glassez)
2d3914c077 Prevent incorrect popullating of Unread RSS list 2017-05-04 12:39:59 +03:00
Vladimir Golovnev (Glassez)
4e37688105 Properly clear ArticleListWidget 2017-05-04 12:30:02 +03:00
Frédéric Brière
f53a403a7b Set "category" column as case-insensitive in TransferListSortModel. 
(From what I can tell, it would appear that the sorting was already
case-insensitive by default.  This makes it explicit.)
 2017-05-03 14:07:55 -04:00
Frédéric Brière
ec08cb5445 Leave categories order intact in "Add new torrent" dialog. 
The categories are already properly sorted in AddNewTorrentDialog; this
second case-sensitive sort undid all that.

This partially addresses #6708.
 2017-05-03 14:07:55 -04:00
Chocobo1
da581dee41 Fix double click on system tray icon causing program to open and 
minimize immediately

Closes #5826.
Simply ignore DoubleClick event, as it always come after Trigger
event
 2017-05-03 00:14:51 +08:00
Chocobo1
3e964212ac Fix signaling to checkForUpdatesFinished() failed. 
Fixup of 14e168039c.
 2017-05-02 20:33:21 +08:00
Chocobo1
1fbf121506 Fix CookiesDialog position 2017-05-01 16:02:09 +08:00
Chocobo1
f36e891010 Fix trackersadditiondlg position 2017-05-01 15:32:08 +08:00
Chocobo1
bd2f69a9d6 Fix peeradditiondlg position 2017-05-01 15:32:08 +08:00
Chocobo1
6f6fe626a1 Fix shutdownconfirm position 2017-05-01 15:32:08 +08:00
Chocobo1
fb9ebce9c6 Fix pluginselectdlg position 
Fix peerlistwidget position
Fix mainwindow position
 2017-05-01 15:32:08 +08:00
Chocobo1
2258e4d5ed Fix automatedrssdownloader position 2017-05-01 15:32:08 +08:00
Chocobo1
73047e3c84 Cleanup downloadfromurldlg, statsdialog 2017-05-01 15:32:08 +08:00
Chocobo1
933f9f1451 Fix optionsdlg position 2017-05-01 15:31:58 +08:00
Chocobo1
46abe42a54 Fix deletionconfirmationdlg position 
Fix autoexpandabledialog position
Fix previewselect position
 2017-05-01 15:30:41 +08:00
Chocobo1
a902eb6b2b Fix speedlimitdlg position 2017-05-01 15:30:38 +08:00
Chocobo1
de54fa2c30 Fix addnewtorrentdialog position 
Fix messageBox position
 2017-05-01 14:48:10 +08:00
sledgehammer999
67f44e03a2 Merge pull request #6689 from briankendall/fix_macos_addnewtorrentdialog_bug 
Fix for macOS-specific bug in AddNewTorrentDialog
 2017-04-30 22:29:51 +03:00
Brian Kendall
eba41978b0 Added command line arguments for specifying options when adding torrents 
Arguments include adding torrents as paused/started, skiping hash check, setting category, downloading in sequential order, downloading first and last pieces first, and skipping the 'add new torrent' dialog. Added TriStateBoolOption class for specifying options that don't have a default value when unused (e.g. add-paused). Also improved command line usage text to include more information, have better organization, and not exceed 80 columns in width. Also also added firstLastPiecePriority field to BitTorrent::AddTorrentData, and modified TorrentHandle so that if first/last piece priority should be on, it will be toggled on after the torrent's metadata has loaded.
 2017-04-30 14:22:30 -04:00
Vladimir Golovnev
c50cee8feb Merge pull request #6686 from glassez/fix-nullptr 
Fix RSS GUI bugs
 2017-04-27 12:55:44 +03:00
Vladimir Golovnev (Glassez)
a78a1a9c64 Add invariant checking in ArticleListWidget 2017-04-27 12:31:18 +03:00
Vladimir Golovnev (Glassez)
335443e6a0 Drop QThread::msleep wrapper 2017-04-26 10:44:47 +03:00
Brian Kendall
59e6a4298d Fixed macOS-specific bug in AddNewTorrentDialog 
Because AddNewTorrentDialog is a sheet in macOS, repositioning it causes bad things to happen, particularly if the main dialog is on a secondary monitor.
 2017-04-25 13:34:06 -04:00
Vladimir Golovnev (Glassez)
6764de8ef0 Fix ArticleListWidget adds new articles in wrong order 2017-04-25 13:15:11 +03:00
Vladimir Golovnev (Glassez)
71814885aa Fix ArticleListWidget doesn't clear properly 2017-04-25 13:14:55 +03:00
Vladimir Golovnev (Glassez)
abfcfb5af0 Fix possible null pointer dereference 2017-04-25 13:01:34 +03:00
Vladimir Golovnev
e433cbab97 Merge pull request #6677 from glassez/fix-create-subfolder 
Allow strip root folder using default settings
 2017-04-24 12:21:53 +03:00
Vladimir Golovnev (Glassez)
c799923d7d Allow strip root folder using default settings 2017-04-24 12:03:35 +03:00
Eugene Shalygin
c865ba2803 Merge pull request #6671 from zywo/cmake-build 
Fix CMake build
 2017-04-23 14:16:39 +02:00
Vladimir Golovnev (qlassez)
f259bde275 Fix "Create subfolder" in AddNewTorrentDialog 2017-04-23 15:05:03 +03:00
zywo
51104a9fb4 Fix CMake build 2017-04-23 09:29:27 +01:00
Vladimir Golovnev (Glassez)
989a70fe60 Redesign RSS subsystem 2017-04-23 09:03:46 +03:00
Eugene Shalygin
14e168039c Use explicit class for search plugin versions 2017-04-21 09:47:08 +02:00
sledgehammer999
ae0a9d74c4 Merge pull request #6487 from Chocobo1/ui 
GUI polish
 2017-04-18 04:01:13 +03:00
Eugene Shalygin
4e1b7c3b87 Remove generated include from headers 
Not only fixes compilation with CMake 3.8 (without messing with include
paths) but makes sources cleaner.
 2017-04-17 16:31:19 +02:00
Eugene Shalygin
34798399da cmake: fixes for cmake 3.8 
AUTOUIC seems to became stricter.
 2017-04-17 16:27:24 +02:00
Vladimir Golovnev (Glassez)
22178f9997 Fix strip torrent root folder 2017-04-15 17:33:20 +03:00
Vladimir Golovnev (Glassez)
d413bc65ef Improve strip torrent root folder 
Fix issue when you rename the "root item" in the "Add New Torrent" dialog
and uncheck "Create subfolder", it will create the subfolder with the
renamed name.
Fix PropertiesWidget first folder is expanded after app restart.
Strip root folder if torrent was added via magnet link.
Fix crash when you get name of torrent without metadata.
 2017-04-15 10:11:53 +03:00
sledgehammer999
4b2d8a7941 Setting for creating subfolder on multifile torrents. Closes #588. 2017-04-15 10:11:53 +03:00
Eugene Shalygin
0bf7fa15c1 Replace wrappers in base/utils/fs.h with Profile::SpecialFolders::location() 2017-04-12 00:50:33 +02:00
Chocobo1
812bd4c83a Uncrustify 2017-04-05 17:39:44 +08:00
Chocobo1
a86f189f53 Relax comparsion for floating point 2017-04-05 17:36:47 +08:00
Chocobo1
59556dfc6a Cleanup & refactor 2017-04-05 17:36:47 +08:00
Chocobo1
86e82c71e5 Setup parent pointer 
Rely on Qt to do the delete, since the parent ownership is setup
correctly.
 2017-04-05 17:36:36 +08:00
sledgehammer999
b2528f7573 Merge pull request #6581 from Chocobo1/set_location 
Fix cancel "Set location" causes files move to installation dir
 2017-04-04 01:15:27 +03:00
Chocobo1
5de505acfe Cleanup headers 
Remove unused headers
Sort header includes
 2017-03-30 16:45:11 +08:00
Chocobo1
faaafce35b Fix cancel "Set location" causes files move to installation dir. 
Closes #6568.
 2017-03-30 16:45:10 +08:00
Chocobo1
0d3c670728 Add log message 2017-03-30 16:45:10 +08:00
epicgirl1998
f904cfa32d Remove extra space 
fixes https://github.com/qbittorrent/qBittorrent/issues/6523
 2017-03-17 03:43:49 +02:00
Eugene Shalygin
3091e03a95 Fix CMake build 2017-03-08 09:12:49 +01:00
Chocobo1
a16c557137 Always draw background 2017-03-08 14:36:42 +08:00
Chocobo1
2b2b3a4fe7 Fix downloaded/uploaded columns were not highlighted properly when selected. 
Refactor
 2017-03-08 14:36:09 +08:00
sledgehammer999
bc910798da
Indicate bitness in stackstrace and about dialog. Closes #6172. 2017-03-08 01:01:17 +02:00
sledgehammer999
a7dcf20ed1
Fix state of IP filter widgets. 2017-03-08 00:30:54 +02:00
sledgehammer999
aa51907387
Merge pull request #6369 from magao/issue6367 
Use Perl-compatible regexes for RSS rules. Closes #6367.
 2017-03-08 00:04:17 +02:00
sledgehammer999
147f4d76e2 Merge pull request #6445 from Chocobo1/fix 
Follow http user-agent format
 2017-03-07 23:38:14 +02:00
sledgehammer999
7a6da3d3ce
Merge pull request #6479 from Chocobo1/qt4 
Remove remainings of Qt4
 2017-03-07 23:28:56 +02:00
sledgehammer999
b90db12ba0
Use a QTreeView and a sort proxy in the manually banned IP list to have a consistent sort order with QStringList::sor(). 2017-03-07 23:16:51 +02:00
sledgehammer999
14513cd81f
Allow edit of manually banned IPs regardless if an IP filter has been set. 2017-03-07 23:16:43 +02:00
Chocobo1
87384ca2a2 Replace Utils::String::toHtmlEscaped() by QString::.toHtmlEscaped() 2017-03-07 00:03:53 +08:00
Chocobo1
7539bee5c5 Remove remaining QBT_USES_QT5 defines. 
Fixup of e64bb1de8c.
 2017-03-06 23:47:07 +08:00
dzmat
59de1af31b implemented UI for managment of locally banned IP list (Closes #1837 ) 2017-03-06 19:40:34 +07:00
Chocobo1
2091dfaa69 Follow http user-agent format 
Add version variable without the starting "v"
 2017-03-06 14:42:32 +08:00
Chocobo1
cb1646be32 Prepend QBT_ for preprocessor variables 2017-03-06 13:41:58 +08:00
sledgehammer999
fc49856857 Merge pull request #6391 from Chocobo1/cert 
Allow QSsl::Ec as private key format
 2017-03-06 01:22:09 +02:00
Eugene Shalygin
e64bb1de8c Drop Qt 4 support 2017-03-05 22:24:59 +01:00
Chocobo1
6ca3e4f094
Add Utils::String::toHtmlEscaped 2017-03-03 21:28:30 +02:00
sledgehammer999
31b69ae6f6
Update copyright year. 2017-03-03 21:26:38 +02:00
sledgehammer999
9e56f3d318 Merge pull request #6385 from thalieht/Trackerlist 
Trackerlist: Seperate seeds from peers for DHT, PeX, LSD
 2017-02-20 01:53:54 +02:00
sledgehammer999
4adcd03ec7 Merge pull request #6366 from Chocobo1/rand 
Replace rand()
 2017-02-20 01:49:27 +02:00
Chocobo1
759bf4d73d Allow to load/use ECDSA certificate in webUI. 
Limit max read size
Improve messages in dialogs
Refactor
 2017-02-17 12:23:51 +08:00
Chocobo1
511796f74e Replace rand() by a true uniform distribution generator 2017-02-16 12:21:26 +08:00
thalieht
4f1c428d8f Seperate seeds from peers for DHT, PeX and LSD 2017-02-15 21:24:47 +02:00
murlakatamenka
78438d7044 Update mainwindow.h (remove duplicate declaration) 2017-02-11 21:36:52 +03:00
Tim Delaney
f9abd254f4 Use Perl-compatible regexes for RSS rules. Closes #6367. 
--HG--
branch : magao-dev
 2017-02-11 16:33:18 +11:00
sledgehammer999
73f762250c Merge pull request #6358 from Chocobo1/coverity 
Fix issues on coverity
 2017-02-08 15:34:45 +02:00
Chocobo1
4ad541d066 Fix coverity issues 
torrentcontentmodel: Use a variable to store filesCount
optionsdlg: add fallthrough comment to suppress warning
speedPlotview: initialize member
misc: fix wrong type used, add spaces
 2017-02-08 13:49:47 +08:00
Tim Delaney
c0339d4f6a Fix regex RSS matching. Closes #6337. 
--HG--
branch : magao-dev
 2017-02-05 08:53:33 +11:00
Tim Delaney
f96eb587ff Bugfix RSS feed list and rules editor. Closes #3782, #6281. 
--HG--
branch : magao-dev
 2017-01-22 15:36:27 +11:00
Tim Delaney
e4d9e9f63f Follow project coding style. Issue #2192. 
--HG--
branch : magao-dev
 2017-01-29 09:24:41 +11:00
sledgehammer999
f6a941defc Merge pull request #6294 from thalieht/hotkeys 
Add hotkeys for some things. Closes #2090
 2017-02-06 22:41:30 +02:00
sledgehammer999
01ddf23745
Remove unnecessary semicolon. 2017-02-06 18:52:04 +02:00
sledgehammer999
83009adbc0
Use same casting method and fix code style. 2017-02-06 18:52:03 +02:00
sledgehammer999
c8f955e302
Fix previous commit. 2017-02-06 18:51:56 +02:00
thalieht
0240c87095 TransferListWidget: Some coding style 2017-02-06 17:52:40 +02:00
thalieht
5675021895 enable RSS, Search and Execution Log widgets before switching to them via hotkeys 2017-02-06 17:52:40 +02:00
sledgehammer999
12b73747f5
Merge pull request #3058 from VladimirSinenko/master 
Fixed sort order for datetime columns with empty values (closes #2988)
 2017-02-06 17:49:26 +02:00
sledgehammer999
d880372b49
Fix unused variable warning by gcc. 2017-02-06 01:20:31 +02:00
sledgehammer999
fa8c69a5e1 Merge pull request #6315 from glassez/cat-tree-state 
Fix category filter widget doesn't save on/off state
 2017-02-06 00:13:59 +02:00
Chocobo1
976504498a Use case-insensitive comparsion for torrent content window. 
Closes #6327
 2017-02-03 23:40:22 +08:00
thalieht
2bb2d3fc89 change all existing shortcuts to use Qt::Keys 2017-01-28 19:43:16 +02:00
sledgehammer999
3b3de81cb7 Merge pull request #6181 from magao/issue6170 
RSS episode filter improvements. Closes #800, #2749, #3876, #6170.
 2017-01-26 01:02:05 +02:00
sledgehammer999
769fe17a21 Merge pull request #6179 from magao/issue6165 
RSS use red text to indicate invalid filter. Closes #6165.
 2017-01-25 23:28:57 +02:00
sledgehammer999
354702140a Merge pull request #6180 from magao/issue6171 
Allow | in RSS must contain. Closes #6171.
 2017-01-25 23:27:59 +02:00
sledgehammer999
5df8ad32fe Merge pull request #6183 from magao/issue6163 
Save rule on enable/disable even if not selected. Closes #6163.
 2017-01-25 23:25:49 +02:00
sledgehammer999
b9b8352a31 Merge pull request #6184 from magao/issue5539 
RSS: allow resetting rule to no category. Closes #5539.
 2017-01-25 23:20:19 +02:00
sledgehammer999
eb3f4b8490 Merge pull request #6283 from Chocobo1/sort 
Use case-insensitive sort for Name column in Search tab. Closes #407.
 2017-01-25 23:07:11 +02:00
sledgehammer999
14ebf2118a Merge pull request #6289 from evsh/cmake 
Cmake compilation fixes
 2017-01-25 23:06:21 +02:00
thalieht
c87cdaea23 add hotkeys for Trackerlist Peerlist etc. 2017-01-25 11:33:33 +02:00
thalieht
0fdd3e23ff add hotkey for execution log tab 2017-01-25 11:33:33 +02:00
thalieht
beddee8dd4 Transferlist: add hotkeys for double click and recheck selected torrents 2017-01-25 10:42:32 +02:00
thalieht
ed900d3e86 change torrentDoubleClicked() so it can be used in a hotkey 2017-01-25 10:11:19 +02:00
Vladimir Golovnev (Glassez)
d79297db1a Save/load category filter widget state 2017-01-22 14:59:03 +03:00
Chocobo1
4669a99617 Use case-insensitive sort for Name column in Search tab. Closes #407. 2017-01-22 11:48:01 +08:00
Eugene Shalygin
180ec7af4a cmake: RSS target has to depend on qbt_base as it uses its includes 2017-01-21 20:12:48 +01:00
Eugene Shalygin
68e8f565e2 Fix cmake compilation 2017-01-21 00:32:00 +01:00
sledgehammer999
cb0f73da57 Merge pull request #5613 from glassez/cat_tree 
Implement category filter widget. Closes #5444.
 2017-01-20 23:21:31 +02:00
sledgehammer999
c8ddd68a7a Merge pull request #6212 from magao/issue2192 
Follow project coding style. Issue #2192.
 2017-01-20 23:13:06 +02:00
Vladimir Golovnev (Glassez)
c002f30848 Implement category filter widget 
Show categories in tree mode when subcategories are enabled.
 2017-01-20 20:55:01 +03:00
sledgehammer999
8d58c52ad8 Merge pull request #6249 from bil-elmoussaoui/master 
Fixes default indicator name
 2017-01-20 19:10:45 +02:00
sledgehammer999
824b90b643 Merge pull request #6269 from Chocobo1/icons 
Fix new icons too large
 2017-01-20 18:33:35 +02:00
sledgehammer999
05def34697 Merge pull request #6157 from Chocobo1/speedLimit 
Speedlimitdlg: raise slider default value to 10000
 2017-01-20 18:24:42 +02:00
Chocobo1
0517a3eb63 Fix rss icon too large in rss settings dialog 
Give a name to the rss icon (in .ui file)
Add helper function: Utils::Misc::largeIconSize()
Group functions under the same #ifdef
 2017-01-20 13:45:50 +08:00
Chocobo1
d52a74092b Reset values to default, these are controled elsewhere. 2017-01-19 23:42:12 +08:00
sledgehammer999
7d7f82ae46
Fix finding 'English' item in language dropdown menu when an unrecognized locale is requested. Closes #6109. 2017-01-19 17:22:40 +02:00
sledgehammer999
fed325a54d Merge pull request #6140 from Chocobo1/relocateNoRemove 
After files relocate, don't remove the old folder even if it is empty
 2017-01-19 15:52:09 +02:00
Chocobo1
fa45ba102c Refactor 2017-01-19 14:21:04 +08:00
sledgehammer999
ba03fb30f3 Merge pull request #5987 from Chocobo1/temp_dir 
Put temp files in .qBittorrent directory
 2017-01-19 01:33:57 +02:00
sledgehammer999
a092cb9bda
Remove settings to exchange trackers. It wasn't used by non-libtorrent clients. Also it has a privacy risk and you might be DDoSing someone. DHT makes it obsolete anyway. 2017-01-19 01:13:55 +02:00
sledgehammer999
18d9403a58 Merge pull request #6098 from dzmat/rename_tab_names 
Clarify options tab page objects names
 2017-01-19 00:14:30 +02:00
sledgehammer999
c43cfbad17 Merge pull request #6182 from magao/issue6164 
Fix tab order in RSS downloader. Closes #6164.
 2017-01-18 20:08:06 +02:00
sledgehammer999
bfec8b8588 Merge pull request #6161 from okeatime/tr 
Avoid unnecessary translation. Closes #6158
 2017-01-18 19:50:40 +02:00
sledgehammer999
d686f2dda6 Merge pull request #6250 from evsh/fix-icon-names 
Fix icon rendering in Linux
 2017-01-18 19:07:41 +02:00
Eugene Shalygin
9bab229108 Adjust icons names to better fit FDO scheme 
An icon theme may use variously styled icons for various types of UI
elements. For example, Breeze theme uses monochrome icons for actions
(toolbars) and statuses, but colourful for view contents. qBittorrent
was using icon names without putting attention to categories, creating
mix of styles in UI elements (i.e. the main toolbar).

This commit fixes icon names (and move some of them to theme) to avoid
this style mixes where possible.

Unfortunately, options dialog page icons for network and speed limits
are remained monochrome because there are no Breeze or Adwaita icons to
match.
 2017-01-18 18:03:33 +01:00
sledgehammer999
7d55467f4b Merge pull request #6234 from Chocobo1/scroll 
For each cell setting ignore wheel events. Closes #866.
 2017-01-18 17:40:02 +02:00
Eugene Shalygin
3de105704e Do not resize SVG icons 
An icon which is loaded from SVG file can be rendered in any size and
resolutions natively. We were generating 16x16, 24x24, and 32x32
pixmaps, and not appending but creating new icon. Therefore for SVG
icons we effectively were reducing their quality.

If icon already contains 7 (or more) sizes (16 to 256 px) we do not
resize it anymore.
 2017-01-18 10:26:35 +01:00
Eugene Shalygin
9d3378bd3b Support fallback when selecting theme icons 
Fallback icon theme are not supported everywhere. Hence we mimic
signature of QIcon::fromTheme().
 2017-01-18 10:26:24 +01:00
Bilal Elmoussaoui
ada75cbbe1 fixes default indicator name 
copy icons instead of renaming them, create status folder

rename from *-indicator to *-tray
 2017-01-18 01:13:43 +01:00
Chocobo1
8380edc00c For each cell setting ignore wheel events. Closes #866. 2017-01-13 17:47:46 +08:00
Chocobo1
08aaff379b Fix download & upload icon too large in systray on linux. Closes #6233. 2017-01-13 16:59:59 +08:00
sledgehammer999
c384cc8c8c
Move new icons to their own theme folder. 2017-01-11 18:02:26 +02:00
Tim Delaney
70ce12372d Follow project coding style. Issue #2192. 
--HG--
branch : magao-dev
 2017-01-08 11:46:01 +11:00
Tim Delaney
8949a8ad75 RSS: allow resetting rule to no category. Closes #5539. 
--HG--
branch : magao-dev
 2016-12-31 16:58:01 +11:00
Tim Delaney
2244b7cb66 RSS episode filter refactoring and logging (prep for later commits). 
--HG--
branch : magao-dev
 2016-12-31 18:01:22 +11:00
Oke Atime
e89c32685b
Avoid unnecessary translation. Closes #6158 2016-12-31 01:29:47 +09:00
Chocobo1
14a39ba3c3 Speedlimitdlg: raise slider default value to 10000. Closes #6150. 
Old value 1000 (KB/s) can be a bit small for modern internet.
 2016-12-30 13:41:27 +08:00
Chocobo1
e178e70053 Code rewrite, no behavior change 2016-12-30 13:35:47 +08:00
sledgehammer999
88b2b26007
Don't use hardcoded numbers to refer to columns. 2016-12-30 01:37:26 +02:00
sledgehammer999
2d37a39e43
Allow to change priority for unselected files through the combobox like it is done via the context menu. 2016-12-30 01:37:19 +02:00
sledgehammer999
7ba66e692f
Always show progress and remaining bytes for unselected files. 2016-12-30 01:37:13 +02:00
sledgehammer999
3e375128c0
Use a disabled progressbar's palette for unselected files. 
Thanks to evsh(Eugene Shalygin) for example code.
 2016-12-30 01:37:02 +02:00
dzmat
6ce443424b Clarify options tab page objects names 2016-12-19 19:00:03 +07:00
sledgehammer999
7adb1d7f82 WINDOWS: Make the updater to look for the x64 installer if running x64 version. 2016-12-17 19:46:04 +02:00
sledgehammer999
d330ae2421 Merge pull request #6056 from okeatime/resume_pause 
Make resume/pause menu items clickable. Closes #6040
 2016-12-16 14:59:08 +02:00
Oke Atime
5ae35ea6dc Make resume/pause menu items clickable. Closes #6040 2016-12-16 21:50:09 +09:00
Oke Atime
84da355f4c Case insensitive sort for client clumn. Closes #6054 2016-12-15 15:25:30 +09:00
sledgehammer999
435886bbf0 Fix GUI for proxy settings. Closes #6045. 2016-12-14 17:35:23 +02:00
sledgehammer999
5c4db0fa17 Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. 2016-12-14 17:18:34 +02:00
sledgehammer999
283511116e New translations: Icelandic, Latvian, Malay, Occitan, Uzbek 
Also re-run lupdate.
 2016-12-13 02:09:28 +02:00
sledgehammer999
ba1e5b8d58 Merge pull request #6013 from Chocobo1/mac_warnings 
Fix warnings on macOS
 2016-12-07 16:48:35 +02:00
sledgehammer999
49ed0765e1 Merge pull request #5928 from Chocobo1/rss-view 
Change RSS view layout to horizontal
 2016-12-07 01:44:56 +02:00
Chocobo1
ce3c53b3c4 Replace deprecated classes 2016-12-07 01:31:44 +08:00
Chocobo1
ab187f06da Fix unused variable warnings 2016-12-07 01:31:39 +08:00
sledgehammer999
f7194eecb0 Merge pull request #5997 from Chocobo1/msvc_warnings 
Fix msvc warnings
 2016-12-02 19:15:59 +02:00
Chocobo1
11c2ee81c1 Fix warning C4267. 
conversion from 'size_t' to 'int', possible loss of data.
 2016-12-02 15:32:27 +08:00