From a1ffcea08814801903b1a9515b18cf97067968ae Mon Sep 17 00:00:00 2001 From: Kjell Morgenstern Date: Wed, 27 Nov 2019 09:28:17 +0100 Subject: [PATCH] More http -> https and routing fixes --- src/dialogs/quotedialog.cpp | 2 +- src/fapplication.cpp | 4 ++-- src/sketch/pcbsketchwidget.cpp | 2 +- src/sketch/welcomeview.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dialogs/quotedialog.cpp b/src/dialogs/quotedialog.cpp index 6fb332c5e..e7bf13909 100644 --- a/src/dialogs/quotedialog.cpp +++ b/src/dialogs/quotedialog.cpp @@ -310,7 +310,7 @@ void QuoteDialog::setText() { } void QuoteDialog::visitFritzingFab() { - QDesktopServices::openUrl(QString("http://fab.fritzing.org")); + QDesktopServices::openUrl(QString("https://fab.fritzing.org")); } QString QuoteDialog::countArgs() { diff --git a/src/fapplication.cpp b/src/fapplication.cpp index 843c79b27..72159c991 100644 --- a/src/fapplication.cpp +++ b/src/fapplication.cpp @@ -1206,7 +1206,7 @@ int FApplication::startup() //if (!fabEnabled) { QNetworkAccessManager * manager = new QNetworkAccessManager(this); connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(gotOrderFab(QNetworkReply *))); - manager->get(QNetworkRequest(QUrl(QString("http://fab.fritzing.org/launched%1").arg(Version::makeRequestParamsString(true))))); + manager->get(QNetworkRequest(QUrl(QString("https://fab.fritzing.org/launched%1").arg(Version::makeRequestParamsString(true))))); //} if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, LoadProgressEnd); @@ -1429,7 +1429,7 @@ void FApplication::checkForUpdates(bool atUserRequest) } } - QString atom = QString("http://fritzing.org/download/feed/atom/%1/%2") + QString atom = QString("https://fritzing.org/download/feed/atom/%1/%2") .arg(PLATFORM_NAME) .arg(Version::makeRequestParamsString(true)); DebugDialog::debug(atom); diff --git a/src/sketch/pcbsketchwidget.cpp b/src/sketch/pcbsketchwidget.cpp index b4af2b3aa..9fadc68c0 100644 --- a/src/sketch/pcbsketchwidget.cpp +++ b/src/sketch/pcbsketchwidget.cpp @@ -2753,7 +2753,7 @@ void PCBSketchWidget::requestQuote(bool byUser) { manager->setProperty("count", countArgs); QString filename = QUrl::toPercentEncoding(filenameIf()); connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(gotFabQuote(QNetworkReply *))); - QString string = QString("https://aisler.net/meta/fritzing_quote%1&area=%2&count=%3&filename=%4&byuser=%5") + QString string = QString("https://fab.fritzing.org/fritzing-fab/quote%1&area=%2&count=%3&filename=%4&byuser=%5") .arg(paramString) .arg(area) .arg(countArgs) diff --git a/src/sketch/welcomeview.cpp b/src/sketch/welcomeview.cpp index 64717024c..6a4d22745 100644 --- a/src/sketch/welcomeview.cpp +++ b/src/sketch/welcomeview.cpp @@ -484,7 +484,7 @@ QWidget * WelcomeView::initShop() { m_fabUberFrame = createShopContentFrame(":/resources/images/pcbs_2013.png", tr("Fritzing Fab"), tr("Fritzing Fab is an easy and affordable service for producing professional PCBs from your Fritzing sketches."), - "http://fab.fritzing.org/", + "https://fab.fritzing.org/", tr("produce your first pcb now >>"), tr("Order your PCB now."), ":/resources/images/icons/WS-fabLogo.png", @@ -591,12 +591,12 @@ QWidget * WelcomeView::initBlog() { QWidget * headerFrame = createHeaderFrame(tr("Projects"), "Projects", tr("Blog"), "Blog", m_inactiveHeaderLabelColor, m_activeHeaderLabelColor, m_projectsLabel, m_blogLabel); frameLayout->addWidget(headerFrame); - m_blogListWidget = createBlogContentFrame("https://blog.fritzing.org", tr("Fritzing News."), ":/resources/images/icons/WS-blogLogo.png", "#802742"); + m_blogListWidget = createBlogContentFrame("http://blog.fritzing.org", tr("Fritzing News."), ":/resources/images/icons/WS-blogLogo.png", "#802742"); m_blogUberFrame = m_blogListWidget; while (m_blogUberFrame->parentWidget()) m_blogUberFrame = m_blogUberFrame->parentWidget(); frameLayout->addWidget(m_blogUberFrame); - m_projectListWidget = createBlogContentFrame("https://fritzing.org/projects/", tr("Fritzing Projects."), ":/resources/images/icons/WS-galleryLogo.png", "#00a55b"); + m_projectListWidget = createBlogContentFrame("http://fritzing.org/projects/", tr("Fritzing Projects."), ":/resources/images/icons/WS-galleryLogo.png", "#00a55b"); m_projectsUberFrame = m_projectListWidget; while (m_projectsUberFrame->parentWidget()) m_projectsUberFrame = m_projectsUberFrame->parentWidget(); frameLayout->addWidget(m_projectsUberFrame); @@ -743,7 +743,7 @@ void WelcomeView::gotBlogSnippet(QNetworkReply * networkReply) { } if (!goodBlog) { - QString message = (blog) ? tr("Unable to reach blog.fritzing.org") : tr("Unable to reach friting.org/projects") ; + QString message = (blog) ? tr("Unable to reach blog.fritzing.org") : tr("Unable to reach fritzing.org/projects") ; QString placeHolder = QString("
    • ").arg(message); if (doc.setContent(placeHolder, &errorStr, &errorLine, &errorColumn)) { readBlog(doc, true, blog, "");