Compare commits
3 Commits
f444d40071
...
e6bba9f0ee
Author | SHA1 | Date | |
---|---|---|---|
e6bba9f0ee | |||
a6bb0234f7 | |||
73b1154b68 |
@ -209,7 +209,8 @@
|
||||
<object class="GtkLabel" id="label_date_to_date">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">to</property>
|
||||
<property name="label" translatable="yes"><a href="">to</a></property>
|
||||
<property name="use_markup">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
|
@ -22,7 +22,7 @@ int main(int argc, char *argv[])
|
||||
gtk_widget_show(mainWindow->mainWindow);
|
||||
gtk_main();
|
||||
|
||||
mdiary_save_settings(settings_path, settings);
|
||||
mdiary_save_settings(settings_path, settings); //
|
||||
mdiary_settings_free(settings);
|
||||
g_free(settings_path);
|
||||
|
||||
|
@ -322,6 +322,10 @@ static void mainWindow_connect_signals(struct mainWindow *mainWindow)
|
||||
"focus-in-event",
|
||||
(GCallback) mainWindow_showPopover,
|
||||
mainWindow);
|
||||
g_signal_connect(mainWindow->labelDateToDate,
|
||||
"activate-link",
|
||||
(GCallback) mainWindow_showPopover,
|
||||
mainWindow);
|
||||
g_signal_connect(mainWindow->calendarRange,
|
||||
"day-selected",
|
||||
(GCallback) mainWindow_calendarSelected,
|
||||
@ -443,6 +447,7 @@ struct mainWindow *mainWindow_new()
|
||||
mainWindow->labelSummary = GTK_WIDGET(gtk_builder_get_object(builder, "labelSummary"));
|
||||
mainWindow->buttonClearSearch = GTK_WIDGET(gtk_builder_get_object(builder, "buttonClearSearch"));
|
||||
mainWindow->headerBar = GTK_WIDGET(gtk_builder_get_object(builder, "headerBar"));
|
||||
mainWindow->labelDateToDate = GTK_WIDGET(gtk_builder_get_object(builder, "label_date_to_date"));
|
||||
mainWindow->entryListView = GTK_TREE_VIEW(gtk_builder_get_object(builder, "entryListView"));
|
||||
mainWindow->entryListSelection = GTK_TREE_SELECTION(gtk_builder_get_object(builder, "entryListSelection"));
|
||||
mainWindow->textBuffer = GTK_TEXT_BUFFER(gtk_builder_get_object(builder, "entryTextBuffer"));
|
||||
@ -538,12 +543,15 @@ void mainWindow_calendarSelected(GtkWidget *widget, gpointer user_data)
|
||||
guint year, month, day;
|
||||
gchar *text;
|
||||
|
||||
if (mainWindow->selectedDateEntry) {
|
||||
gtk_calendar_get_date(GTK_CALENDAR(mainWindow->calendarRange), &year, &month, &day);
|
||||
text = g_strdup_printf("%d-%02d-%02d", year, month + 1, day);
|
||||
if (mainWindow->selectedDateEntry == mainWindow->labelDateToDate) {
|
||||
gtk_entry_set_text(GTK_ENTRY(mainWindow->dateStart), text);
|
||||
gtk_entry_set_text(GTK_ENTRY(mainWindow->dateEnd), text);
|
||||
} else if (mainWindow->selectedDateEntry) {
|
||||
gtk_entry_set_text(GTK_ENTRY(mainWindow->selectedDateEntry), text);
|
||||
g_free(text);
|
||||
}
|
||||
g_free(text);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -758,7 +766,6 @@ void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gpointer user_data)
|
||||
GtkWidget *dialog;
|
||||
gint res;
|
||||
|
||||
|
||||
dialog = gtk_file_chooser_dialog_new("Choose Workspace", GTK_WINDOW(mainWindow->mainWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
|
||||
"Cancel", GTK_RESPONSE_CANCEL,
|
||||
"Select", GTK_RESPONSE_ACCEPT,
|
||||
@ -775,7 +782,4 @@ void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gpointer user_data)
|
||||
}
|
||||
|
||||
gtk_widget_destroy (dialog);
|
||||
|
||||
g_print("TODO: Show directory browser dialog.\n");
|
||||
|
||||
}
|
||||
|
@ -30,6 +30,7 @@ struct mainWindow {
|
||||
GtkWidget *labelSummary;
|
||||
GtkWidget *buttonClearSearch;
|
||||
GtkWidget *headerBar;
|
||||
GtkWidget *labelDateToDate;
|
||||
GtkTreeView *entryListView;
|
||||
GtkTreeSelection *entryListSelection;
|
||||
GtkTextBuffer *textBuffer;
|
||||
|
Loading…
Reference in New Issue
Block a user