From 538b2c54d9efd2e238f9afb9811939ee5a922ff5 Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sun, 5 Feb 2017 14:31:17 +0100 Subject: [PATCH] Added choose Workspace menu --- glade/mainWindow.glade | 90 ++++++++++++++++++++++++++++++++++++++++-- src/mainwindow.c | 13 ++++-- src/mainwindow.h | 4 +- 3 files changed, 98 insertions(+), 9 deletions(-) diff --git a/glade/mainWindow.glade b/glade/mainWindow.glade index 41d8b4d..08fb7f9 100644 --- a/glade/mainWindow.glade +++ b/glade/mainWindow.glade @@ -2,6 +2,59 @@ + + True + False + select-folder + + + False + + + True + False + vertical + + + True + True + edit-find-symbolic + False + False + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + Other Workspaces ... + True + True + True + + + False + True + 2 + + + + + @@ -339,12 +392,43 @@ False 4 - - Choose workspace + True True True - + chooseWorkspacePopover + + + True + False + 2 + + + True + False + Choose Workspace + + + False + True + 0 + + + + + True + False + down + in + + + False + True + 1 + + + + False diff --git a/src/mainwindow.c b/src/mainwindow.c index 2cebb95..061cd08 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -245,6 +245,11 @@ static void mainWindow_connect_signals(struct mainWindow *mainWindow) "icon-press", (GCallback) mainWindow_dateIconPress, mainWindow); + + g_signal_connect(mainWindow->buttonOtherWorkspace, + "clicked", + (GCallback) mainWindow_otherWorkspaceClicked, + mainWindow); } /** @@ -272,7 +277,7 @@ struct mainWindow *mainWindow_new() mainWindow = malloc(sizeof(struct mainWindow)); mainWindow->mainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "mainWindow")); - mainWindow->buttonChooseWorkspace = GTK_WIDGET(gtk_builder_get_object(builder, "buttonChooseWorkspace")); + mainWindow->buttonOtherWorkspace = GTK_WIDGET(gtk_builder_get_object(builder, "buttonOtherWorkspace")); mainWindow->searchEntry = GTK_WIDGET(gtk_builder_get_object(builder, "searchEntry")); mainWindow->dateStart = GTK_WIDGET(gtk_builder_get_object(builder, "dateStart")); mainWindow->dateEnd = GTK_WIDGET(gtk_builder_get_object(builder, "dateEnd")); @@ -323,14 +328,14 @@ void mainWindow_set_meta_information(struct mainWindow *mainWindow, guint time_e } /** - * @brief mainWindow_chooseWorkspaceClicked is called when the user clicks the Choose Workspace button. + * @brief mainWindow_otherWorkspaceClicked is called when the user clicks the Other Workspace button. * @param widget N/A * @param event N/A * @param user_data struct mainWindow * */ -void mainWindow_chooseWorkspaceClicked(GtkWidget *widget, gint event, gpointer user_data) +void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gint event, gpointer user_data) { - printf("Choose workspace.\n"); + printf("TODO: Show directory browser dialog.\n"); fflush(stdout); } diff --git a/src/mainwindow.h b/src/mainwindow.h index ca2f64d..93b08ee 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -8,7 +8,7 @@ struct mainWindow { GtkWidget *mainWindow; - GtkWidget *buttonChooseWorkspace; + GtkWidget *buttonOtherWorkspace; GtkWidget *searchEntry; GtkWidget *dateStart; GtkWidget *dateEnd; @@ -47,7 +47,7 @@ void mainWindow_set_meta_information(struct mainWindow *mainWindow, guint time_e /* Slots */ void mainWindow_showPopover(GtkWidget *widget, GdkEvent *event, gpointer user_data); -void mainWindow_chooseWorkspaceClicked(GtkWidget *widget, gint event, gpointer user_data); +void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gint event, gpointer user_data); void mainWindow_clearSearch(GtkWidget *widget, gpointer user_data); void mainWindow_calendarSelected(GtkWidget *widget, gpointer user_data); void mainWindow_entrySelected(GtkWidget *widget, gpointer user_data);