← Back to branch summary

~jcowgill/ubuntu/trusty/easytag/bug-1295882

« back to all changes in this revision

Viewing changes to src/easytag.c

  • Committer: Bazaar Package Importer
  • Author(s): Maia Kozheva
  • Date: 2011-05-02 20:04:35 UTC
  • mfrom: (1.3.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110502200435-oxnbpvmsscs02oe2
Tags: 2.1.6+git20110423-1
http://bugs.debian.org/620141
http://bugs.debian.org/360390
* New maintainers. (Taking over from Sebastian Bacher per his agreement.)
* New upstream snapshot.
* Switch to the 3.0 (quilt) format.
* debian/copyright:
  - New upstream address.
* debian/control:
  - Update maintainer field.
  - Bump Standards-Version to 3.9.2.
  - Do not depend on cdbs, use debhelper version with override support.
  - Use dh-autoreconf to generate automake files.
  - Add Vcs-* fields.
  - Fix misspelling in package description.
  - Set DM-Upload-Allowed.
* debian/rules:
  - Rewrite using debhelper 7.
  - Link with -Wl,--as-needed.
  - Add get-orig-source rule to export git snapshots.
* debian/patches:
  - Remove 01-autoload.patch, merged upstream.
  - Remove 02-autoreconf.patch, using dh_autoreconf now.
  - Remove manpage-has-bad-whatis-entry.patch, merged upstream.
  - Add desktop.patch: desktop file fixes. (Closes: #620141, #360390)
* Update debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/easytag.c
650
650
    Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(ArtistEntry));
651
651
    g_object_set_data(G_OBJECT(ArtistEntry),"MButtonName",ArtistMButton);
652
652
 
 
653
    /* Album Artist */
 
654
    AlbumArtistLabel = gtk_label_new(_("Album Artist:"));
 
655
    gtk_table_attach(GTK_TABLE(Table),AlbumArtistLabel,0,1,2,3,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
656
    gtk_misc_set_alignment(GTK_MISC(AlbumArtistLabel),1,0.5);
 
657
 
 
658
    AlbumArtistEntry = gtk_entry_new();
 
659
    gtk_table_attach(GTK_TABLE(Table),AlbumArtistEntry,1,10,2,3,
 
660
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
 
661
 
 
662
    AlbumArtistMButton = gtk_button_new();
 
663
    gtk_widget_set_size_request(AlbumArtistMButton,MButtonSize,MButtonSize);
 
664
    gtk_table_attach(GTK_TABLE(Table),AlbumArtistMButton,10,11,2,3,0,0,TablePadding,TablePadding);
 
665
    g_signal_connect(G_OBJECT(AlbumArtistMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
 
666
    gtk_tooltips_set_tip(Tips,AlbumArtistMButton,_("Tag selected files with this album artist"),NULL);
 
667
 
 
668
    Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(AlbumArtistEntry));
 
669
    g_object_set_data(G_OBJECT(AlbumArtistEntry),"MButtonName",AlbumArtistMButton);
 
670
 
653
671
    /* Album */
654
672
    AlbumLabel = gtk_label_new(_("Album:"));
655
 
    gtk_table_attach(GTK_TABLE(Table),AlbumLabel,0,1,2,3,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
673
    gtk_table_attach(GTK_TABLE(Table),AlbumLabel,0,1,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
656
674
    gtk_misc_set_alignment(GTK_MISC(AlbumLabel),1,0.5);
657
675
 
658
676
    AlbumEntry = gtk_entry_new();
659
 
    gtk_table_attach(GTK_TABLE(Table),AlbumEntry,1,7,2,3,
 
677
    gtk_table_attach(GTK_TABLE(Table),AlbumEntry,1,7,3,4,
660
678
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
661
679
 
662
680
    AlbumMButton = gtk_button_new();
663
681
    //gtk_widget_set_size_request(AlbumMButton, 10, 10);
664
682
    gtk_widget_set_size_request(AlbumMButton,MButtonSize,MButtonSize);
665
 
    gtk_table_attach(GTK_TABLE(Table),AlbumMButton,7,8,2,3,0,0,TablePadding,TablePadding);
 
683
    gtk_table_attach(GTK_TABLE(Table),AlbumMButton,7,8,3,4,0,0,TablePadding,TablePadding);
666
684
    g_signal_connect(G_OBJECT(AlbumMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
667
685
    gtk_tooltips_set_tip(Tips,AlbumMButton,_("Tag selected files with this album name"),NULL);
668
686
 
671
689
 
672
690
    /* Disc Number */
673
691
    DiscNumberLabel = gtk_label_new(_("CD:"));
674
 
    gtk_table_attach(GTK_TABLE(Table),DiscNumberLabel,8,9,2,3,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
692
    gtk_table_attach(GTK_TABLE(Table),DiscNumberLabel,8,9,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
675
693
    gtk_misc_set_alignment(GTK_MISC(DiscNumberLabel),1,0.5);
676
694
 
677
695
    DiscNumberEntry = gtk_entry_new();
678
 
    gtk_table_attach(GTK_TABLE(Table),DiscNumberEntry,9,10,2,3,
 
696
    gtk_table_attach(GTK_TABLE(Table),DiscNumberEntry,9,10,3,4,
679
697
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
680
698
    gtk_widget_set_size_request(DiscNumberEntry,30,-1);
681
699
    // FIX ME should allow to type only something like : 1/3
684
702
    DiscNumberMButton = gtk_button_new();
685
703
    //gtk_widget_set_size_request(DiscNumberMButton, 10, 10);
686
704
    gtk_widget_set_size_request(DiscNumberMButton,MButtonSize,MButtonSize);
687
 
    gtk_table_attach(GTK_TABLE(Table),DiscNumberMButton,10,11,2,3,0,0,TablePadding,TablePadding);
 
705
    gtk_table_attach(GTK_TABLE(Table),DiscNumberMButton,10,11,3,4,0,0,TablePadding,TablePadding);
688
706
    g_signal_connect(G_OBJECT(DiscNumberMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
689
707
    gtk_tooltips_set_tip(Tips,DiscNumberMButton,_("Tag selected files with this disc number"),NULL);
690
708
 
693
711
 
694
712
    /* Year */
695
713
    YearLabel = gtk_label_new(_("Year:"));
696
 
    gtk_table_attach(GTK_TABLE(Table),YearLabel,0,1,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
714
    gtk_table_attach(GTK_TABLE(Table),YearLabel,0,1,4,5,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
697
715
    gtk_misc_set_alignment(GTK_MISC(YearLabel),1,0.5);
698
716
 
699
717
    YearEntry = gtk_entry_new();
700
718
    gtk_entry_set_max_length(GTK_ENTRY(YearEntry), 4);
701
 
    gtk_table_attach(GTK_TABLE(Table),YearEntry,1,2,3,4,
 
719
    gtk_table_attach(GTK_TABLE(Table),YearEntry,1,2,4,5,
702
720
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
703
721
    gtk_widget_set_size_request(YearEntry,37,-1);
704
722
    g_signal_connect(G_OBJECT(YearEntry),"insert_text",G_CALLBACK(Insert_Only_Digit),NULL);
707
725
 
708
726
    YearMButton = gtk_button_new();
709
727
    gtk_widget_set_size_request(YearMButton,MButtonSize,MButtonSize);
710
 
    gtk_table_attach(GTK_TABLE(Table),YearMButton,2,3,3,4,0,0,TablePadding,TablePadding);
 
728
    gtk_table_attach(GTK_TABLE(Table),YearMButton,2,3,4,5,0,0,TablePadding,TablePadding);
711
729
    g_signal_connect(G_OBJECT(YearMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
712
730
    gtk_tooltips_set_tip(Tips,YearMButton,_("Tag selected files with this year"),NULL);
713
731
 
714
732
    /* Small vertical separator */
715
733
    Separator = gtk_vseparator_new();
716
 
    gtk_table_attach(GTK_TABLE(Table),Separator,3,4,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
734
    gtk_table_attach(GTK_TABLE(Table),Separator,3,4,4,5,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
717
735
 
718
736
 
719
737
    /* Track and Track total */
720
738
    TrackMButtonSequence = gtk_button_new();
721
739
    gtk_widget_set_size_request(TrackMButtonSequence,MButtonSize,MButtonSize);
722
 
    gtk_table_attach(GTK_TABLE(Table),TrackMButtonSequence,4,5,3,4,0,0,TablePadding,TablePadding);
 
740
    gtk_table_attach(GTK_TABLE(Table),TrackMButtonSequence,4,5,4,5,0,0,TablePadding,TablePadding);
723
741
    g_signal_connect(G_OBJECT(TrackMButtonSequence),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
724
742
    gtk_tooltips_set_tip(Tips,TrackMButtonSequence,_("Number selected tracks sequentially. "
725
743
                                                     "Starts at 01 in each subdirectory."), NULL);
731
749
    GTK_WIDGET_UNSET_FLAGS(TrackMButtonSequence,GTK_CAN_FOCUS);   // To have enought space to display the icon
732
750
 
733
751
    TrackLabel = gtk_label_new(_("Track #:"));
734
 
    gtk_table_attach(GTK_TABLE(Table),TrackLabel,5,6,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
752
    gtk_table_attach(GTK_TABLE(Table),TrackLabel,5,6,4,5,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
735
753
    gtk_misc_set_alignment(GTK_MISC(TrackLabel),1,0.5);
736
754
 
737
755
    if (TrackEntryComboModel != NULL)
740
758
        TrackEntryComboModel = gtk_list_store_new(MISC_COMBO_COUNT, G_TYPE_STRING);
741
759
 
742
760
    TrackEntryCombo = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(TrackEntryComboModel), MISC_COMBO_TEXT);
743
 
    gtk_table_attach(GTK_TABLE(Table),TrackEntryCombo,6,7,3,4,
 
761
    gtk_table_attach(GTK_TABLE(Table),TrackEntryCombo,6,7,4,5,
744
762
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
745
763
    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(TrackEntryCombo),3); // Three columns to display track numbers list
746
764
 
749
767
        G_CALLBACK(Insert_Only_Digit),NULL);
750
768
 
751
769
    Label = gtk_label_new("/");
752
 
    gtk_table_attach(GTK_TABLE(Table),Label,7,8,3,4,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
770
    gtk_table_attach(GTK_TABLE(Table),Label,7,8,4,5,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
753
771
    gtk_misc_set_alignment(GTK_MISC(Label),0.5,0.5);
754
772
 
755
773
    TrackMButtonNbrFiles = gtk_button_new();
756
774
    gtk_widget_set_size_request(TrackMButtonNbrFiles,MButtonSize,MButtonSize);
757
 
    gtk_table_attach(GTK_TABLE(Table),TrackMButtonNbrFiles,8,9,3,4,0,0,TablePadding,TablePadding);
 
775
    gtk_table_attach(GTK_TABLE(Table),TrackMButtonNbrFiles,8,9,4,5,0,0,TablePadding,TablePadding);
758
776
    g_signal_connect(G_OBJECT(TrackMButtonNbrFiles),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
759
777
    gtk_tooltips_set_tip(Tips,TrackMButtonNbrFiles,_("Set the number of files, in the same directory of the displayed file, to the selected tracks."), NULL);
760
778
    // Pixmap into TrackMButtonNbrFiles button
765
783
    GTK_WIDGET_UNSET_FLAGS(TrackMButtonNbrFiles,GTK_CAN_FOCUS);   // To have enought space to display the icon
766
784
 
767
785
    TrackTotalEntry = gtk_entry_new();
768
 
    gtk_table_attach(GTK_TABLE(Table),TrackTotalEntry,9,10,3,4,
 
786
    gtk_table_attach(GTK_TABLE(Table),TrackTotalEntry,9,10,4,5,
769
787
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
770
788
    gtk_widget_set_size_request(TrackTotalEntry,30,-1);
771
789
    g_signal_connect(G_OBJECT(GTK_ENTRY(TrackTotalEntry)),"insert_text",
773
791
 
774
792
    TrackMButton = gtk_button_new();
775
793
    gtk_widget_set_size_request(TrackMButton,MButtonSize,MButtonSize);
776
 
    gtk_table_attach(GTK_TABLE(Table),TrackMButton,10,11,3,4,0,0,TablePadding,TablePadding);
 
794
    gtk_table_attach(GTK_TABLE(Table),TrackMButton,10,11,4,5,0,0,TablePadding,TablePadding);
777
795
    g_signal_connect(G_OBJECT(TrackMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
778
796
    gtk_tooltips_set_tip(Tips,TrackMButton,_("Tag selected files with this number of tracks"),NULL);
779
797
 
782
800
 
783
801
    /* Genre */
784
802
    GenreLabel = gtk_label_new(_("Genre:"));
785
 
    gtk_table_attach(GTK_TABLE(Table),GenreLabel,0,1,4,5,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
803
    gtk_table_attach(GTK_TABLE(Table),GenreLabel,0,1,5,6,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
786
804
    gtk_misc_set_alignment(GTK_MISC(GenreLabel),1,0.5);
787
805
 
788
806
    if (GenreComboModel != NULL)
797
815
    gtk_entry_completion_set_text_column(completion, 0);
798
816
    gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(GenreComboModel), MISC_COMBO_TEXT, Combo_Alphabetic_Sort, NULL, NULL);
799
817
    gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(GenreComboModel), MISC_COMBO_TEXT, GTK_SORT_ASCENDING);
800
 
    gtk_table_attach(GTK_TABLE(Table),GenreCombo,1,10,4,5,
 
818
    gtk_table_attach(GTK_TABLE(Table),GenreCombo,1,10,5,6,
801
819
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
802
820
    Load_Genres_List_To_UI();
803
821
    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(GenreCombo),2); // Two columns to display genres list
804
822
 
805
823
    GenreMButton = gtk_button_new();
806
824
    gtk_widget_set_size_request(GenreMButton,MButtonSize,MButtonSize);
807
 
    gtk_table_attach(GTK_TABLE(Table),GenreMButton,10,11,4,5,0,0,TablePadding,TablePadding);
 
825
    gtk_table_attach(GTK_TABLE(Table),GenreMButton,10,11,5,6,0,0,TablePadding,TablePadding);
808
826
    g_signal_connect(G_OBJECT(GenreMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
809
827
    gtk_tooltips_set_tip(Tips,GenreMButton,_("Tag selected files with this genre"),NULL);
810
828
 
813
831
 
814
832
    /* Comment */
815
833
    CommentLabel = gtk_label_new(_("Comment:"));
816
 
    gtk_table_attach(GTK_TABLE(Table),CommentLabel,0,1,5,6,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
834
    gtk_table_attach(GTK_TABLE(Table),CommentLabel,0,1,6,7,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
817
835
    gtk_misc_set_alignment(GTK_MISC(CommentLabel),1,0.5);
818
836
 
819
837
    CommentEntry = gtk_entry_new();
820
 
    gtk_table_attach(GTK_TABLE(Table),CommentEntry,1,10,5,6,
 
838
    gtk_table_attach(GTK_TABLE(Table),CommentEntry,1,10,6,7,
821
839
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
822
840
 
823
841
        // Use of a text view instead of an entry...
835
853
 
836
854
    CommentMButton = gtk_button_new();
837
855
    gtk_widget_set_size_request(CommentMButton,MButtonSize,MButtonSize);
838
 
    gtk_table_attach(GTK_TABLE(Table),CommentMButton,10,11,5,6,0,0,TablePadding,TablePadding);
 
856
    gtk_table_attach(GTK_TABLE(Table),CommentMButton,10,11,6,7,0,0,TablePadding,TablePadding);
839
857
    g_signal_connect(G_OBJECT(CommentMButton),"clicked",G_CALLBACK(Mini_Button_Clicked),NULL);
840
858
    gtk_tooltips_set_tip(Tips,CommentMButton,_("Tag selected files with this comment"),NULL);
841
859
 
847
865
 
848
866
    /* Composer (name of the composers) */
849
867
    ComposerLabel = gtk_label_new(_("Composer:"));
850
 
    gtk_table_attach(GTK_TABLE(Table),ComposerLabel,0,1,6,7,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
868
    gtk_table_attach(GTK_TABLE(Table),ComposerLabel,0,1,7,8,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
851
869
    gtk_misc_set_alignment(GTK_MISC(ComposerLabel),1,0.5);
852
870
 
853
871
    ComposerEntry = gtk_entry_new();
854
 
    gtk_table_attach(GTK_TABLE(Table),ComposerEntry,1,10,6,7,
 
872
    gtk_table_attach(GTK_TABLE(Table),ComposerEntry,1,10,7,8,
855
873
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
856
874
 
857
875
    ComposerMButton = gtk_button_new();
858
876
    gtk_widget_set_size_request(ComposerMButton,MButtonSize,MButtonSize);
859
 
    gtk_table_attach(GTK_TABLE(Table),ComposerMButton,10,11,6,7,0,0,TablePadding,TablePadding);
 
877
    gtk_table_attach(GTK_TABLE(Table),ComposerMButton,10,11,7,8,0,0,TablePadding,TablePadding);
860
878
    g_signal_connect(G_OBJECT(ComposerMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
861
879
    gtk_tooltips_set_tip(Tips,ComposerMButton,_("Tag selected files with this composer"),NULL);
862
880
 
866
884
 
867
885
    /* Original Artist / Performer */
868
886
    OrigArtistLabel = gtk_label_new(_("Orig. Artist:"));
869
 
    gtk_table_attach(GTK_TABLE(Table),OrigArtistLabel,0,1,7,8,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
887
    gtk_table_attach(GTK_TABLE(Table),OrigArtistLabel,0,1,8,9,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
870
888
    gtk_misc_set_alignment(GTK_MISC(OrigArtistLabel),1,0.5);
871
889
 
872
890
    OrigArtistEntry = gtk_entry_new();
873
 
    gtk_table_attach(GTK_TABLE(Table),OrigArtistEntry,1,10,7,8,
 
891
    gtk_table_attach(GTK_TABLE(Table),OrigArtistEntry,1,10,8,9,
874
892
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
875
893
 
876
894
    OrigArtistMButton = gtk_button_new();
877
895
    gtk_widget_set_size_request(OrigArtistMButton,MButtonSize,MButtonSize);
878
 
    gtk_table_attach(GTK_TABLE(Table),OrigArtistMButton,10,11,7,8,0,0,TablePadding,TablePadding);
 
896
    gtk_table_attach(GTK_TABLE(Table),OrigArtistMButton,10,11,8,9,0,0,TablePadding,TablePadding);
879
897
    g_signal_connect(G_OBJECT(OrigArtistMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
880
898
    gtk_tooltips_set_tip(Tips,OrigArtistMButton,_("Tag selected files with this original artist"),NULL);
881
899
 
885
903
 
886
904
    /* Copyright */
887
905
    CopyrightLabel = gtk_label_new(_("Copyright:"));
888
 
    gtk_table_attach(GTK_TABLE(Table),CopyrightLabel,0,1,8,9,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
906
    gtk_table_attach(GTK_TABLE(Table),CopyrightLabel,0,1,9,10,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
889
907
    gtk_misc_set_alignment(GTK_MISC(CopyrightLabel),1,0.5);
890
908
 
891
909
    CopyrightEntry = gtk_entry_new();
892
 
    gtk_table_attach(GTK_TABLE(Table),CopyrightEntry,1,10,8,9,
 
910
    gtk_table_attach(GTK_TABLE(Table),CopyrightEntry,1,10,9,10,
893
911
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
894
912
 
895
913
    CopyrightMButton = gtk_button_new();
896
914
    gtk_widget_set_size_request(CopyrightMButton,MButtonSize,MButtonSize);
897
 
    gtk_table_attach(GTK_TABLE(Table),CopyrightMButton,10,11,8,9,0,0,TablePadding,TablePadding);
 
915
    gtk_table_attach(GTK_TABLE(Table),CopyrightMButton,10,11,9,10,0,0,TablePadding,TablePadding);
898
916
    g_signal_connect(G_OBJECT(CopyrightMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
899
917
    gtk_tooltips_set_tip(Tips,CopyrightMButton,_("Tag selected files with this copyright"),NULL);
900
918
 
904
922
 
905
923
    /* URL */
906
924
    URLLabel = gtk_label_new(_("URL:"));
907
 
    gtk_table_attach(GTK_TABLE(Table),URLLabel,0,1,9,10,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
925
    gtk_table_attach(GTK_TABLE(Table),URLLabel,0,1,10,11,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
908
926
    gtk_misc_set_alignment(GTK_MISC(URLLabel),1,0.5);
909
927
 
910
928
    URLEntry = gtk_entry_new();
911
 
    gtk_table_attach(GTK_TABLE(Table),URLEntry,1,10,9,10,
 
929
    gtk_table_attach(GTK_TABLE(Table),URLEntry,1,10,10,11,
912
930
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
913
931
 
914
932
    URLMButton = gtk_button_new();
915
933
    gtk_widget_set_size_request(URLMButton,MButtonSize,MButtonSize);
916
 
    gtk_table_attach(GTK_TABLE(Table),URLMButton,10,11,9,10,0,0,TablePadding,TablePadding);
 
934
    gtk_table_attach(GTK_TABLE(Table),URLMButton,10,11,10,11,0,0,TablePadding,TablePadding);
917
935
    g_signal_connect(G_OBJECT(URLMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
918
936
    gtk_tooltips_set_tip(Tips,URLMButton,_("Tag selected files with this URL"),NULL);
919
937
 
923
941
 
924
942
    /* Encoded by */
925
943
    EncodedByLabel = gtk_label_new(_("Encoded by:"));
926
 
    gtk_table_attach(GTK_TABLE(Table),EncodedByLabel,0,1,10,11,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
944
    gtk_table_attach(GTK_TABLE(Table),EncodedByLabel,0,1,11,12,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
927
945
    gtk_misc_set_alignment(GTK_MISC(EncodedByLabel),1,0.5);
928
946
 
929
947
    EncodedByEntry = gtk_entry_new();
930
 
    gtk_table_attach(GTK_TABLE(Table),EncodedByEntry,1,10,10,11,
 
948
    gtk_table_attach(GTK_TABLE(Table),EncodedByEntry,1,10,11,12,
931
949
                     GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding);
932
950
 
933
951
    EncodedByMButton = gtk_button_new();
934
952
    gtk_widget_set_size_request(EncodedByMButton,MButtonSize,MButtonSize);
935
 
    gtk_table_attach(GTK_TABLE(Table),EncodedByMButton,10,11,10,11,0,0,TablePadding,TablePadding);
 
953
    gtk_table_attach(GTK_TABLE(Table),EncodedByMButton,10,11,11,12,0,0,TablePadding,TablePadding);
936
954
    g_signal_connect(G_OBJECT(EncodedByMButton),"clicked", G_CALLBACK(Mini_Button_Clicked),NULL);
937
955
    gtk_tooltips_set_tip(Tips,EncodedByMButton,_("Tag selected files with this encoder name"),NULL);
938
956
 
954
972
    g_signal_connect_swapped(G_OBJECT(OrigArtistEntry), "activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(CopyrightEntry));
955
973
    g_signal_connect_swapped(G_OBJECT(CopyrightEntry),  "activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(URLEntry));
956
974
    g_signal_connect_swapped(G_OBJECT(URLEntry),        "activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(EncodedByEntry));
957
 
    g_signal_connect_swapped(G_OBJECT(EncodedByEntry),  "activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(TitleEntry));
 
975
    g_signal_connect_swapped(G_OBJECT(EncodedByEntry),  "activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(AlbumArtistEntry));
 
976
        g_signal_connect_swapped(G_OBJECT(AlbumArtistEntry),"activate",G_CALLBACK(gtk_widget_grab_focus),G_OBJECT(TitleEntry));
958
977
 
959
978
    // Set focus chain
960
979
    focusable_widgets_list = g_list_append(focusable_widgets_list,TitleEntry);
986
1005
    focusable_widgets_list = g_list_append(focusable_widgets_list,URLMButton);
987
1006
    focusable_widgets_list = g_list_append(focusable_widgets_list,EncodedByEntry);
988
1007
    focusable_widgets_list = g_list_append(focusable_widgets_list,EncodedByMButton);
 
1008
        focusable_widgets_list = g_list_append(focusable_widgets_list,AlbumArtistEntry);
 
1009
    focusable_widgets_list = g_list_append(focusable_widgets_list,AlbumArtistMButton);
989
1010
    focusable_widgets_list = g_list_append(focusable_widgets_list,TitleEntry); // To loop to the beginning
990
1011
    gtk_container_set_focus_chain(GTK_CONTAINER(Table),focusable_widgets_list);
991
1012
 
1199
1220
        else
1200
1221
            msg = g_strdup(_("Removed artist from selected files."));
1201
1222
    }
 
1223
    else if (object==G_OBJECT(AlbumArtistMButton))
 
1224
    {
 
1225
        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(AlbumArtistEntry),0,-1);
 
1226
        while (etfilelist)
 
1227
        {
 
1228
            etfile = (ET_File *)etfilelist->data;
 
1229
            FileTag = ET_File_Tag_Item_New();
 
1230
            ET_Copy_File_Tag_Item(etfile,FileTag);
 
1231
            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string_to_set);
 
1232
            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
 
1233
 
 
1234
            if (!etfilelist->next) break;
 
1235
            etfilelist = g_list_next(etfilelist);
 
1236
        }
 
1237
        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
 
1238
            msg = g_strdup_printf(_("Selected files tagged with album artist '%s'."),string_to_set);
 
1239
        else
 
1240
            msg = g_strdup(_("Removed album artist from selected files."));
 
1241
    }
1202
1242
    else if (object==G_OBJECT(AlbumMButton))
1203
1243
    {
1204
1244
        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(AlbumEntry),0,-1);
2197
2237
        gchar *msg;
2198
2238
        gint response;
2199
2239
 
2200
 
        msg = g_strdup_printf(_("Be careful, severals files (%d file(s)) were changed by an external program.\n"
 
2240
        msg = g_strdup_printf(_("Be careful, several files (%d file(s)) were changed by an external program.\n"
2201
2241
                                "Do you want to continue anyway?"),nb_files_changed_by_ext_program);
2202
2242
        msgbox = msg_box_new(_("Saving File(s)..."),
2203
2243
                             GTK_WINDOW(MainWindow),
4082
4122
    gtk_widget_show(GTK_WIDGET(TitleMButton));
4083
4123
    gtk_widget_show(GTK_WIDGET(ArtistLabel));
4084
4124
    gtk_widget_show(GTK_WIDGET(ArtistEntry));
 
4125
    gtk_widget_show(GTK_WIDGET(AlbumArtistLabel));
 
4126
    gtk_widget_show(GTK_WIDGET(AlbumArtistEntry));
4085
4127
    gtk_widget_show(GTK_WIDGET(ArtistMButton));
4086
4128
    gtk_widget_show(GTK_WIDGET(AlbumLabel));
4087
4129
    gtk_widget_show(GTK_WIDGET(AlbumEntry));
4377
4419
 
4378
4420
    gtk_entry_set_text(GTK_ENTRY(TitleEntry),                       "");
4379
4421
    gtk_entry_set_text(GTK_ENTRY(ArtistEntry),                      "");
 
4422
    gtk_entry_set_text(GTK_ENTRY(AlbumArtistEntry),                 "");
4380
4423
    gtk_entry_set_text(GTK_ENTRY(AlbumEntry),                       "");
4381
4424
    gtk_entry_set_text(GTK_ENTRY(DiscNumberEntry),                  "");
4382
4425
    gtk_entry_set_text(GTK_ENTRY(YearEntry),                        "");
4441
4484
    if (OPEN_SCANNER_WINDOW_ON_STARTUP)
4442
4485
        Open_ScannerWindow(SCANNER_TYPE); // Open the last selected scanner
4443
4486
 
4444
 
    Statusbar_Message(_("Select a directory to browse!"),FALSE);
4445
4487
    if (INIT_DIRECTORY)
4446
4488
    {
4447
4489
        Browser_Tree_Select_Dir(INIT_DIRECTORY);
 
4490
        Browser_Reload_Directory();
4448
4491
    }else
4449
4492
    {
 
4493
        Statusbar_Message(_("Select a directory to browse!"),FALSE);
4450
4494
        Browser_Load_Default_Directory();
4451
4495
    }
4452
4496