[gnome-builder/wip/gtk4-port: 237/736] libide/greeter: shuffle menus and ui files around




commit c1a9be759cd5e845d1a05061e6b9a4117343b8b5
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 30 16:43:21 2022 -0700

    libide/greeter: shuffle menus and ui files around
    
    We will eventually drop the clone bit and move it to the vcsui, but for
    now these can live in the workspace itself since we have the ability to
    load these manually.
    
    The style.css will be supported soon, to load css overrides for libadwaita.

 src/{plugins => libide}/greeter/gtk/menus.ui    | 20 +++++---------------
 src/libide/greeter/ide-greeter-row.c            |  3 ++-
 src/libide/greeter/ide-greeter-workspace.c      |  2 +-
 src/libide/greeter/libide-greeter.gresource.xml |  4 +++-
 src/libide/greeter/style.css                    |  6 ++++++
 src/plugins/greeter/greeter.gresource.xml       |  1 -
 6 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/src/plugins/greeter/gtk/menus.ui b/src/libide/greeter/gtk/menus.ui
similarity index 81%
rename from src/plugins/greeter/gtk/menus.ui
rename to src/libide/greeter/gtk/menus.ui
index 458ef2969..952fbfd30 100644
--- a/src/plugins/greeter/gtk/menus.ui
+++ b/src/libide/greeter/gtk/menus.ui
@@ -5,7 +5,7 @@
       <item>
         <attribute name="id">ide-greeter-workspace-menu-clone</attribute>
         <attribute name="label" translatable="yes">_Clone Repository…</attribute>
-        <attribute name="action">win.surface</attribute>
+        <attribute name="action">win.page</attribute>
         <attribute name="target" type="s">'clone'</attribute>
       </item>
     </section>
@@ -48,29 +48,19 @@
         <attribute name="action">app.quit</attribute>
       </item>
     </section>
-    <!--
-    <section id="ide-greeter-workspace-menu-debug-section">
-      <attribute name="label" translatable="yes">Debugging</attribute>
-      <item>
-        <attribute name="id">ide-greeter-workspace-menu-stats</attribute>
-        <attribute name="label" translatable="yes">Type Statistics</attribute>
-        <attribute name="action">app.about:types</attribute>
-      </item>
-    </section>
-    -->
   </menu>
   <menu id="ide-primary-workspace-menu">
     <section id="ide-primary-workspace-menu-projects-section">
       <item>
         <attribute name="id">ide-primary-workspace-menu-open</attribute>
         <attribute name="label" translatable="yes">Open a _Project…</attribute>
-        <attribute name="action">app.present-greeter-with-surface</attribute>
+        <attribute name="action">app.present-greeter-with-page</attribute>
         <attribute name="target" type="s">''</attribute>
       </item>
       <item>
         <attribute name="id">ide-primary-workspace-menu-clone</attribute>
         <attribute name="label" translatable="yes">_Clone Repository…</attribute>
-        <attribute name="action">app.present-greeter-with-surface</attribute>
+        <attribute name="action">app.present-greeter-with-page</attribute>
         <attribute name="target" type="s">'clone'</attribute>
       </item>
     </section>
@@ -80,13 +70,13 @@
       <item>
         <attribute name="id">ide-editor-workspace-menu-open</attribute>
         <attribute name="label" translatable="yes">Open a _Project…</attribute>
-        <attribute name="action">app.present-greeter-with-surface</attribute>
+        <attribute name="action">app.present-greeter-with-page</attribute>
         <attribute name="target" type="s">''</attribute>
       </item>
       <item>
         <attribute name="id">ide-editor-workspace-menu-clone</attribute>
         <attribute name="label" translatable="yes">_Clone Repository…</attribute>
-        <attribute name="action">app.present-greeter-with-surface</attribute>
+        <attribute name="action">app.present-greeter-with-page</attribute>
         <attribute name="target" type="s">'clone'</attribute>
       </item>
     </section>
diff --git a/src/libide/greeter/ide-greeter-row.c b/src/libide/greeter/ide-greeter-row.c
index 64c477d65..900740f3c 100644
--- a/src/libide/greeter/ide-greeter-row.c
+++ b/src/libide/greeter/ide-greeter-row.c
@@ -168,7 +168,7 @@ ide_greeter_row_class_init (IdeGreeterRowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/builder/ui/ide-greeter-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/libide-greeter/ide-greeter-row.ui");
   gtk_widget_class_bind_template_child_private (widget_class, IdeGreeterRow, check_button);
   gtk_widget_class_bind_template_child_private (widget_class, IdeGreeterRow, image);
   gtk_widget_class_bind_template_child_private (widget_class, IdeGreeterRow, subtitle);
@@ -304,6 +304,7 @@ ide_greeter_row_set_project_info (IdeGreeterRow  *self,
               GtkLabel *tag;
 
               tag = g_object_new (GTK_TYPE_LABEL,
+                                  "css-name", "button",
                                   "label", key,
                                   NULL);
               gtk_widget_add_css_class (GTK_WIDGET (tag), "pill");
diff --git a/src/libide/greeter/ide-greeter-workspace.c b/src/libide/greeter/ide-greeter-workspace.c
index aa1cf7dce..70642dc6f 100644
--- a/src/libide/greeter/ide-greeter-workspace.c
+++ b/src/libide/greeter/ide-greeter-workspace.c
@@ -644,7 +644,7 @@ ide_greeter_workspace_class_init (IdeGreeterWorkspaceClass *klass)
 
   ide_workspace_class_set_kind (workspace_class, "greeter");
 
-  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/builder/ui/ide-greeter-workspace.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/libide-greeter/ide-greeter-workspace.ui");
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, action_bar);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, back_button);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, buttons_section);
diff --git a/src/libide/greeter/libide-greeter.gresource.xml b/src/libide/greeter/libide-greeter.gresource.xml
index 4919ca046..d4b17aec3 100644
--- a/src/libide/greeter/libide-greeter.gresource.xml
+++ b/src/libide/greeter/libide-greeter.gresource.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/builder/ui">
+  <gresource prefix="/org/gnome/libide-greeter/">
     <file preprocess="xml-stripblanks">ide-greeter-row.ui</file>
     <file preprocess="xml-stripblanks">ide-greeter-workspace.ui</file>
+    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
+    <file>style.css</file>
   </gresource>
 </gresources>
diff --git a/src/libide/greeter/style.css b/src/libide/greeter/style.css
new file mode 100644
index 000000000..e82080fc6
--- /dev/null
+++ b/src/libide/greeter/style.css
@@ -0,0 +1,6 @@
+window.greeter button.pill {
+  font-size: .83333em;
+  border-radius: 99px;
+  margin: 0;
+  padding: 3px 12px;
+}
diff --git a/src/plugins/greeter/greeter.gresource.xml b/src/plugins/greeter/greeter.gresource.xml
index 13594ee06..8f74d34ce 100644
--- a/src/plugins/greeter/greeter.gresource.xml
+++ b/src/plugins/greeter/greeter.gresource.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/plugins/greeter">
-    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
     <file>greeter.plugin</file>
   </gresource>
 </gresources>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]