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; |
656 { |
655 { |
657 curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
656 curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
658 } |
657 } |
659 |
658 |
660 QList<HWTeam> teamsList; |
659 QList<HWTeam> teamsList; |
661 for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) |
660 for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); ++it) |
662 { |
661 { |
663 HWTeam team(*it); |
662 HWTeam team(*it); |
664 team.loadFromFile(); |
663 team.loadFromFile(); |
665 teamsList.push_back(team); |
664 teamsList.push_back(team); |
666 } |
665 } |
702 } |
701 } |
703 } |
702 } |
704 |
703 |
705 void HWForm::GoToPage(int id) |
704 void HWForm::GoToPage(int id) |
706 { |
705 { |
707 bool stopAnim = false; |
706 //bool stopAnim = false; |
708 |
707 |
709 int lastid = ui.Pages->currentIndex(); |
708 int lastid = ui.Pages->currentIndex(); |
710 PagesStack.push(ui.Pages->currentIndex()); |
709 PagesStack.push(ui.Pages->currentIndex()); |
711 |
710 |
712 OnPageShown(id, lastid); |
711 OnPageShown(id, lastid); |
719 unnecessary. |
718 unnecessary. |
720 */ |
719 */ |
721 |
720 |
722 |
721 |
723 #if (QT_VERSION >= 0x040600) |
722 #if (QT_VERSION >= 0x040600) |
724 if (!stopAnim) |
723 //if (!stopAnim) |
725 { |
724 { |
726 /**Start animation :**/ |
725 /**Start animation :**/ |
727 int coeff = 1; |
726 int coeff = 1; |
728 #ifdef false |
727 #ifdef false |
729 coeff = 2; |
728 coeff = 2; |
815 } |
814 } |
816 /*if (curid == ID_PAGE_DRAWMAP) |
815 /*if (curid == ID_PAGE_DRAWMAP) |
817 stopAnim = true; */ |
816 stopAnim = true; */ |
818 |
817 |
819 if ((!hwnet) || (!hwnet->isInRoom())) |
818 if ((!hwnet) || (!hwnet->isInRoom())) |
820 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
819 if (id == ID_PAGE_NETGAME) |
821 { |
820 { |
822 stopAnim = true; |
821 stopAnim = true; |
823 GoBack(); |
822 GoBack(); |
824 } |
823 } |
825 |
824 |