From 46e3471d0fbe729e9fdd20752ce6268716aacd61 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Tue, 24 Oct 2017 15:09:40 +0200 Subject: [PATCH] minor tweak to the ok/cancel button labels of MyFileChooserButton --- rtgui/guiutils.cc | 6 +++--- rtgui/guiutils.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 1512b3537..430e03968 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -1190,9 +1190,9 @@ MyFileChooserButton::MyFileChooserButton(const Glib::ustring &title, Gtk::FileCh void MyFileChooserButton::show_chooser() { - Gtk::FileChooserDialog dlg(*static_cast(get_toplevel()), title_, action_); - dlg.add_button("Cancel", Gtk::RESPONSE_CANCEL); - dlg.add_button("Ok", Gtk::RESPONSE_OK); + Gtk::FileChooserDialog dlg(getToplevelWindow(this), title_, action_); + dlg.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL); + dlg.add_button(M(action_ == Gtk::FILE_CHOOSER_ACTION_SAVE ? "GENERAL_SAVE" : "GENERAL_OPEN"), Gtk::RESPONSE_OK); dlg.set_filename(filename_); for (auto &f : file_filters_) { dlg.add_filter(f); diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 186d21527..2861b4913 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -33,7 +33,6 @@ // for convenience... #include "pathutils.h" -#include "multilangmgr.h" Glib::ustring escapeHtmlChars(const Glib::ustring &src);