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

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

Browse Source
This commit is contained in:
Бычков Андрей
2016-11-30 12:22:14 +00:00
parent 8b72323dd1
commit 17f118354d
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/system_daemon/daemon.cpp
View File

@@ -339,7 +339,7 @@ PIScreenTile * Daemon::tile() const {
void Daemon::escPressed() {
if (mode == rmNone)
if (mode == rmNone || mode == rmLocalFileManager)
menuRequest();
else {
if (mode > rmSelectMode) {

3
utils/system_daemon/daemon.h
View File

@@ -44,7 +44,7 @@ public:
void showMainList() {showTile(list_daemons, "Select daemon");}
void showActionList() {showTile(list_actions, "Select action");}
void showLocalFilemanager() {mode = rmFileManager; showTile(tile_fm, "File manager");}
void showLocalFilemanager() {mode = rmLocalFileManager; showTile(tile_fm, "File manager");}
PIStringList availableDaemons();
void connectToDaemon(const PIString & dn);
@@ -87,6 +87,7 @@ private:
enum RemoteMode {
rmNone,
rmLocalFileManager,
rmSelectMode,
rmInformation,
rmFileManager,

12
utils/system_daemon/file_manager.cpp
View File

@@ -344,15 +344,3 @@ void FileManager::remoteRestoreDir() {
panels[1]->cur = 0;
}
void FileManager::keyEvent(PIKbdListener::KeyEvent key) {
if (!tile_root->visible) return;
if (screen.dialogTile()) return;
switch (key.key) {
case PIKbdListener::Esc:
menuRequest();
break;
default: break;
}
}

2
utils/system_daemon/file_manager.h
View File

@@ -34,7 +34,6 @@ public:
void clearSelectionLocal() {panels[0]->selected.clear();}
void clearSelectionRemote() {panels[1]->selected.clear();}
EVENT(menuRequest)
EVENT3(actionRequest, bool, remote_tile, FileManager::Action, type, PIVariant, data)
private:
@@ -62,7 +61,6 @@ private:
EVENT3(actionRequest, bool, remote_tile, FileManager::Action, type, PIVariant, data)
};
EVENT_HANDLER1(void, keyEvent, PIKbdListener::KeyEvent, key);
EVENT1(tileKey, PIKbdListener::KeyEvent, key)
static void tileKey_s(void * fm, PIKbdListener::KeyEvent key) {((FileManager*)fm)->tileKey(key);}

24
utils/system_daemon/main.cpp
View File

@@ -84,7 +84,6 @@ public:
CONNECTU(screen, tileEvent, this, tileEvent)
CONNECTU(screen, keyPressed, this, keyEvent)
CONNECTU(&daemon_.fm, menuRequest, this, menuRequest)
CONNECTU(&daemon_, menuRequest, this, menuRequest)
start(10);
}
@@ -132,16 +131,16 @@ public:
}
PIScreenTile * peerTile() {
PIScreenTile* ret = new PIScreenTile();
TileSimple * htl = new TileSimple();
htl->size_policy = PIScreenTypes::Fixed;
ret->direction = PIScreenTypes::Vertical;
htl->content << TileSimple::Row("Peer: " + daemon_.name() + " | " + daemon_.selfInfo().name, CellFormat(PIScreenTypes::Default, PIScreenTypes::Default, PIScreenTypes::Bold));
peerinfo_header = new TileSimple();
peerinfo_header->size_policy = PIScreenTypes::Fixed;
peerinfo_header->content << TileSimple::Row("Peer: " + daemon_.name() + " | " + daemon_.selfInfo().name, CellFormat(PIScreenTypes::Default, PIScreenTypes::Default, PIScreenTypes::Bold));
addrs_tl = new TileList();
peers_tl = new TileList();
peerinfo_tl = new TileSimple();
peermap_tl = new TileList();
peerinfo_tl->size_policy = PIScreenTypes::Fixed;
ret->addTile(htl);
ret->addTile(peerinfo_header);
ret->addTile(peers_tl);
ret->addTile(peerinfo_tl);
ret->addTile(addrs_tl);
@@ -231,7 +230,18 @@ public:
case 3: tpeer->show(); peers_tl->setFocus(); break;
case 4: daemon_.reinit(); tmenu->show(); break;
case 5: tpeerdiag->show(); break;
case 6: daemon_.changeName(pisd_prefix + askUserInput("Peer name:")); updateTitle(title); menuRequest(); break;
case 6:
{
PIString nn = askUserInput("Peer name:");
if (!nn.isEmpty()) {
daemon_.changeName(pisd_prefix + nn);
peerinfo_header->content.clear();
peerinfo_header->content << TileSimple::Row("Peer: " + daemon_.name() + " | " + daemon_.selfInfo().name, CellFormat(PIScreenTypes::Default, PIScreenTypes::Default, PIScreenTypes::Bold));
updateTitle(title);
}
menuRequest();
}
break;
case 7: PIKbdListener::exiting = true; break;
}
}
@@ -263,7 +273,7 @@ public:
PIScreenTile * tmenu, * tinfo, * tfm, * tdaemon, * tpeer, * tpeerdiag;
TileList * peers_tl, * addrs_tl, * peermap_tl;
TileSimple * title;
TileSimple * peerinfo_tl;
TileSimple * peerinfo_tl, * peerinfo_header;
TileSimple * peerdiagdata_tl, * peerdiagservice_tl;
PIVector<PIScreenTile * > mtiles;
int cur_peer;