equal
deleted
inserted
replaced
94 #include "roomslistmodel.h" |
94 #include "roomslistmodel.h" |
95 #include "recorder.h" |
95 #include "recorder.h" |
96 #include "playerslistmodel.h" |
96 #include "playerslistmodel.h" |
97 |
97 |
98 #include "DataManager.h" |
98 #include "DataManager.h" |
|
99 #include "AutoUpdater.h" |
99 |
100 |
100 #ifdef __APPLE__ |
101 #ifdef __APPLE__ |
101 #include "M3Panel.h" |
102 #include "M3Panel.h" |
102 #ifdef SPARKLE_ENABLED |
103 #ifdef SPARKLE_ENABLED |
103 #include "SparkleAutoUpdater.h" |
104 #include "SparkleAutoUpdater.h" |
144 #ifdef VIDEOREC |
145 #ifdef VIDEOREC |
145 ui.pageVideos->init(config); |
146 ui.pageVideos->init(config); |
146 ui.pageOptions->setConfig(config); |
147 ui.pageOptions->setConfig(config); |
147 #endif |
148 #endif |
148 |
149 |
|
150 AutoUpdater* updater = NULL; |
|
151 if (config->isAutoUpdateEnabled()) |
|
152 { |
|
153 #ifdef __APPLE__ |
|
154 #ifdef SPARKLE_ENABLED |
|
155 updater = new SparkleAutoUpdater(); |
|
156 #endif |
|
157 #endif |
|
158 if (updater) |
|
159 { |
|
160 updater->checkForUpdates(); |
|
161 delete updater; |
|
162 } |
|
163 } |
|
164 |
149 #ifdef __APPLE__ |
165 #ifdef __APPLE__ |
150 panel = new M3Panel; |
166 panel = new M3Panel; |
151 |
|
152 #ifdef SPARKLE_ENABLED |
|
153 AutoUpdater* updater; |
|
154 |
|
155 updater = new SparkleAutoUpdater(); |
|
156 if (updater && config->isAutoUpdateEnabled()) |
|
157 updater->checkForUpdates(); |
|
158 #endif |
|
159 |
167 |
160 QShortcut *hideFrontend = new QShortcut(QKeySequence("Ctrl+M"), this); |
168 QShortcut *hideFrontend = new QShortcut(QKeySequence("Ctrl+M"), this); |
161 connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized())); |
169 connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized())); |
162 #else |
170 #else |
163 // ctrl+q closes frontend for consistency |
171 // ctrl+q closes frontend for consistency |