Browse Source

Implemented link on to label to set both days at the same time

newfile
Markus Koch 5 years ago
parent
commit
e6bba9f0ee
  1. 3
      glade/mainWindow.glade
  2. 2
      src/main.c
  3. 16
      src/mainwindow.c
  4. 1
      src/mainwindow.h

3
glade/mainWindow.glade

@ -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">&lt;a href=""&gt;to&lt;/a&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>

2
src/main.c

@ -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);

16
src/mainwindow.c

@ -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);
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);
}
/**

1
src/mainwindow.h

@ -30,6 +30,7 @@ struct mainWindow {
GtkWidget *labelSummary;
GtkWidget *buttonClearSearch;
GtkWidget *headerBar;
GtkWidget *labelDateToDate;
GtkTreeView *entryListView;
GtkTreeSelection *entryListSelection;
GtkTextBuffer *textBuffer;

Loading…
Cancel
Save