Commit ac729f64 authored by Mathieu Faverge's avatar Mathieu Faverge

Oops, I didn't want to cimmit this commented line

parent c10439cb
......@@ -119,7 +119,7 @@ private:
public:
static QSettings *settings;
// static Palette *_palette;
static Palette *_palette;
static Palette * _link_types;
static Palette * _event_types;
......
......@@ -182,7 +182,6 @@ void Settings_window::fill_table(const string &palette_name) {
Palette* p=Session::get_palette("palette",palette_name);
colors = p->get_map();
if(colors.empty() ) { // Loads the colors of the current trace
if(_c->get_trace()) { // Need a trace loaded
_c->get_trace()->get_states_colors(colors);
......@@ -193,14 +192,10 @@ void Settings_window::fill_table(const string &palette_name) {
}
}
for(map<string, Color *>::iterator it = colors.begin() ;
it != colors.end() ; ++ it) {
add_state_line(row, (*it).first.c_str(), (*it).second, p->is_visible((*it).first));
}
}
void Settings_window::add_state_line(int &row, std::string st_name, Color *c, bool checked) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment