Minute changes

Author: teamcons

.gitignore

@@ -3,17 +3,10 @@ builddir/
 ~*
 *~
 .flatpak-builder/
-app-dir/
-obj-x86_64-linux-gnu/
 repo/
-.vscode/settings.json
-data/Application copy.css
-src/Widgets/SettingsPopover copy.vala
-src/MainWindow copy.vala
+.vscode/
 generate_stylesheets.sh
-src/Widgets/help/ActionBar.vala
 .gitignore
-src/Widgets/help/MainWindow.vala
 .flatpak/
-src/Widgets/help/dumped
-.potrans
+.potrans
+.editorconfig

src/Application.vala

@@ -260,7 +260,7 @@ namespace Jorts {
 
                 case "--preferences":
                     activate ();
-                    preferences = new PreferenceWindow(this);
+                    preferences = new Jorts.PreferenceWindow();
                     break;
 
                 case "--dump":

src/Preferences.vala

@@ -40,10 +40,8 @@ namespace Jorts {
             { ACTION_NEW, action_new }
         };
 
-        public PreferenceWindow (Gtk.Application app) {
+        construct {
             debug ("Showing preference window");
-
-            Object (application: app);
             Intl.setlocale ();
 
             var actions = new SimpleActionGroup ();

src/StickyNoteWindow.vala

@@ -90,7 +90,7 @@ namespace Jorts {
         /*************************************************/
 
         public StickyNoteWindow (Gtk.Application app, NoteData data) {
-            Object (application: app);
+
             Intl.setlocale ();
             debug ("New StickyNoteWindow instance: " + data.title);
 

src/Widgets/ColorPill.vala

@@ -25,6 +25,7 @@ I just dont wanna rewrite the same button over and over
 
 public class Jorts.ColorPill : Gtk.CheckButton {
         public ColorPill (string tooltip, string colorclass) {
+
                 add_css_class("colorpill");
                 add_css_class(colorclass);
                 set_size_request (24, 24);

src/Widgets/SettingsPopover.vala

@@ -63,25 +63,13 @@ public class Jorts.SettingsPopover : Gtk.Popover {
             THEME SELECTION
         */
 
-        //  //TRANSLATORS: The label is displayed above colored pills the user can click to choose a theme color
-        //  var color_button_label = new Granite.HeaderLabel (_("Sticky Note Colour"));
-        //  color_button_label.add_css_class (Granite.STYLE_CLASS_TITLE_LABEL);
-        //  color_button_label.tooltip_text = _("Choose a colour for this sticky note");
-        //  color_button_label.margin_top = 9;
-
-        //setting_grid.append (color_button_label);
-
-
-        //TODO: Multiline
         var color_button_box = new Jorts.ColorBox (theme) {
             margin_start = 12,
             margin_end = 12
         };
 
         color_button_box.theme_changed.connect ((selected) => {this.theme_changed (selected);});
 
-
-
         /* 
             ZOOM SELECTION
         */
@@ -111,7 +99,7 @@ public class Jorts.SettingsPopover : Gtk.Popover {
         this.zoom_out_button.clicked.connect (() => {this.zoom_changed ("zoom_out");});
         this.zoom_default_button.clicked.connect (() => {this.zoom_changed ("reset");});
         this.zoom_in_button.clicked.connect (() => {this.zoom_changed ("zoom_in");});
-        
+
         var font_size_box = new Gtk.Box (HORIZONTAL, 0) {
             homogeneous = true,
             hexpand = true,
@@ -121,7 +109,7 @@ public class Jorts.SettingsPopover : Gtk.Popover {
 
         font_size_box.append (this.zoom_out_button);
         font_size_box.append (this.zoom_default_button);
-        font_size_box.append (this.zoom_in_button);       
+        font_size_box.append (this.zoom_in_button);
         font_size_box.add_css_class (Granite.STYLE_CLASS_LINKED);
 
         /*
@@ -146,7 +134,7 @@ public class Jorts.SettingsPopover : Gtk.Popover {
         //TRANSLATORS: %d is replaced by a number. Ex: 100, to display 100%
         //It must stay as "%d" in the translation so the app can replace it with the current zoom level.
         var label = _("%d%%").printf (zoom);
-        this.zoom_default_button.set_label (label);  
+        this.zoom_default_button.set_label (label);
     }