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

expand filename

Browse source
This commit is contained in:
fluxgen 2004-05-03 15:38:26 +00:00
parent a969d7fdff
commit 2adf0b8cc2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/MenuCreator.cc
View file

@ -20,7 +20,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: MenuCreator.cc,v 1.3 2004/05/02 22:28:45 fluxgen Exp $ // $Id: MenuCreator.cc,v 1.4 2004/05/03 15:38:26 fluxgen Exp $
#include "MenuCreator.hh" #include "MenuCreator.hh"
@ -55,13 +55,13 @@ void LayerMenuItem<FluxboxWindow>::click(int button, int time) {
m_object->moveToLayer(m_layernum); m_object->moveToLayer(m_layernum);
} }
static FbTk::Menu *createStyleMenu(FbTk::Menu &parent, const std::string &label, static void createStyleMenu(FbTk::Menu &parent, const std::string &label,
const std::string &directory) { const std::string &directory) {
// perform shell style ~ home directory expansion // perform shell style ~ home directory expansion
string stylesdir(FbTk::StringUtil::expandFilename(directory)); string stylesdir(FbTk::StringUtil::expandFilename(directory));
if (!FbTk::Directory::isDirectory(stylesdir)) if (!FbTk::Directory::isDirectory(stylesdir))
return 0; return;
FbTk::Directory dir(stylesdir.c_str()); FbTk::Directory dir(stylesdir.c_str());
@ -87,6 +87,7 @@ static FbTk::Menu *createStyleMenu(FbTk::Menu &parent, const std::string &label,
// update menu graphics // update menu graphics
parent.update(); parent.update();
Fluxbox::instance()->saveMenuFilename(stylesdir.c_str()); Fluxbox::instance()->saveMenuFilename(stylesdir.c_str());
} }
static void translateMenuItem(Parser &parse, static void translateMenuItem(Parser &parse,
@ -280,7 +281,8 @@ bool getStart(FbMenuParser &parser, std::string &label) {
} }
FbTk::Menu *MenuCreator::createFromFile(const std::string &filename, int screen_number) { FbTk::Menu *MenuCreator::createFromFile(const std::string &filename, int screen_number) {
FbMenuParser parser(filename); std::string real_filename = FbTk::StringUtil::expandFilename(filename);
FbMenuParser parser(real_filename);
if (!parser.isLoaded()) if (!parser.isLoaded())
return 0; return 0;