Browse Source

Now specify where to read the configs instead of letting it happen in constructors. A stored object of MainConfig is not needed either.

merge-requests/365/head
eidheim 11 years ago
parent
commit
8ba888bf98
  1. 2
      juci/juci.h
  2. 2
      juci/window.cc

2
juci/juci.h

@ -1,7 +1,6 @@
#ifndef JUCI_JUCI_H_
#define JUCI_JUCI_H_
#include "config.h"
#include "window.h"
#include "logging.h"
@ -13,7 +12,6 @@ public:
void on_activate();
private:
MainConfig main_config;
std::unique_ptr<Window> window;
std::string directory;
std::vector<std::string> files;

2
juci/window.cc

@ -1,6 +1,7 @@
#include "window.h"
#include "logging.h"
#include "singletons.h"
#include "config.h"
namespace sigc {
SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
@ -15,6 +16,7 @@ Window::Window() : notebook(), plugin_api(&notebook), box(Gtk::ORIENTATION_VERTI
//TODO: see TODO Window::on_directory_navigation
directories.m_TreeView.signal_row_activated().connect(sigc::mem_fun(*this, &Window::on_directory_navigation));
MainConfig main_config; //Read the configs here
add_menu();
box.pack_start(entry_box, Gtk::PACK_SHRINK);

Loading…
Cancel
Save