backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-07 06:03:40 +08:00
Code Issues Projects Releases Wiki Activity

Fixed issue 487

Browse Source
This commit is contained in:
Nick Bolton
2010-06-02 20:19:23 +00:00
parent a2bd73b8bf
commit 476903c47b
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gui/src/MainWindow.cpp
View File

@@ -44,7 +44,6 @@ MainWindow::MainWindow(QWidget* parent) :
m_ServerConfig(&m_Settings, 5, 3),
m_pTempConfigFile(NULL),
m_pLogDialog(new LogDialog(this, synergyProcess())),
m_pLabelStatusBar(NULL),
m_pTrayIcon(NULL),
m_pTrayIconMenu(NULL)
{
@@ -52,7 +51,6 @@ MainWindow::MainWindow(QWidget* parent) :
createTrayIcon();
createMenuBar();
createStatusBar();
loadSettings();
initConnections();
@@ -66,6 +64,11 @@ MainWindow::~MainWindow()
saveSettings();
}
void MainWindow::setStatus(const QString &status)
{
m_pStatusLabel->setText(status);
}
void MainWindow::createTrayIcon()
{
#if !defined(Q_OS_MAC)
@@ -123,12 +126,6 @@ void MainWindow::createMenuBar()
setMenuBar(menubar);
}
void MainWindow::createStatusBar()
{
m_pLabelStatusBar = new QLabel(tr("Synergy is not running."));
statusBar()->addPermanentWidget(m_pLabelStatusBar);
}
void MainWindow::loadSettings()
{
// gui
@@ -383,7 +380,7 @@ void MainWindow::setSynergyState(qSynergyState state)
m_pGroupServer->setEnabled(state == synergyDisconnected);
m_pActionStartSynergy->setEnabled(state == synergyDisconnected);
m_pActionStopSynergy->setEnabled(state == synergyConnected);
m_pLabelStatusBar->setText(state == synergyConnected ? QString(tr("Synergy %1 is running.")).arg(synergyType() == synergyServer ? tr("server") : tr("client")) : tr("Synergy is not running."));
setStatus(state == synergyConnected ? QString(tr("Synergy %1 is running.")).arg(synergyType() == synergyServer ? tr("server") : tr("client")) : tr("Synergy is not running."));
setIcon(state);
m_SynergyState = state;
}