From ab569a5b5cddca68e94dd7dbb4f446414d798d92 Mon Sep 17 00:00:00 2001 From: Tingwen Zhang Date: Fri, 16 May 2025 09:29:09 -0400 Subject: [PATCH 1/5] feat: renamed all files under src --- .../pdfgui/icons/{C60_16x16.png => C60-16x16.png} | Bin .../icons/{columbia_logo.png => columbia-logo.png} | Bin .../pdfgui/icons/{danse_logo.png => danse-logo.png} | Bin .../pdfgui/icons/{msu_logo.png => msu-logo.png} | Bin .../pdfgui/icons/{nsf_logo.png => nsf-logo.png} | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename src/diffpy/pdfgui/icons/{C60_16x16.png => C60-16x16.png} (100%) rename src/diffpy/pdfgui/icons/{columbia_logo.png => columbia-logo.png} (100%) rename src/diffpy/pdfgui/icons/{danse_logo.png => danse-logo.png} (100%) rename src/diffpy/pdfgui/icons/{msu_logo.png => msu-logo.png} (100%) rename src/diffpy/pdfgui/icons/{nsf_logo.png => nsf-logo.png} (100%) diff --git a/src/diffpy/pdfgui/icons/C60_16x16.png b/src/diffpy/pdfgui/icons/C60-16x16.png similarity index 100% rename from src/diffpy/pdfgui/icons/C60_16x16.png rename to src/diffpy/pdfgui/icons/C60-16x16.png diff --git a/src/diffpy/pdfgui/icons/columbia_logo.png b/src/diffpy/pdfgui/icons/columbia-logo.png similarity index 100% rename from src/diffpy/pdfgui/icons/columbia_logo.png rename to src/diffpy/pdfgui/icons/columbia-logo.png diff --git a/src/diffpy/pdfgui/icons/danse_logo.png b/src/diffpy/pdfgui/icons/danse-logo.png similarity index 100% rename from src/diffpy/pdfgui/icons/danse_logo.png rename to src/diffpy/pdfgui/icons/danse-logo.png diff --git a/src/diffpy/pdfgui/icons/msu_logo.png b/src/diffpy/pdfgui/icons/msu-logo.png similarity index 100% rename from src/diffpy/pdfgui/icons/msu_logo.png rename to src/diffpy/pdfgui/icons/msu-logo.png diff --git a/src/diffpy/pdfgui/icons/nsf_logo.png b/src/diffpy/pdfgui/icons/nsf-logo.png similarity index 100% rename from src/diffpy/pdfgui/icons/nsf_logo.png rename to src/diffpy/pdfgui/icons/nsf-logo.png From bf98d5e92d6688b9bf88e6550090d2ceef616452 Mon Sep 17 00:00:00 2001 From: Tingwen Zhang Date: Fri, 16 May 2025 09:34:18 -0400 Subject: [PATCH 2/5] feat: renamed files under news --- news/{rm_texinfo.rst => rm-texinfo.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{rm_texinfo.rst => rm-texinfo.rst} (100%) diff --git a/news/rm_texinfo.rst b/news/rm-texinfo.rst similarity index 100% rename from news/rm_texinfo.rst rename to news/rm-texinfo.rst From 2c2fd754e9e8f31e2bdf5ddf69e852f5d33e56a4 Mon Sep 17 00:00:00 2001 From: TingwenZhang Date: Fri, 16 May 2025 10:21:37 -0400 Subject: [PATCH 3/5] Fix reusable-workflow reference to @main --- .github/workflows/check-news-item.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-news-item.yml b/.github/workflows/check-news-item.yml index 33a188fd..f439c0c9 100644 --- a/.github/workflows/check-news-item.yml +++ b/.github/workflows/check-news-item.yml @@ -7,6 +7,6 @@ on: jobs: check-news-item: - uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0 + uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@main with: project: diffpy.pdfgui From 63e7892c1169df18c4dc39bbaa9ee7005170302a Mon Sep 17 00:00:00 2001 From: TingwenZhang Date: Fri, 16 May 2025 10:33:44 -0400 Subject: [PATCH 4/5] Fix reusable-workflow reference --- .github/workflows/check-news-item.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-news-item.yml b/.github/workflows/check-news-item.yml index f439c0c9..89fa514c 100644 --- a/.github/workflows/check-news-item.yml +++ b/.github/workflows/check-news-item.yml @@ -7,6 +7,6 @@ on: jobs: check-news-item: - uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@main + uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml with: project: diffpy.pdfgui From 461e94dbf9adcc73d1a18941b8f7f4a5c8f6ec93 Mon Sep 17 00:00:00 2001 From: TingwenZhang Date: Fri, 16 May 2025 22:01:28 -0400 Subject: [PATCH 5/5] chore: fixed all references to the renamed images in the python file; restore workflow to @v0 --- .github/workflows/check-news-item.yml | 2 +- src/diffpy/pdfgui/gui/aboutdialog.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-news-item.yml b/.github/workflows/check-news-item.yml index 89fa514c..33a188fd 100644 --- a/.github/workflows/check-news-item.yml +++ b/.github/workflows/check-news-item.yml @@ -7,6 +7,6 @@ on: jobs: check-news-item: - uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml + uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0 with: project: diffpy.pdfgui diff --git a/src/diffpy/pdfgui/gui/aboutdialog.py b/src/diffpy/pdfgui/gui/aboutdialog.py index fb242433..821bddd0 100644 --- a/src/diffpy/pdfgui/gui/aboutdialog.py +++ b/src/diffpy/pdfgui/gui/aboutdialog.py @@ -128,13 +128,13 @@ def __init__(self, *args, **kwds): self.label_svnrevision.SetLabel(revision) # set bitmaps for logo buttons - logo = wx.Bitmap(iconpath("nsf_logo.png")) + logo = wx.Bitmap(iconpath("nsf-logo.png")) self.bitmap_button_nsf.SetBitmapLabel(logo) - logo = wx.Bitmap(iconpath("danse_logo.png")) + logo = wx.Bitmap(iconpath("danse-logo.png")) self.bitmap_button_danse.SetBitmapLabel(logo) - logo = wx.Bitmap(iconpath("msu_logo.png")) + logo = wx.Bitmap(iconpath("msu-logo.png")) self.bitmap_button_msu.SetBitmapLabel(logo) - logo = wx.Bitmap(iconpath("columbia_logo.png")) + logo = wx.Bitmap(iconpath("columbia-logo.png")) self.bitmap_button_columbia.SetBitmapLabel(logo) # resize dialog window to fit version number nicely