Merge branch 'true-application' into 'master' (9aec0d21) · Commits · Canek Peláez / Music Library Maintainer · GitLab

data/mlm.ui

+58 −58

Original line number	Diff line number	Diff line
		@@ -605,7 +605,7 @@
		</object>
		<object class="GtkAdjustment" id="year_adjustment">
		<property name="lower">1900</property>
		<property name="upper">2014</property>
		<property name="upper">2019</property>
		<property name="value">1900</property>
		<property name="step-increment">1</property>
		<property name="page-increment">10</property>
		@@ -646,11 +646,11 @@
		<property name="popup-completion">False</property>
		<signal name="match-selected" handler="on_match_selected" swapped="no"/>
		</object>
		<object class="GtkPopover" id="popover">
		<property name="relative-to">reencode</property>
		<signal name="notify::visible" handler="popover_visibility_changed" swapped="no"/>
		<object class="GtkPopover" id="encode_popover">
		<property name="relative-to">encode_menu_button</property>
		<signal name="notify::visible" handler="on_popover_visibility_changed" swapped="no"/>
		<child>
		<object class="GtkProgressBar" id="bar">
		<object class="GtkProgressBar" id="encode_progress_bar">
		<property name="margin">12</property>
		<property name="visible">True</property>
		<property name="text">Reencoding...</property>
		@@ -666,7 +666,7 @@
		<signal name="destroy" handler="on_window_destroy" swapped="no"/>
		<signal name="key-press-event" handler="on_window_key_press" swapped="no"/>
		<child type="titlebar">
		<object class="GtkHeaderBar" id="header">
		<object class="GtkHeaderBar" id="header_bar">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="spacing">6</property>
		@@ -680,7 +680,7 @@
		<property name="spacing">0</property>
		<property name="orientation">horizontal</property>
		<child>
		<object class="GtkButton" id="previous">
		<object class="GtkButton" id="previous_button">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="tooltip-text" translatable="yes">Previous MP3</property>
		@@ -696,7 +696,7 @@
		</object>
		</child>
		<child>
		<object class="GtkButton" id="next">
		<object class="GtkButton" id="next_button">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="tooltip-text" translatable="yes">Next MP3</property>
		@@ -717,7 +717,7 @@
		</object>
		</child>
		<child>
		<object class="GtkButton" id="save">
		<object class="GtkButton" id="save_button">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="tooltip-text" translatable="yes">Save tags to MP3</property>
		@@ -736,13 +736,13 @@
		</packing>
		</child>
		<child>
		<object class="GtkMenuButton" id="reencode">
		<object class="GtkMenuButton" id="encode_menu_button">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="use-popover">True</property>
		<property name="tooltip-text" translatable="yes">Reencode MP3</property>
		<property name="tooltip-text" translatable="yes">Encode MP3</property>
		<child>
		<object class="GtkImage" id="reencode_image">
		<object class="GtkImage" id="encode_image">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="icon-name">system-run-symbolic</property>
		@@ -757,7 +757,7 @@
		</object>
		</child>
		<child>
		<object class="GtkFrame" id="frame">
		<object class="GtkFrame" id="tags_frame">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="margin">18</property>
		@@ -772,13 +772,13 @@
		<property name="left-padding">12</property>
		<property name="right-padding">12</property>
		<child>
		<object class="GtkBox" id="vbox">
		<object class="GtkBox" id="tags_vbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="orientation">vertical</property>
		<property name="spacing">12</property>
		<child>
		<object class="GtkGrid" id="grid">
		<object class="GtkGrid" id="tags_grid">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="row-spacing">6</property>
		@@ -790,7 +790,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Artist</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">artist</property>
		<property name="mnemonic-widget">artist_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -798,12 +798,12 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="artist">
		<object class="GtkEntry" id="artist_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		<property name="tooltip-text" translatable="yes">Main artist name</property>
		<signal name="changed" handler="tags_changed" swapped="no"/>
		<signal name="changed" handler="on_tags_changed" swapped="no"/>
		</object>
		<packing>
		<property name="left-attach">1</property>
		@@ -818,7 +818,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Title</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">title</property>
		<property name="mnemonic-widget">title_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -826,7 +826,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="title">
		<object class="GtkEntry" id="title_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -846,7 +846,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">A_lbum</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">album</property>
		<property name="mnemonic-widget">album_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -854,7 +854,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="album">
		<object class="GtkEntry" id="album_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -874,7 +874,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">Album _band</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">band</property>
		<property name="mnemonic-widget">band_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -882,7 +882,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="band">
		<object class="GtkEntry" id="band_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -902,7 +902,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Year</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">year</property>
		<property name="mnemonic-widget">year_spin_button</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -910,7 +910,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkSpinButton" id="year">
		<object class="GtkSpinButton" id="year_spin_button">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -931,7 +931,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Disc</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">disc</property>
		<property name="mnemonic-widget">disc_spin_button</property>
		</object>
		<packing>
		<property name="left-attach">2</property>
		@@ -939,7 +939,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkSpinButton" id="disc">
		<object class="GtkSpinButton" id="disc_spin_button">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -960,7 +960,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">T_rack</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">track</property>
		<property name="mnemonic-widget">track_spin_button</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -968,7 +968,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkSpinButton" id="track">
		<object class="GtkSpinButton" id="track_spin_button">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -989,7 +989,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">T_otal</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">total</property>
		<property name="mnemonic-widget">total_spin_button</property>
		</object>
		<packing>
		<property name="left-attach">2</property>
		@@ -997,7 +997,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkSpinButton" id="total">
		<object class="GtkSpinButton" id="total_spin_button">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -1018,7 +1018,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Genre</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">genre</property>
		<property name="mnemonic-widget">genre_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -1026,7 +1026,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkComboBoxText" id="genre_combobox">
		<object class="GtkComboBoxText" id="genre_combo_box">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="active-id">0</property>
		@@ -1036,7 +1036,7 @@
		<property name="popup-fixed-width">True</property>
		<property name="id-column">1</property>
		<child internal-child="entry">
		<object class="GtkEntry" id="genre">
		<object class="GtkEntry" id="genre_entry">
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		<property name="text">Blues</property>
		@@ -1059,7 +1059,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">_Comment</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">comment</property>
		<property name="mnemonic-widget">comment_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -1067,7 +1067,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="comment">
		<object class="GtkEntry" id="comment_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -1087,7 +1087,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">Compo_ser</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">composer</property>
		<property name="mnemonic-widget">composer_entry</property>
		<property name="tooltip-text" translatable="yes">Track composer</property>
		</object>
		<packing>
		@@ -1096,7 +1096,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="composer">
		<object class="GtkEntry" id="composer_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -1116,7 +1116,7 @@
		<property name="halign">end</property>
		<property name="label" translatable="yes">Origi_nal artist</property>
		<property name="use-underline">True</property>
		<property name="mnemonic-widget">original</property>
		<property name="mnemonic-widget">original_entry</property>
		</object>
		<packing>
		<property name="left-attach">0</property>
		@@ -1124,7 +1124,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkEntry" id="original">
		<object class="GtkEntry" id="original_entry">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="hexpand">True</property>
		@@ -1145,13 +1145,13 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="hbox">
		<object class="GtkBox" id="images_hbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="spacing">6</property>
		<property name="homogeneous">True</property>
		<child>
		<object class="GtkBox" id="cover_vbox">
		<object class="GtkBox" id="cover_image_vbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="orientation">vertical</property>
		@@ -1170,7 +1170,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="cover_hbox">
		<object class="GtkBox" id="cover_image_hbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="spacing">6</property>
		@@ -1194,7 +1194,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="cover_buttons_vbox">
		<object class="GtkBox" id="cover_image_buttons_vbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="orientation">vertical</property>
		@@ -1206,9 +1206,9 @@
		<property name="receives-default">True</property>
		<property name="always_show-image">True</property>
		<property name="tooltip-text" translatable="yes">Open image</property>
		<signal name="clicked" handler="on_open_cover_clicked" swapped="no"/>
		<signal name="clicked" handler="on_open_cover_image_clicked" swapped="no"/>
		<child>
		<object class="GtkImage" id="open_cover_image">
		<object class="GtkImage" id="open_cover_image_image">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="icon-name">document-open-symbolic</property>
		@@ -1223,14 +1223,14 @@
		</packing>
		</child>
		<child>
		<object class="GtkButton" id="clear_cover_button">
		<object class="GtkButton" id="clear_cover_image_button">
		<property name="visible">True</property>
		<property name="can-focus">True</property>
		<property name="receives-default">True</property>
		<property name="tooltip-text" translatable="yes">Clear image</property>
		<signal name="clicked" handler="on_clear_cover_clicked" swapped="no"/>
		<signal name="clicked" handler="on_clear_cover_image_clicked" swapped="no"/>
		<child>
		<object class="GtkImage" id="clear_cover_image">
		<object class="GtkImage" id="clear_cover_image_image">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="icon-name">edit-clear-all-symbolic</property>
		@@ -1266,7 +1266,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="artist_vbox">
		<object class="GtkBox" id="artist_image_vbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="orientation">vertical</property>
		@@ -1285,7 +1285,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="artist_hbox">
		<object class="GtkBox" id="artist_image_hbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="spacing">6</property>
		@@ -1309,7 +1309,7 @@
		</packing>
		</child>
		<child>
		<object class="GtkBox" id="artist_buttons_vbox">
		<object class="GtkBox" id="artist_image_buttons_vbox">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="orientation">vertical</property>
		@@ -1320,9 +1320,9 @@
		<property name="can-focus">True</property>
		<property name="receives-default">True</property>
		<property name="tooltip-text" translatable="yes">Open image</property>
		<signal name="clicked" handler="on_open_artist_clicked" swapped="no"/>
		<signal name="clicked" handler="on_open_artist_image_clicked" swapped="no"/>
		<child>
		<object class="GtkImage" id="open_artist_image">
		<object class="GtkImage" id="open_artist_image_image">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="icon-name">document-open-symbolic</property>
		@@ -1342,7 +1342,7 @@
		<property name="can-focus">True</property>
		<property name="receives-default">True</property>
		<property name="tooltip-text" translatable="yes">Clear image</property>
		<signal name="clicked" handler="on_clear_artist_clicked" swapped="no"/>
		<signal name="clicked" handler="on_clear_artist_image_clicked" swapped="no"/>
		<child>
		<object class="GtkImage" id="clear_artist_image">
		<property name="visible">True</property>
		@@ -1418,7 +1418,7 @@
		</object>
		</child>
		<child>
		<object class="GtkLabel" id="time">
		<object class="GtkLabel" id="time_label">
		<property name="visible">True</property>
		<property name="label">00:00</property>
		</object>
		@@ -1430,7 +1430,7 @@
		</object>
		</child>
		<child type="label">
		<object class="GtkLabel" id="filename">
		<object class="GtkLabel" id="filename_label">
		<property name="visible">True</property>
		<property name="can-focus">False</property>
		<property name="max-width-chars">40</property>

lib/mlm/file-tags.vala

+2 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,8 @@ namespace MLM {
		define_text_value(FrameId.ALBUM, value);
		_album = string_frames.has_key(FrameId.ALBUM) ?
		string_frames[FrameId.ALBUM] : null;
		if (_album == null)
		return;
		var frame = tag.search_picture_frame(Id3Tag.PictureType.COVERFRONT);
		if (frame != null)
		frame.set_picture_description(value + " cover");

src/application/application-window.vala

+345 −378

File changed.

Preview size limit exceeded, changes collapsed.

src/application/application.vala

+214 −87

File changed.

Preview size limit exceeded, changes collapsed.

src/application/encoder.vala

+35 −7

File changed.

Preview size limit exceeded, changes collapsed.