opengnsys
/
ogbrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#724: Utilizar definitivamente la variable {{{ogactiveadmin}}} en lugar de {{{boot}}} para seleccionar el modo de arranque administrador del cliente, el cual no era detectado en distribuciones ogLive basadas en Ubuntu 15.10. 

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4896 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/master
ramon 2016-04-25 11:50:24 +00:00
parent 099ac5d4a5
commit 9608e6e669
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainwindow.cpp
View File

@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
dock->setWidget(m_tabs); dock->setWidget(m_tabs);
// Y el dock al mainwindow // Y el dock al mainwindow
if(m_env.contains("boot") && m_env["boot"] == "admin") if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
addDockWidget(Qt::BottomDockWidgetArea,dock); addDockWidget(Qt::BottomDockWidgetArea,dock);
// Top Dock // Top Dock
@ -80,7 +80,7 @@ MainWindow::MainWindow(QWidget *parent)
dock->setWidget(m_webBar); dock->setWidget(m_webBar);
// dock al mainwindow // dock al mainwindow
if(m_env.contains("boot") && m_env["boot"] == "admin") if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
addDockWidget(Qt::TopDockWidgetArea,dock); addDockWidget(Qt::TopDockWidgetArea,dock);
// Status bar // Status bar

2
src/mainwindow.h
View File

@ -3,7 +3,7 @@
#define COMMAND "command:" #define COMMAND "command:"
#define COMMAND_WITH_CONFIRMATION "commandwithconfirmation:" #define COMMAND_WITH_CONFIRMATION "commandwithconfirmation:"
#define ENVIRONMENT "OGLOGFILE,boot" #define ENVIRONMENT "OGLOGFILE,ogactiveadmin"
//#define ENVIRONMENT "OGIP,OGSERVER,OGLOG" //#define ENVIRONMENT "OGIP,OGSERVER,OGLOG"
#include <QWidget> #include <QWidget>