Skip to content

Filter themen speichern neu #836

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.

Sign up for GitHub

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

Open
MarkusJannek wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Filter themen speichern neu #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9144e51
baue nightlys nur im develop branch
alex1702 Nov 11, 2025
bfe606f
Update Filterdialog
MarkusJannek Feb 13, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/macos-apple-silicon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
build:
if: github.ref == 'refs/heads/develop'
name: Build macOS ${{ matrix.arch }} nightly
runs-on: ${{ matrix.runner }}
strategy:
Expand Down Expand Up @@ -125,6 +126,7 @@ jobs:
aws --endpoint-url "https://${S3_ENDPOINT}" s3 cp "target/media/${FILE_NAME}.sha512" "s3://${S3_BUCKET}/${FILE_NAME}.sha512"

build-windows-arm64:
if: github.ref == 'refs/heads/develop'
name: Build Windows ARM64 nightly
runs-on: windows-11-arm

Expand Down Expand Up @@ -223,6 +225,7 @@ jobs:
aws --endpoint-url $endpoint s3 cp "target\media\$zipName.sha512" "s3://$bucket/$zipName.sha512"

build-windows-amd64:
if: github.ref == 'refs/heads/develop'
name: Build Windows AMD64 nightly
runs-on: windows-latest

Expand Down
14 changes: 9 additions & 5 deletions src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ private void setupThemaComboBox() {
jcbThema.setSelectedItem(thema);
jcbThema.addActionListener(_ -> {
var sel = (String) jcbThema.getSelectedItem();
if (sel != null) {
if (sel != null && !sel.isEmpty()) {
filterConfig.setThema(sel);
}
MessageBus.getMessageBus().publish(new ReloadTableDataEvent());
Expand Down Expand Up @@ -303,11 +303,14 @@ private void restoreConfigSettings() {
cbDontShowAudioVersions.setSelected(filterConfig.isDontShowAudioVersions());
cbDontShowDuplicates.setSelected(filterConfig.isDontShowDuplicates());

//setSelectedItem wird 2x benötigt, da sonst entweder das Thema gar nicht geladen wird aus der Config, bzw. nicht in der Combobox angezeigt wird
jcbThema.setSelectedItem(filterConfig.getThema());

((SenderCheckBoxList) senderList).restoreFilterConfig();
((FilmLengthSlider) filmLengthSlider).restoreFilterConfig(filterConfig);

spZeitraum.restoreFilterConfig(filterConfig);
jcbThema.setSelectedItem(filterConfig.getThema());
}

private void enableControls(boolean enable) {
Expand Down Expand Up @@ -613,8 +616,9 @@ public void actionPerformed(ActionEvent e) {
existingFilter.ifPresentOrElse(_ -> {
//if a filter already exists we cannot rename...
JOptionPane.showMessageDialog(MediathekGui.ui(),
String.format("Filter %s existiert bereits.\nAktion wird abgebrochen", fName),
Konstanten.PROGRAMMNAME, JOptionPane.ERROR_MESSAGE);
String.format(
"Filter %s existiert bereits.\nAktion wird abgebrochen", fName),
Konstanten.PROGRAMMNAME, JOptionPane.ERROR_MESSAGE);
}, () -> {
// no existing name...
Configuration config = ApplicationConfiguration.getConfiguration();
Expand All @@ -626,9 +630,9 @@ public void actionPerformed(ActionEvent e) {
config.unlock(LockMode.WRITE);
logger.trace("Renamed filter \"{}\" to \"{}\"", fltName, fName);
});
}
else
} else {
logger.warn("New and old filter name are identical...doing nothing");
}
}
else {
JOptionPane.showMessageDialog(MediathekGui.ui(), "Filtername darf nicht leer sein!",
Expand Down