diff --git a/ClipboardApi.java b/ClipboardApi.java old mode 100644 new mode 100755 diff --git a/ComposeWindow.java b/ComposeWindow.java old mode 100644 new mode 100755 index 7b2702e..6a8ee25 --- a/ComposeWindow.java +++ b/ComposeWindow.java @@ -159,6 +159,7 @@ ComposeWindow extends JFrame { newComposition(); setContentPane(display); + setIconImage(primaire.getProgramIcon()); } // - -%- - diff --git a/ImageApi.java b/ImageApi.java old mode 100644 new mode 100755 diff --git a/ImageWindow.java b/ImageWindow.java old mode 100644 new mode 100755 diff --git a/JKomasto.java b/JKomasto.java old mode 100644 new mode 100755 index e87c232..803c69f --- a/JKomasto.java +++ b/JKomasto.java @@ -47,6 +47,9 @@ JKomasto { private MastodonApi api; + private Image + programIcon; + // ---%-@-%--- public MastodonApi @@ -80,6 +83,9 @@ JKomasto { public WindowUpdater getWindowUpdater() { return windowUpdater; } + public Image + getProgramIcon() { return programIcon; } + // ---%-@-%--- public static void @@ -95,6 +101,7 @@ JKomasto { { api = new MastodonApi(); windowUpdater = new WindowUpdater(this); + programIcon = ImageApi.local("kettle"); timelineWindow = new TimelineWindow(this); composeWindow = new ComposeWindow(this); diff --git a/KDE_Dialog_Appear.wav b/KDE_Dialog_Appear.wav old mode 100644 new mode 100755 diff --git a/LoginWindow.java b/LoginWindow.java old mode 100644 new mode 100755 index cedbd05..957d354 --- a/LoginWindow.java +++ b/LoginWindow.java @@ -399,6 +399,8 @@ LoginWindow extends JFrame { display.setPreferredSize(new Dimension(320, 280)); setContentPane(display); pack(); + + setIconImage(primaire.getProgramIcon()); } } diff --git a/MastodonApi.java b/MastodonApi.java old mode 100644 new mode 100755 diff --git a/NotificationsWindow.java b/NotificationsWindow.java old mode 100644 new mode 100755 index 1dc2467..b4fe3a0 --- a/NotificationsWindow.java +++ b/NotificationsWindow.java @@ -205,6 +205,7 @@ NotificationsWindow extends JFrame { setContentPane(display); pack(); + setIconImage(primaire.getProgramIcon()); setDefaultCloseOperation(DISPOSE_ON_CLOSE); setVisible(true); } diff --git a/PostWindow.java b/PostWindow.java old mode 100644 new mode 100755 index d228db4..7028391 --- a/PostWindow.java +++ b/PostWindow.java @@ -332,6 +332,7 @@ PostWindow extends JFrame { display = new PostComponent(this); setContentPane(display); + setIconImage(primaire.getProgramIcon()); } } diff --git a/RepliesWindow.java b/RepliesWindow.java old mode 100644 new mode 100755 index 4a0afa8..fb1d51f --- a/RepliesWindow.java +++ b/RepliesWindow.java @@ -168,6 +168,8 @@ RepliesWindow extends JFrame { display = new RepliesComponent(this); setContentPane(display); setSize(384, 224); + + setIconImage(primaire.getProgramIcon()); } } diff --git a/RequestListener.java b/RequestListener.java old mode 100644 new mode 100755 diff --git a/RichTextPane.java b/RichTextPane.java old mode 100644 new mode 100755 diff --git a/RudimentaryHTMLParser.java b/RudimentaryHTMLParser.java old mode 100644 new mode 100755 diff --git a/TimelineWindow.java b/TimelineWindow.java old mode 100644 new mode 100755 index 41b9dec..4db24d3 --- a/TimelineWindow.java +++ b/TimelineWindow.java @@ -368,6 +368,10 @@ implements ActionListener { String f = type.toString().toLowerCase(); display.setBackgroundImage(ImageApi.local(f)); + /* + * (注) Java's image renderer draws images with transparency + * darker than GIMP does. Overcompensate in lightening. + */ display.repaint(); } @@ -673,6 +677,7 @@ implements ActionListener { setContentPane(display); setTimelineType(TimelineType.HOME); + setIconImage(primaire.getProgramIcon()); } } @@ -747,9 +752,23 @@ implements { int w = getWidth(), h = getHeight(); g.clearRect(0, 0, w, h); - int h2 = h * 5 / 10, w2 = h2; - int x = w - w2, y = h - h2; - g.drawImage(backgroundImage, x, y, w2, h2, this); + + if (backgroundImage != null) + { + int b = h * 5 / 10; + int iw = backgroundImage.getWidth(this); + int ih = backgroundImage.getHeight(this); + if (ih > iw) { + ih = ih * b / iw; + iw = b; + } + else { + iw = iw * b / ih; + ih = b; + } + int x = w - iw, y = h - ih; + g.drawImage(backgroundImage, x, y, iw, ih, this); + } ((java.awt.Graphics2D)g).setRenderingHint( java.awt.RenderingHints.KEY_ANTIALIASING, diff --git a/TwoToggleButton.java b/TwoToggleButton.java old mode 100644 new mode 100755 diff --git a/WindowUpdater.java b/WindowUpdater.java old mode 100644 new mode 100755 diff --git a/graphics/Federated.xcf b/graphics/Federated.xcf old mode 100644 new mode 100755 index 1d9a6c6..09cedd3 Binary files a/graphics/Federated.xcf and b/graphics/Federated.xcf differ diff --git a/graphics/Flags.xcf b/graphics/Flags.xcf old mode 100644 new mode 100755 diff --git a/graphics/Home.xcf b/graphics/Home.xcf new file mode 100644 index 0000000..4c3b70e Binary files /dev/null and b/graphics/Home.xcf differ diff --git a/graphics/Hourglass.xcf b/graphics/Hourglass.xcf old mode 100644 new mode 100755 diff --git a/graphics/Kettle.xcf b/graphics/Kettle.xcf new file mode 100644 index 0000000..8cbe896 Binary files /dev/null and b/graphics/Kettle.xcf differ diff --git a/graphics/boostToggled.png b/graphics/boostToggled.png old mode 100644 new mode 100755 diff --git a/graphics/boostUntoggled.png b/graphics/boostUntoggled.png old mode 100644 new mode 100755 diff --git a/graphics/button.png b/graphics/button.png old mode 100644 new mode 100755 diff --git a/graphics/disabledOverlay.png b/graphics/disabledOverlay.png old mode 100644 new mode 100755 diff --git a/graphics/favouriteToggled.png b/graphics/favouriteToggled.png old mode 100644 new mode 100755 diff --git a/graphics/favouriteUntoggled.png b/graphics/favouriteUntoggled.png old mode 100644 new mode 100755 diff --git a/graphics/federated.png b/graphics/federated.png old mode 100644 new mode 100755 index 7ddfddd..ec0146e Binary files a/graphics/federated.png and b/graphics/federated.png differ diff --git a/graphics/home.png b/graphics/home.png new file mode 100644 index 0000000..2c7aafd Binary files /dev/null and b/graphics/home.png differ diff --git a/graphics/kettle.png b/graphics/kettle.png new file mode 100644 index 0000000..e43f52c Binary files /dev/null and b/graphics/kettle.png differ diff --git a/graphics/miscToggled.png b/graphics/miscToggled.png old mode 100644 new mode 100755 diff --git a/graphics/miscUntoggled.png b/graphics/miscUntoggled.png old mode 100644 new mode 100755 diff --git a/graphics/ref1.png b/graphics/ref1.png old mode 100644 new mode 100755 diff --git a/graphics/replyToggled.png b/graphics/replyToggled.png old mode 100644 new mode 100755 diff --git a/graphics/replyUntoggled.png b/graphics/replyUntoggled.png old mode 100644 new mode 100755 diff --git a/graphics/selectedOverlay.png b/graphics/selectedOverlay.png old mode 100644 new mode 100755 diff --git a/graphics/test1.png b/graphics/test1.png old mode 100644 new mode 100755 diff --git a/graphics/test2.png b/graphics/test2.png old mode 100644 new mode 100755 diff --git a/graphics/test3.png b/graphics/test3.png old mode 100644 new mode 100755 diff --git a/graphics/test4.png b/graphics/test4.png old mode 100644 new mode 100755 diff --git a/notifOptions.txt b/notifOptions.txt old mode 100644 new mode 100755 diff --git a/notifOptions.txt~ b/notifOptions.txt~ old mode 100644 new mode 100755