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@240 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-24 13:15:09 +00:00
parent 77a48eb270
commit 537c2fcd37
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/system_daemon/daemon.cpp
View File

@@ -206,7 +206,7 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) {
Daemon::Daemon(): inited__(false), PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
Daemon::Daemon(): inited__(false), PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)) {
// setName("Daemon");
dtimer.setName("__S__Daemon_timer");
mode = offset = cur = height = 0;
@@ -608,13 +608,14 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
//if (conn_name != from) return;
// piCout << "rec" << data.size();
if (data.size() < 4) return;
PIMutexLocker ml(remote_mutex);
PIByteArray ba(data), rba;
Remote * r = remotes.value(from);
PIString dir;
int type; ba >> type;
//piCout << "rec from " << from << type << r;
// piCout << "rec from " << from << type << r;
switch (type) {
case RequestHostInfo:
makeMyHostInfo();
@@ -626,7 +627,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
r->dir_my.cd(dir);
r->ft.setDirectory(r->dir_my);
//piCout << "store to" << r->dir_my.absolutePath();
piCout << "cd to" << r->dir_my.absolutePath();
piCoutObj << "cd to" << r->dir_my.absolutePath();
r->updateDir();
// sendDirToRemote(r);
break;
@@ -737,7 +738,6 @@ void Daemon::makeOtherHostInfo() {
void Daemon::requestChDir(const PIString & d) {
if (d.isEmpty()) return;
Remote * r = remotes.value(conn_name, 0);
//piCout << "request chdir" << d << conn_name << r;
if (d.isEmpty()) return;
if (!r) return;
fm.remoteSaveDir();
@@ -745,4 +745,6 @@ void Daemon::requestChDir(const PIString & d) {
PIByteArray ba;
ba << int(RequestChangeDir) << d;
send(conn_name, ba);
// bool ok = send(conn_name, ba);
// piCout << "request chdir" << d << conn_name << r << ok;
}

5
utils/system_daemon/file_manager.cpp
View File

@@ -1,6 +1,5 @@
#include "file_manager.h"
#include "shared.h"
#include "daemon.h"
extern PIScreen screen;
@@ -225,10 +224,8 @@ void FileManager::TileDir::resizeEvent(int w, int h) {
FileManager::FileManager(Daemon * d) {
FileManager::FileManager() {
setName("FileManager");
del_commit = false;
daemon = d;
CONNECTU(&screen, keyPressed, this, keyEvent)
//dir.setDir("/home/peri4/Documents");
TileSimple * tl;

6
utils/system_daemon/file_manager.h
View File

@@ -4,12 +4,11 @@
#include "piscreentiles.h"
#include "pidir.h"
class Daemon;
class FileManager: public PIObject {
PIOBJECT(FileManager)
public:
FileManager(Daemon * d = 0);
FileManager();
PIScreenTile * tile() const;
PIScreenTile * localTile() const {return panels[0];}
@@ -67,11 +66,8 @@ private:
EVENT1(tileKey, PIKbdListener::KeyEvent, key)
static void tileKey_s(void * fm, PIKbdListener::KeyEvent key) {((FileManager*)fm)->tileKey(key);}
bool del_commit;
TileDir * panels[2];
Daemon * daemon;
PIScreenTile * tile_root;
PIStringList selected;
typedef PIPair<PIString, PIString> SSPair;
};