nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add style item only if the file is a regular file and not a .file or a backup~ file, thanks Ciaran McCreesh

Browse source
This commit is contained in:
fluxgen 2003-12-18 21:13:52 +00:00
parent 6018caf733
commit 7f8adc5a49
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.251 2003/12/18 18:03:21 fluxgen Exp $ // $Id: Screen.cc,v 1.252 2003/12/18 21:13:52 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -2049,9 +2049,12 @@ void BScreen::createStyleMenu(FbTk::Menu &menu,
// for each file in directory add filename and path to menu // for each file in directory add filename and path to menu
for (size_t file_index = 0; file_index < dir.entries(); file_index++) { for (size_t file_index = 0; file_index < dir.entries(); file_index++) {
std::string style(stylesdir + '/' + filelist[file_index]); std::string style(stylesdir + '/' + filelist[file_index]);
// add to menu only if the file is a regular file // add to menu only if the file is a regular file, and not a
if (FbTk::Directory::isRegularFile(style) || // .file or a backup~ file
FbTk::Directory::isRegularFile(style + "/theme.cfg")) if ((FbTk::Directory::isRegularFile(style) &&
(filelist[file_index][0] != '.') &&
(style[style.length() - 1] != '~')
) || FbTk::Directory::isRegularFile(style + "/theme.cfg"))
menu.insert(new StyleMenuItem(filelist[file_index], style)); menu.insert(new StyleMenuItem(filelist[file_index], style));
} }
// update menu graphics // update menu graphics