v0.9.3 dark/day css fixes, add dark/day toolbar button

ag88 · ag88 · commit f01a96783ca9 · 2025-07-20T14:41:33.000+08:00
v0.9.3:
- dark/day css fixes, mainly markdown
- add dark/day toolbar button
diff --git a/asciidoc-lib/pom.xml b/asciidoc-lib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.2</version>
+		<version>0.9.3</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
diff --git a/docservice-api/pom.xml b/docservice-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.jmarkdownviewer</groupId>
-    <version>0.9.2</version>
+    <version>0.9.3</version>
   </parent>
 
   <groupId>org.jmarkdownviewer</groupId>
diff --git a/markdown-lib/pom.xml b/markdown-lib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.2</version>
+		<version>0.9.3</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
diff --git a/mdadocviewer/pom.xml b/mdadocviewer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.2</version>
+		<version>0.9.3</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
diff --git a/mdadocviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MainFrame.java b/mdadocviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MainFrame.java
@@ -59,6 +59,12 @@ public class MainFrame extends JFrame implements ActionListener {
 	HtmlPane htmlpane;
 	JLabel mlMsg;
 	URL stylesheet;
+	
+	JButton bnDark;
+	JButton bnDay;
+	ButtonGroup gr1;	
+	JRadioButtonMenuItem rbmday;
+	JRadioButtonMenuItem rbmdark; 
 
 	public MainFrame() {
 		super();
@@ -94,14 +100,14 @@ public void createGui() {
 		menubar.add(mView);
 		mView.add(addmenuitem("Markdown", "MD", KeyEvent.VK_M));
 		mView.addSeparator();
-		ButtonGroup gr1 = new ButtonGroup();
-		JRadioButtonMenuItem rbmday = new JRadioButtonMenuItem("Normal Mode", true);
+		gr1 = new ButtonGroup();
+		rbmday = new JRadioButtonMenuItem("Normal Mode", true);
 		rbmday.setActionCommand("DAY");
 		rbmday.setMnemonic(KeyEvent.VK_N);
 		rbmday.addActionListener(this);
 		gr1.add(rbmday);		
 		mView.add(rbmday);
-		JRadioButtonMenuItem rbmdark = new JRadioButtonMenuItem("Dark Mode", false);
+		rbmdark = new JRadioButtonMenuItem("Dark Mode", false);
 		rbmdark.setActionCommand("DARK");
 		rbmdark.setMnemonic(KeyEvent.VK_D);
 		rbmdark.addActionListener(this);
@@ -114,6 +120,12 @@ public void createGui() {
 		JToolBar toolbar = new JToolBar();
 		toolbar.add(makeNavigationButton("Open24.gif", "OPEN", "Open", "Open"));
 		toolbar.add(makeNavigationButton("Refresh24.gif", "RELOAD", "Reload", "Reload"));
+		
+		bnDark = makeNavigationButton("moon.png", "DARK", "Dark", "Dark");
+		toolbar.add(bnDark);
+		bnDay = makeNavigationButton("sun.png", "DAY", "Day", "Day");
+		toolbar.add(bnDay);
+		bnDay.setVisible(false);		
 		add(toolbar, BorderLayout.NORTH);
 		
 		if (stylesheet == null)
@@ -348,6 +360,10 @@ public void actionPerformed(ActionEvent e) {
 			} catch (Exception e2) {
 				log.error(e2.getMessage());
 			}
+			bnDark.setVisible(true);
+			bnDay.setVisible(false);
+			gr1.clearSelection();
+			rbmday.setSelected(true);			
 		} else if(cmd.equals("DARK")) {
 			URL url = App.class.getResource("github-dark.css");
 			htmlpane.setStyleSheet(url);
@@ -356,6 +372,10 @@ public void actionPerformed(ActionEvent e) {
 			} catch (Exception e3) {
 				log.error(e3.getMessage());
 			}
+			bnDark.setVisible(false);
+			bnDay.setVisible(true);
+			gr1.clearSelection();
+			rbmdark.setSelected(true);			
 		} else if(cmd.equals("PRINT")) {
 			doprint();
 		} else if (cmd.equals("EXIT")) {
diff --git a/mdadocviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/moon.png b/mdadocviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/moon.png
diff --git a/mdadocviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/sun.png b/mdadocviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/sun.png
diff --git a/mdviewer/pom.xml b/mdviewer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.2</version>
+		<version>0.9.3</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
diff --git a/mdviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MainFrame.java b/mdviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MainFrame.java
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.MessageFormat;
+import java.util.Enumeration;
 
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
@@ -53,7 +54,13 @@ public class MainFrame extends JFrame implements ActionListener {
 	HtmlPane htmlpane;
 	JLabel mlMsg;
 	URL stylesheet;
-
+	
+	JButton bnDark;
+	JButton bnDay;
+	ButtonGroup gr1;
+	JRadioButtonMenuItem rbmday;
+	JRadioButtonMenuItem rbmdark; 
+	
 	public MainFrame() {
 		super();
 		setTitle("jmarkdown (and AsciiDoc) viewer");
@@ -88,14 +95,14 @@ public void createGui() {
 		menubar.add(mView);
 		mView.add(addmenuitem("Markdown", "MD", KeyEvent.VK_M));
 		mView.addSeparator();
-		ButtonGroup gr1 = new ButtonGroup();
-		JRadioButtonMenuItem rbmday = new JRadioButtonMenuItem("Normal Mode", true);
+		gr1 = new ButtonGroup();
+		rbmday = new JRadioButtonMenuItem("Normal Mode", true);
 		rbmday.setActionCommand("DAY");
 		rbmday.setMnemonic(KeyEvent.VK_N);
 		rbmday.addActionListener(this);
 		gr1.add(rbmday);
 		mView.add(rbmday);
-		JRadioButtonMenuItem rbmdark = new JRadioButtonMenuItem("Dark Mode", false);
+		rbmdark = new JRadioButtonMenuItem("Dark Mode", false);
 		rbmdark.setActionCommand("DARK");
 		rbmdark.setMnemonic(KeyEvent.VK_D);
 		rbmdark.addActionListener(this);
@@ -108,6 +115,12 @@ public void createGui() {
 		JToolBar toolbar = new JToolBar();
 		toolbar.add(makeNavigationButton("Open24.gif", "OPEN", "Open", "Open"));
 		toolbar.add(makeNavigationButton("Refresh24.gif", "RELOAD", "Reload", "Reload"));
+		
+		bnDark = makeNavigationButton("moon.png", "DARK", "Dark", "Dark");
+		toolbar.add(bnDark);
+		bnDay = makeNavigationButton("sun.png", "DAY", "Day", "Day");
+		toolbar.add(bnDay);
+		bnDay.setVisible(false);
 		add(toolbar, BorderLayout.NORTH);
 
 		if (stylesheet == null)
@@ -325,6 +338,10 @@ public void actionPerformed(ActionEvent e) {
 			} catch (Exception e2) {
 				log.error(e2.getMessage());
 			}
+			bnDark.setVisible(true);
+			bnDay.setVisible(false);
+			gr1.clearSelection();
+			rbmday.setSelected(true);
 		} else if (cmd.equals("DARK")) {
 			URL url = App.class.getResource("github-dark.css");
 			htmlpane.setStyleSheet(url);
@@ -333,6 +350,10 @@ public void actionPerformed(ActionEvent e) {
 			} catch (Exception e3) {
 				log.error(e3.getMessage());
 			}
+			bnDark.setVisible(false);
+			bnDay.setVisible(true);
+			gr1.clearSelection();
+			rbmdark.setSelected(true);
 		} else if (cmd.equals("PRINT")) {
 			doprint();
 		} else if (cmd.equals("EXIT")) {
diff --git a/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/github-dark.css b/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/github-dark.css
@@ -115,19 +115,23 @@ h2 {
 
 h3 {
   font-size: 18px;
+  color: white;
 }
 
 h4 {
   font-size: 16px;
+  color: white;
 }
 
 h5 {
   font-size: 14px;
+  color: white;
 }
 
 h6 {
   color: rgb(238, 238, 236);
   font-size: 14px;
+  color: white;
 }
 
 p, blockquote, ul, ol, dl, li, table, pre {
diff --git a/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/github.css b/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/github.css
@@ -115,14 +115,17 @@ h2 {
 
 h3 {
   font-size: 18px;
+  color: black;
 }
 
 h4 {
   font-size: 16px;
+  color: black;  
 }
 
 h5 {
   font-size: 14px;
+  color: black;  
 }
 
 h6 {
diff --git a/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/moon.png b/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/moon.png
diff --git a/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/sun.png b/mdviewer/src/main/resources/org/jmarkdownviewer/jmdviewer/icons/sun.png
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.jmarkdownviewer</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.9.2</version>
+	<version>0.9.3</version>
 	<packaging>pom</packaging>
 
 	<name>parent</name>
diff --git a/viewer/pom.xml b/viewer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.2</version>
+		<version>0.9.3</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
diff --git a/web/moon.svg b/web/moon.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="27.890223mm"
+   height="27.206697mm"
+   viewBox="0 0 27.890223 27.206697"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="moon.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.6980499"
+     inkscape:cx="80.714549"
+     inkscape:cy="56.369465"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1410"
+     inkscape:window-height="886"
+     inkscape:window-x="301"
+     inkscape:window-y="71"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-80.048171,-122.89077)">
+    <path
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:#800080;stroke-width:1.33333337;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 328.84701,465.68463 c -4.30698,-2.69053 -12.00073,4.83438 -17.33124,13.64913 -5.33051,8.81476 -8.29779,19.05862 -8.30483,29.74436 7.3e-4,31.78596 25.76872,57.55308 57.55468,57.55274 10.23868,-0.0118 20.08868,-2.74313 28.66545,-7.6845 4.28838,-2.47068 8.25845,-5.49386 11.79964,-9.00583 3.54118,-3.51197 7.44131,-6.23251 5.58261,-9.37813 -1.9593,-2.06048 -4.84124,1.27012 -9.3348,2.38441 -4.49356,1.11429 -9.12156,1.68641 -13.78516,1.69186 -31.78596,3.5e-4 -57.55396,-25.76677 -57.55469,-57.55273 0.0202,-10.16572 6.49294,-18.61274 2.70834,-21.40131 z"
+       transform="scale(0.26458333)"
+       id="path11"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccssccccc" />
+  </g>
+</svg>
diff --git a/web/sun.svg b/web/sun.svg

Original file line number	Diff line number	Diff line change
`@@ -115,19 +115,23 @@ h2 {`
`115`	`115`
`116`	`116`	`h3 {`
`117`	`117`	`font-size: 18px;`
	`118`	`+ color: white;`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`h4 {`
`121`	`122`	`font-size: 16px;`
	`123`	`+ color: white;`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`h5 {`
`125`	`127`	`font-size: 14px;`
	`128`	`+ color: white;`
`126`	`129`	`}`
`127`	`130`
`128`	`131`	`h6 {`
`129`	`132`	`color: rgb(238, 238, 236);`
`130`	`133`	`font-size: 14px;`
	`134`	`+ color: white;`
`131`	`135`	`}`
`132`	`136`
`133`	`137`	`p, blockquote, ul, ol, dl, li, table, pre {`