Moved UI files into subdirectories

stuarthayhurst · Jun 15, 2023 · 702004c · 702004c
1 parent 6ff3919
commit 702004c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -42,8 +42,8 @@ translations:
 	@./scripts/update-pot.sh
 	@./scripts/update-po.sh -a
 gtk4:
-	gtk-builder-tool simplify --replace extension/ui/prefs.ui
-	gtk4-builder-tool simplify --3to4 extension/ui/prefs.ui > extension/ui/prefs-gtk4.ui
+	gtk-builder-tool simplify --replace extension/ui/gtk3/prefs.ui
+	gtk4-builder-tool simplify --3to4 extension/ui/gtk3/prefs.ui > extension/ui/gtk4/prefs.ui
 compress:
 	$(MAKE) $(PNG_FILES)
 $(PNG_FILES):

diff --git a/extension/prefs.js b/extension/prefs.js
@@ -43,9 +43,9 @@ var PrefsPages = class PrefsPages {
   _createPreferences() {
     //Use different UI file for GNOME 40+ and 3.38
     if (ShellVersion >= 40) {
-      this._builder.add_from_file(Me.path + '/ui/prefs-gtk4.ui');
+      this._builder.add_from_file(Me.path + '/ui/gtk4/prefs.ui');
     } else {
-      this._builder.add_from_file(Me.path + '/ui/prefs.ui');
+      this._builder.add_from_file(Me.path + '/ui/gtk3/prefs.ui');
     }
 
     //Get the settings container widget

diff --git a/extension/ui/prefs.ui → extension/ui/gtk3/prefs.ui b/extension/ui/prefs.ui → extension/ui/gtk3/prefs.ui
diff --git a/extension/ui/prefs-gtk4.ui → extension/ui/gtk4/prefs.ui b/extension/ui/prefs-gtk4.ui → extension/ui/gtk4/prefs.ui
diff --git a/scripts/update-pot.sh b/scripts/update-pot.sh
@@ -12,7 +12,7 @@ xgettext --from-code=UTF-8 \
          --copyright-holder="Stuart Hayhurst" \
          --package-name="alphabetical-grid-extension" \
          --output=po/messages.pot \
-         -- *.js lib/*.js ui/*.ui
+         -- *.js lib/*.js ui/*/*.ui
 
 #Replace some lines of the header with our own
 sed -i '1s/.*/# <LANGUAGE> translation for the Alphabetical App Grid GNOME Shell Extension./' po/messages.pot