Merge branch 'dev' into release5.4
This commit is contained in:
commit
5236a27f44
@ -280,8 +280,6 @@ void SaveAsDialog::okPressed ()
|
||||
|
||||
void SaveAsDialog::cancelPressed ()
|
||||
{
|
||||
|
||||
fname = fchooser->get_filename();
|
||||
response (Gtk::RESPONSE_CANCEL);
|
||||
}
|
||||
|
||||
@ -297,7 +295,7 @@ void SaveAsDialog::formatChanged (Glib::ustring f)
|
||||
}
|
||||
}
|
||||
|
||||
void SaveAsDialog::setInitialFileName (Glib::ustring fname)
|
||||
void SaveAsDialog::setInitialFileName (const Glib::ustring& fname)
|
||||
{
|
||||
this->fname = fname;
|
||||
fchooser->set_current_name(fname);
|
||||
|
@ -57,7 +57,7 @@ public:
|
||||
bool getToTailOfQueue ();
|
||||
int getSaveMethodNum ();
|
||||
|
||||
void setInitialFileName (Glib::ustring iname);
|
||||
void setInitialFileName (const Glib::ustring& iname);
|
||||
void setImagePath (const Glib::ustring& imagePath);
|
||||
|
||||
void okPressed ();
|
||||
|
Loading…
x
Reference in New Issue
Block a user