Fix accel clash

Author: teamcons

data/jorts.metainfo.xml.in

@@ -103,6 +103,7 @@
                     <li>Added a reset-settings commandline option. Could be handy.</li>
                     <li>Ctrl+L to focus note title</li>
                     <li>Ctrl+M to open note settings now</li>
+                    <li>Alt+Number to change theme quickly</li>
                     <li>Some UI elements show up after being shown, for a sleek vibe</li>
                     <li>New note setting: Monospace. Could be for accessibility, could be for ascii doodles</li>
                     <li>Cleaner, nicer code under the hood. Probably marginally enhanced performances or less edge bugs</li>

src/Application.vala

@@ -88,7 +88,7 @@ public class Jorts.Application : Gtk.Application {
         set_accels_for_action ("app.action_delete", {"<Control>W"});
         set_accels_for_action ("app.action_save", {"<Control>S"});
         set_accels_for_action ("app.action_zoom_out", {"<Control>minus", "<Control>KP_Subtract"});
-        set_accels_for_action ("app.action_zoom_default", {"<Control>equal"});
+        set_accels_for_action ("app.action_zoom_default", {"<Control>equal", "<Control>0", "<Control>KP_0"});
         set_accels_for_action ("app.action_zoom_in", {"<Control>plus", "<Control>KP_Add"});
         set_accels_for_action ("app.action_toggle_scribbly", {"<Control>H"});
         set_accels_for_action ("app.action_toggle_actionbar", {"<Control>T"});
@@ -97,16 +97,16 @@ public class Jorts.Application : Gtk.Application {
         set_accels_for_action ("app.action_show_emoji", {"<Control>period"});
         set_accels_for_action ("app.action_show_menu", {"<Control>M"});
 
-        set_accels_for_action ("app.action_theme_1", {"<Control>1"});
-        set_accels_for_action ("app.action_theme_2", {"<Control>2"});
-        set_accels_for_action ("app.action_theme_3", {"<Control>3"});
-        set_accels_for_action ("app.action_theme_4", {"<Control>4"});
-        set_accels_for_action ("app.action_theme_5", {"<Control>5"});
-        set_accels_for_action ("app.action_theme_6", {"<Control>6"});
-        set_accels_for_action ("app.action_theme_7", {"<Control>7"});
-        set_accels_for_action ("app.action_theme_8", {"<Control>8"});
-        set_accels_for_action ("app.action_theme_9", {"<Control>9"});
-        set_accels_for_action ("app.action_theme_0", {"<Control>0", "<Control>KP_0"});
+        set_accels_for_action ("app.action_theme_1", {"<Alt>1"});
+        set_accels_for_action ("app.action_theme_2", {"<Alt>2"});
+        set_accels_for_action ("app.action_theme_3", {"<Alt>3"});
+        set_accels_for_action ("app.action_theme_4", {"<Alt>4"});
+        set_accels_for_action ("app.action_theme_5", {"<Alt>5"});
+        set_accels_for_action ("app.action_theme_6", {"<Alt>6"});
+        set_accels_for_action ("app.action_theme_7", {"<Alt>7"});
+        set_accels_for_action ("app.action_theme_8", {"<Alt>8"});
+        set_accels_for_action ("app.action_theme_9", {"<Alt>9"});
+        set_accels_for_action ("app.action_theme_0", {"<Alt>0", "<Alt>KP_0"});
 
 
         // Force the eOS icon theme, and set the blueberry as fallback, if for some reason it fails for individual notes

src/Widgets/ColorBox.vala

@@ -52,34 +52,34 @@ public class Jorts.ColorBox : Gtk.Box {
             color_button_slate = new ColorPill (Jorts.Themes.SLATE);
 
             color_button_blueberry.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>1"}, Jorts.Themes.BLUEBERRY.to_nicename ());
+                {"<Alt>1"}, Jorts.Themes.BLUEBERRY.to_nicename ());
 
             color_button_mint.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>2"}, Jorts.Themes.MINT.to_nicename ());
+                {"<Alt>2"}, Jorts.Themes.MINT.to_nicename ());
 
             color_button_lime.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>3"}, Jorts.Themes.LIME.to_nicename ());
+                {"<Alt>3"}, Jorts.Themes.LIME.to_nicename ());
 
             color_button_banana.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>4"}, Jorts.Themes.BANANA.to_nicename ());
+                {"<Alt>4"}, Jorts.Themes.BANANA.to_nicename ());
 
             color_button_orange.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>5"}, Jorts.Themes.ORANGE.to_nicename ());
+                {"<Alt>5"}, Jorts.Themes.ORANGE.to_nicename ());
 
             color_button_strawberry.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>6"}, Jorts.Themes.STRAWBERRY.to_nicename ());
+                {"<Alt>6"}, Jorts.Themes.STRAWBERRY.to_nicename ());
 
             color_button_bubblegum.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>7"}, Jorts.Themes.BUBBLEGUM.to_nicename ());
+                {"<Alt>7"}, Jorts.Themes.BUBBLEGUM.to_nicename ());
 
             color_button_grape.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>8"}, Jorts.Themes.GRAPE.to_nicename ());
+                {"<Alt>8"}, Jorts.Themes.GRAPE.to_nicename ());
 
             color_button_cocoa.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>9"}, Jorts.Themes.COCOA.to_nicename ());
+                {"<Alt>9"}, Jorts.Themes.COCOA.to_nicename ());
 
             color_button_slate.tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>0"}, Jorts.Themes.SLATE.to_nicename ());
+                {"<Alt>0"}, Jorts.Themes.SLATE.to_nicename ());
 
 
             color_button_lime.set_group (color_button_blueberry);