From 47955c4e538878892ea207c80a6ad300c03afb4e Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 30 May 2019 13:07:44 +0200
Subject: [PATCH] Make showing main window work
---
data/ui/app.briar.gtk.gresource.xml | 1 +
data/ui/main.ui | 22 ++++++++++++++++++++++
src/briar/gtk/containers/main.py | 1 -
src/briar/gtk/containers/startup.py | 1 -
src/briar/gtk/window.py | 3 ++-
5 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 data/ui/main.ui
diff --git a/data/ui/app.briar.gtk.gresource.xml b/data/ui/app.briar.gtk.gresource.xml
index 8cd9fae..6525dd2 100644
--- a/data/ui/app.briar.gtk.gresource.xml
+++ b/data/ui/app.briar.gtk.gresource.xml
@@ -3,6 +3,7 @@
<gresource prefix="/app/briar/gtk">
<file compressed="true">ui/application.css</file>
<file compressed="true" preprocess="xml-stripblanks">ui/login.ui</file>
+ <file compressed="true" preprocess="xml-stripblanks">ui/main.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/setup.ui</file>
</gresource>
</gresources>
diff --git a/data/ui/main.ui b/data/ui/main.ui
new file mode 100644
index 0000000..bdeb727
--- /dev/null
+++ b/data/ui/main.ui
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkGrid" id="main">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="margin_left">18</property>
+ <property name="margin_right">18</property>
+ <property name="margin_top">18</property>
+ <property name="margin_bottom">18</property>
+ <child>
+ <object class="GtkListBox" id="contacts_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+</interface>
+
+
diff --git a/src/briar/gtk/containers/main.py b/src/briar/gtk/containers/main.py
index de6b33b..0dee7fd 100644
--- a/src/briar/gtk/containers/main.py
+++ b/src/briar/gtk/containers/main.py
@@ -10,7 +10,6 @@ class MainContainer(Container):
def __init__(self):
super().__init__()
self.__setup_view()
- self.__register_signals()
def __setup_view(self):
self.builder.add_from_resource("/app/briar/gtk/ui/main.ui")
diff --git a/src/briar/gtk/containers/startup.py b/src/briar/gtk/containers/startup.py
index 420790c..2f16321 100644
--- a/src/briar/gtk/containers/startup.py
+++ b/src/briar/gtk/containers/startup.py
@@ -52,7 +52,6 @@ class StartupContainer(Container):
def _startup_finished(self, succeeded):
if succeeded:
- print("Startup succeeded")
self.emit("briar_startup_completed", (succeeded,))
return
print("Startup failed")
diff --git a/src/briar/gtk/window.py b/src/briar/gtk/window.py
index 78362d6..e11cb78 100644
--- a/src/briar/gtk/window.py
+++ b/src/briar/gtk/window.py
@@ -48,7 +48,8 @@ class Window(Gtk.ApplicationWindow):
self.__grid.add(self.__container)
def __on_startup_completed(self, inst, obj):
- self.__grid = Gtk.Grid()
+ self.__grid.destroy()
+ self.__setup_grid()
self.__setup_main_container()
def __setup_main_container(self):
--
GitLab