From 56302086c9c0d6af537d7603a7c63fb3606945f5 Mon Sep 17 00:00:00 2001 From: Alex Bennee Date: Wed, 14 Jul 2010 15:58:03 +0100 Subject: EasyTag 2.1.2 --- src/about.c | 3 ++- src/ape_tag.c | 1 - src/cddb.c | 2 +- src/easytag.c | 36 ++++++++++++++++++--------- src/et_core.c | 13 +++++++++- src/id3v24_tag.c | 3 ++- src/log.c | 24 ++++++++++++++++++ src/prefs.c | 11 +++++++++ src/prefs.h | 1 + src/scan.c | 21 ++++++++-------- src/setting.c | 75 +++++++++++++++++++++++++++++--------------------------- src/setting.h | 1 + 12 files changed, 129 insertions(+), 62 deletions(-) mode change 100755 => 100644 src/cddb.c mode change 100755 => 100644 src/easytag.c (limited to 'src') diff --git a/src/about.c b/src/about.c index 101aacc..edaf3ab 100755 --- a/src/about.c +++ b/src/about.c @@ -304,7 +304,7 @@ void Show_About_Window (void) #endif #ifndef ENABLE_SPEEX - Label = gtk_label_new(_("(Speep file support disabled)")); + Label = gtk_label_new(_("(Speex file support disabled)")); gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0); #endif @@ -358,6 +358,7 @@ void Show_About_Window (void) gtk_misc_set_padding(GTK_MISC(Label),2,2); gtk_label_set_line_wrap(GTK_LABEL(Label),TRUE); gtk_container_add(GTK_CONTAINER(Frame),Label); + gtk_container_resize_children(GTK_CONTAINER(Frame)); /* diff --git a/src/ape_tag.c b/src/ape_tag.c index c88f326..e15f41e 100755 --- a/src/ape_tag.c +++ b/src/ape_tag.c @@ -33,7 +33,6 @@ #include "ape_tag.h" #include "et_core.h" #include "log.h" -#include "log.h" #include "misc.h" #include "setting.h" #include "charset.h" diff --git a/src/cddb.c b/src/cddb.c old mode 100755 new mode 100644 index 42610da..f3cc888 --- a/src/cddb.c +++ b/src/cddb.c @@ -225,7 +225,7 @@ void Open_Cddb_Window (void) GtkWidget *PopupMenu; GtkWidget *Icon; GtkTooltips *Tips; - gchar *CddbAlbumList_Titles[] = { "", N_("Artist / Album"), N_("Category")}; + gchar *CddbAlbumList_Titles[] = { NULL, N_("Artist / Album"), N_("Category")}; // Note: don't set "" instead of NULL else this will cause problem with translation language gchar *CddbTrackList_Titles[] = { "#", N_("Track Name"), N_("Time")}; GtkCellRenderer* renderer; GtkTreeViewColumn* column; diff --git a/src/easytag.c b/src/easytag.c old mode 100755 new mode 100644 index 7ae6d35..2b26967 --- a/src/easytag.c +++ b/src/easytag.c @@ -789,17 +789,18 @@ GtkWidget *Create_Tag_Area (void) gtk_table_attach(GTK_TABLE(Table),CommentEntry,1,10,5,6, GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,TablePadding,TablePadding); - // Use of a text view instead of an entry... - //ScrollWindow = gtk_scrolled_window_new(NULL,NULL); - //gtk_table_attach_defaults(GTK_TABLE(Table),ScrollWindow,1,10,5,6); - //gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow), GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); - //gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ScrollWindow), GTK_SHADOW_IN); - //gtk_widget_set_size_request(ScrollWindow,-1,52); // Display ~3 lines... - //TextBuffer = gtk_text_buffer_new(NULL); - //CommentView = gtk_text_view_new_with_buffer(TextBuffer); - //gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(CommentView), GTK_WRAP_WORD); // To not display the horizontal scrollbar - //gtk_container_add(GTK_CONTAINER(ScrollWindow),CommentView); - //Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView)); + // Use of a text view instead of an entry... + /******ScrollWindow = gtk_scrolled_window_new(NULL,NULL); + gtk_table_attach(GTK_TABLE(Table),ScrollWindow,1,10,5,6,GTK_FILL,GTK_FILL,TablePadding,TablePadding); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow), GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ScrollWindow), GTK_SHADOW_IN); + gtk_widget_set_size_request(ScrollWindow,-1,52); // Display ~3 lines... + TextBuffer = gtk_text_buffer_new(NULL); + CommentView = gtk_text_view_new_with_buffer(TextBuffer); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(CommentView), GTK_WRAP_WORD); // To not display the horizontal scrollbar + gtk_container_add(GTK_CONTAINER(ScrollWindow),CommentView); + Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView)); + *******/ CommentMButton = gtk_button_new(); gtk_widget_set_size_request(CommentMButton,MButtonSize,MButtonSize); @@ -1620,6 +1621,9 @@ void Action_Select_First_File (void) Update_Command_Buttons_Sensivity(); Scan_Rename_File_Generate_Preview(); Scan_Fill_Tag_Generate_Preview(); + + if (SET_FOCUS_TO_FIRST_TAG_FIELD) + gtk_widget_grab_focus(GTK_WIDGET(TitleEntry)); } @@ -1716,6 +1720,9 @@ void Action_Select_Last_File (void) Update_Command_Buttons_Sensivity(); Scan_Rename_File_Generate_Preview(); Scan_Fill_Tag_Generate_Preview(); + + if (SET_FOCUS_TO_FIRST_TAG_FIELD) + gtk_widget_grab_focus(GTK_WIDGET(TitleEntry)); } @@ -2086,6 +2093,7 @@ gint Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files) double fraction; GtkAction *uiaction; GtkWidget *TBViewMode; + GtkWidget *widget_focused; GtkTreePath *currentPath = NULL; if (!ETCore) return FALSE; @@ -2096,6 +2104,9 @@ gint Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files) /* Save the current displayed data */ ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed); + /* Save widget that has current focus, to give it again the focus after saving */ + widget_focused = gtk_window_get_focus(GTK_WINDOW(MainWindow)); + /* Count the number of files to save */ nb_files_to_save = 0; etfilelist_tmp = etfilelist; @@ -2207,6 +2218,9 @@ gint Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files) Tag_Area_Set_Sensitive(TRUE); File_Area_Set_Sensitive(TRUE); + /* Give again focus to the first entry, else the focus is passed to an other */ + gtk_widget_grab_focus(GTK_WIDGET(widget_focused)); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), ""); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), 0); Statusbar_Message(msg,TRUE); diff --git a/src/et_core.c b/src/et_core.c index 3e608f3..3240088 100755 --- a/src/et_core.c +++ b/src/et_core.c @@ -3624,7 +3624,7 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile) ETFileDescription = ETFile->ETFileDescription; - // Save permissions of the file (cause they may change with files on NFS) + // Save permissions and dates of the file (cause they may change with files on NFS) if ( stat(cur_filename,&statbuf)!=-1 ) file_set_properties = TRUE; else @@ -3685,6 +3685,17 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile) if (state==TRUE) { + + // Update date and time of the parent directory of the file after changing the tag + // value (ex: needed for Amarok for refreshing). Note that when renaming a file the + // parent directory is automatically updated. + if (UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME) + { + gchar *path = g_path_get_dirname(cur_filename); + utime(g_path_get_dirname(cur_filename),NULL); + g_free(path); + } + ET_Mark_File_Tag_As_Saved(ETFile); return TRUE; }else diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c index 7b3c729..d15bfec 100755 --- a/src/id3v24_tag.c +++ b/src/id3v24_tag.c @@ -39,6 +39,7 @@ #include "genres.h" #include "setting.h" #include "misc.h" +#include "log.h" #include "et_core.h" #include "msgbox.h" #include "charset.h" @@ -892,7 +893,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile) /********* * Genre * - ********** + *********/ /* Genre is written like this : * - "" -> "3" * - "" -> "EuroDance" diff --git a/src/log.c b/src/log.c index f066fc7..0dfc39b 100755 --- a/src/log.c +++ b/src/log.c @@ -67,6 +67,7 @@ struct _Log_Data * Prototypes * **************/ gboolean Log_Popup_Menu_Handler (GtkMenu *menu, GdkEventButton *event); +void Log_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter); void Log_Print_Tmp_List (void); gchar *Log_Format_Date (void); @@ -162,6 +163,27 @@ gboolean Log_Popup_Menu_Handler (GtkMenu *menu, GdkEventButton *event) return FALSE; } + +/* + * Set a row visible in the log list (by scrolling the list) + */ +void Log_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter) +{ + /* + * TODO: Make this only scroll to the row if it is not visible + * (like in easytag GTK1) + * See function gtk_tree_view_get_visible_rect() ?? + */ + GtkTreePath *rowPath; + + if (!treeModel) return; + + rowPath = gtk_tree_model_get_path(treeModel, rowIter); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(LogList), rowPath, NULL, FALSE, 0, 0); + gtk_tree_path_free(rowPath); +} + + /* * Remove all lines in the log list */ @@ -221,6 +243,7 @@ void Log_Print (gchar const *format, ...) LOG_ROW_BACKGROUND, NULL, LOG_ROW_FOREGROUND, NULL, -1); + Log_List_Set_Row_Visible(GTK_TREE_MODEL(logListModel), &iter); g_free(time); }else { @@ -280,6 +303,7 @@ void Log_Print_Tmp_List (void) LOG_ROW_BACKGROUND, NULL, LOG_ROW_FOREGROUND, NULL, -1); + Log_List_Set_Row_Visible(GTK_TREE_MODEL(logListModel), &iter); } if (!LogPrintTmpList->next) break; diff --git a/src/prefs.c b/src/prefs.c index 5b649e6..485e35f 100755 --- a/src/prefs.c +++ b/src/prefs.c @@ -468,6 +468,17 @@ void Open_OptionsWindow (void) gtk_tooltips_set_tip(Tips,PreserveModificationTime,_("Preserve the modification time " "(in file properties) when saving the file."),NULL); + /* Change directory modification time */ + UpdateParentDirectoryModificationTime = gtk_check_button_new_with_label(_("Update modification time " + "of the parent directory of the file (recommended when using Amarok)")); + gtk_box_pack_start(GTK_BOX(vbox),UpdateParentDirectoryModificationTime,FALSE,FALSE,0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(UpdateParentDirectoryModificationTime),UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME); + gtk_tooltips_set_tip(Tips,UpdateParentDirectoryModificationTime,_("The modification time " + "of the parent directory of the file will be updated when saving tag the file. At the " + "present time it is automatically done only when renaming a file.\nThis feature is " + "interesting when using applications like Amarok. For performance reasons, they refresh " + "file informations by detecting changes of the parent directory."),NULL); + /* Character Set for File Name */ Frame = gtk_frame_new (_("Character Set for File Name")); diff --git a/src/prefs.h b/src/prefs.h index 79532a4..b88eed1 100755 --- a/src/prefs.h +++ b/src/prefs.h @@ -67,6 +67,7 @@ GtkWidget *FilenameExtensionNoChange; GtkWidget *FilenameExtensionLowerCase; GtkWidget *FilenameExtensionUpperCase; GtkWidget *PreserveModificationTime; +GtkWidget *UpdateParentDirectoryModificationTime; GtkWidget *FilenameCharacterSetOther; GtkWidget *FilenameCharacterSetApproximate; diff --git a/src/scan.c b/src/scan.c index 2f7be4a..ce080a0 100755 --- a/src/scan.c +++ b/src/scan.c @@ -3381,16 +3381,17 @@ gboolean Mask_Editor_List_Key_Press (GtkWidget *widget, GdkEvent *event) if (event && event->type == GDK_KEY_PRESS) { GdkEventKey *kevent = (GdkEventKey *)event; - switch(kevent->keyval) { - case GDK_Delete: - Mask_Editor_List_Remove(); - break; -/* case GDK_Up: - Mask_Editor_Clist_Move_Up(); - break; - case GDK_Down: - Mask_Editor_Clist_Move_Down(); - break; + switch(kevent->keyval) + { + case GDK_Delete: + Mask_Editor_List_Remove(); + break; +/* case GDK_Up: + Mask_Editor_Clist_Move_Up(); + break; + case GDK_Down: + Mask_Editor_Clist_Move_Down(); + break; */ } } return TRUE; diff --git a/src/setting.c b/src/setting.c index 8e68c6b..93d11a3 100755 --- a/src/setting.c +++ b/src/setting.c @@ -139,14 +139,15 @@ tConfigVariable Config_Variables[] = {"sorting_file_mode", CV_TYPE_INT, &SORTING_FILE_MODE }, {"sorting_file_case_sensitive", CV_TYPE_BOOL, &SORTING_FILE_CASE_SENSITIVE }, - {"replace_illegal_character_in_filename",CV_TYPE_BOOL, &REPLACE_ILLEGAL_CHARACTERS_IN_FILENAME }, - {"filename_extension_lower_case", CV_TYPE_BOOL, &FILENAME_EXTENSION_LOWER_CASE }, - {"filename_extension_upper_case", CV_TYPE_BOOL, &FILENAME_EXTENSION_UPPER_CASE }, - {"filename_extension_no_change", CV_TYPE_BOOL, &FILENAME_EXTENSION_NO_CHANGE }, - {"preserve_modification_time", CV_TYPE_BOOL, &PRESERVE_MODIFICATION_TIME }, - {"filename_character_set_other", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_OTHER }, - {"filename_character_set_approximate", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_APPROXIMATE }, - {"filename_character_set_discard", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_DISCARD }, + {"replace_illegal_character_in_filename", CV_TYPE_BOOL, &REPLACE_ILLEGAL_CHARACTERS_IN_FILENAME }, + {"filename_extension_lower_case", CV_TYPE_BOOL, &FILENAME_EXTENSION_LOWER_CASE }, + {"filename_extension_upper_case", CV_TYPE_BOOL, &FILENAME_EXTENSION_UPPER_CASE }, + {"filename_extension_no_change", CV_TYPE_BOOL, &FILENAME_EXTENSION_NO_CHANGE }, + {"preserve_modification_time", CV_TYPE_BOOL, &PRESERVE_MODIFICATION_TIME }, + {"update_parent_directory_modification_time", CV_TYPE_BOOL, &UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME}, + {"filename_character_set_other", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_OTHER }, + {"filename_character_set_approximate", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_APPROXIMATE }, + {"filename_character_set_discard", CV_TYPE_BOOL, &FILENAME_CHARACTER_SET_DISCARD }, {"write_id3_tags_in_flac_file", CV_TYPE_BOOL, &WRITE_ID3_TAGS_IN_FLAC_FILE }, {"strip_tag_when_empty_fields", CV_TYPE_BOOL, &STRIP_TAG_WHEN_EMPTY_FIELDS }, @@ -396,6 +397,7 @@ void Init_Config_Variables (void) FILENAME_EXTENSION_UPPER_CASE = 0; FILENAME_EXTENSION_NO_CHANGE = 0; PRESERVE_MODIFICATION_TIME = 1; + UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME = 0; FILENAME_CHARACTER_SET_OTHER = 1; FILENAME_CHARACTER_SET_APPROXIMATE = 0; @@ -653,24 +655,25 @@ void Apply_Changes_Of_Preferences_Window (void) MESSAGE_BOX_POSITION_CENTER_ON_PARENT = GTK_TOGGLE_BUTTON(MessageBoxPositionCenterOnParent)->active; if (AUDIO_FILE_PLAYER) g_free(AUDIO_FILE_PLAYER); - AUDIO_FILE_PLAYER = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(FilePlayerCombo)->child))); + AUDIO_FILE_PLAYER = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(FilePlayerCombo)->child))); /* File Settings */ - REPLACE_ILLEGAL_CHARACTERS_IN_FILENAME = GTK_TOGGLE_BUTTON(ReplaceIllegalCharactersInFilename)->active; - FILENAME_EXTENSION_LOWER_CASE = GTK_TOGGLE_BUTTON(FilenameExtensionLowerCase)->active; - FILENAME_EXTENSION_UPPER_CASE = GTK_TOGGLE_BUTTON(FilenameExtensionUpperCase)->active; - FILENAME_EXTENSION_NO_CHANGE = GTK_TOGGLE_BUTTON(FilenameExtensionNoChange)->active; - PRESERVE_MODIFICATION_TIME = GTK_TOGGLE_BUTTON(PreserveModificationTime)->active; + REPLACE_ILLEGAL_CHARACTERS_IN_FILENAME = GTK_TOGGLE_BUTTON(ReplaceIllegalCharactersInFilename)->active; + FILENAME_EXTENSION_LOWER_CASE = GTK_TOGGLE_BUTTON(FilenameExtensionLowerCase)->active; + FILENAME_EXTENSION_UPPER_CASE = GTK_TOGGLE_BUTTON(FilenameExtensionUpperCase)->active; + FILENAME_EXTENSION_NO_CHANGE = GTK_TOGGLE_BUTTON(FilenameExtensionNoChange)->active; + PRESERVE_MODIFICATION_TIME = GTK_TOGGLE_BUTTON(PreserveModificationTime)->active; + UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME = GTK_TOGGLE_BUTTON(UpdateParentDirectoryModificationTime)->active; - FILENAME_CHARACTER_SET_OTHER = GTK_TOGGLE_BUTTON(FilenameCharacterSetOther)->active; - FILENAME_CHARACTER_SET_APPROXIMATE = GTK_TOGGLE_BUTTON(FilenameCharacterSetApproximate)->active; - FILENAME_CHARACTER_SET_DISCARD = GTK_TOGGLE_BUTTON(FilenameCharacterSetDiscard)->active; + FILENAME_CHARACTER_SET_OTHER = GTK_TOGGLE_BUTTON(FilenameCharacterSetOther)->active; + FILENAME_CHARACTER_SET_APPROXIMATE = GTK_TOGGLE_BUTTON(FilenameCharacterSetApproximate)->active; + FILENAME_CHARACTER_SET_DISCARD = GTK_TOGGLE_BUTTON(FilenameCharacterSetDiscard)->active; /* Tag Settings */ - WRITE_ID3_TAGS_IN_FLAC_FILE = GTK_TOGGLE_BUTTON(WriteId3TagsInFlacFiles)->active; - STRIP_TAG_WHEN_EMPTY_FIELDS = GTK_TOGGLE_BUTTON(StripTagWhenEmptyFields)->active; - CONVERT_OLD_ID3V2_TAG_VERSION = GTK_TOGGLE_BUTTON(ConvertOldId3v2TagVersion)->active; - USE_NON_STANDARD_ID3_READING_CHARACTER_SET = GTK_TOGGLE_BUTTON(UseNonStandardId3ReadingCharacterSet)->active; + WRITE_ID3_TAGS_IN_FLAC_FILE = GTK_TOGGLE_BUTTON(WriteId3TagsInFlacFiles)->active; + STRIP_TAG_WHEN_EMPTY_FIELDS = GTK_TOGGLE_BUTTON(StripTagWhenEmptyFields)->active; + CONVERT_OLD_ID3V2_TAG_VERSION = GTK_TOGGLE_BUTTON(ConvertOldId3v2TagVersion)->active; + USE_NON_STANDARD_ID3_READING_CHARACTER_SET = GTK_TOGGLE_BUTTON(UseNonStandardId3ReadingCharacterSet)->active; #ifdef ENABLE_ID3LIB active = gtk_combo_box_get_active(GTK_COMBO_BOX(FileWritingId3v2VersionCombo)); @@ -682,30 +685,30 @@ void Apply_Changes_Of_Preferences_Window (void) FILE_READING_ID3V1V2_CHARACTER_SET = Charset_Get_Name_From_Title(temp); g_free(temp); - FILE_WRITING_ID3V2_WRITE_TAG = GTK_TOGGLE_BUTTON(FileWritingId3v2WriteTag)->active; - FILE_WRITING_ID3V2_USE_CRC32 = GTK_TOGGLE_BUTTON(FileWritingId3v2UseCrc32)->active; - FILE_WRITING_ID3V2_USE_COMPRESSION = GTK_TOGGLE_BUTTON(FileWritingId3v2UseCompression)->active; + FILE_WRITING_ID3V2_WRITE_TAG = GTK_TOGGLE_BUTTON(FileWritingId3v2WriteTag)->active; + FILE_WRITING_ID3V2_USE_CRC32 = GTK_TOGGLE_BUTTON(FileWritingId3v2UseCrc32)->active; + FILE_WRITING_ID3V2_USE_COMPRESSION = GTK_TOGGLE_BUTTON(FileWritingId3v2UseCompression)->active; FILE_WRITING_ID3V2_USE_UNICODE_CHARACTER_SET = GTK_TOGGLE_BUTTON(FileWritingId3v2UseUnicodeCharacterSet)->active; active = gtk_combo_box_get_active(GTK_COMBO_BOX(FileWritingId3v2UnicodeCharacterSetCombo)); - FILE_WRITING_ID3V2_UNICODE_CHARACTER_SET = (active == 1) ? "UTF-16" : "UTF-8"; + FILE_WRITING_ID3V2_UNICODE_CHARACTER_SET = (active == 1) ? "UTF-16" : "UTF-8"; temp = Get_Active_Combo_Box_Item(GTK_COMBO_BOX(FileWritingId3v2NoUnicodeCharacterSetCombo)); - FILE_WRITING_ID3V2_NO_UNICODE_CHARACTER_SET = Charset_Get_Name_From_Title(temp); - g_free(temp); + FILE_WRITING_ID3V2_NO_UNICODE_CHARACTER_SET = Charset_Get_Name_From_Title(temp); + g_free(temp); - FILE_WRITING_ID3V2_ICONV_OPTIONS_NO = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsNo)->active; - FILE_WRITING_ID3V2_ICONV_OPTIONS_TRANSLIT = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsTranslit)->active; - FILE_WRITING_ID3V2_ICONV_OPTIONS_IGNORE = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsIgnore)->active; + FILE_WRITING_ID3V2_ICONV_OPTIONS_NO = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsNo)->active; + FILE_WRITING_ID3V2_ICONV_OPTIONS_TRANSLIT = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsTranslit)->active; + FILE_WRITING_ID3V2_ICONV_OPTIONS_IGNORE = GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsIgnore)->active; - FILE_WRITING_ID3V1_WRITE_TAG = GTK_TOGGLE_BUTTON(FileWritingId3v1WriteTag)->active; + FILE_WRITING_ID3V1_WRITE_TAG = GTK_TOGGLE_BUTTON(FileWritingId3v1WriteTag)->active; temp = Get_Active_Combo_Box_Item(GTK_COMBO_BOX(FileWritingId3v1CharacterSetCombo)); - FILE_WRITING_ID3V1_CHARACTER_SET = Charset_Get_Name_From_Title(temp); - g_free(temp); + FILE_WRITING_ID3V1_CHARACTER_SET = Charset_Get_Name_From_Title(temp); + g_free(temp); - FILE_WRITING_ID3V1_ICONV_OPTIONS_NO = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsNo)->active; - FILE_WRITING_ID3V1_ICONV_OPTIONS_TRANSLIT = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsTranslit)->active; - FILE_WRITING_ID3V1_ICONV_OPTIONS_IGNORE = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsIgnore)->active; + FILE_WRITING_ID3V1_ICONV_OPTIONS_NO = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsNo)->active; + FILE_WRITING_ID3V1_ICONV_OPTIONS_TRANSLIT = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsTranslit)->active; + FILE_WRITING_ID3V1_ICONV_OPTIONS_IGNORE = GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsIgnore)->active; /* Scanner */ // Fill Tag Scanner diff --git a/src/setting.h b/src/setting.h index 7a47a2d..fceba05 100755 --- a/src/setting.h +++ b/src/setting.h @@ -89,6 +89,7 @@ gint FILENAME_EXTENSION_LOWER_CASE; gint FILENAME_EXTENSION_UPPER_CASE; gint FILENAME_EXTENSION_NO_CHANGE; gint PRESERVE_MODIFICATION_TIME; +gint UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME; gint FILENAME_CHARACTER_SET_OTHER; gint FILENAME_CHARACTER_SET_APPROXIMATE; -- cgit v1.2.3