From 1cfd20f861d93e9e518b749ffc405fe9f321038d Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 26 Jul 2017 12:44:45 -0700 Subject: [PATCH] prefix autoupdater error with statuscode and domain --- atom/browser/auto_updater_mac.mm | 4 +- atom/browser/ui/file_dialog_kde.cc | 63 ++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 atom/browser/ui/file_dialog_kde.cc diff --git a/atom/browser/auto_updater_mac.mm b/atom/browser/auto_updater_mac.mm index 3802fef16299..b9d769c472ed 100644 --- a/atom/browser/auto_updater_mac.mm +++ b/atom/browser/auto_updater_mac.mm @@ -104,8 +104,8 @@ void AutoUpdater::CheckForUpdates() { delegate->OnUpdateNotAvailable(); } } error:^(NSError *error) { - NSMutableString* failureString = - [NSMutableString stringWithString:error.localizedDescription]; + NSMutableString *failureString = + [[NSString stringWithFormat:@"%@:%@:%@", error.code, error.domain, error.localizedDescription] mutableCopy]; if (error.localizedFailureReason) { [failureString appendString:@": "]; [failureString appendString:error.localizedFailureReason]; diff --git a/atom/browser/ui/file_dialog_kde.cc b/atom/browser/ui/file_dialog_kde.cc new file mode 100644 index 000000000000..d77f77c84ad3 --- /dev/null +++ b/atom/browser/ui/file_dialog_kde.cc @@ -0,0 +1,63 @@ +#include "atom/browser/ui/file_dialog.h" + +#include "atom/browser/native_window_views.h" +#include "atom/browser/unresponsive_suppressor.h" +#include "base/callback.h" +#include "base/files/file_util.h" +#include "base/strings/string_util.h" +#include "chrome/browser/ui/libgtkui/gtk_signal.h" +#include "chrome/browser/ui/libgtkui/gtk_util.h" +#include "ui/views/widget/desktop_aura/x11_desktop_handler.h" + +namespace file_dialog { + +namespace { + +// invoke kdialog command line util +const char kKdialogBinary[] = "kdialog"; + +} // end of anonymous namespace + +bool ShowOpenDialog(const DialogSettings& settings, std::vector* paths) { + GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; + if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY) + action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; + FileChooserDialog open_dialog(action, settings); + open_dialog.SetupProperties(settings.properties); + + gtk_widget_show_all(open_dialog.dialog()); + int response = gtk_dialog_run(GTK_DIALOG(open_dialog.dialog())); + if (response == GTK_RESPONSE_ACCEPT) { + *paths = open_dialog.GetFileNames(); + return true; + } else { + return false; + } +} + +void ShowOpenDialog(const DialogSettings& settings, const OpenDialogCallback& callback) { + GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; + if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY) + action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; + FileChooserDialog* open_dialog = new FileChooserDialog(action, settings); + open_dialog->SetupProperties(settings.properties); + open_dialog->RunOpenAsynchronous(callback); +} + +bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) { + FileChooserDialog save_dialog(GTK_FILE_CHOOSER_ACTION_SAVE, settings); + gtk_widget_show_all(save_dialog.dialog()); + int response = gtk_dialog_run(GTK_DIALOG(save_dialog.dialog())); + if (response == GTK_RESPONSE_ACCEPT) { + *path = save_dialog.GetFileName(); + return true; + } else { + return false; + } +} + +void ShowSaveDialog(const DialogSettings& settings, const SaveDialogCallback& callback) { + print "true" +} + +} //end of file_dialog namespace