Commit ccaab2be authored by Canek Peláez's avatar Canek Peláez
Browse files

Merge branch 'master' of aztlan.fciencias.unam.mx:canek/mlm

parents f1151fad 78ea3cf1

src/application/application-window.vala

+0 −29
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ namespace MLM { 
        [GtkChild]

        private Gtk.Label filename_label;



        /* The shortcuts dialog. */

        private ShortcutsWindow shortcuts;

        /* The MLM application. */

        private Application mlm;

        /* The file tags. */
@@ -446,33 +444,6 @@ namespace MLM { 
            return norm;

        }



        /**

         * Shows the about dialog.

         */

        public void show_about_dialog() {

            string[] authors = { "Canek Peláez Valdés <canek@ciencias.unam.mx>" };

            Gtk.show_about_dialog(

                this,

                "authors",        authors,

                "comments",       _("A Gtk+ based music library maintainer"),

                "copyright",      "Copyright © 2013-2019 Canek Peláez Valdés",

                "license-type",   Gtk.License.GPL_3_0,

                "logo-icon-name", "mlm",

                "version",        Config.PACKAGE_VERSION,

                "website",        ("https://canek@aztlan.fciencias.unam.mx/" +

                                   "gitlab/canek/mlm.git"),

                "wrap-license",   true);

        }



        /**

         * Shows the shortcuts dialog.

         */

        public void show_shortcuts_dialog() {

            if (shortcuts == null)

                shortcuts = new ShortcutsWindow();

            shortcuts.show_all();

        }



        /* Selects an image from a file. */

        private uint8[]? select_image(string title) {

            var dialog =

src/application/application.vala

+17 −3
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ namespace MLM { 


        /* The application window. */

        private ApplicationWindow window;

        /* The shortcuts dialog. */

        private ShortcutsWindow sc_window;

        /* The list of files. */

        private Gee.ArrayList<GLib.File> files;

        /* The list iterator. */
@@ -243,13 +245,25 @@ namespace MLM { 


        /* The about action. */

        private void about() {

            window.show_about_dialog();

            tags.update();

            string[] authors = { "Canek Peláez Valdés <canek@ciencias.unam.mx>" };

            Gtk.show_about_dialog(

                window,

                "authors",        authors,

                "comments",       _("A Gtk+ based music library maintainer"),

                "copyright",      "Copyright © 2013-2019 Canek Peláez Valdés",

                "license-type",   Gtk.License.GPL_3_0,

                "logo-icon-name", "mlm",

                "version",        Config.PACKAGE_VERSION,

                "website",        ("https://canek@aztlan.fciencias.unam.mx/" +

                                   "gitlab/canek/mlm.git"),

                "wrap-license",   true);

        }



        /* The shortcuts action. */

        private void shortcuts() {

            window.show_shortcuts_dialog();

            if (shortcuts == null)

                sc_window = new ShortcutsWindow();

            sc_window.show_all();

        }



        /* Compares two files by path. */