Skip to content

Commit a1ffcea

Browse files
More http -> https and routing fixes
1 parent 7f6263c commit a1ffcea

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/dialogs/quotedialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void QuoteDialog::setText() {
310310
}
311311

312312
void QuoteDialog::visitFritzingFab() {
313-
QDesktopServices::openUrl(QString("http://fab.fritzing.org"));
313+
QDesktopServices::openUrl(QString("https://fab.fritzing.org"));
314314
}
315315

316316
QString QuoteDialog::countArgs() {

src/fapplication.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ int FApplication::startup()
12061206
//if (!fabEnabled) {
12071207
QNetworkAccessManager * manager = new QNetworkAccessManager(this);
12081208
connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(gotOrderFab(QNetworkReply *)));
1209-
manager->get(QNetworkRequest(QUrl(QString("http://fab.fritzing.org/launched%1").arg(Version::makeRequestParamsString(true)))));
1209+
manager->get(QNetworkRequest(QUrl(QString("https://fab.fritzing.org/launched%1").arg(Version::makeRequestParamsString(true)))));
12101210
//}
12111211

12121212
if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, LoadProgressEnd);
@@ -1429,7 +1429,7 @@ void FApplication::checkForUpdates(bool atUserRequest)
14291429
}
14301430
}
14311431

1432-
QString atom = QString("http://fritzing.org/download/feed/atom/%1/%2")
1432+
QString atom = QString("https://fritzing.org/download/feed/atom/%1/%2")
14331433
.arg(PLATFORM_NAME)
14341434
.arg(Version::makeRequestParamsString(true));
14351435
DebugDialog::debug(atom);

src/sketch/pcbsketchwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2753,7 +2753,7 @@ void PCBSketchWidget::requestQuote(bool byUser) {
27532753
manager->setProperty("count", countArgs);
27542754
QString filename = QUrl::toPercentEncoding(filenameIf());
27552755
connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(gotFabQuote(QNetworkReply *)));
2756-
QString string = QString("https://aisler.net/meta/fritzing_quote%1&area=%2&count=%3&filename=%4&byuser=%5")
2756+
QString string = QString("https://fab.fritzing.org/fritzing-fab/quote%1&area=%2&count=%3&filename=%4&byuser=%5")
27572757
.arg(paramString)
27582758
.arg(area)
27592759
.arg(countArgs)

src/sketch/welcomeview.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ QWidget * WelcomeView::initShop() {
484484
m_fabUberFrame = createShopContentFrame(":/resources/images/pcbs_2013.png",
485485
tr("Fritzing Fab"),
486486
tr("Fritzing Fab is an easy and affordable service for producing professional PCBs from your Fritzing sketches."),
487-
"http://fab.fritzing.org/",
487+
"https://fab.fritzing.org/",
488488
tr("produce your first pcb now >>"),
489489
tr("Order your PCB now."),
490490
":/resources/images/icons/WS-fabLogo.png",
@@ -591,12 +591,12 @@ QWidget * WelcomeView::initBlog() {
591591
QWidget * headerFrame = createHeaderFrame(tr("Projects"), "Projects", tr("Blog"), "Blog", m_inactiveHeaderLabelColor, m_activeHeaderLabelColor, m_projectsLabel, m_blogLabel);
592592
frameLayout->addWidget(headerFrame);
593593

594-
m_blogListWidget = createBlogContentFrame("https://blog.fritzing.org", tr("Fritzing News."), ":/resources/images/icons/WS-blogLogo.png", "#802742");
594+
m_blogListWidget = createBlogContentFrame("http://blog.fritzing.org", tr("Fritzing News."), ":/resources/images/icons/WS-blogLogo.png", "#802742");
595595
m_blogUberFrame = m_blogListWidget;
596596
while (m_blogUberFrame->parentWidget()) m_blogUberFrame = m_blogUberFrame->parentWidget();
597597
frameLayout->addWidget(m_blogUberFrame);
598598

599-
m_projectListWidget = createBlogContentFrame("https://fritzing.org/projects/", tr("Fritzing Projects."), ":/resources/images/icons/WS-galleryLogo.png", "#00a55b");
599+
m_projectListWidget = createBlogContentFrame("http://fritzing.org/projects/", tr("Fritzing Projects."), ":/resources/images/icons/WS-galleryLogo.png", "#00a55b");
600600
m_projectsUberFrame = m_projectListWidget;
601601
while (m_projectsUberFrame->parentWidget()) m_projectsUberFrame = m_projectsUberFrame->parentWidget();
602602
frameLayout->addWidget(m_projectsUberFrame);
@@ -743,7 +743,7 @@ void WelcomeView::gotBlogSnippet(QNetworkReply * networkReply) {
743743
}
744744

745745
if (!goodBlog) {
746-
QString message = (blog) ? tr("Unable to reach blog.fritzing.org") : tr("Unable to reach friting.org/projects") ;
746+
QString message = (blog) ? tr("Unable to reach blog.fritzing.org") : tr("Unable to reach fritzing.org/projects") ;
747747
QString placeHolder = QString("<li><a class='title' href='nop' title='%1'></a></li>").arg(message);
748748
if (doc.setContent(placeHolder, &errorStr, &errorLine, &errorColumn)) {
749749
readBlog(doc, true, blog, "");

0 commit comments

Comments
 (0)