Skip to content

Commit 290abba

Browse files
committed
- use alternate row colors by default
- code cleanup - remove Windows 7 table legacy stuff
1 parent bc5a1df commit 290abba

File tree

5 files changed

+3
-36
lines changed

5 files changed

+3
-36
lines changed

src/main/java/mediathek/mac/MediathekGuiMac.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ import kotlin.io.path.absolutePathString
3030
class MediathekGuiMac : MediathekGui() {
3131
private val powerManager = OsxPowerManager()
3232

33-
override fun useAlternateRowColors(): Boolean {
34-
return true
35-
}
36-
3733
override fun addQuitMenuItem() {
3834
//using native handler instead
3935
}

src/main/java/mediathek/mainwindow/MediathekGui.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ protected void setupScrollBarWidth() {
338338
* @return true when alternating row colors should be used, false otherwise.
339339
*/
340340
protected boolean useAlternateRowColors() {
341-
return false;
341+
return true;
342342
}
343343

344344
public void setupAlternatingRowColors() {

src/main/java/mediathek/tool/table/MVTable.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package mediathek.tool.table;
22

3-
import com.sun.jna.platform.win32.VersionHelpers;
43
import mediathek.config.MVConfig;
54
import mediathek.gui.messages.FontSizeChangedEvent;
65
import mediathek.tool.MessageBus;
76
import net.engio.mbassy.listener.Handler;
87
import org.apache.commons.lang3.StringUtils;
9-
import org.apache.commons.lang3.SystemUtils;
108
import org.apache.logging.log4j.LogManager;
119
import org.apache.logging.log4j.Logger;
1210
import org.jetbrains.annotations.NotNull;
@@ -64,8 +62,6 @@ public MVTable(int maxColumns, boolean @NotNull [] visibleColumStore,
6462

6563
calculateRowHeight();
6664

67-
applyWindowsSevenTableEffects();
68-
6965
MessageBus.getMessageBus().subscribe(this);
7066
}
7167

@@ -75,17 +71,6 @@ private void handleFontSizeChanged(FontSizeChangedEvent e) {
7571
SwingUtilities.invokeLater(this::calculateRowHeight);
7672
}
7773

78-
/**
79-
* Show JTable grid lines on Windows 7 only.
80-
*/
81-
private void applyWindowsSevenTableEffects() {
82-
// Windows 7 used to have grid lines therefore simulate behaviour
83-
if (SystemUtils.IS_OS_WINDOWS && !VersionHelpers.IsWindows8OrGreater()) {
84-
setShowHorizontalLines(true);
85-
setShowVerticalLines(true);
86-
}
87-
}
88-
8974
private SortKey sortKeyLesen(String s, String strSortOrder) {
9075
SortKey sk;
9176

src/main/java/mediathek/x11/MediathekGuiX11.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public MediathekGuiX11() {
2020
setupX11WindowManagerClassName();
2121
}
2222

23-
@Override
24-
protected boolean useAlternateRowColors() {
25-
return true;
26-
}
27-
2823
@Override
2924
protected void createDarkModeToggleButton() {
3025
// we are using a menu item here

src/main/kotlin/mediathek/windows/MediathekGuiWindows.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mediathek.windows
22

3-
import com.sun.jna.platform.win32.VersionHelpers
43
import mediathek.mainwindow.MediathekGui
54
import mediathek.tool.notification.INotificationCenter
65
import mediathek.tool.notification.WinNotificationCenter
@@ -11,21 +10,13 @@ import java.io.IOException
1110
class MediathekGuiWindows : MediathekGui() {
1211
private val logger = LogManager.getLogger()
1312

14-
override fun useAlternateRowColors(): Boolean {
15-
return VersionHelpers.IsWindows8OrGreater()
16-
}
17-
1813
override fun createDarkModeToggleButton() {
19-
//not used on Windows 10, we are creating a menu bar action here
20-
if (!VersionHelpers.IsWindows10OrGreater())
21-
super.createDarkModeToggleButton()
14+
//not used on Windows 10+, we are creating a menu bar action here
2215
}
2316

2417
override fun createMenuBar() {
2518
super.createMenuBar()
26-
if (VersionHelpers.IsWindows10OrGreater()) {
27-
createDarkModeMenuAction()
28-
}
19+
createDarkModeMenuAction()
2920
}
3021
override fun shutdownComputer() {
3122
val strShutdownCommand = arrayOf("shutdown.exe", "-s", "-t", "0")

0 commit comments

Comments
 (0)