From e0a1329218ba2912e9e923c8c4e22af2307295fe Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Thu, 2 Aug 2018 13:05:57 +0200 Subject: [PATCH] main-window: Replace the stack switcher by a header bar Drop the in-window content stack witcher and replace it by a header bar containing both a CallsHistoryHeaderBar and a CallsNewCallHeaderBar. --- src/main.c | 4 ++++ src/ui/main-window.ui | 49 ++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/main.c b/src/main.c index ed84205..5609e92 100644 --- a/src/main.c +++ b/src/main.c @@ -30,9 +30,11 @@ #include "calls-call-window.h" #include "calls-encryption-indicator.h" #include "calls-history-box.h" +#include "calls-history-header-bar.h" #include "calls-main-window.h" #include "calls-mm-provider.h" #include "calls-new-call-box.h" +#include "calls-new-call-header-bar.h" #include "config.h" static void @@ -46,7 +48,9 @@ show_window (GtkApplication *app) CALLS_TYPE_ENCRYPTION_INDICATOR; CALLS_TYPE_HISTORY_BOX; + CALLS_TYPE_HISTORY_HEADER_BAR; CALLS_TYPE_NEW_CALL_BOX; + CALLS_TYPE_NEW_CALL_HEADER_BAR; HDY_TYPE_DIALER; connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui index 3b868b6..74c0a15 100644 --- a/src/ui/main-window.ui +++ b/src/ui/main-window.ui @@ -21,31 +21,6 @@ True False vertical - - - True - False - - - True - False - center - 0 - main_stack - - - True - True - 1 - - - - - False - True - 0 - - False @@ -135,7 +110,29 @@ - + + False + True + + + + False + True + + + history + + + + + False + True + + + new-call + + + \ No newline at end of file