← Back to branch summary

~mateo-salta/nitroshare/nitroshare

« back to all changes in this revision

Viewing changes to src/main/CTrayIcon.cpp

  • Committer: Nathan Osman
  • Date: 2012-06-27 21:56:40 UTC
  • Revision ID: admin@quickmediasolutions.com-20120627215640-c6mspvllk1br9vx2
Implemented basic progress bar for uploads (which seems to be broken at the moment) and corrected a bug with the way unique IDs were generated for each machine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/CTrayIcon.cpp
139
139
    CFileSender * client = new CFileSender(this, filenames);
140
140
    connect(client, SIGNAL(Message(QString,QSystemTrayIcon::MessageIcon)),
141
141
                    SLOT(OnMessage(QString,QSystemTrayIcon::MessageIcon)));
 
142
 
 
143
    /* If the object emitting the signal is a CShareBox, then we can use
 
144
    it to display progress of the transfer. */
 
145
    CShareBox * box = qobject_cast<CShareBox *>(sender());
 
146
    if(box)
 
147
        connect(client, SIGNAL(Progress(int)), box, SLOT(OnProgress(int)));
 
148
 
142
149
    client->Start(m_broadcast_server.GetMachine(id));
143
150
}
144
151