git-svn-id: svn://db.shs.com.ru/pip@231 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2016-08-19 12:51:03 +00:00
parent 6d7a7d3eb1
commit 4ceabcd22d
10 changed files with 147 additions and 79 deletions

View File

@@ -33,7 +33,7 @@ _Init _pisd_init;
PIScreen screen(false);
PISystemMonitor sys_mon;
Daemon daemon_;
FileManager file_manager;
//FileManager file_manager;
class MainMenu: public PITimer {
@@ -62,7 +62,7 @@ public:
mt->hide(); mt->name() = "local info";
center->addTile(mt); mtiles << mt;
mt = tfm = file_manager.tile();
//mt = tfm = daemon_.fm.tile();
mt->hide(); mt->name() = "file manager";
center->addTile(mt); mtiles << mt;
@@ -84,7 +84,7 @@ public:
CONNECTU(&screen, tileEvent, this, tileEvent)
CONNECTU(&screen, keyPressed, this, keyEvent)
CONNECTU(&file_manager, menuRequest, this, menuRequest)
CONNECTU(&daemon_.fm, menuRequest, this, menuRequest)
CONNECTU(&daemon_, menuRequest, this, menuRequest)
start(10);
}
@@ -208,6 +208,7 @@ public:
EVENT_HANDLER(void, menuRequest) {
piForeach (PIScreenTile * t, mtiles)
t->hide();
daemon_.disconnect();
tmenu->show();
tmenu->setFocus();
}
@@ -218,8 +219,8 @@ public:
t->hide();
switch (e.data.toInt()) {
case 0: tinfo->show(); break;
case 1: tfm->show(); break;
case 2: daemon_.showMainList(); tdaemon->show(); break;
case 1: daemon_.fm.setLocal(); daemon_.showLocalFilemanager(); tdaemon->show(); break;
case 2: daemon_.fm.setRemote(); daemon_.showMainList(); tdaemon->show(); break;
case 3: tpeer->show(); peers_tl->setFocus(); break;
case 4: daemon_.reinit(); tmenu->show(); break;
case 5: tpeerdiag->show(); break;