equal
deleted
inserted
replaced
163 #ifdef VIDEOREC |
163 #ifdef VIDEOREC |
164 ui.pageVideos->init(config); |
164 ui.pageVideos->init(config); |
165 #endif |
165 #endif |
166 |
166 |
167 #ifdef __APPLE__ |
167 #ifdef __APPLE__ |
168 AutoUpdater* updater = NULL; |
|
169 if (config->isAutoUpdateEnabled()) |
168 if (config->isAutoUpdateEnabled()) |
170 { |
169 { |
171 #ifdef __APPLE__ |
170 AutoUpdater* updater = NULL; |
|
171 |
172 #ifdef SPARKLE_ENABLED |
172 #ifdef SPARKLE_ENABLED |
173 updater = new SparkleAutoUpdater(); |
173 updater = new SparkleAutoUpdater(); |
174 #endif |
|
175 #endif |
174 #endif |
176 if (updater) |
175 if (updater) |
177 { |
176 { |
178 updater->checkForUpdates(); |
177 updater->checkForUpdates(); |
179 delete updater; |
178 delete updater; |
658 { |
657 { |
659 curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
658 curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
660 } |
659 } |
661 |
660 |
662 QList<HWTeam> teamsList; |
661 QList<HWTeam> teamsList; |
663 for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) |
662 for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); ++it) |
664 { |
663 { |
665 HWTeam team(*it); |
664 HWTeam team(*it); |
666 team.loadFromFile(); |
665 team.loadFromFile(); |
667 teamsList.push_back(team); |
666 teamsList.push_back(team); |
668 } |
667 } |
704 } |
703 } |
705 } |
704 } |
706 |
705 |
707 void HWForm::GoToPage(int id) |
706 void HWForm::GoToPage(int id) |
708 { |
707 { |
709 bool stopAnim = false; |
708 //bool stopAnim = false; |
710 |
709 |
711 int lastid = ui.Pages->currentIndex(); |
710 int lastid = ui.Pages->currentIndex(); |
712 PagesStack.push(ui.Pages->currentIndex()); |
711 PagesStack.push(ui.Pages->currentIndex()); |
713 |
712 |
714 OnPageShown(id, lastid); |
713 OnPageShown(id, lastid); |
721 unnecessary. |
720 unnecessary. |
722 */ |
721 */ |
723 |
722 |
724 |
723 |
725 #if (QT_VERSION >= 0x040600) |
724 #if (QT_VERSION >= 0x040600) |
726 if (!stopAnim) |
725 //if (!stopAnim) |
727 { |
726 { |
728 /**Start animation :**/ |
727 /**Start animation :**/ |
729 int coeff = 1; |
728 int coeff = 1; |
730 #ifdef false |
729 #ifdef false |
731 coeff = 2; |
730 coeff = 2; |
817 } |
816 } |
818 /*if (curid == ID_PAGE_DRAWMAP) |
817 /*if (curid == ID_PAGE_DRAWMAP) |
819 stopAnim = true; */ |
818 stopAnim = true; */ |
820 |
819 |
821 if ((!hwnet) || (!hwnet->isInRoom())) |
820 if ((!hwnet) || (!hwnet->isInRoom())) |
822 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
821 if (id == ID_PAGE_NETGAME) |
823 { |
822 { |
824 stopAnim = true; |
823 stopAnim = true; |
825 GoBack(); |
824 GoBack(); |
826 } |
825 } |
827 |
826 |