kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Unify gtk/xdp file dialog getters

Browse source
This commit is contained in:
Ilya Fedin 2021-03-22 03:13:00 +04:00 • committed by John Preston
parent a16b7fbb83
commit ce5579e8f9
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Telegram/SourceFiles/platform/linux/linux_gtk_file_dialog.cpp
View file

@ -681,12 +681,15 @@ bool Get(
}
dialog.selectFile(startFile);
int res = dialog.exec();
const auto res = dialog.exec();
QString path = dialog.directory().absolutePath();
if (path != cDialogLastPath()) {
cSetDialogLastPath(path);
Local::writeSettings();
if (type != Type::ReadFolder) {
// Save last used directory for all queries except directory choosing.
const auto path = dialog.directory().absolutePath();
if (!path.isEmpty() && path != cDialogLastPath()) {
cSetDialogLastPath(path);
Local::writeSettings();
}
}
if (res == QDialog::Accepted) {

30
Telegram/SourceFiles/platform/linux/linux_xdp_file_dialog.cpp
View file

@ -592,6 +592,11 @@ void XDPFileDialog::gotResponse(
if (const auto i = results.find("uris"); i != end(results)) {
_selectedFiles = base::Platform::GlibVariantCast<
std::vector<Glib::ustring>>(i->second);
_directory = _selectedFiles.empty()
? Glib::ustring()
: Glib::ustring(
Glib::path_get_dirname(_selectedFiles.back()));
}
if (const auto i = results.find("current_filter");
@ -688,7 +693,18 @@ bool Get(
dialog.setDirectory(QFileInfo(startFile).absoluteDir().absolutePath());
dialog.selectFile(startFile);
int res = dialog.exec();
const auto res = dialog.exec();
if (type != Type::ReadFolder) {
// Save last used directory for all queries except directory choosing.
const auto path = dialog.directory().path();
if (!path.isEmpty()
&& !path.contains(docRegExp)
&& path != cDialogLastPath()) {
cSetDialogLastPath(path);
Local::writeSettings();
}
}
if (res == QDialog::Accepted) {
QStringList selectedFilesStrings;
@ -702,18 +718,6 @@ bool Get(
} else {
files = selectedFilesStrings.mid(0, 1);
}
QString path = files.isEmpty()
? QString()
: QFileInfo(files.back()).absoluteDir().absolutePath();
if (!path.isEmpty()
&& !path.contains(docRegExp)
&& path != cDialogLastPath()) {
cSetDialogLastPath(path);
Local::writeSettings();
}
return true;
}