|
|
|
@ -498,6 +498,28 @@ static void mainWindow_settings_combo_changed(GtkComboBox *widget, gpointer user
|
|
|
|
|
mainWindow_entrySelected(NULL, user_data); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void mainWindow_settings_comboNewDateFormat_changed(GtkComboBox *widget, gpointer user_data) |
|
|
|
|
{ |
|
|
|
|
struct mainWindow *mainWindow = (struct mainWindow *)user_data; |
|
|
|
|
|
|
|
|
|
mainWindow_set_new_file_date_format(mainWindow, gtk_combo_box_get_active_id(GTK_COMBO_BOX(mainWindow->settingsDialog.comboNewDateFormat))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const gchar *newDateFormats[] = {"%d.%m.%Y %H:%M", |
|
|
|
|
"%Y-%m-%d %H:%M", |
|
|
|
|
NULL}; |
|
|
|
|
|
|
|
|
|
void mainWindow_set_new_file_date_format(struct mainWindow *mainWindow, gchar *fmt) |
|
|
|
|
{ |
|
|
|
|
if (!fmt) { |
|
|
|
|
fmt = newDateFormats[0]; |
|
|
|
|
} |
|
|
|
|
g_free(mainWindow->newFileDateFormat); |
|
|
|
|
mainWindow->newFileDateFormat = g_strdup(fmt); |
|
|
|
|
|
|
|
|
|
gtk_combo_box_set_active_id(mainWindow->settingsDialog.comboNewDateFormat, fmt); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static gboolean mainWindow_settings_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) |
|
|
|
|
{ |
|
|
|
|
gtk_widget_hide(widget); |
|
|
|
@ -511,6 +533,10 @@ void mainWindow_settings_show(struct mainWindow *mainWindow)
|
|
|
|
|
|
|
|
|
|
static void mainWindow_configure_settings_dialog(struct mainWindow *mainWindow) |
|
|
|
|
{ |
|
|
|
|
GDateTime *datetime; |
|
|
|
|
int i; |
|
|
|
|
gchar *text; |
|
|
|
|
|
|
|
|
|
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(mainWindow->settingsDialog.comboDisplayMode), |
|
|
|
|
"text", "Text only"); |
|
|
|
|
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(mainWindow->settingsDialog.comboDisplayMode), |
|
|
|
@ -518,11 +544,26 @@ static void mainWindow_configure_settings_dialog(struct mainWindow *mainWindow)
|
|
|
|
|
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(mainWindow->settingsDialog.comboDisplayMode), |
|
|
|
|
"html", "Full HTML with images"); |
|
|
|
|
|
|
|
|
|
datetime = g_date_time_new_now_local(); |
|
|
|
|
for (i= 0; newDateFormats[i]; ++i) { |
|
|
|
|
text = g_date_time_format(datetime, newDateFormats[i]); |
|
|
|
|
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(mainWindow->settingsDialog.comboNewDateFormat), |
|
|
|
|
newDateFormats[i], text); |
|
|
|
|
g_free(text); |
|
|
|
|
} |
|
|
|
|
g_date_time_unref(datetime); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
g_signal_connect(mainWindow->settingsDialog.comboDisplayMode, |
|
|
|
|
"changed", |
|
|
|
|
(GCallback) mainWindow_settings_combo_changed, |
|
|
|
|
mainWindow); |
|
|
|
|
|
|
|
|
|
g_signal_connect(mainWindow->settingsDialog.comboNewDateFormat, |
|
|
|
|
"changed", |
|
|
|
|
(GCallback) mainWindow_settings_comboNewDateFormat_changed, |
|
|
|
|
mainWindow); |
|
|
|
|
|
|
|
|
|
g_signal_connect(mainWindow->settingsDialog.settingsDialog, |
|
|
|
|
"delete-event", |
|
|
|
|
(GCallback) mainWindow_settings_delete_event, |
|
|
|
@ -575,8 +616,9 @@ struct mainWindow *mainWindow_new()
|
|
|
|
|
|
|
|
|
|
mainWindow->currentWorkspaceUrl = NULL; |
|
|
|
|
|
|
|
|
|
mainWindow->settingsDialog.settingsDialog = GTK_WIDGET(gtk_builder_get_object(builder, "settingsDialog")); |
|
|
|
|
mainWindow->settingsDialog.comboDisplayMode = GTK_WIDGET(gtk_builder_get_object(builder, "comboDisplayMode")); |
|
|
|
|
mainWindow->settingsDialog.settingsDialog = GTK_WIDGET(gtk_builder_get_object(builder, "settingsDialog")); |
|
|
|
|
mainWindow->settingsDialog.comboDisplayMode = GTK_WIDGET(gtk_builder_get_object(builder, "comboDisplayMode")); |
|
|
|
|
mainWindow->settingsDialog.comboNewDateFormat = GTK_WIDGET(gtk_builder_get_object(builder, "comboNewDateFormat")); |
|
|
|
|
|
|
|
|
|
mainWindow->filterSettings.time_start = 0; |
|
|
|
|
mainWindow->filterSettings.time_end = -1; |
|
|
|
@ -586,6 +628,8 @@ struct mainWindow *mainWindow_new()
|
|
|
|
|
|
|
|
|
|
mainWindow->renderer = RENDERER_NONE; |
|
|
|
|
|
|
|
|
|
mainWindow->newFileDateFormat = NULL; |
|
|
|
|
|
|
|
|
|
gtk_builder_connect_signals(builder, NULL); |
|
|
|
|
|
|
|
|
|
g_object_unref(G_OBJECT(builder)); |
|
|
|
@ -601,6 +645,7 @@ struct mainWindow *mainWindow_new()
|
|
|
|
|
mainWindow_configure_entry_completion(mainWindow); |
|
|
|
|
mainWindow_set_meta_information(mainWindow, 0, 0, TRUE); |
|
|
|
|
|
|
|
|
|
mainWindow_set_new_file_date_format(mainWindow, NULL); |
|
|
|
|
mainWindow_renderer_set(mainWindow, RENDERER_TEXT); |
|
|
|
|
|
|
|
|
|
return mainWindow; |
|
|
|
@ -1107,7 +1152,7 @@ void mainWindow_new_entry_clicked(GtkWidget *widget, gpointer user_data)
|
|
|
|
|
if (fd) { |
|
|
|
|
for (i = 0; default_template[i] != NULL; ++i) { |
|
|
|
|
if (default_template[i][0] == '\0') { |
|
|
|
|
default_path = g_date_time_format(datetime, "%d.%m.%Y %H:%M"); |
|
|
|
|
default_path = g_date_time_format(datetime, mainWindow->newFileDateFormat); |
|
|
|
|
fwrite(default_path, sizeof(char), strlen(default_path), fd); |
|
|
|
|
g_free(default_path); |
|
|
|
|
} else { |
|
|
|
|