Commit graph

1235 commits

Author SHA1 Message Date
fourtf f1fbd7ee5c Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-08-12 23:30:18 +02:00
apa420 93bbe33664 Cleaned some stuff up and did some things 2018-08-12 21:05:12 +02:00
apa420 320558ee63 more stuff done, does compile, changed vector for map 2018-08-12 20:21:21 +02:00
apa420 05d5709bb9 stuff does compile 2018-08-12 18:54:32 +02:00
apa420 54166ec130 temp stuff 2018-08-12 15:29:40 +02:00
fourtf f6414c9d7e remove settings and paths from Application 2018-08-12 12:56:28 +02:00
Lajamerr Mittesdine 7ff4f12257 Fix Global FFZ emotes in Emote Popup (#663)
There was two instances of Global BTTV emotes.
Changed the second instance to Global FFZ emotes.
2018-08-12 01:12:03 +02:00
fourtf 1ec1ecd52b fixed crash when moderation buttons are enabled 2018-08-12 00:02:05 +02:00
Touhou-fan b3fd278c3c Fix selecting incorrect image (#659) 2018-08-11 23:53:20 +02:00
fourtf 44f5a15da3 turning a lot of includes into forward declares 2018-08-11 22:23:06 +02:00
fourtf 63eaf3b94c fixed not being able to select text backwards 2018-08-11 17:35:46 +02:00
fourtf c768bd9bd9 fixed image animations 2018-08-11 17:15:17 +02:00
apa420 2de99ca9f5 update, should now be working Toasts for splitheader channels 2018-08-11 16:11:51 +02:00
fourtf c719bb6b74 categorized emtotepopup 2018-08-11 14:26:02 +02:00
Rasmus Karlsson 7aa34ef9bc remove c++17 dependency 2018-08-11 14:12:41 +02:00
Rasmus Karlsson 6fa32607d3 fix misspelling of the rapidjson include file thing 2018-08-11 14:10:20 +02:00
apa420 77411f7012 WIP commit 2018-08-11 12:47:03 +02:00
fourtf cf9560508c improving code quality 2018-08-10 20:53:13 +02:00
fourtf edfae49cc9 simplified Image 2018-08-10 18:56:17 +02:00
apa420 125af43d90 Fixed issue, everything except the main feature work now 2018-08-10 00:15:42 +02:00
apa420 5437a6dd4d update which actually let's you compile, but doesn't properly save an item after renaming it 2018-08-10 00:04:50 +02:00
fourtf 6344fa6b23 loading images on their own thread 2018-08-09 20:46:58 +02:00
fourtf bb76a632f4 fixed image size now updating on load 2018-08-09 17:04:15 +02:00
fourtf 878daf6eee added link to license 2018-08-09 16:44:04 +02:00
fourtf cb235ef532 fixed ocd inducing 1 pixel offsets 2018-08-09 16:20:09 +02:00
apa420 5c6d2f36b5 WIP notification settings, doesn't actually work 2018-08-09 15:41:32 +02:00
apa420 b68c7ded5f WIP notification settings, doesn't actually work 2018-08-09 15:41:03 +02:00
fourtf 81f2f8781a fixed window frame for qt 5.11.1 2018-08-09 15:13:11 +02:00
fourtf e1f180ac28 added qt version number to about tab 2018-08-09 06:34:14 +02:00
fourtf 94813fe3df added subfunctions for ChannelView() 2018-08-08 20:06:20 +02:00
fourtf bdfe24035b fixed rectangle being off by 1 pixel in split container 2018-08-08 19:42:14 +02:00
fourtf 5957b87298 minor changes 2018-08-08 15:50:43 +02:00
fourtf d89b62692a refined SplitHeader 2018-08-08 15:35:54 +02:00
fourtf 7a9af4ae84 moved menu code to ripple effect button 2018-08-07 23:46:00 +02:00
fourtf e1b8faacc9 added increased size of drag and drop regions 2018-08-07 09:45:10 +02:00
fourtf 5df231f072 improved split header menu button 2018-08-07 09:38:18 +02:00
fourtf f34063213c fixed split header menu opening in the wrong direction 2018-08-07 09:05:27 +02:00
fourtf 0682214ba7 fixed settings background color 2018-08-07 08:12:44 +02:00
fourtf 381177dd24 refactored EnumFlags 2018-08-07 07:55:31 +02:00
fourtf bfa75330a4 fixed crash 2018-08-07 06:25:58 +02:00
fourtf c26422aec1 refactored MessageBuilder 2018-08-07 01:35:24 +02:00
fourtf f71ff08e68 changed to 80 max column 2018-08-06 21:17:03 +02:00
fourtf defa7e41fa simplified Image a bit 2018-08-06 20:00:04 +02:00
fourtf c71795da17 Merge branch '4tf' 2018-08-06 18:41:30 +02:00
fourtf 35d462d1f1 worked on Image 2018-08-06 18:25:47 +02:00
apa420 43ba408568 Added functionality of customizable split headers #637 (#648)
* Added functionality of customizable split headers

* removed empty line
2018-08-06 16:42:23 +02:00
apa420 c6cfb548f5 added functionality of 'boldness-slider' #647 (#650) 2018-08-06 16:41:27 +02:00
apa420 82460557cb 'ignore highlights' checkbox in user info popup - did request (#618)
* Added 'ignore userhighlights' to userpopup

* removed unecesarry include

* Fixed the todo

* renamed bool

* Did request

* changed some names
2018-08-06 16:40:46 +02:00
apa420 7e3292e900 Dynamic lowercase link setting - did request (#612)
* Added functionality of dynamic lowercase links

* fixed fourtfs request, lajamerr has a better solution though

* Fix matching and lowercasing of domain only.

* Update TwitchMessageBuilder.cpp

Added what fourtf asked in a good  way
NOTE: I removed a : from the regex since otherwise it would fuck up

* fixed stuff and removed debugs

* fixed stuff
2018-08-06 16:40:12 +02:00
fourtf c2e2dfb577 this commit is too big 2018-08-02 14:23:27 +02:00
Rasmus Karlsson 7cdfa173c7 enable external link opening in attributions
Fix #641
2018-07-28 11:20:18 +00:00
apa420 133bd6a766 fixed (live) issue #626 (#631) 2018-07-23 15:12:14 +02:00
DatGuy1 f060907678 Add channel badges and emotes to LogsPopup (#576)
* Add channel badges and emotes to LogsPopup

* Move roomID stuff to seperate function

* Use onSuccess
2018-07-23 14:50:09 +02:00
fourtf 3b3c5d8d75 added code to handle a single connection 2018-07-16 17:23:41 +02:00
apa420 f33cc884b2 Fixed issue with Excluded users not saving from the highlights tab (#624) 2018-07-16 17:09:29 +02:00
fourtf e51c5c692a Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-07-15 20:41:57 +02:00
fourtf 1614b11e42 Refactored TwitchChannel 2018-07-15 20:28:54 +02:00
Rasmus Karlsson f60d649f5e Remove UrlFetch file 2018-07-15 12:11:46 +00:00
Rasmus Karlsson f1af162dab clean up some includes 2018-07-15 12:03:41 +00:00
Rasmus Karlsson c995e2bf0d Remove unused code 2018-07-15 11:10:23 +00:00
Rasmus Karlsson 22bf008bdf Update new settings library version 2018-07-15 11:03:25 +00:00
fourtf 111853c574 improving TwitchChannel 2018-07-14 14:24:18 +02:00
apa420 a720c76dc0 changed an #include (#622) 2018-07-14 08:53:28 +02:00
apa420 ba99d62139 Fixed /ignore and /unignore as well as give description for the command (#611)
* Fixed /ignore and /unignore as well as give description for the command
2018-07-13 22:23:03 +02:00
pajlada aa0059ffe0
Merge pull request #614 from apa420/apa-fixing-timeout-buttons
Fixed issue with timeoutbuttons #613
2018-07-13 22:15:39 +02:00
LajamerrMittesdine 588aad751b Fix QMenus from going out of screen boundaries 2018-07-13 05:56:46 -04:00
apa420 5d2be3ae2a fixed issue with timeoutbuttons #613 2018-07-13 02:06:35 +02:00
apa420 12093d1bb6 Adding elements to the preview in the look tab (#605)
* fixes issue #584

* Added different elements to the preview in the look tab
2018-07-12 18:58:56 +02:00
apa420 fb0cdf78cb Added description when typing /follow (#606)
* Added description when typing /follow

* syntax fix of 1364e0e707
2018-07-12 18:57:11 +02:00
apa420 9dda0a05fa @boldUsernames now work dynamically with the setting (#607) 2018-07-12 18:56:54 +02:00
Lajamerr Mittesdine 12a21b7b1a Fix match linking (#608)
Right now it's matching links even if they have garbage text infront of it. For example, `sahttp://www.google.com`

This change fixes that.
2018-07-12 18:56:08 +02:00
apa420 1d2e56f19d changed return-value of errors to false 2018-07-12 11:11:21 +02:00
apa420 7288c5a0b6 removed unecessary #include 2018-07-12 10:58:29 +02:00
apa420 801779b872 fixed stuff for PR 2018-07-12 10:52:18 +02:00
apa420 c26e18c2bf Added functionality of /follow and /unfollow 2018-07-12 03:54:54 +02:00
Rasmus Karlsson 352da60d07 Fix code formatting (code wasn't clang-formatted)
Shorten "minute" to "m" etc
Fix space-adding inconsistency when adding "seconds"
2018-07-11 16:58:57 +02:00
Rasmus Karlsson 4ea1ed085f Remove unneccesary QString operator= 2018-07-11 16:53:19 +02:00
Nikolai Zimmermann f63d9d3e33 Better time display for timeouts (#601)
* Better time display for timeouts

* remove newline
2018-07-11 16:09:28 +02:00
apa420 db099260ad Added functionality of reading log-size in the moderation-folder (#600) 2018-07-11 14:23:21 +02:00
Lajamerr Mittesdine 727ccd2ff4 Add support for spotify hyperlinking (#597)
* Add support for spotify hyperlinking

* Change open link in browser to open link
2018-07-11 13:50:05 +02:00
apa420 77f904fae4 Fixes the issue with making the chatterino window smaller with long usernames (#588) 2018-07-10 18:31:34 +02:00
23rd c3793121cb Added mention of user by right-clicking on his nickname. (#589)
* Added mention of user by right-clicking on his nickname.

* Removed possibility of choice. Always add @ to username.
2018-07-10 18:27:42 +02:00
Lajamerr Mittesdine d82c647edd Fix new emotes not loading properly because of cache (#596)
Fix #595
2018-07-10 17:47:16 +02:00
Rasmus Karlsson da1627e47d Fix historical messages not triggering highlights
For now they only trigger the highlighting of the message, but not sound
or flash alerts as I think that's weird.

Fix #308
2018-07-08 09:43:44 +00:00
Rasmus Karlsson aaa82dce75 Fix custom highlight sounds not working on Linux 2018-07-08 09:42:48 +00:00
hemirt d2450c298b remove duplicate code (#585) 2018-07-07 22:30:19 +02:00
Rasmus Karlsson ebc47b1463 trim config shit 2018-07-07 22:00:23 +02:00
Rasmus Karlsson 0d40894b47 improve error message in loadEmotes 2018-07-07 21:59:17 +02:00
Rasmus Karlsson 926a753a54 Load twitch emotes on initialize as well
Fix #581
2018-07-07 21:55:09 +02:00
pajlada 2ea3643100
Fix timer stuff (#580)
* Add and sort Network files to chatterino project file
2018-07-07 15:50:05 +02:00
Rasmus Karlsson 55269587f5 Trying out a solution KKona 2018-07-07 13:51:01 +02:00
fourtf 6bf7ba1ebe fixed compilation 2018-07-07 12:03:37 +02:00
fourtf c609a9fd37 started to refactor Application 2018-07-07 11:41:13 +02:00
Rasmus Karlsson 6a418e6e59 Refactor NetworkRequest class
Add followUser and unfollowUser methods to TwitchAccount
2018-07-07 11:09:27 +00:00
Rasmus Karlsson cada32edfd Treat missing returns as errors 2018-07-07 11:09:27 +00:00
Rasmus Karlsson 256aabf746 Remove unused parseJSONFromReply2 function 2018-07-07 11:09:27 +00:00
Rasmus Karlsson efbd0f31e6 Remove getJSON2 function 2018-07-07 11:09:27 +00:00
Rasmus Karlsson faa088b7e5 Remove NetworkManager urlPut function 2018-07-07 11:09:27 +00:00
Rasmus Karlsson 091b597fe9 Remove unused "urlDelete" function from NetworkManager
Allow NetworkRequest to be constructed with a QUrl
2018-07-07 11:09:27 +00:00
Rasmus Karlsson 1f2968934c Remove unused functions in NetworkManager 2018-07-07 11:09:27 +00:00
DatGuy1 b12c4e1d45 Add text command to display logs (#574)
* Add text command to display logs

* Allow @username instead of username
2018-07-07 10:25:12 +02:00
fourtf 280bb4cf8e Renamed private members 2018-07-06 19:24:35 +02:00
fourtf 6935619820 Changed some stuff 2018-07-06 19:24:35 +02:00
fourtf 535c0616a3 Applied project style to multiple files 2018-07-06 18:10:21 +02:00
fourtf 3993708164 Refactored NetworkRequest and misc 2018-07-06 17:56:11 +02:00
fourtf 477d4751f7 refactor CompletionModel 2018-07-06 17:42:00 +02:00
fourtf aa3df2e6d8 refactored Channel 2018-07-06 17:30:12 +02:00
fourtf b639604a47 refactored BaseWidget 2018-07-06 17:11:37 +02:00
fourtf 741c1f7820 refactored Window 2018-07-06 17:03:57 +02:00
fourtf 314c15bb87 Small fixes for the last PR 2018-07-05 22:55:06 +02:00
DatGuy1 086ae010b1 Add viewing logs to UserInfoPopup (#548)
* Add cbenni logviewer

* Remove unneeded includes

* Updated getLogs to check for logs on Overrustle

will check logs on overrustle if none were found on cbenni

* Formatting, fix some bugs

* Fixes per PR comments

* Should really take more time when pushing

* Changes per PR, simplify code a lot

* Style/formatting fixes
2018-07-05 22:47:51 +02:00
fourtf eeb514c444 minor changes 2018-07-05 18:17:12 +02:00
fourtf 42550129e7 reworked the Look settings page 2018-07-05 17:38:24 +02:00
fourtf 80c8e11cec refactored the ignores page a bit 2018-07-05 16:45:34 +02:00
fourtf 1da23e5e91 renamed IgnoreUsersPage to IgnoresPage 2018-07-05 16:22:25 +02:00
fourtf d925704aa9 renamed file to fix compiling 2018-07-05 16:09:08 +02:00
fourtf 6059f98c21 renamed UpdatePromptDialog to UpdateDialog 2018-07-05 16:04:50 +02:00
DatGuy1 9c7c99928f Add highlighting of all messages from a certain user (#564)
* Rework to use controllers

* Rework to use controllers

* Add doHighlight

* Cherry pick?

* Fixes per PR

* Remove file
2018-07-05 15:58:20 +02:00
apa420 eb69cbf5f5 The file-url for logging is now displayed as a smaller link (#570)
* The file-url for logging is now displayed as a smaller link, todo: Show link on hover

* added a label to the folder-url in the settings
2018-07-05 15:57:08 +02:00
fourtf 3d7926cac1 added the update download button for linux/mac (updates don't work tho
so it doesn't show)
2018-07-05 13:25:10 +02:00
fourtf 59332270b5 put the update button code into it's own file 2018-07-05 12:54:38 +02:00
fourtf ef13aef7df fixes for linux 2018-07-05 12:08:33 +02:00
fourtf f2238729f1 worked on the UpdatePromptDialog 2018-07-05 11:42:40 +02:00
fourtf f02a89690e added mechanic for deleting a BaseWindow on focus out 2018-07-05 10:34:04 +02:00
fourtf 335cbf8758 added basic download icon to the window frame 2018-07-04 20:42:51 +02:00
fourtf 3303de18cd added double click to resize handle 2018-07-04 19:52:11 +02:00
fourtf 14f125ff87 added room mode selector for mods again 2018-07-04 19:44:54 +02:00
fourtf e9a112f8b3 changed order of split header items 2018-07-04 19:44:54 +02:00
apa420 2e1fdbec32 Changed where the bold @username setting is found 2018-07-04 18:10:50 +02:00
Rasmus Karlsson a66a2f2e8d Add a list of contributors to the about page 2018-07-04 16:52:14 +00:00
fourtf e76871c09c improved moderation mode icons 2018-07-04 14:13:29 +02:00
apa420 9754d1c350 I use startWith again 2018-07-04 14:01:39 +02:00
apa420 2524bb8af6 this time I compiled before pushing 2018-07-04 14:01:39 +02:00
apa420 4491bba5ec Boldness is now fontStyle 2018-07-04 14:01:39 +02:00
apa420 31a38d19a7 Fixed code, things that fourtf asked for 2018-07-04 14:01:39 +02:00
apa420 4bf174376a Fixed random code that didn't belong 2018-07-04 14:01:39 +02:00
apa420 318e8b6234 Bold @username 2018-07-04 14:01:39 +02:00
Rasmus Karlsson acf77beff2 Remove file that I accidentally re-added 2018-07-04 13:58:38 +00:00
DatGuy1 e9fb5971da Add option to make link domains lowercase (#557) 2018-07-04 13:53:49 +02:00
fourtf 06ff6e6479 added dim effect to the titlebar buttons 2018-07-04 13:13:21 +02:00
fourtf 19fdfaef42 reworked splitheader a bit 2018-07-04 13:06:26 +02:00
Rasmus Karlsson 4ea613503e Remove unused include 2018-07-04 11:45:10 +00:00
Rasmus Karlsson 03b7fae09e Refactor highlight blacklist to use the model system
Fix #560
2018-07-04 11:45:10 +00:00
fourtf 362dcb88bc put returns into #else to remove unreachable code warnings 2018-07-04 10:41:43 +02:00
fourtf 1064729e1a Fixed issue with the window frame 2018-07-04 10:38:36 +02:00
Rasmus Karlsson 5dbdb6424c Get rid of some more warnings 2018-07-03 21:27:17 +00:00
Rasmus Karlsson ba5d6e5c4b Remove unused variable from ModerationAction class 2018-07-03 18:09:17 +00:00
Rasmus Karlsson a716e93112 Remove pessemistic move 2018-07-03 18:09:07 +00:00
fourtf 3a9de8cb86 renamed classes AppearancePage and BahaviourPage 2018-07-03 17:45:31 +02:00
fourtf cd57b2b518 renamed AppearancePage and BehaviourPage 2018-07-03 17:45:31 +02:00