SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIDeque bugs fixed

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@27 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-03-16 12:17:14 +00:00
parent 7657996e98
commit e50bedc5ef
12 changed files with 198 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/system_daemon/daemon.cpp
View File

@@ -65,7 +65,14 @@ void Daemon::showTile(PIScreenTile * t, const PIString & header) {
tile_header->content[0].first = header;
tile_header->content[0].second.flags = Bold;
if (!conn_name.isEmpty())
tile_header->content[0].first.insert(0, "Daemon \"" + connectedDaemon() + "\": ");
tile_header->content[0].first.insert(0, PIString("Daemon \"") + connectedDaemon() + "\": ");
/*PIString s;
if (!conn_name.isEmpty())
s = "Daemon \"" + connectedDaemon() + "\": ";
s += header;
tile_header->content.resize(1);
tile_header->content[0].first = s;
tile_header->content[0].second.flags = Bold;*/
}

54
utils/system_daemon/main.cpp
View File

@@ -203,37 +203,8 @@ public:
};
void tabMenu() {
/*startTab();
console.addString("Select with numeric key:");
console.addString(" 0 - this screen");
console.addString(" 1 - show host info");
console.addString(" 2 - local file manager");
console.addString(" 3 - connect to another daemon");
finishTab();*/
}
void tabInfo() {
/*startTab();
console.addString("Exec command: " + PISystemInfo::instance()->execCommand);
console.addString(" Executed on " + PISystemInfo::instance()->execDateTime.toString());
console.addString(" Hostname: " + PISystemInfo::instance()->hostname);
console.addString(" Username: " + PISystemInfo::instance()->user);
console.addString(" OS name: " + PISystemInfo::instance()->OS_name);
console.addString(" OS version: " + PISystemInfo::instance()->OS_version);
console.addString("Architecture: " + PISystemInfo::instance()->architecture);
console.addString(" CPU count: " + PIString::fromNumber(PISystemInfo::instance()->processorsCount));
console.addVariable("of this process", &sys_mon, 2);
finishTab();*/
}
void tabConnect() {
}
int main(int argc, char * argv[]) {
piDebug = false;
//piDebug = false;
PICLI cli(argc, argv);
//cli.addArgument("");
sys_mon.startOnSelf();
@@ -241,28 +212,5 @@ int main(int argc, char * argv[]) {
MainMenu menu;
screen.start();
screen.waitForFinish();
//return 0;
/*while (!PIKbdListener::exiting) {
if (oldmode != mode) {
file_manager.disable();
daemon_.disable();
oldmode = mode;
switch (mode) {
case 0: /// menu
tabMenu();
break;
case 1: /// host info
tabInfo();
break;
case 2: /// file manager
file_manager.enable();
break;
case 3: /// daemon
daemon_.enable();
break;
}
}
piMSleep(100);
}*/
return 0;
};