X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=6591edea6b725b1f234d3c4a56f18851c3d0a4ba;hp=7490cb41f514f9fbbd91fc8e207f99a69f61f0be;hb=84ff541e038763977a99642a90af11ee995c440d;hpb=2ccedbc06565f046269493baf4b113bcad9f940a diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 7490cb41..6591edea 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -76,8 +76,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) connect(clientSyncer, SIGNAL(startCoreSetup(const QVariantList &)), this, SLOT(startCoreConfig(const QVariantList &))); connect(clientSyncer, SIGNAL(sessionProgress(quint32, quint32)), this, SLOT(coreSessionProgress(quint32, quint32))); connect(clientSyncer, SIGNAL(networksProgress(quint32, quint32)), this, SLOT(coreNetworksProgress(quint32, quint32))); - connect(clientSyncer, SIGNAL(channelsProgress(quint32, quint32)), this, SLOT(coreChannelsProgress(quint32, quint32))); - connect(clientSyncer, SIGNAL(ircUsersProgress(quint32, quint32)), this, SLOT(coreIrcUsersProgress(quint32, quint32))); connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(syncFinished())); connect(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates())); @@ -396,10 +394,6 @@ void CoreConnectDlg::startSync() { ui.sessionProgress->setValue(0); ui.networksProgress->setRange(0, 1); ui.networksProgress->setValue(0); - ui.channelsProgress->setRange(0, 1); - ui.channelsProgress->setValue(0); - ui.ircUsersProgress->setRange(0, 1); - ui.ircUsersProgress->setValue(0); ui.stackedWidget->setCurrentWidget(ui.syncPage); // clean up old page @@ -428,31 +422,6 @@ void CoreConnectDlg::coreNetworksProgress(quint32 val, quint32 max) { } } -void CoreConnectDlg::coreChannelsProgress(quint32 val, quint32 max) { - if(max == 0) { - ui.channelsProgress->setFormat("0/0"); - ui.channelsProgress->setRange(0, 1); - ui.channelsProgress->setValue(1); - } else { - ui.channelsProgress->setFormat("%v/%m"); - ui.channelsProgress->setRange(0, max); - ui.channelsProgress->setValue(val); - } -} - -void CoreConnectDlg::coreIrcUsersProgress(quint32 val, quint32 max) { - if(max == 0) { - ui.ircUsersProgress->setFormat("0/0"); - ui.ircUsersProgress->setRange(0, 1); - ui.ircUsersProgress->setValue(1); - } else { - if(val % 100) return; - ui.ircUsersProgress->setFormat("%v/%m"); - ui.ircUsersProgress->setRange(0, max); - ui.ircUsersProgress->setValue(val); - } -} - void CoreConnectDlg::syncFinished() { if(!wizard) accept(); else { @@ -495,6 +464,14 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co ui.useSsl->setEnabled(false); #endif } + +#ifndef BUILD_MONO + // if we don't have a mono build we hide the option to use the internal connection and force the setting to use remote host + ui.useInternal->setChecked(false); + ui.useInternal->hide(); + ui.useRemote->hide(); + ui.labelUseBuiltinCore->hide(); +#endif } QVariantMap CoreAccountEditDlg::accountData() {