Skip to content

SaveDialog: use fileinfo, localize, DRY #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremypw merged 3 commits into from
Aug 30, 2023
+35 −34
Merged

SaveDialog: use fileinfo, localize, DRY #269

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dc9e79
SaveDialog: use fileinfo, localize, DRY
danirabbit Aug 29, 2023
8708286
pass folder_dir
danirabbit Aug 29, 2023
69accfc
fix lint
danirabbit Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions src/Widgets/SaveDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class Screenshot.SaveDialog : Granite.Dialog {

public signal void save_response (bool response, string folder_dir, string output_name, string format);

private Gtk.Label folder_name;
private Gtk.Image folder_image;

public SaveDialog (Gdk.Pixbuf pixbuf, Settings settings, Gtk.Window parent) {
Object (
deletable: false,
Expand Down Expand Up @@ -148,41 +151,33 @@ public class Screenshot.SaveDialog : Granite.Dialog {
margin_top = 18
};

var folder_name = new Gtk.Label ("") {
folder_name = new Gtk.Label ("") {
halign = Gtk.Align.START,
hexpand = true
};

var folder_icon = new Gtk.Image () {
pixel_size = 16
};
folder_image = new Gtk.Image ();

if (folder_dir == Environment.get_home_dir ()) {
folder_name.label = "Home";
folder_icon.gicon = new ThemedIcon ("user-home");
} else if (folder_dir == "/") {
folder_name.label = "File System";
folder_icon.gicon = new ThemedIcon ("drive-harddisk");
} else {
folder_name.label = Path.get_basename (folder_dir);
folder_icon.gicon = new ThemedIcon ("folder");
}
update_location_button (folder_dir);

var arrow = new Gtk.Image () {
gicon = new ThemedIcon ("pan-down-symbolic"),
halign = Gtk.Align.END
};
var arrow = new Gtk.Image.from_icon_name ("view-more-horizontal-symbolic", BUTTON);

var location_button_indicator = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
location_button_indicator.add (folder_icon);
var location_button_indicator = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
location_button_indicator.add (folder_image);
location_button_indicator.add (folder_name);
location_button_indicator.add (arrow);

var location_button = new Gtk.Button ();
location_button.add (location_button_indicator);
var location_button = new Gtk.Button () {
child = location_button_indicator
};

var location_dialog = new Gtk.FileChooserNative (_("Select Screenshots Folder…"), this,
Gtk.FileChooserAction.SELECT_FOLDER, "Open", "Cancel");
var location_dialog = new Gtk.FileChooserNative (
_("Select Screenshots Folder…"),
this,
Gtk.FileChooserAction.SELECT_FOLDER,
_("Select"),
null
);
location_dialog.set_current_folder (folder_dir);

var content = this.get_content_area () as Gtk.Box;
Expand Down Expand Up @@ -253,17 +248,23 @@ public class Screenshot.SaveDialog : Granite.Dialog {
folder_dir = settings.get_string ("folder-dir");
}

if (folder_dir == Environment.get_home_dir ()) {
folder_name.label = "Home";
folder_icon.gicon = new ThemedIcon ("user-home");
} else if (folder_dir == "/") {
folder_name.label = "File System";
folder_icon.gicon = new ThemedIcon ("drive-harddisk");
} else {
folder_name.label = Path.get_basename (folder_dir);
folder_icon.gicon = new ThemedIcon ("folder");
}
update_location_button (folder_dir);
}
});
}

private void update_location_button (string folder_dir) {
var file = File.new_for_path (folder_dir);
try {
var info = file.query_info (
FileAttribute.STANDARD_DISPLAY_NAME + "," + FileAttribute.STANDARD_ICON,
FileQueryInfoFlags.NONE
);
folder_name.label = info.get_display_name ();
folder_image.gicon = info.get_icon ();
} catch (Error e) {
folder_name.label = folder_dir;
folder_image.gicon = new ThemedIcon ("folder");
}
}
}