mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7150ff7202
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-04 (Mon, 04 Jul 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-04 21:32:58 +02:00
parent 2f8caeb659 b81e75dd36
commit c696021be4
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/shellwindow.cpp
View File

@@ -51,10 +51,14 @@ CShellWindow::CShellWindow(const std::string &Command, const int Mode, int *Res,
textBox = NULL; textBox = NULL;
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
command = Command; setCommand(Command, Mode, Res, auto_exec);
mode = Mode; }
res = Res;
void CShellWindow::setCommand(const std::string &Command, const int Mode, int* Res, bool auto_exec)
{
command = Command;
mode = Mode;
res = Res;
if (auto_exec) if (auto_exec)
exec(); exec();
} }

4
src/gui/widget/shellwindow.h
View File

@@ -56,6 +56,10 @@ class CShellWindow : public sigc::trackable
}; };
CShellWindow(const std::string &Command, const int Mode = 0, int* Res = NULL, bool auto_exec = true); CShellWindow(const std::string &Command, const int Mode = 0, int* Res = NULL, bool auto_exec = true);
~CShellWindow(); ~CShellWindow();
void setCommand(const std::string &Command, const int Mode = 0, int* Res = NULL, bool auto_exec = true);
std::string getCommand(){return command;}
int getMode(){return mode;}
void exec(); void exec();
/*! /*!