"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Preferences.cpp" between
xfe-1.41.tar.gz and xfe-1.42.tar.gz

About: Xfe (X File Explorer) is a file manager and browser (using the FOX toolkit).

Preferences.cpp  (xfe-1.41):Preferences.cpp  (xfe-1.42)
skipping to change at line 91 skipping to change at line 91
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_ACCEPT, PreferencesBox::onCmdAccep t), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_ACCEPT, PreferencesBox::onCmdAccep t),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_CANCEL, PreferencesBox::onCmdCance l), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_CANCEL, PreferencesBox::onCmdCance l),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_TXTEDIT, PreferencesBox::on CmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_TXTEDIT, PreferencesBox::on CmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_TXTVIEW, PreferencesBox::on CmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_TXTVIEW, PreferencesBox::on CmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_IMGVIEW, PreferencesBox::on CmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_IMGVIEW, PreferencesBox::on CmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_ARCHIVER, PreferencesBox::o nCmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_ARCHIVER, PreferencesBox::o nCmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_PDFVIEW, PreferencesBox::on CmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_PDFVIEW, PreferencesBox::on CmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_VIDEOPLAY, PreferencesBox:: onCmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_VIDEOPLAY, PreferencesBox:: onCmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_AUDIOPLAY, PreferencesBox:: onCmdBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_AUDIOPLAY, PreferencesBox:: onCmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_XTERM, PreferencesBox::onCm dBrowse), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_XTERM, PreferencesBox::onCm dBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_MOUNTCMD, PreferencesBox::o
nCmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_UMOUNTCMD, PreferencesBox::
onCmdBrowse),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_COLOR, PreferencesBox::onCmdColor) , FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_COLOR, PreferencesBox::onCmdColor) ,
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_NORMALFONT, PreferencesBox::onCmdN ormalFont), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_NORMALFONT, PreferencesBox::onCmdN ormalFont),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_TEXTFONT, PreferencesBox::onCmdTex tFont), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_TEXTFONT, PreferencesBox::onCmdTex tFont),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_THEME, PreferencesBox::onCmdTheme) , FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_THEME, PreferencesBox::onCmdTheme) ,
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_ICON_PATH, PreferencesBox:: onCmdBrowsePath), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_BROWSE_ICON_PATH, PreferencesBox:: onCmdBrowsePath),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_HOMEDIR, PreferencesBox::onC mdStartDir), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_HOMEDIR, PreferencesBox::onC mdStartDir),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_CURRENTDIR, PreferencesBox:: onCmdStartDir), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_CURRENTDIR, PreferencesBox:: onCmdStartDir),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_LASTDIR, PreferencesBox::onC mdStartDir), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_START_LASTDIR, PreferencesBox::onC mdStartDir),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_SU_CMD, PreferencesBox::onCmdSuMod e), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_SU_CMD, PreferencesBox::onCmdSuMod e),
FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_SUDO_CMD, PreferencesBox::onCmdSuM ode), FXMAPFUNC(SEL_COMMAND, PreferencesBox::ID_SUDO_CMD, PreferencesBox::onCmdSuM ode),
skipping to change at line 321 skipping to change at line 323
del = new FXCheckButton(group, _("Confirm delete")); del = new FXCheckButton(group, _("Confirm delete"));
del_emptydir = new FXCheckButton(group, _("Confirm delete non empty folders" ), this, ID_CONFIRM_DEL_EMPTYDIR); del_emptydir = new FXCheckButton(group, _("Confirm delete non empty folders" ), this, ID_CONFIRM_DEL_EMPTYDIR);
overwrite = new FXCheckButton(group, _("Confirm overwrite")); overwrite = new FXCheckButton(group, _("Confirm overwrite"));
exec = new FXCheckButton(group, _("Confirm execute text files")); exec = new FXCheckButton(group, _("Confirm execute text files"));
properties = new FXCheckButton(group, _("Confirm change properties")); properties = new FXCheckButton(group, _("Confirm change properties"));
group = new FXGroupBox(dialogs, _("Warnings"), GROUPBOX_TITLE_LEFT|FRAME_GRO OVE|LAYOUT_FILL_X|LAYOUT_FILL_Y); group = new FXGroupBox(dialogs, _("Warnings"), GROUPBOX_TITLE_LEFT|FRAME_GRO OVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
folder_warning = new FXCheckButton(group, _("Warn when setting current folde r in search window")); folder_warning = new FXCheckButton(group, _("Warn when setting current folde r in search window"));
#if defined(linux) #if defined(linux)
mount = new FXCheckButton(group, _("Warn when mount points are not respondin g")); mount = new FXCheckButton(group, _("Warn when mount points are not respondin g"));
show_mount = new FXCheckButton(group, _("Display mount/umount success messag es")); show_mount = new FXCheckButton(group, _("Display mount / unmount success mes sages"));
#endif #endif
preserve_date_warning = new FXCheckButton(group, _("Warn when date preservat ion failed")); preserve_date_warning = new FXCheckButton(group, _("Warn when date preservat ion failed"));
root_warning = new FXCheckButton(group, _("Warn if running as root")); root_warning = new FXCheckButton(group, _("Warn if running as root"));
FXbool confirm_trash = getApp()->reg().readUnsignedEntry("OPTIONS", "confirm _trash", true); FXbool confirm_trash = getApp()->reg().readUnsignedEntry("OPTIONS", "confirm _trash", true);
trashmv->setCheck(confirm_trash); trashmv->setCheck(confirm_trash);
FXbool confirm_del = getApp()->reg().readUnsignedEntry("OPTIONS", "confirm_d elete", true); FXbool confirm_del = getApp()->reg().readUnsignedEntry("OPTIONS", "confirm_d elete", true);
del->setCheck(confirm_del); del->setCheck(confirm_del);
FXbool confirm_properties = getApp()->reg().readUnsignedEntry("OPTIONS", "co nfirm_properties", true); FXbool confirm_properties = getApp()->reg().readUnsignedEntry("OPTIONS", "co nfirm_properties", true);
properties->setCheck(confirm_properties); properties->setCheck(confirm_properties);
skipping to change at line 432 skipping to change at line 434
new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_ VIDEOPLAY, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20 , 20); new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_ VIDEOPLAY, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20 , 20);
oldvideoplayer = getApp()->reg().readStringEntry("PROGS", "videoplayer", DEF AULT_VIDEOPLAYER); oldvideoplayer = getApp()->reg().readStringEntry("PROGS", "videoplayer", DEF AULT_VIDEOPLAYER);
videoplayer->setText(oldvideoplayer); videoplayer->setText(oldvideoplayer);
new FXLabel(matrix, _("Terminal:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LA YOUT_FILL_ROW); new FXLabel(matrix, _("Terminal:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LA YOUT_FILL_ROW);
xterm = new FXTextField(matrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LAYOUT _FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X); xterm = new FXTextField(matrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LAYOUT _FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X);
new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_ XTERM, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20, 20 ); new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_ XTERM, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20, 20 );
oldxterm = getApp()->reg().readStringEntry("PROGS", "xterm", DEFAULT_TERMINA L); oldxterm = getApp()->reg().readStringEntry("PROGS", "xterm", DEFAULT_TERMINA L);
xterm->setText(oldxterm); xterm->setText(oldxterm);
group = new FXGroupBox(programs, _("Volume management"), GROUPBOX_TITLE_LEFT
|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
matrix = new FXMatrix(group, 3, MATRIX_BY_COLUMNS|LAYOUT_SIDE_TOP|LAYOUT_FIL
L_X|LAYOUT_FILL_Y);
new FXLabel(matrix, _("Mount:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LAYOU
T_FILL_ROW);
mountcmd = new FXTextField(matrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LAY
OUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X);
new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_
MOUNTCMD, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20,
20);
oldmountcmd = getApp()->reg().readStringEntry("PROGS", "mount", DEFAULT_MOUN
TCMD);
mountcmd->setText(oldmountcmd);
new FXLabel(matrix, _("Unmount:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LAY
OUT_FILL_ROW);
umountcmd = new FXTextField(matrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LA
YOUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X);
new FXButton(matrix, _("\tSelect file..."), filedialogicon, this, ID_BROWSE_
UMOUNTCMD, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y, 0, 0, 0, 0, 20
, 20);
oldumountcmd = getApp()->reg().readStringEntry("PROGS", "unmount", DEFAULT_U
MOUNTCMD);
umountcmd->setText(oldumountcmd);
// Fourth tab - Visual // Fourth tab - Visual
new FXTabItem(tabbook, _("&Themes"), NULL); new FXTabItem(tabbook, _("&Themes"), NULL);
FXVerticalFrame* visual = new FXVerticalFrame(tabbook, FRAME_RAISED); FXVerticalFrame* visual = new FXVerticalFrame(tabbook, FRAME_RAISED);
FXGroupBox* themes = new FXGroupBox(visual, _("Color theme"), GROUPBOX_ TITLE_LEFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y); FXGroupBox* themes = new FXGroupBox(visual, _("Color theme"), GROUPBOX_ TITLE_LEFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
FXPacker* pack = new FXPacker(themes, FRAME_THICK|FRAME_SUNKEN|LAYOUT _FILL_Y|LAYOUT_FILL_X, 0, 0, 0, 0, 0, 0, 0, 0); FXPacker* pack = new FXPacker(themes, FRAME_THICK|FRAME_SUNKEN|LAYOUT _FILL_Y|LAYOUT_FILL_X, 0, 0, 0, 0, 0, 0, 0, 0);
themesList = new FXList(pack, this, ID_THEME, LIST_BROWSESELECT|FRAME_SUNKEN |FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y); themesList = new FXList(pack, this, ID_THEME, LIST_BROWSESELECT|FRAME_SUNKEN |FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y);
themesList->setNumVisible(7); themesList->setNumVisible(7);
for (int i = 0; i < NUM_THEMES; i++) for (int i = 0; i < NUM_THEMES; i++)
{ {
themesList->appendItem(Themes[i].name); themesList->appendItem(Themes[i].name);
skipping to change at line 489 skipping to change at line 506
// Fifth tab - Fonts // Fifth tab - Fonts
new FXTabItem(tabbook, _("&Fonts"), NULL); new FXTabItem(tabbook, _("&Fonts"), NULL);
FXVerticalFrame* fonts = new FXVerticalFrame(tabbook, FRAME_RAISED); FXVerticalFrame* fonts = new FXVerticalFrame(tabbook, FRAME_RAISED);
FXGroupBox* fgroup = new FXGroupBox(fonts, _("Fonts"), GROUPBOX_TITLE_L EFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y); FXGroupBox* fgroup = new FXGroupBox(fonts, _("Fonts"), GROUPBOX_TITLE_L EFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
FXMatrix* fmatrix = new FXMatrix(fgroup, 3, MATRIX_BY_COLUMNS|LAYOUT_SIDE_TO P|LAYOUT_FILL_X|LAYOUT_FILL_Y); FXMatrix* fmatrix = new FXMatrix(fgroup, 3, MATRIX_BY_COLUMNS|LAYOUT_SIDE_TO P|LAYOUT_FILL_X|LAYOUT_FILL_Y);
new FXLabel(fmatrix, _("Normal font:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUM N|LAYOUT_FILL_ROW); new FXLabel(fmatrix, _("Normal font:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUM N|LAYOUT_FILL_ROW);
normalfont = new FXTextField(fmatrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN| LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X); normalfont = new FXTextField(fmatrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN| LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X);
new FXButton(fmatrix, _(" Select..."), NULL, this, ID_NORMALFONT, FRAME_RAIS ED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y); //,0,0,0,0,20,20); new FXButton(fmatrix, _(" Select..."), NULL, this, ID_NORMALFONT, FRAME_RAIS ED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y); //,0,0,0,0,20,20);
oldnormalfont = getApp()->reg().readStringEntry("SETTINGS", "font", "Helveti ca,100,normal,regular"); oldnormalfont = getApp()->reg().readStringEntry("SETTINGS", "font", DEFAULT_ NORMAL_FONT);
normalfont->setText(oldnormalfont); normalfont->setText(oldnormalfont);
new FXLabel(fmatrix, _("Text font:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN| LAYOUT_FILL_ROW); new FXLabel(fmatrix, _("Text font:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN| LAYOUT_FILL_ROW);
textfont = new FXTextField(fmatrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LA YOUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X); textfont = new FXTextField(fmatrix, 30, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LA YOUT_FILL_COLUMN|LAYOUT_FILL_ROW|LAYOUT_FILL_X);
new FXButton(fmatrix, _(" Select..."), NULL, this, ID_TEXTFONT, FRAME_RAISED |FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y); //0,0,0,0,20,20); new FXButton(fmatrix, _(" Select..."), NULL, this, ID_TEXTFONT, FRAME_RAISED |FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y); //0,0,0,0,20,20);
oldtextfont = getApp()->reg().readStringEntry("SETTINGS", "textfont", "Helve tica,100,normal,regular"); oldtextfont = getApp()->reg().readStringEntry("SETTINGS", "textfont", DEFAUL T_TEXT_FONT);
textfont->setText(oldtextfont); textfont->setText(oldtextfont);
// Sixth tab - Key bindings // Sixth tab - Key bindings
new FXTabItem(tabbook, _("&Key Bindings"), NULL); new FXTabItem(tabbook, _("&Key Bindings"), NULL);
FXVerticalFrame* keybindings = new FXVerticalFrame(tabbook, FRAME_RAISED); FXVerticalFrame* keybindings = new FXVerticalFrame(tabbook, FRAME_RAISED);
FXGroupBox* kbgroup = new FXGroupBox(keybindings, _("Key Bindings"), GR OUPBOX_TITLE_LEFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y); FXGroupBox* kbgroup = new FXGroupBox(keybindings, _("Key Bindings"), GR OUPBOX_TITLE_LEFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
FXPacker* kbpack = new FXPacker(kbgroup, LAYOUT_FILL_X); FXPacker* kbpack = new FXPacker(kbgroup, LAYOUT_FILL_X);
new FXButton(kbpack, _("Modify key bindings..."), minikeybindingsicon, this, ID_CHANGE_KEYBINDINGS, FRAME_RAISED|FRAME_THICK|ICON_BEFORE_TEXT|LAYOUT_SIDE_TO P|LAYOUT_FILL_X); //,0,0,0,0,20,20); new FXButton(kbpack, _("Modify key bindings..."), minikeybindingsicon, this, ID_CHANGE_KEYBINDINGS, FRAME_RAISED|FRAME_THICK|ICON_BEFORE_TEXT|LAYOUT_SIDE_TO P|LAYOUT_FILL_X); //,0,0,0,0,20,20);
new FXButton(kbpack, _("Restore default key bindings..."), reloadicon, this, ID_RESTORE_KEYBINDINGS, FRAME_RAISED|FRAME_THICK|ICON_BEFORE_TEXT|LAYOUT_SIDE_T OP|LAYOUT_FILL_X); //,0,0,0,0,20,20); new FXButton(kbpack, _("Restore default key bindings..."), reloadicon, this, ID_RESTORE_KEYBINDINGS, FRAME_RAISED|FRAME_THICK|ICON_BEFORE_TEXT|LAYOUT_SIDE_T OP|LAYOUT_FILL_X); //,0,0,0,0,20,20);
skipping to change at line 652 skipping to change at line 669
audioplayer->setText(FXPath::name(path)); audioplayer->setText(FXPath::name(path));
break; break;
case ID_BROWSE_VIDEOPLAY: case ID_BROWSE_VIDEOPLAY:
videoplayer->setText(FXPath::name(path)); videoplayer->setText(FXPath::name(path));
break; break;
case ID_BROWSE_XTERM: case ID_BROWSE_XTERM:
xterm->setText(FXPath::name(path)); xterm->setText(FXPath::name(path));
break; break;
case ID_BROWSE_MOUNTCMD:
mountcmd->setText(FXPath::name(path));
break;
case ID_BROWSE_UMOUNTCMD:
umountcmd->setText(FXPath::name(path));
break;
} }
} }
return(1); return(1);
} }
// Change normal font // Change normal font
long PreferencesBox::onCmdNormalFont(FXObject*, FXSelector, void*) long PreferencesBox::onCmdNormalFont(FXObject*, FXSelector, void*)
{ {
FontDialog fontdlg(this, _("Change Normal Font"), DECOR_BORDER|DECOR_TITLE); FontDialog fontdlg(this, _("Change Normal Font"), DECOR_BORDER|DECOR_TITLE);
FXFontDesc fontdesc; FXFontDesc fontdesc;
FXString fontspec; FXString fontspec;
fontspec = getApp()->reg().readStringEntry("SETTINGS", "font", "Helvetica,10 0,normal,regular"); fontspec = getApp()->reg().readStringEntry("SETTINGS", "font", DEFAULT_NORMA L_FONT);
FXFont* nfont = new FXFont(getApp(), fontspec); FXFont* nfont = new FXFont(getApp(), fontspec);
nfont->create(); nfont->create();
nfont->getFontDesc(fontdesc); nfont->getFontDesc(fontdesc);
fontdlg.setFontSelection(fontdesc); fontdlg.setFontSelection(fontdesc);
if (fontdlg.execute()) if (fontdlg.execute())
{ {
fontdlg.getFontSelection(fontdesc); fontdlg.getFontSelection(fontdesc);
nfont->setFontDesc(fontdesc); nfont->setFontDesc(fontdesc);
fontspec = nfont->getFont(); fontspec = nfont->getFont();
skipping to change at line 687 skipping to change at line 712
return(1); return(1);
} }
// Change text font // Change text font
long PreferencesBox::onCmdTextFont(FXObject*, FXSelector, void*) long PreferencesBox::onCmdTextFont(FXObject*, FXSelector, void*)
{ {
FontDialog fontdlg(this, _("Change Text Font"), DECOR_BORDER|DECOR_TITLE); FontDialog fontdlg(this, _("Change Text Font"), DECOR_BORDER|DECOR_TITLE);
FXFontDesc fontdesc; FXFontDesc fontdesc;
FXString fontspec; FXString fontspec;
fontspec = getApp()->reg().readStringEntry("SETTINGS", "textfont", "Helvetic a,100,normal,regular"); fontspec = getApp()->reg().readStringEntry("SETTINGS", "textfont", DEFAULT_T EXT_FONT);
FXFont* tfont = new FXFont(getApp(), fontspec); FXFont* tfont = new FXFont(getApp(), fontspec);
tfont->create(); tfont->create();
tfont->getFontDesc(fontdesc); tfont->getFontDesc(fontdesc);
fontdlg.setFontSelection(fontdesc); fontdlg.setFontSelection(fontdesc);
if (fontdlg.execute()) if (fontdlg.execute())
{ {
fontdlg.getFontSelection(fontdesc); fontdlg.getFontSelection(fontdesc);
tfont->setFontDesc(fontdesc); tfont->setFontDesc(fontdesc);
fontspec = tfont->getFont(); fontspec = tfont->getFont();
textfont->setText(fontspec); textfont->setText(fontspec);
skipping to change at line 1614 skipping to change at line 1639
} }
} }
} }
// Terminal has changed // Terminal has changed
if (oldxterm != xterm->getText()) if (oldxterm != xterm->getText())
{ {
getApp()->reg().writeStringEntry("PROGS", "xterm", xterm->getText().text ()); getApp()->reg().writeStringEntry("PROGS", "xterm", xterm->getText().text ());
} }
// Mount command has changed
if (oldmountcmd != mountcmd->getText())
{
getApp()->reg().writeStringEntry("PROGS", "mount", mountcmd->getText().t
ext());
}
// Unmount command has changed
if (oldumountcmd != umountcmd->getText())
{
getApp()->reg().writeStringEntry("PROGS", "unmount", umountcmd->getText(
).text());
}
getApp()->reg().writeUnsignedEntry("OPTIONS", "auto_save_layout", autosave-> getCheck()); getApp()->reg().writeUnsignedEntry("OPTIONS", "auto_save_layout", autosave-> getCheck());
getApp()->reg().writeUnsignedEntry("SETTINGS", "save_win_pos", savewinpos->g etCheck()); getApp()->reg().writeUnsignedEntry("SETTINGS", "save_win_pos", savewinpos->g etCheck());
getApp()->reg().writeUnsignedEntry("OPTIONS", "use_trash_can", trashcan->get Check()); getApp()->reg().writeUnsignedEntry("OPTIONS", "use_trash_can", trashcan->get Check());
getApp()->reg().writeUnsignedEntry("OPTIONS", "use_trash_bypass", trashbypas s->getCheck()); getApp()->reg().writeUnsignedEntry("OPTIONS", "use_trash_bypass", trashbypas s->getCheck());
getApp()->reg().writeUnsignedEntry("OPTIONS", "ask_before_copy", ask->getChe ck()); getApp()->reg().writeUnsignedEntry("OPTIONS", "ask_before_copy", ask->getChe ck());
getApp()->reg().writeUnsignedEntry("SETTINGS", "single_click", single_click) ; getApp()->reg().writeUnsignedEntry("SETTINGS", "single_click", single_click) ;
getApp()->reg().writeStringEntry("SETTINGS", "time_format", timeformat->getT ext().text()); getApp()->reg().writeStringEntry("SETTINGS", "time_format", timeformat->getT ext().text());
getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_trash", trashmv->getC heck()); getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_trash", trashmv->getC heck());
getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_delete", del->getChec k()); getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_delete", del->getChec k());
getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_properties", properti es->getCheck()); getApp()->reg().writeUnsignedEntry("OPTIONS", "confirm_properties", properti es->getCheck());
skipping to change at line 1877 skipping to change at line 1914
txtviewer->setText(oldtxtviewer); txtviewer->setText(oldtxtviewer);
txteditor->setText(oldtxteditor); txteditor->setText(oldtxteditor);
filecomparator->setText(oldfilecomparator); filecomparator->setText(oldfilecomparator);
imgeditor->setText(oldimgeditor); imgeditor->setText(oldimgeditor);
imgviewer->setText(oldimgviewer); imgviewer->setText(oldimgviewer);
archiver->setText(oldarchiver); archiver->setText(oldarchiver);
pdfviewer->setText(oldpdfviewer); pdfviewer->setText(oldpdfviewer);
audioplayer->setText(oldaudioplayer); audioplayer->setText(oldaudioplayer);
videoplayer->setText(oldvideoplayer); videoplayer->setText(oldvideoplayer);
xterm->setText(oldxterm); xterm->setText(oldxterm);
mountcmd->setText(oldmountcmd);
umountcmd->setText(oldumountcmd);
// Fourth tab - Visual // Fourth tab - Visual
themesList->setCurrentItem(themelist_prev); themesList->setCurrentItem(themelist_prev);
currTheme = currTheme_prev; currTheme = currTheme_prev;
iconpath->setText(oldiconpath); iconpath->setText(oldiconpath);
use_clearlooks = use_clearlooks_prev; use_clearlooks = use_clearlooks_prev;
getApp()->reg().writeUnsignedEntry("SETTINGS", "use_clearlooks", use_clearlo oks); getApp()->reg().writeUnsignedEntry("SETTINGS", "use_clearlooks", use_clearlo oks);
// Fifth tab - Fonts // Fifth tab - Fonts
normalfont->setText(oldnormalfont); normalfont->setText(oldnormalfont);
skipping to change at line 1947 skipping to change at line 1986
oldtxtviewer = txtviewer->getText(); oldtxtviewer = txtviewer->getText();
oldtxteditor = txteditor->getText(); oldtxteditor = txteditor->getText();
oldfilecomparator = filecomparator->getText(); oldfilecomparator = filecomparator->getText();
oldimgeditor = imgeditor->getText(); oldimgeditor = imgeditor->getText();
oldimgviewer = imgviewer->getText(); oldimgviewer = imgviewer->getText();
oldarchiver = archiver->getText(); oldarchiver = archiver->getText();
oldpdfviewer = pdfviewer->getText(); oldpdfviewer = pdfviewer->getText();
oldaudioplayer = audioplayer->getText(); oldaudioplayer = audioplayer->getText();
oldvideoplayer = videoplayer->getText(); oldvideoplayer = videoplayer->getText();
oldxterm = xterm->getText(); oldxterm = xterm->getText();
oldmountcmd = mountcmd->getText();
oldumountcmd = umountcmd->getText();
// Fourth tab - Visual // Fourth tab - Visual
themelist_prev = themesList->getCurrentItem(); themelist_prev = themesList->getCurrentItem();
currTheme_prev = currTheme; currTheme_prev = currTheme;
oldiconpath = iconpath->getText(); oldiconpath = iconpath->getText();
use_clearlooks_prev = use_clearlooks; use_clearlooks_prev = use_clearlooks;
// Fifth tab - Fonts // Fifth tab - Fonts
oldnormalfont = normalfont->getText(); oldnormalfont = normalfont->getText();
oldtextfont = textfont->getText(); oldtextfont = textfont->getText();
 End of changes. 11 change blocks. 
5 lines changed or deleted 62 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS