extern string system_lyxdir;
extern Languages languages;
-static string const colourFile("/usr/lib/X11/rgb.txt");
-vector<FormPreferences::X11Colour> FormPreferences::colourDB;
+static string const colorFile("/usr/lib/X11/rgb.txt");
+vector<X11Color> FormPreferences::colorDB;
+vector<XFormColor> FormPreferences::xformColorDB;
pair<vector<string>, vector<string> > FormPreferences::dirlist;
// Two functions used to help sort a vector<Command> and a vector<Format>.
dialog_(0),
converters_tab_(0), inputs_tab_(0), look_n_feel_tab_(0),
outputs_tab_(0), usage_tab_(0),
- colours_(0), converters_(0), formats_(0), inputs_misc_(0),
+ colors_(0), converters_(0), formats_(0), inputs_misc_(0),
interface_(0), language_(0), lnf_misc_(0), outputs_misc_(0),
paths_(0), printer_(0), screen_fonts_(0), spellchecker_(0),
combo_default_lang(0), combo_kbmap_1(0), combo_kbmap_2(0),
delete combo_kbmap_1;
delete combo_kbmap_2;
- delete colours_;
+ delete colors_;
delete converters_;
delete formats_;
delete inputs_misc_;
}
+void FormPreferences::redraw()
+{
+ if( form() && form()->visible )
+ fl_redraw_form( form() );
+ else
+ return;
+
+ FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
+ if (outer_form && outer_form->visible)
+ fl_redraw_form( outer_form );
+ else
+ return;
+
+ if( outer_form == converters_tab_->form )
+ outer_form =
+ fl_get_active_folder(converters_tab_->tabfolder_outer);
+
+ else if( outer_form == look_n_feel_tab_->form )
+ outer_form =
+ fl_get_active_folder(look_n_feel_tab_->tabfolder_outer);
+
+ else if( outer_form == inputs_tab_->form )
+ outer_form = fl_get_active_folder(inputs_tab_->tabfolder_outer);
+
+ else if( outer_form == outputs_tab_->form )
+ outer_form =
+ fl_get_active_folder(outputs_tab_->tabfolder_outer);
+
+ else if( outer_form == usage_tab_->form )
+ outer_form = fl_get_active_folder(usage_tab_->tabfolder_outer);
+
+ if (outer_form && outer_form->visible)
+ fl_redraw_form( outer_form );
+}
+
+
FL_FORM * FormPreferences::form() const
{
if (dialog_) return dialog_->form;
// build actual tabfolder contents
// these will become nested tabfolders
- buildColours();
+ buildColors();
buildConverters();
buildFormats();
buildInputsMisc();
_("Interface"),
interface_->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
- _("Colours"),
- colours_->form);
+ _("Colors"),
+ colors_->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
_("Misc"),
lnf_misc_->form);
// like update the screen fonts because that flushes the textcache
// and other stuff which may cost us a lot on slower/high-load machines.
- applyColours();
+ applyColors();
applyConverters();
applyFormats();
applyInputsMisc();
string str;
- if (ob->form->fdui == colours_) {
- str = feedbackColours( ob );
+ if (ob->form->fdui == colors_) {
+ str = feedbackColors( ob );
} else if (ob->form->fdui == converters_) {
str = feedbackConverters( ob );
} else if (ob->form->fdui == formats_) {
// some totally ridiculous value somewhere. Change activate to suit.
// comments before each test describe what is _valid_
- if (ob->form->fdui == colours_)
- return inputColours(ob);
+ if (ob->form->fdui == colors_)
+ return inputColors(ob);
else if (ob->form->fdui == converters_)
return inputConverters(ob);
else if (ob->form->fdui == language_)
else if (ob->form->fdui == formats_)
return inputFormats(ob);
- return false;
+ return true;
}
if (!dialog_) return;
// read lyxrc entries
- updateColours();
+ updateColors();
updateConverters();
updateFormats();
updateInputsMisc();
}
-void FormPreferences::applyColours() const
+void FormPreferences::applyColors() const
{
+ bool modifiedXForms = false;
+ bool modifiedText = false;
+ bool modifiedBackground = false;
+
+ for( vector<XFormColor>::const_iterator cit = xformColorDB.begin();
+ cit != xformColorDB.end(); ++cit ) {
+ RGB col;
+ fl_getmcolor((*cit).colorID, &col.r, &col.g, &col.b);
+ if( col != (*cit).col ) {
+ modifiedXForms = true;
+ if( (*cit).colorID == FL_BLACK )
+ modifiedText = true;
+ if( (*cit).colorID == FL_COL1 )
+ modifiedBackground = true;
+ }
+ }
+
+ if( modifiedXForms ) {
+ vector<XFormColor>::const_iterator cit;
+ for( cit = xformColorDB.begin();
+ cit != xformColorDB.end(); ++cit ) {
+ fl_mapcolor((*cit).colorID,
+ (*cit).col.r, (*cit).col.g, (*cit).col.b);
+
+ if( modifiedText && (*cit).colorID == FL_BLACK ) {
+ ColorsAdjustVal( FL_INACTIVE, FL_BLACK, 0.5 );
+ }
+
+ if( modifiedBackground && (*cit).colorID == FL_COL1 ) {
+ ColorsAdjustVal( FL_MCOL, FL_COL1, 0.1 );
+ ColorsAdjustVal( FL_TOP_BCOL, FL_COL1, 0.1 );
+ ColorsAdjustVal( FL_LEFT_BCOL, FL_COL1, 0.1 );
+
+ ColorsAdjustVal( FL_RIGHT_BCOL, FL_COL1, -0.5);
+ ColorsAdjustVal( FL_BOTTOM_BCOL, FL_COL1, -0.5);
+ }
+ }
+ Dialogs::redrawGUI();
+ }
}
-void FormPreferences::buildColours()
+void FormPreferences::buildColors()
{
- colours_ = build_colours();
+ colors_ = build_colors();
- FL_OBJECT * obj = colours_->valslider_red;
+ FL_OBJECT * obj = colors_->valslider_red;
fl_set_slider_bounds(obj, 0, 255);
fl_set_slider_precision(obj, 0);
fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
- obj = colours_->valslider_green;
+ obj = colors_->valslider_green;
fl_set_slider_bounds(obj, 0, 255);
fl_set_slider_precision(obj, 0);
fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
- obj = colours_->valslider_blue;
+ obj = colors_->valslider_blue;
fl_set_slider_bounds(obj, 0, 255);
fl_set_slider_precision(obj, 0);
fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
- fl_set_object_color(colours_->button_colour,
+ fl_set_object_color(colors_->button_color,
FL_FREE_COL4, FL_FREE_COL4);
- fl_set_input_return(colours_->input_name, FL_RETURN_END_CHANGED);
+ fl_set_input_return(colors_->input_name, FL_RETURN_END_CHANGED);
- if (ColoursLoadBrowser(colourFile) )
- fl_set_input(colours_->input_name, colourFile.c_str());
+ if (ColorsLoadBrowserX11(colorFile) )
+ fl_set_input(colors_->input_name, colorFile.c_str());
else
- fl_set_input(colours_->input_name, N_("No file found"));
+ fl_set_input(colors_->input_name, N_("No file found"));
+
+ ColorsLoadBrowserLyX();
// deactivate the browse button because it isn't implemented
- fl_deactivate_object(colours_->button_browse);
- fl_set_object_lcol(colours_->button_browse, FL_INACTIVE);
+ fl_deactivate_object(colors_->button_browse);
+ fl_set_object_lcol(colors_->button_browse, FL_INACTIVE);
// set up the feedback mechanism
- setPreHandler( colours_->browser_x11 );
- setPreHandler( colours_->input_name );
- setPreHandler( colours_->button_browse );
- setPreHandler( colours_->button_colour );
- setPreHandler( colours_->valslider_red );
- setPreHandler( colours_->valslider_green );
- setPreHandler( colours_->valslider_blue );
- setPreHandler( colours_->browser_lyx_objs );
- setPreHandler( colours_->button_modify );
+ setPreHandler( colors_->browser_x11 );
+ setPreHandler( colors_->input_name );
+ setPreHandler( colors_->button_browse );
+ setPreHandler( colors_->button_color );
+ setPreHandler( colors_->valslider_red );
+ setPreHandler( colors_->valslider_green );
+ setPreHandler( colors_->valslider_blue );
+ setPreHandler( colors_->browser_lyx_objs );
+ setPreHandler( colors_->button_modify );
}
string const
-FormPreferences::feedbackColours(FL_OBJECT const * const ob) const
+FormPreferences::feedbackColors(FL_OBJECT const * const ob) const
{
- return string();
+ string str;
+
+ if (ob == colors_->browser_x11 ) {
+ str = N_("The colors listed in the X11 database.");
+ } else if (ob == colors_->browser_lyx_objs ) {
+ str = N_("LyX objects that can be assigned a color.");
+ } else if (ob == colors_->input_name ) {
+ str = N_("The file containing the X11 color database.");
+ } else if (ob == colors_->button_color ) {
+ str = N_("You will only be able to modify the LyX object if the sliders and X11 browser agree. Force this by clicking on the highlighted browser name.");
+ } else if (ob == colors_->valslider_red
+ || ob == colors_->valslider_green
+ || ob == colors_->valslider_blue ) {
+ str = N_("Find a new color. The name highlighted in the X11 database is the closest match to this.");
+ } else if (ob == colors_->button_modify ) {
+ str = N_("Modify the color of the LyX object.");
+ }
+
+ return str;
}
-bool FormPreferences::inputColours( FL_OBJECT const * const ob )
+bool FormPreferences::inputColors( FL_OBJECT const * const ob )
{
- bool activate = true;
+ if (ob == colors_->browser_x11) {
+ return ColorsBrowserX11();
+
+ } else if (ob == colors_->valslider_red
+ || ob == colors_->valslider_green
+ || ob == colors_->valslider_blue) {
+ return ColorsRGB();
+
+ } else if (ob == colors_->input_name) {
+ return ColorsDatabase();
+
+ } else if (ob == colors_->browser_lyx_objs) {
+ return ColorsBrowserLyX();
+
+ } else if (ob == colors_->button_modify) {
+ return ColorsModify();
+ }
- if (ob == colours_->browser_x11) {
- int i = fl_get_browser(colours_->browser_x11);
- if (i > 0) {
- ColoursUpdateBrowser(i-1);
- }
+ return true;
+}
- } else if (ob == colours_->valslider_red
- || ob == colours_->valslider_green
- || ob == colours_->valslider_blue) {
- ColoursUpdateRGB();
-
- } else if (ob == colours_->input_name) {
- string file = fl_get_input(colours_->input_name);
- if (ColoursLoadBrowser(file) )
- fl_set_input(colours_->input_name, file.c_str());
- else if (ColoursLoadBrowser(colourFile) )
- fl_set_input(colours_->input_name, colourFile.c_str());
- else
- fl_set_input(colours_->input_name, N_("No file found"));
+
+void FormPreferences::ColorsAdjustVal( int colAdjust, int colParent,
+ double addVal ) const
+{
+ RGB rgb;
+ fl_getmcolor( colParent, &rgb.r, &rgb.g, &rgb.b);
+
+ HSV hsv = HSV( rgb );
+ hsv.v += addVal;
+ if( hsv.v > 1.0 )
+ hsv.v = 1.0;
+ else if( hsv.v < 0.0 )
+ hsv.v = 0.0;
+
+ rgb = RGB( hsv );
+ fl_mapcolor( colAdjust, rgb.r, rgb.g, rgb.b );
+}
+
+
+bool FormPreferences::ColorsBrowserLyX() const
+{
+ int i = fl_get_browser( colors_->browser_lyx_objs );
+ if (i < 1)
+ return true;
+
+ string name = fl_get_browser_line( colors_->browser_lyx_objs, i );
+
+ vector<XFormColor>::const_iterator cit =
+ find_if(xformColorDB.begin(), xformColorDB.end(),
+ compare_memfun(&XFormColor::getname, name));
+
+ if( cit != xformColorDB.end() ) {
+ fl_freeze_form( colors_->form );
+
+ fl_set_slider_value( colors_->valslider_red, (*cit).col.r );
+ fl_set_slider_value( colors_->valslider_green, (*cit).col.g );
+ fl_set_slider_value( colors_->valslider_blue, (*cit).col.b );
+ ColorsRGB();
+
+ fl_unfreeze_form( colors_->form );
}
- return activate;
+ fl_deactivate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_INACTIVE );
+
+ return true;
+}
+
+
+bool FormPreferences::ColorsBrowserX11() const
+{
+ int i = fl_get_browser(colors_->browser_x11);
+ if (i < 1)
+ return true;
+
+ fl_freeze_form( colors_->form );
+
+ RGB col = colorDB[i-1].second;
+
+ fl_mapcolor( FL_FREE_COL4 + i, col.r, col.g, col.b );
+ fl_mapcolor( FL_FREE_COL4, col.r, col.g, col.b );
+ fl_set_slider_value( colors_->valslider_red, col.r );
+ fl_set_slider_value( colors_->valslider_green, col.g );
+ fl_set_slider_value( colors_->valslider_blue, col.b );
+ fl_redraw_object( colors_->button_color );
+
+ // Is it valid to activate the "Modify" button?
+ int line = fl_get_browser(colors_->browser_lyx_objs);
+ bool isSelected = ( line > 0 );
+ if( isSelected )
+ if( line > fl_get_browser_maxline(colors_->browser_lyx_objs) )
+ isSelected = false;
+
+ if( isSelected && colorDB[i-1].second == col ) {
+ fl_activate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_BLACK );
+ }
+
+ fl_unfreeze_form( colors_->form );
+
+ return true;
}
-bool FormPreferences::ColoursLoadBrowser(string const & filename)
+bool FormPreferences::ColorsDatabase() const
+{
+ string file = fl_get_input(colors_->input_name);
+ if (ColorsLoadBrowserX11(file) )
+ fl_set_input(colors_->input_name, file.c_str());
+ else if (ColorsLoadBrowserX11(colorFile) )
+ fl_set_input(colors_->input_name, colorFile.c_str());
+ else
+ fl_set_input(colors_->input_name, N_("No file found"));
+ return true;
+}
+
+
+void FormPreferences::ColorsLoadBrowserLyX()
+{
+ XFormColor xcol;
+
+ xcol.name = "GUI background";
+ xcol.colorID = FL_COL1;
+ fl_getmcolor(FL_COL1, &xcol.col.r, &xcol.col.g, &xcol.col.b);
+
+ xformColorDB.push_back( xcol );
+
+ xcol.name = "GUI text";
+ xcol.colorID = FL_BLACK;
+ fl_getmcolor(FL_BLACK, &xcol.col.r, &xcol.col.g, &xcol.col.b);
+
+ xformColorDB.push_back( xcol );
+
+ xcol.name = "GUI active tab";
+ xcol.colorID = FL_LIGHTER_COL1;
+ fl_getmcolor(FL_LIGHTER_COL1, &xcol.col.r, &xcol.col.g, &xcol.col.b);
+
+ xformColorDB.push_back( xcol );
+
+ xcol.name = "GUI push button";
+ xcol.colorID = FL_YELLOW;
+ fl_getmcolor(FL_YELLOW, &xcol.col.r, &xcol.col.g, &xcol.col.b);
+
+ xformColorDB.push_back( xcol );
+
+ FL_OBJECT * colbr = colors_->browser_lyx_objs;
+ fl_clear_browser( colbr );
+ for( vector<XFormColor>::const_iterator cit = xformColorDB.begin();
+ cit != xformColorDB.end(); ++cit ) {
+ fl_addto_browser(colbr, (*cit).name.c_str() );
+ }
+
+ fl_deselect_browser(colors_->browser_lyx_objs);
+ fl_deactivate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_INACTIVE );
+}
+
+
+bool FormPreferences::ColorsLoadBrowserX11(string const & filename) const
{
LyXLex lex(0, 0);
lex.setCommentChar('!');
if (!lex.setFile(filename))
- return false;
+ return true;
vector<RGB> cols;
vector<string> names;
name = "white";
else
name = lowercase( name );
-
- if (name == "black" || name == "white") {
+
+ if ( col == RGB(0,0,0) || col == RGB(255,255,255) ) {
cols.insert(cols.begin(), col);
names.insert(names.begin(), name);
} else {
}
}
+ FL_OBJECT * colbr = colors_->browser_x11;
+ fl_freeze_form(colors_->form);
+ fl_clear_browser( colbr );
+
vector<string>::const_iterator sit = names.begin();
for (vector<RGB>::const_iterator iit = cols.begin();
iit != cols.end(); ++iit, ++sit) {
- colourDB.push_back( X11Colour(*sit, *iit) );
+ colorDB.push_back( X11Color(*sit, *iit) );
+ fl_addto_browser(colbr, (*sit).c_str());
}
- FL_OBJECT * colbr = colours_->browser_x11;
- fl_freeze_form(colours_->form);
- fl_clear_browser( colbr );
-
- for (vector<X11Colour>::const_iterator cit = colourDB.begin();
- cit != colourDB.end(); ++cit) {
- string name = (*cit).first;
- //RGB col = (*cit).second;
- //name += " (" + tostr(col.r) + ", " + tostr(col.g) +
- // ", " + tostr(col.b) + ")";
- fl_addto_browser(colbr, name.c_str());
- }
-
fl_set_browser_topline(colbr, 1);
fl_select_browser_line(colbr, 1);
- ColoursUpdateBrowser(0);
- fl_unfreeze_form(colours_->form);
+ ColorsBrowserX11();
+ fl_unfreeze_form(colors_->form);
return true;
}
-int FormPreferences::ColoursSearchEntry(RGB const & col) const
+bool FormPreferences::ColorsModify() const
{
- int mindiff = 0x7fffffff;
- vector<X11Colour>::const_iterator mincit = colourDB.begin();
+ int i = fl_get_browser( colors_->browser_lyx_objs );
+ if (i < 1)
+ return true;
- for (vector<X11Colour>::const_iterator cit = colourDB.begin();
- cit != colourDB.end(); ++cit) {
- RGB colDB = (*cit).second;
- RGB diff;
- diff.r = col.r - colDB.r;
- diff.g = col.g - colDB.g;
- diff.b = col.b - colDB.b;
+ string name = fl_get_browser_line( colors_->browser_lyx_objs, i );
- int d = (2 * (diff.r * diff.r) +
- 3 * (diff.g * diff.g) +
- (diff.b * diff.b));
+ vector<XFormColor>::iterator it = // non-const; it's modified below
+ find_if(xformColorDB.begin(), xformColorDB.end(),
+ compare_memfun(&XFormColor::getname, name));
- if (mindiff > d) {
- mindiff = d;
- mincit = cit;
- }
- }
- return static_cast<int>(mincit - colourDB.begin());
-}
+ if( it == xformColorDB.end() )
+ return true;
+ int j = fl_get_browser( colors_->browser_x11 );
+ if (j < 1)
+ return true;
-void FormPreferences::ColoursUpdateBrowser(int i)
-{
- fl_freeze_form(colours_->form);
+ (*it).col.r = colorDB[j-1].second.r;
+ (*it).col.g = colorDB[j-1].second.g;
+ (*it).col.b = colorDB[j-1].second.b;
- RGB col = colourDB[i].second;
-
- fl_mapcolor(FL_FREE_COL4 + i, col.r, col.g, col.b);
- fl_mapcolor(FL_FREE_COL4, col.r, col.g, col.b);
- fl_set_slider_value(colours_->valslider_red, col.r);
- fl_set_slider_value(colours_->valslider_green, col.g);
- fl_set_slider_value(colours_->valslider_blue, col.b);
- fl_redraw_object(colours_->button_colour);
+ fl_deselect_browser(colors_->browser_x11);
+ fl_deselect_browser(colors_->browser_lyx_objs);
+ fl_deactivate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_INACTIVE );
- fl_unfreeze_form(colours_->form);
+ return true;
}
-
-void FormPreferences::ColoursUpdateRGB()
+bool FormPreferences::ColorsRGB() const
{
- fl_freeze_form(colours_->form);
+ fl_freeze_form(colors_->form);
RGB col;
- col.r = int(fl_get_slider_value(colours_->valslider_red));
- col.g = int(fl_get_slider_value(colours_->valslider_green));
- col.b = int(fl_get_slider_value(colours_->valslider_blue));
+ col.r = int(fl_get_slider_value(colors_->valslider_red));
+ col.g = int(fl_get_slider_value(colors_->valslider_green));
+ col.b = int(fl_get_slider_value(colors_->valslider_blue));
fl_mapcolor(FL_FREE_COL4, col.r, col.g, col.b);
- fl_redraw_object(colours_->button_colour);
+ fl_redraw_object(colors_->button_color);
- int const i = ColoursSearchEntry( col );
+ int const i = ColorsSearchEntry( col );
// change topline only if necessary
- // int top = fl_get_browser_topline(colours_->browser_x11);
+ // int top = fl_get_browser_topline(colors_->browser_x11);
// if (i < top || i > (top+15))
- fl_set_browser_topline(colours_->browser_x11, i - 5);
- fl_select_browser_line(colours_->browser_x11, i + 1);
+ fl_set_browser_topline(colors_->browser_x11, i - 5);
+ fl_select_browser_line(colors_->browser_x11, i + 1);
+
+ // Only activate the "Modify" button if the browser and slider colors
+ // are the same AND if a LyX object is selected.
+ int line = fl_get_browser(colors_->browser_lyx_objs);
+ bool isSelected = ( line > 0 );
+ if( isSelected )
+ if( line > fl_get_browser_maxline(colors_->browser_lyx_objs) )
+ isSelected = false;
+
+ if( isSelected && colorDB[i].second == col ) {
+ fl_activate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_BLACK );
+ } else {
+ fl_deactivate_object( colors_->button_modify );
+ fl_set_object_lcol( colors_->button_modify, FL_INACTIVE );
+ }
+
+ fl_unfreeze_form(colors_->form);
- fl_unfreeze_form(colours_->form);
+ return true;
}
-void FormPreferences::updateColours()
+int FormPreferences::ColorsSearchEntry(RGB const & col) const
+{
+ int mindiff = 0x7fffffff;
+ vector<X11Color>::const_iterator mincit = colorDB.begin();
+
+ for (vector<X11Color>::const_iterator cit = colorDB.begin();
+ cit != colorDB.end(); ++cit) {
+ RGB colDB = (*cit).second;
+ RGB diff;
+ diff.r = col.r - colDB.r;
+ diff.g = col.g - colDB.g;
+ diff.b = col.b - colDB.b;
+
+ int d = (2 * (diff.r * diff.r) +
+ 3 * (diff.g * diff.g) +
+ (diff.b * diff.b));
+
+ if (mindiff > d) {
+ mindiff = d;
+ mincit = cit;
+ }
+ }
+ return static_cast<int>(mincit - colorDB.begin());
+}
+
+
+void FormPreferences::updateColors()
{}
return ConvertersDelete();
}
- return false;
+ return true;
}
string to = command.to->prettyname;
pair<string, string> FromTo = pair<string, string>(from, to);
- vector<Command>::iterator it = // non-const because it's modified below
+ vector<Command>::iterator it = // non-const; it's modified below
find_if(commands_vec.begin(), commands_vec.end(),
compare_memfun(&Command::getFromToPrettyname, FromTo));
string to = command.to->prettyname;
pair<string, string> FromTo = pair<string, string>(from, to);
- vector<Command>::iterator it = // non-const because it's modified below
+ vector<Command>::iterator it = // non-const; it's modified below
find_if(commands_vec.begin(), commands_vec.end(),
compare_memfun(&Command::getFromToPrettyname, FromTo));
return false;
Format format(name, extension, prettyname, shortcut, viewer);
- vector<Format>::iterator it = // non-const because it's modified below
+ vector<Format>::iterator it = // non-const; it's modified below
find_if(formats_vec.begin(), formats_vec.end(),
compare_memfun(&Format::getname, name));
bool FormPreferences::FormatsDelete()
{
string name = fl_get_input(formats_->input_format);
- vector<Format>::iterator it = // non-const because it's modified below
+ vector<Format>::iterator it = // non-const; it's modified below
find_if(formats_vec.begin(), formats_vec.end(),
compare_memfun(&Format::getname, name));
find( dirlist.first.begin(), dirlist.first.end(),
fullpath );
if (cit != dirlist.first.end()) {
- vector<string>::size_type sel = cit - dirlist.first.begin();
- combo_kbmap_1->select_text( dirlist.second[sel] );
+ vector<string>::size_type sel =
+ cit - dirlist.first.begin();
+ combo_kbmap_1->select_text(dirlist.second[sel]);
} else
combo_kbmap_1->select_text("");
cit = find( dirlist.first.begin(), dirlist.first.end(),
fullpath );
if (cit != dirlist.first.end()) {
- vector<string>::size_type sel = cit - dirlist.first.begin();
- combo_kbmap_2->select_text( dirlist.second[sel] );
+ vector<string>::size_type sel =
+ cit - dirlist.first.begin();
+ combo_kbmap_2->select_text(dirlist.second[sel]);
} else
- combo_kbmap_1->select_text("");
+ combo_kbmap_2->select_text("");
} else {
combo_kbmap_1->select_text( "" );
combo_kbmap_2->select_text( "" );
projects / features.git / commitdiff