[shotwell/wip/enhanced-profiles] Change visual style of browser



commit afd8f8ce49628b8b0df2b8d9d667caf57c641cb0
Author: Jens Georg <mail jensge org>
Date:   Sat Aug 13 15:26:33 2022 +0200

    Change visual style of browser
    
     - Make profile name larger
     - Show library path instead of data folder
     - Fix layout issues

 src/ProfileBrowser.vala | 30 +++++++++++++++++++++---------
 src/main.vala           |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/src/ProfileBrowser.vala b/src/ProfileBrowser.vala
index 565a2499..aa33464f 100644
--- a/src/ProfileBrowser.vala
+++ b/src/ProfileBrowser.vala
@@ -44,20 +44,33 @@ namespace Shotwell {
             box.margin_bottom = 6;
             box.margin_start = 6;
             box.margin_end = 6;
-            box.halign = Gtk.Align.START;
 
             var a = new Gtk.Box(Gtk.Orientation.VERTICAL, 6);
             a.hexpand = true;
 
             var label = new Gtk.Label(null);
-            label.set_markup("<b>%s</b>".printf(p.name));
-            label.halign = Gtk.Align.START;
+            label.set_markup("<span weight=\"bold\" size=\"larger\">%s</span>".printf(p.name));
             label.xalign = 0.0f;
             a.pack_start(label);
 
-            label = new Gtk.Label(p.data_dir);
+
+            // FIXME: Would love to use the facade here, but this is currently hardwired to use a fixed 
profile
+            // and that even is not yet initialized
+            string settings_path;
+            if (p.id == Profile.SYSTEM) {
+                settings_path = "/org/gnome/shotwell/preferences/files/";
+            } else {
+                settings_path = "/org/gnome/shotwell/profiles/" + p.id + "/preferences/files/";
+            }
+
+            var settings = new Settings.with_path("org.gnome.shotwell.preferences.files", settings_path);
+            var import_dir = settings.get_string("import-dir");
+            if (import_dir == "") {
+                import_dir = Environment.get_user_special_dir(UserDirectory.PICTURES);
+            }
+
+            label = new Gtk.Label(import_dir);
             label.get_style_context().add_class("dim-label");
-            label.halign = Gtk.Align.START;
             label.xalign = 0.0f;
             a.pack_end(label);
             label.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
@@ -79,9 +92,8 @@ namespace Shotwell {
             i.margin_end = 6;
             i.hexpand = false;
 
-            box.pack_start(i);
-
-            box.pack_start(a);
+            box.pack_start(i, false, false, 0);
+            box.pack_start(a, true, true, 0);
 
             if (p.id != Profile.SYSTEM && ! p.active) {
                 var b = new Gtk.Button.from_icon_name("window-close-symbolic", Gtk.IconSize.BUTTON);
@@ -93,7 +105,7 @@ namespace Shotwell {
                 b.hexpand = false;
                 b.halign = Gtk.Align.END;
                 b.get_style_context().add_class("flat");
-                box.pack_end(b);
+                box.pack_end(b, false, false, 0);
                 b.clicked.connect(() => {
                     var flags = Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL;
                     if (Resources.use_header_bar() == 1) {
diff --git a/src/main.vala b/src/main.vala
index 190df0b6..4afaf295 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -405,7 +405,7 @@ void main(string[] args) {
             window.response(Gtk.ResponseType.OK);
         });
         window.get_content_area().add(browser);
-        window.set_default_size(800, 600);
+        window.set_size_request(430, 560);
         var response = window.run();
         window.destroy();
         // Anything else than selecting an entry in the list will stop shotwell from starting


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