Rename more thoroughly to GNOME Tweaks

README.md

@@ -37,7 +37,7 @@ RUNNING
 -------
  * If you wish to run the application uninstalled, execute;
 
-    ./gnome-tweak-tool [-p /path/to/jhbuild/prefix/]
+    ./gnome-tweaks [-p /path/to/jhbuild/prefix/]
 
 SUPPORTED DESKTOPS
 ------------------
@@ -70,5 +70,5 @@ This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later version.
 
-data/gnome-tweak-tool-appdata.xml.in is licensed under the Creative Commons
+data/org.gnome.tweaks.appdata.xml.in is licensed under the Creative Commons
 CC0-1.0 license.

data/meson.build

@@ -6,7 +6,7 @@ gui_data = [
 ]
 install_data(gui_data, install_dir: pkgdatadir)
 
-desktop_file = 'gnome-tweak-tool.desktop'
+desktop_file = 'org.gnome.tweaks.desktop'
 i18n.merge_file(desktop_file,
   input: desktop_file + '.in',
   output: desktop_file,
@@ -16,7 +16,7 @@ i18n.merge_file(desktop_file,
   type: 'desktop'
 )
 
-appdata_file = 'gnome-tweak-tool.appdata.xml'
+appdata_file = 'org.gnome.tweaks.appdata.xml'
 i18n.merge_file(appdata_file,
   input: appdata_file + '.in',
   output: appdata_file,

data/gnome-tweak-tool.desktop.in → data/org.gnome.tweaks.desktop.in

@@ -2,11 +2,12 @@
 Name=Tweaks
 Comment=Tweak advanced GNOME 3 settings
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-tweak-tool
-Exec=gnome-tweak-tool
+Icon=org.gnome.tweaks
+Exec=gnome-tweaks
 Terminal=false
 Type=Application
 StartupNotify=true
+StartupWMClass=gnome-tweaks
 Categories=GNOME;GTK;Utility;
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=Settings;Advanced;Preferences;Extensions;Fonts;Theme;XKB;Keyboard;Typing;

data/shell.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gnome-tweak-tool">
+<interface domain="gnome-tweaks">
   <!-- interface-requires gtk+ 3.6 -->
   <menu id="appmenu">
    <section>

gnome-tweak-tool → gnome-tweaks

@@ -58,7 +58,7 @@ if __name__ == '__main__':
     gtweak.LIBEXEC_DIR = LIBEXEC_DIR
     gtweak.ENABLE_TEST = options.test
     gtweak.ALL_TWEAKS = options.load
-    gtweak.APP_NAME = "gnome-tweak-tool"
+    gtweak.APP_NAME = "gnome-tweaks"
     gtweak.VERBOSE = options.verbose
 
     if options.debug:
@@ -70,8 +70,8 @@ if __name__ == '__main__':
     locale.setlocale(locale.LC_ALL, None)
     gettext.install(gtweak.APP_NAME, LOCALE_DIR, names=('gettext', 'ngettext'))
 
-    from gtweak.app import GnomeTweakTool
-    app = GnomeTweakTool()
+    from gtweak.app import GnomeTweaks
+    app = GnomeTweaks()
     signal.signal(signal.SIGINT, signal.SIG_DFL)
     exit_status = app.run(None)
     sys.exit(exit_status)

gtweak/app.py

@@ -17,11 +17,11 @@ from gtweak.gshellwrapper import GnomeShellFactory
 from gtweak.utils import DisableExtension
 
 
-class GnomeTweakTool(Gtk.Application):
+class GnomeTweaks(Gtk.Application):
 
     def __init__(self):
         GLib.set_application_name(_("GNOME Tweaks"))
-        Gtk.Application.__init__(self, application_id="org.gnome.TweakTool")
+        Gtk.Application.__init__(self, application_id="org.gnome.Tweaks")
         self.win = None
 
     def do_activate(self):
@@ -98,7 +98,7 @@ class GnomeTweakTool(Gtk.Application):
         aboutdialog.set_comments(about_comment)
 
         aboutdialog.set_copyright("Copyright © 2011 - 2013 John Stowers.")
-        aboutdialog.set_logo_icon_name("gnome-tweak-tool")
+        aboutdialog.set_logo_icon_name("org.gnome.tweaks")
         aboutdialog.set_website("https://wiki.gnome.org/Apps/GnomeTweakTool")
         aboutdialog.set_website_label(_("Homepage"))
         aboutdialog.set_license_type(Gtk.License.GPL_3_0)

gtweak/tweaks/tweak_group_shell_extensions.py

@@ -43,7 +43,7 @@ class _ExtensionsBlankState(Gtk.Box, Tweak):
                                valign=Gtk.Align.CENTER)
         Tweak.__init__(self, 'extensions', '')
 
-        self.add(Gtk.Image(icon_name="gnome-tweak-tool-symbolic",
+        self.add(Gtk.Image(icon_name="org.gnome.tweaks-symbolic",
                  pixel_size=128, opacity=0.3))
 
         self.add(Gtk.Label(label="<b>" + _("No Extensions Installed") + "</b>",

gtweak/tweakview.py

@@ -24,7 +24,7 @@ class Window(Gtk.ApplicationWindow):
         else:
             self.set_size_request(950, 700)
         self.set_position(Gtk.WindowPosition.CENTER)
-        self.set_icon_name("gnome-tweak-tool")
+        self.set_icon_name("org.gnome.tweaks")
 
         self.hsize_group = Gtk.SizeGroup(mode=Gtk.SizeGroupMode.HORIZONTAL)
 

gtweak/utils.py

@@ -299,11 +299,11 @@ class Notification:
             self.notification = Notify.Notification.new(
                                     summary,
                                     body,
-                                    'gnome-tweak-tool'
+                                    'gnome-tweaks'
             )
             self.notification.set_hint(
                                 "desktop-entry",
-                                GLib.Variant('s', 'gnome-tweak-tool'))
+                                GLib.Variant('s', 'org.gnome.tweaks'))
             self.notification.show()
         else:
             raise Exception("Not Supported")
@@ -315,14 +315,14 @@ class LogoutNotification:
             self.notification = Notify.Notification.new(
                                 _("Configuration changes require restart"),
                                 _("Your session needs to be restarted for settings to take effect"),
-                                'gnome-tweak-tool')
+                                'gnome-tweaks')
             self.notification.add_action(
                                 "restart",
                                 _("Restart Session"),
                                 self._logout, None, None)
             self.notification.set_hint(
                                 "desktop-entry",
-                                GLib.Variant('s', 'gnome-tweak-tool'))
+                                GLib.Variant('s', 'org.gnome.tweaks'))
             self.notification.show()
         else:
             raise Exception("Not Supported")

meson.build

-project('gnome-tweak-tool',
+project('gnome-tweaks',
   version: '3.27.3',
   meson_version: '>= 0.40.0'
 )
@@ -23,7 +23,9 @@ gtweakdir = join_paths(pythondir, 'gtweak')
 icondir = join_paths(datadir, 'icons', 'hicolor')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 
-install_data('gnome-tweak-tool', install_dir: bindir)
+install_data('gnome-tweaks', install_dir: bindir)
+# Intentionally keep lid-inhibitor with old name so that user autostart
+# files created by older versions of Tweaks will still work
 install_data('gnome-tweak-tool-lid-inhibitor', install_dir: libexecdir)
 
 subdir('gtweak')

po/POTFILES.in

 # List of source files which contain translatable strings.
-data/gnome-tweak-tool.appdata.xml.in
-data/gnome-tweak-tool.desktop.in
+data/org.gnome.tweaks.appdata.xml.in
+data/org.gnome.tweaks.desktop.in
 data/shell.ui
 gtweak/app.py
 gtweak/tweakmodel.py