Revise project structure

meson.build

-project('briar-gtk',         version: '0.1.0',
+project(
+  'briar-gtk',
+  version: '0.1.0',
   meson_version: '>= 0.40.0',
 )
 
 i18n = import('i18n')
 
-
-subdir('data')
+subdir('res')
 subdir('src')
 subdir('po')
 

data/meson.build → res/meson.build

@@ -38,4 +38,14 @@ if compile_schemas.found()
   test('Validate schema file', compile_schemas,
     args: ['--strict', '--dry-run', meson.current_source_dir()]
   )
-endif
\ No newline at end of file
+endif
+
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+gnome = import('gnome')
+
+gnome.compile_resources('briar-gtk',
+  'ui/gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir,
+)
\ No newline at end of file

src/briar-gtk.gresource.xml → res/ui/gresource.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/app/briar/gtk">
-    <file>window.ui</file>
+    <file>ui/setup.ui</file>
   </gresource>
 </gresources>

src/window.ui → res/ui/setup.ui

@@ -28,7 +28,7 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
-              <object class="GtkLabel" id="username-label">
+              <object class="GtkLabel" id="username_label">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="label" translatable="yes">Nickname</property>
@@ -39,7 +39,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="username">
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
                 <property name="placeholder_text" translatable="yes">Choose your nickname</property>
               </object>
@@ -49,7 +49,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="username-next">
+              <object class="GtkButton" id="username_next">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="label" translatable="yes">Next</property>
@@ -69,7 +69,7 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
-              <object class="GtkLabel" id="password-label">
+              <object class="GtkLabel" id="password_label">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="label" translatable="yes">Password</property>
@@ -80,7 +80,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="password">
+              <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
                 <property name="placeholder_text" translatable="yes">Choose your password</property>
               </object>
@@ -90,7 +90,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="password_confirm">
+              <object class="GtkEntry" id="password_confirm_entry">
                 <property name="visible">True</property>
                 <property name="placeholder_text" translatable="yes">Confirm your password</property>
               </object>
@@ -100,7 +100,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="password-next">
+              <object class="GtkButton" id="password_next">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="label" translatable="yes">Next</property>
@@ -118,3 +118,4 @@
   </template>
 </interface>
 
+

src/main.py

@@ -22,7 +22,7 @@ gi.require_version('Gtk', '3.0')
 
 from gi.repository import Gtk, Gio
 
-from .window import BriarGtkWindow
+from .setup import BriarSetupWindow
 
 
 class Application(Gtk.Application):
@@ -33,7 +33,7 @@ class Application(Gtk.Application):
     def do_activate(self):
         win = self.props.active_window
         if not win:
-            win = BriarGtkWindow(application=self)
+            win = BriarSetupWindow(application=self)
         win.present()
 
 

src/meson.build

 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
 moduledir = join_paths(pkgdatadir, 'briar_gtk')
-gnome = import('gnome')
-
-gnome.compile_resources('briar-gtk',
-  'briar-gtk.gresource.xml',
-  gresource_bundle: true,
-  install: true,
-  install_dir: pkgdatadir,
-)
 
 python3 = import('python3')
 
@@ -27,9 +19,9 @@ configure_file(
 
 briar_gtk_sources = [
   '__init__.py',
-  'gi_composites.py',
   'main.py',
-  'window.py',
+  'ui/gi_composites.py',
+  'ui/setup.py',
 ]
 
 install_data(briar_gtk_sources, install_dir: moduledir)

src/window.py → src/ui/setup.py

@@ -19,8 +19,8 @@ from gi.repository import Gtk
 from .gi_composites import GtkTemplate
 
 
-@GtkTemplate(ui='/app/briar/gtk/window.ui')
-class BriarGtkWindow(Gtk.ApplicationWindow):
+@GtkTemplate(ui='/app/briar/gtk/ui/setup.ui')
+class BriarSetupWindow(Gtk.ApplicationWindow):
     __gtype_name__ = 'BriarGtkWindow'
 
     username_grid = GtkTemplate.Child()