Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merklisten Abonnement und weitere Erweiterungen #516

Open
wants to merge 3,866 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
3866 commits
Select commit Hold shift + click to select a range
de906e7
- bump javafx version
derreisende77 Jul 20, 2020
b69b2b3
Fixed Xmx for Raspberry Pi
Nicklas2751 Jul 21, 2020
91a74a2
Updated JDK versions
Nicklas2751 Jul 22, 2020
6d88942
Changed media file names
Nicklas2751 Jul 23, 2020
d1112d7
Fixed film length filter not change by filter change by manualy setti…
Nicklas2751 Jul 25, 2020
d4ca643
Fixed compile error
Nicklas2751 Jul 25, 2020
716edcc
cleanup
derreisende77 Jul 27, 2020
9d232f2
gitignore erweitert. travis Bild ausgetauscht.
alex1702 Aug 16, 2020
19696be
Version angepasst. Benamung der install4j Dateien korrigiert. install…
alex1702 Aug 16, 2020
59e07f2
AppImage Startbefehl angepasst.
alex1702 Aug 16, 2020
59c1c32
Merge branch 'release/13.6.0'
alex1702 Aug 16, 2020
11c83ed
Merge tag '13.6.0' into develop
alex1702 Aug 16, 2020
22ed0b7
travis deploy skip_cleanup
alex1702 Aug 16, 2020
0caee17
reduce log output
alex1702 Aug 16, 2020
2909ac8
travis mvn logging reduced to info.
alex1702 Aug 16, 2020
0c36b6c
Hoffentlich nun travis mvn logging reduziert.
alex1702 Aug 16, 2020
2a6d617
- fix #531
derreisende77 Aug 26, 2020
b75de3e
- add proper logging
derreisende77 Aug 26, 2020
e724fbb
- bump kotlin version
derreisende77 Aug 26, 2020
cbfd30e
- fixes #536
derreisende77 Aug 27, 2020
48bb432
- fixes #510
derreisende77 Aug 27, 2020
2e1f3c4
- bump to 13.6.1
derreisende77 Aug 28, 2020
252fbeb
- code cleanup
derreisende77 Aug 28, 2020
647ddbe
- code cleanup
derreisende77 Aug 28, 2020
2b2efc3
- remove dependency to PanelVorlage
derreisende77 Aug 28, 2020
ff6fe81
- bump commons io version
derreisende77 Aug 28, 2020
a36a281
- use Apache Commons FileUtils instead of own class
derreisende77 Aug 28, 2020
92c338a
- use VerticalLayout instead of MigLayout for film tab extension area
derreisende77 Aug 28, 2020
0ac6a1e
- make it private
derreisende77 Aug 28, 2020
384c087
- cleanup cell renderer
derreisende77 Aug 28, 2020
898181f
- use ImageIO for image reading
derreisende77 Aug 28, 2020
9eb6cad
- code cleanup
derreisende77 Aug 31, 2020
ef8bb57
- make used table font accessible
derreisende77 Aug 31, 2020
2ead63a
- implement font size change for tab Filme
derreisende77 Aug 31, 2020
d652ab8
- implement font size change for tab Filme
derreisende77 Aug 31, 2020
138d250
- use FontMetrics for row height calculations
derreisende77 Aug 31, 2020
ed21532
- remove debug font size factor and use more sane value
derreisende77 Aug 31, 2020
cb37d09
- remove unused layout constraints
derreisende77 Aug 31, 2020
da35b1c
- fixes #541
derreisende77 Sep 1, 2020
1182576
- use latest JavaFX
derreisende77 Sep 2, 2020
e90e43a
- fix embarrassing bug where filter dialog wasn´t enabled after updat…
derreisende77 Sep 3, 2020
3498cb4
- minor code cleanup
derreisende77 Sep 3, 2020
8dba7e6
- implement film PlayList classification
derreisende77 Sep 3, 2020
1bdef8c
- rename copy film url and provide entries
derreisende77 Sep 3, 2020
604900e
- make extended logging CLI param visible to users
derreisende77 Sep 3, 2020
85e629b
- fixes #542
derreisende77 Sep 3, 2020
eb2e38e
Fixes #537
Nicklas2751 Sep 4, 2020
b0b3539
Fixes #530
Nicklas2751 Sep 4, 2020
5cef435
Fixes #544
Nicklas2751 Sep 4, 2020
f65b611
Fixes #532
Nicklas2751 Sep 4, 2020
218d68c
- fix glitch where film entries without length were filtered by minim…
derreisende77 Sep 7, 2020
d270fec
- code cleanup
derreisende77 Sep 9, 2020
66b6b8f
- old EREIGNIS_LISTE_PSET notification ported to message bus
derreisende77 Sep 9, 2020
13c6285
- old EREIGNIS_BLACKLIST_GEAENDERT notification ported to message bus
derreisende77 Sep 9, 2020
b859761
- convert to new logger
derreisende77 Sep 9, 2020
17a0bda
- remove rtmpdump and flvstreamer related progress parsing code
derreisende77 Sep 9, 2020
4aaa1cb
Sicherstellen dass mit JDK 14 gebaut wird (#548)
Wonno Sep 9, 2020
15282fe
- remove flvstreamer PSet Script support as we dont need it anymore.
derreisende77 Sep 9, 2020
39476bb
- fix bug where bandwidth monitor did not show any bandwidth later on…
derreisende77 Sep 9, 2020
480caa5
Merge branch 'master' into develop
Nicklas2751 Sep 10, 2020
199cdf5
- introduce some small optimization for column position. Now we only …
derreisende77 Sep 10, 2020
6196b81
- code cleanup
derreisende77 Sep 10, 2020
8bb53cd
Merge branch 'develop' of github.com:mediathekview/MediathekView into…
alex1702 Sep 10, 2020
947f19a
- fix color settings table being too small
derreisende77 Sep 22, 2020
f0b2453
- code cleanup
derreisende77 Sep 22, 2020
4089432
- update libraries
derreisende77 Sep 23, 2020
b4a3bf2
- fixes #555
derreisende77 Sep 27, 2020
c7e0038
Revert "- fixes #555"
derreisende77 Sep 27, 2020
75e245a
- fixes #555
derreisende77 Sep 27, 2020
b851e62
- migrate MAX_PATH file checks to own class
derreisende77 Sep 27, 2020
ad11615
- convert to logger
derreisende77 Sep 27, 2020
0b3cf3f
- code cleanup
derreisende77 Sep 27, 2020
5ee0d83
- convert to logger
derreisende77 Sep 27, 2020
52d004e
- convert to logger
derreisende77 Sep 27, 2020
e1a2cc9
- fixes #557
derreisende77 Oct 5, 2020
2b01d59
- fixes #554
derreisende77 Oct 5, 2020
5fe090f
- code cleanup
derreisende77 Oct 8, 2020
aad2c9a
- minor refactor of blacklist rule creation
derreisende77 Oct 8, 2020
f49d068
- refactor filter routines
derreisende77 Oct 8, 2020
ccf9da3
- split filter routines in one WITHOUT length check and one WITH leng…
derreisende77 Oct 8, 2020
a94efdf
- code refactor
derreisende77 Oct 9, 2020
b84558c
- code refactor
derreisende77 Oct 9, 2020
f39878b
- code refactor
derreisende77 Oct 9, 2020
7af9ca2
- code refactor
derreisende77 Oct 9, 2020
3833ce5
-code refactor
derreisende77 Oct 9, 2020
6cc3b5f
- use F12 key to display filter settings dialog
derreisende77 Oct 10, 2020
89f6183
- bump javafx version
derreisende77 Oct 10, 2020
52dee43
- modernize control key function
derreisende77 Oct 12, 2020
96abb94
- fix checkbox text
derreisende77 Oct 12, 2020
d9900fd
- remember filmlist extension checkbox setting
derreisende77 Oct 12, 2020
9f71a85
- fix PMD multi threading warning for INSTANCE
derreisende77 Oct 13, 2020
c129e6f
- code cleanup
derreisende77 Oct 13, 2020
209412b
- fix PMD warning for thread safety
derreisende77 Oct 13, 2020
41ac35f
Revert "- fix PMD multi threading warning for INSTANCE"
derreisende77 Oct 13, 2020
46a748b
Revert "- fix PMD warning for thread safety"
derreisende77 Oct 13, 2020
ae8bdae
- hide trace message for regular user
derreisende77 Oct 14, 2020
c8a2b6b
- workaround file access denied and other strange exceptions on windo…
derreisende77 Oct 14, 2020
f65e51d
- fix application hang on macOS with JFX 15 when no filmlist is avail…
derreisende77 Oct 14, 2020
39f14b2
- code cleanup
derreisende77 Oct 14, 2020
f4893cc
- bump library versions
derreisende77 Oct 14, 2020
eed60d9
- cleanup
derreisende77 Oct 14, 2020
208311b
- rename function and document its meaning
derreisende77 Oct 15, 2020
90bb9c9
- move config writer code to object
derreisende77 Oct 15, 2020
81f45d2
- code cleanup
derreisende77 Oct 15, 2020
5154d79
- code cleanup
derreisende77 Oct 15, 2020
d061391
- remove GC call as this will not fix reliably the problem.
derreisende77 Oct 16, 2020
dbc255d
- add settings property which can be read be CLI client
derreisende77 Oct 16, 2020
0078ca9
- handle exception during shutdown
derreisende77 Oct 16, 2020
eafaca2
- save abos for now as well, but skip during read
derreisende77 Oct 16, 2020
9714d60
- code refactor
derreisende77 Oct 19, 2020
3cd9ffc
- write history only in case changes are available
derreisende77 Oct 20, 2020
7164716
- do not write livestream recordings into history
derreisende77 Oct 20, 2020
8fd3cfc
- code cleanup
derreisende77 Oct 20, 2020
016e809
- code cleanup
derreisende77 Oct 21, 2020
4a5ac8a
- initial seen history migration checkin
derreisende77 Oct 21, 2020
6bebb66
- add sqlite dependency
derreisende77 Oct 21, 2020
5a003ef
- improve FXErrorDialog
derreisende77 Oct 21, 2020
aad72d2
- implemented migration of old history text file format to database
derreisende77 Oct 21, 2020
bc108b8
- cleanup debug code
derreisende77 Oct 21, 2020
fbc3421
- remove show download history menu command
derreisende77 Oct 21, 2020
5da73b1
- add index to database
derreisende77 Oct 21, 2020
b0e932a
- move corresponding old history text files to trash instead of delet…
derreisende77 Oct 21, 2020
e038f77
- initial incarnation of a seen history controller
derreisende77 Oct 21, 2020
61e114f
- WIP
derreisende77 Oct 21, 2020
6d909e1
- modify logger
derreisende77 Oct 21, 2020
7be29a6
- WIP, first version where new controller is used
derreisende77 Oct 21, 2020
9ce9874
- implemented additional methods
derreisende77 Oct 21, 2020
69ab1c3
- implemented additional methods
derreisende77 Oct 21, 2020
e4598e6
- fix NPE :(
derreisende77 Oct 21, 2020
352f341
- use more PreparedStatements
derreisende77 Oct 21, 2020
995afaa
- fix write protection
derreisende77 Oct 21, 2020
8c49970
- WIP
derreisende77 Oct 21, 2020
1606ace
- remove synchronized keyword
derreisende77 Oct 21, 2020
e7ab638
- fix initialization error on windows
derreisende77 Oct 21, 2020
3590c01
- move old history text file into trash if available
derreisende77 Oct 21, 2020
1766c86
- fix a really stupid NPE bug
derreisende77 Oct 21, 2020
2aa11f9
- cleanup empty history files and fix log output
derreisende77 Oct 21, 2020
c982b2e
- use default isolation
derreisende77 Oct 21, 2020
7f27d3c
- get rid of central history controller
derreisende77 Oct 22, 2020
9e8f8e8
- move some general functions into abstract class
derreisende77 Oct 22, 2020
6f7dcae
- move some general class to abstract class
derreisende77 Oct 22, 2020
238641f
- move functions to abstract class
derreisende77 Oct 22, 2020
b33737c
- code cleanup
derreisende77 Oct 22, 2020
258ef05
- code cleanup
derreisende77 Oct 22, 2020
302128e
- got rid of global seen history controller :)
derreisende77 Oct 22, 2020
d023378
Rename .java to .kt
derreisende77 Oct 22, 2020
7a46099
- convert to kotlin
derreisende77 Oct 22, 2020
51064b3
- send change message only when no error occured
derreisende77 Oct 22, 2020
7f4078f
- rename to SeenHistoryController
derreisende77 Oct 22, 2020
bbd2289
- move to correct package
derreisende77 Oct 22, 2020
b548b9c
- create helper class for deleting files by moving to trash if supported
derreisende77 Oct 22, 2020
622a7f1
- reintroduce readOnly option again
derreisende77 Oct 22, 2020
c2cea00
- if EDT wouldnt be blocked this would properly enable/disable the fi…
derreisende77 Oct 22, 2020
cf409d1
- disable table before filtering
derreisende77 Oct 22, 2020
591eca1
- introduce wal mode for sqlite
derreisende77 Oct 22, 2020
8e8a77d
- code cleanup and debug output for performance testing
derreisende77 Oct 24, 2020
adfc4e9
- perform sqlite setup on all connections
derreisende77 Oct 24, 2020
eb68b00
- use a parallelStream to enhance performance
derreisende77 Oct 24, 2020
53ed021
- use in-memory cache for has been seen database :(
derreisende77 Oct 24, 2020
30751b4
- remove kotlin coroutine support
derreisende77 Oct 24, 2020
d583a2e
- migrate more filters to stream
derreisende77 Oct 24, 2020
e6146e5
- migrate max length
derreisende77 Oct 24, 2020
a53cf05
- migrate min length
derreisende77 Oct 24, 2020
b02b5e3
- minor jvm perf improvements
derreisende77 Oct 24, 2020
af0479d
- complete migration
derreisende77 Oct 24, 2020
1495cc0
- cleanup, remove debug code
derreisende77 Oct 24, 2020
731e8ef
- code cleanup
derreisende77 Oct 24, 2020
d1c731d
- code refactor
derreisende77 Oct 24, 2020
3a8818e
- do not prepare caches if operation is unused
derreisende77 Oct 24, 2020
55c0c2b
- remove cache entries on close
derreisende77 Oct 24, 2020
25264b3
- automatically prepare cache when caller forgot it
derreisende77 Oct 24, 2020
1c666bd
- code cleanup
derreisende77 Oct 25, 2020
077a310
- code cleanup
derreisende77 Oct 25, 2020
6b19fd6
- implement feature to limit the number of cpus used by java. Useful …
derreisende77 Oct 25, 2020
e56c7aa
- implement feature to limit the number of cpus used by java. Useful …
derreisende77 Oct 25, 2020
38a4a22
Rename .java to .kt
derreisende77 Oct 25, 2020
211efe3
- implement Linux affinity
derreisende77 Oct 25, 2020
cc05069
- remove linux affinity code as it does not work
derreisende77 Oct 25, 2020
152f602
- remove affinity impl and use a available library
derreisende77 Oct 25, 2020
d0d26cf
Revert "- remove affinity impl and use a available library"
derreisende77 Oct 25, 2020
b94de38
Rename .java to .kt
derreisende77 Oct 25, 2020
20a45df
- convert to kotlin class
derreisende77 Oct 25, 2020
4f0a174
- perform database maintenance for seen history on shutdown
derreisende77 Oct 25, 2020
7711ab1
- code refactor
derreisende77 Oct 26, 2020
fa2fc40
- cleanup source code formatting
derreisende77 Oct 26, 2020
a5cad08
- WIP
derreisende77 Oct 26, 2020
f78b933
- cleanup
derreisende77 Oct 26, 2020
16a919a
- add JDownloader as a download client for URLs
derreisende77 Oct 26, 2020
2ea7518
- code cleanup
derreisende77 Oct 26, 2020
85c733d
- refactor deprecated logging
derreisende77 Oct 26, 2020
9473738
- refactor deprecated logging
derreisende77 Oct 26, 2020
5799c2f
- refactor deprecated logging
derreisende77 Oct 26, 2020
3942fd8
- refactor deprecated logging
derreisende77 Oct 26, 2020
74fba34
- refactor deprecated logging
derreisende77 Oct 26, 2020
6524787
- refactor
derreisende77 Oct 26, 2020
7c8dc99
- move pset buttons menu creation code to GuiFilme
derreisende77 Oct 27, 2020
224a04a
- rename class
derreisende77 Oct 27, 2020
da57611
- properly close all seen history database connections on shutdown
derreisende77 Oct 28, 2020
a0a5f89
- remove unneeded shutdown hooks
derreisende77 Oct 28, 2020
30931a6
- refactor code
derreisende77 Oct 28, 2020
9cf1c95
- refactor code
derreisende77 Oct 29, 2020
db9a4ad
- code modernization
derreisende77 Oct 28, 2020
29fe73a
- get rid of debug output
derreisende77 Oct 29, 2020
81b38f1
- create prepared statement later when tables have been created
derreisende77 Oct 31, 2020
409d469
- cleanup
derreisende77 Nov 1, 2020
6e38cf0
- move abo table data creation code to manage panel
derreisende77 Nov 1, 2020
4f12708
- add correct abo find method to list
derreisende77 Nov 1, 2020
e843111
- fixes #552
derreisende77 Nov 1, 2020
2910619
- add correct abo find method to list
derreisende77 Nov 1, 2020
2f73feb
- add documentation
derreisende77 Nov 1, 2020
6ae60ec
- cleanup
derreisende77 Nov 1, 2020
8b6f612
- add initial test
derreisende77 Nov 2, 2020
4dfda7f
migrator db test implemented
derreisende77 Nov 2, 2020
90ea75b
- add some documentation
derreisende77 Nov 2, 2020
7e4e5f7
Revert "- add correct abo find method to list"
derreisende77 Nov 2, 2020
ba0d349
Merge branch 'history_migration' into develop
derreisende77 Nov 2, 2020
ccb238b
- add CHANGELOG to project
derreisende77 Nov 2, 2020
6ef5b4a
- rework old abo history controller classes and do some cleanup in there
derreisende77 Nov 2, 2020
3303f97
- remove old copyright
derreisende77 Nov 2, 2020
a8d002f
- fixes #552
derreisende77 Nov 2, 2020
b94926b
- exclude junit from release jars
derreisende77 Nov 2, 2020
3be1eeb
- cleanup
derreisende77 Nov 2, 2020
a3ede9e
- bump junit version
derreisende77 Nov 2, 2020
58eebb1
- add color util function
derreisende77 Nov 2, 2020
76f0152
- move class
derreisende77 Nov 2, 2020
063d686
- fix typo
derreisende77 Nov 2, 2020
01d57da
- show trace log messages in tests
derreisende77 Nov 2, 2020
664476a
- convert Swing PSet Buttons Panel to JavaFX
derreisende77 Nov 3, 2020
9db591e
- fix typo
derreisende77 Nov 4, 2020
f0b5275
- fix a fixed typo....
derreisende77 Nov 4, 2020
9ee7c45
- remove create protocol action, almost unused by anybody
derreisende77 Nov 4, 2020
32c48f1
- enable swing EDT thread checking within enhanced logging as well
derreisende77 Nov 5, 2020
c2d5d6e
- make swing repaint manager install a cli option
derreisende77 Nov 5, 2020
c5ece49
- implement EDT thread checker
derreisende77 Nov 5, 2020
75d7bc1
- move class
derreisende77 Nov 5, 2020
d44ad63
- replace multi-line label
derreisende77 Nov 5, 2020
4dc406b
- get rid of some JIde classes
derreisende77 Nov 5, 2020
7abdc6b
- show hyperlink address in JLabel Tooltip
derreisende77 Nov 5, 2020
e258ce9
- refactor
derreisende77 Nov 5, 2020
1b5e3c3
- do not use StandardCloseDialog for UpdateNotificationDialog
derreisende77 Nov 5, 2020
09304a5
- make classes available
derreisende77 Nov 5, 2020
ac87013
- convert StandardCloseDialog and dependencies away from Jide
derreisende77 Nov 5, 2020
44fb6d7
Rename .java to .kt
derreisende77 Nov 5, 2020
254e2c1
- Yeah, finally no more Jide in here!
derreisende77 Nov 5, 2020
8182ed2
- cleanup reset settings dialog
derreisende77 Nov 5, 2020
efb73b3
- cleanup reset settings dialog
derreisende77 Nov 5, 2020
83c4215
- update layout
derreisende77 Nov 5, 2020
7ebbd72
- do not show internal update menu item if we use external update sup…
derreisende77 Nov 5, 2020
854da5d
- updates to README.txt
derreisende77 Nov 5, 2020
c8d100c
Update to 13.6.1
KWich Nov 6, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
- rename copy film url and provide entries
derreisende77 committed Sep 3, 2020
commit 1bdef8c9a913426a7b7d3560e7874d57e0c628c6
23 changes: 12 additions & 11 deletions src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java
Original file line number Diff line number Diff line change
@@ -395,7 +395,7 @@ public void fertig(ListenerFilmeLadenEvent event) {
setupKeyMapping();

tabelle.setModel(new TModelFilm());
tabelle.addMouseListener(new BeobMausTabelle());
tabelle.addMouseListener(new TableContextMenuHandler());
tabelle
.getSelectionModel()
.addListSelectionListener(
@@ -915,12 +915,14 @@ public void actionPerformed(ActionEvent e) {
}
}

public class BeobMausTabelle extends MouseAdapter {
// rechhte Maustaste in der Tabelle

/**
* Implements the context menu for tab film.
*/
class TableContextMenuHandler extends MouseAdapter {
private static final String COPY_URL_STR = "URL kopieren";
private final BeobPrint beobPrint = new BeobPrint();
private final BeobAbo beobAbo = new BeobAbo(false /* mit Titel */);
private final BeobAbo beobAboMitTitel = new BeobAbo(true /* mit Titel */);
private final BeobAbo beobAbo = new BeobAbo(false);
private final BeobAbo beobAboMitTitel = new BeobAbo(true);
private final BeobBlacklist beobBlacklistSender = new BeobBlacklist(true, false);
private final BeobBlacklist beobBlacklistSenderThema = new BeobBlacklist(true, true);
private final BeobBlacklist beobBlacklistThema = new BeobBlacklist(false, true);
@@ -932,13 +934,12 @@ public class BeobMausTabelle extends MouseAdapter {
private final ActionListener unseenActionListener = new BeobHistory(false);
private final ActionListener seenActionListener = new BeobHistory(true);
private Point p;
private JMenuItem miPrintTable;

BeobMausTabelle() {
TableContextMenuHandler() {
createStaticMenuEntries();
}

private JMenuItem miPrintTable;

private void createStaticMenuEntries() {
miPrintTable = new JMenuItem("Tabelle drucken");
miPrintTable.addActionListener(beobPrint);
@@ -1130,7 +1131,7 @@ private void showMenu(MouseEvent evt) {
res.ifPresent(
film -> {
if (film.isPlayList()) {
var miCopyPlayListUrl = new JMenuItem("PlayList URL kopieren");
var miCopyPlayListUrl = new JMenuItem(COPY_URL_STR);
miCopyPlayListUrl.addActionListener(l -> GuiFunktionen.copyToClipboard(film.getUrl()));
jPopupMenu.addSeparator();
jPopupMenu.add(miCopyPlayListUrl);
@@ -1150,7 +1151,7 @@ private void showMenu(MouseEvent evt) {

final ActionListener copyNormalUrlListener = e -> GuiFunktionen.copyToClipboard(uNormal);
if (!uHd.isEmpty() || !uLow.isEmpty()) {
JMenu submenueURL = new JMenu("Film-URL kopieren");
JMenu submenueURL = new JMenu(COPY_URL_STR);
// HD
if (!uHd.isEmpty()) {
item = new JMenuItem("in höchster/hoher Qualität");