diff -ruN ./wally-2.4.4/include/wally.h ./wally-2.4.4-my/include/wally.h --- ./wally-2.4.4/include/wally.h 2011-12-28 18:38:40.000000000 +0400 +++ ./wally-2.4.4-my/include/wally.h 2014-03-01 13:43:07.936438281 +0400 @@ -58,7 +58,7 @@ private: #ifdef Q_WS_X11 - enum WindowManager { wmUnknown, wmKDE3, wmKDE4, wmGnome, wmXfce, wmFluxbox, + enum WindowManager { wmUnknown, wmKDE3, wmKDE4, wmGnome, wmXfce, wmFluxbox, wmOpenbox, wmBlackbox, wmWindowMaker, wmFVWM, wmGnomeShell }; #endif diff -ruN ./wally-2.4.4/src/wally.cpp ./wally-2.4.4-my/src/wally.cpp --- ./wally-2.4.4/src/wally.cpp 2011-12-28 18:38:40.000000000 +0400 +++ ./wally-2.4.4-my/src/wally.cpp 2014-03-01 13:41:18.249039522 +0400 @@ -115,6 +115,8 @@ windowManager = wmXfce; else if (!wmStr.compare("FluxBox",Qt::CaseInsensitive)) windowManager = wmFluxbox; + else if (!wmStr.compare("OpenBox",Qt::CaseInsensitive)) + windowManager = wmOpenbox; else if (!wmStr.compare("FVWM",Qt::CaseInsensitive)) windowManager = wmFVWM; else if (!wmStr.compare("BlackBox",Qt::CaseInsensitive)) @@ -126,14 +128,14 @@ } #endif - if ((commandLineHelp = (args.indexOf("-help") != -1))) + if ((commandLineHelp = (args.indexOf("--help") != -1))) { QByteArray help = QByteArray("Usage:\n\t-debug\t\tShows debug output") + "\n\t-debughttp\tShows verbose HTTP output" + "\n\t-forcewm \t" + "Use specific window manager (Linux only)\n\n\t" + "where can be:\tKDE3, KDE4, Gnome, XFCE, FluxBox,\n" + - "\t\t\t\tFVWM, BlackBox, WindowMaker, GnomeShell"; + "\t\t\t\tFVWM, BlackBox, WindowMaker, GnomeShell, OpenBox"; std::cout << APPLICATION_NAME << " " << APPLICATION_VERSION << std::endl << std::endl; std::cout << help.constData() << std::endl; @@ -803,6 +805,11 @@ windowManager = wmFluxbox; debugMsg += "detected FluxBox"; } + else if (fName.contains("openbox")) + { + windowManager = wmOpenbox; + debugMsg += "detected OpenBox"; + } else if (fName.contains("fvwm")) { windowManager = wmFVWM; @@ -1545,6 +1552,12 @@ QProcess::execute("fbsetbg",args); break; + case wmOpenbox: + newFile = adaptPhoto(currentFile.absoluteFilePath(),"PNG",currentPhotoInfo); + args << "--set-wallpaper" << newFile.absoluteFilePath(); + QProcess::execute("pcmanfm",args); + break; + case wmFVWM: newFile = adaptPhoto(currentFile.absoluteFilePath(),"XPM",currentPhotoInfo); args << newFile.absoluteFilePath();