Browse Source

Renamed get_current_path to get_current_folder.

merge-requests/365/head
eidheim 10 years ago
parent
commit
6ed8a55821
  1. 2
      src/dialogs.h
  2. 2
      src/dialogs_win.cc
  3. 2
      src/notebook.cc
  4. 2
      src/notebook.h
  5. 2
      src/window.cc

2
src/dialogs.h

@ -27,7 +27,7 @@ private:
auto application=Glib::RefPtr<Application>::cast_static(gio_application);
dialog.set_transient_for(*application->window);
auto current_path=application->window->notebook.get_current_path();
auto current_path=application->window->notebook.get_current_folder();
if(current_path.empty())
current_path=boost::filesystem::current_path();
gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog.gobj(), current_path.string().c_str());

2
src/dialogs_win.cc

@ -97,7 +97,7 @@ private:
auto gio_application=Glib::wrap(g_application, true);
auto application=Glib::RefPtr<Application>::cast_static(gio_application);
auto current_path=application->window->notebook.get_current_path();
auto current_path=application->window->notebook.get_current_folder();
if(current_path.empty())
current_path=boost::filesystem::current_path();

2
src/notebook.cc

@ -288,7 +288,7 @@ bool Notebook::close_current_page() {
return true;
}
boost::filesystem::path Notebook::get_current_path() {
boost::filesystem::path Notebook::get_current_folder() {
boost::filesystem::path current_path;
if(get_current_page()!=-1)

2
src/notebook.h

@ -21,7 +21,7 @@ public:
bool save(int page, bool reparse_needed=false);
bool save_current();
void configure(int view_nr);
boost::filesystem::path get_current_path();
boost::filesystem::path get_current_folder();
private:
bool save_modified_dialog();

2
src/window.cc

@ -495,7 +495,7 @@ void Window::set_menu_actions() {
entry_box.entries.emplace_back(last_run_command, [this](const std::string& content){
if(content!="") {
last_run_command=content;
auto run_path=notebook.get_current_path();
auto run_path=notebook.get_current_folder();
Singleton::terminal->async_print("Running: "+content+'\n');
Singleton::terminal->async_execute(content, run_path, [this, content](int exit_code){

Loading…
Cancel
Save