razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix outdated Tahoma2D links

Browse source
This commit is contained in:
manongjohn 2021-03-27 10:48:40 -04:00
parent 63874b4309
commit c9b9166470
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
toonz/sources/toonz/aboutpopup.cpp
View file

@ -86,20 +86,23 @@ AboutPopup::AboutPopup(QWidget* parent)
mainLayout->addWidget( mainLayout->addWidget(
new QLabel(tr("Tahoma2D is made possible with the help of " new QLabel(tr("Tahoma2D is made possible with the help of "
"patrons.\nSpecial thanks to:"))); "patrons.\nSpecial thanks to:")));
mainLayout->addWidget(new QLabel("Rodney Baker")); QLabel* patrons = new QLabel(
mainLayout->addWidget(new QLabel("Hans Jacob Wagner")); "<i>Rodney Baker, Hans Jacob Wagner, Pierre Coffin, Adam Earle</i>");
mainLayout->addWidget(new QLabel("Pierre Coffin")); patrons->setTextFormat(Qt::TextFormat::RichText);
mainLayout->addWidget(new QLabel("Adam Earle")); mainLayout->addWidget(patrons);
mainLayout->addWidget(new QLabel(" ")); mainLayout->addWidget(new QLabel(" "));
AboutClickableLabel* supportLink = new AboutClickableLabel(this); // AboutClickableLabel* supportLink = new AboutClickableLabel(this);
supportLink->setText(tr("Please consider supporting Tahoma2D on Patreon.")); // supportLink->setText(tr("Please consider supporting Tahoma2D on
connect(supportLink, &AboutClickableLabel::clicked, [=]() { // Patreon."));
QDesktopServices::openUrl(QUrl("https://patreon.com/jeremybullock")); // connect(supportLink, &AboutClickableLabel::clicked, [=]() {
; // QDesktopServices::openUrl(QUrl("https://patreon.com/jeremybullock"));
}); // ;
supportLink->setToolTip("https://patreon.com/jeremybullock"); // });
mainLayout->addWidget(supportLink); // supportLink->setToolTip("https://patreon.com/jeremybullock");
// mainLayout->addWidget(supportLink);
mainLayout->addWidget(new QLabel(
tr("Please consider sponsoring Tahoma2D developers on GitHub.")));
mainLayout->addStretch(); mainLayout->addStretch();
QFrame* mainFrame = new QFrame(this); QFrame* mainFrame = new QFrame(this);

16
toonz/sources/toonz/mainwindow.cpp
View file

@ -585,7 +585,8 @@ centralWidget->setLayout(centralWidgetLayout);*/
setCommandHandler(MI_About, this, &MainWindow::onAbout); setCommandHandler(MI_About, this, &MainWindow::onAbout);
setCommandHandler(MI_OpenOnlineManual, this, &MainWindow::onOpenOnlineManual); setCommandHandler(MI_OpenOnlineManual, this, &MainWindow::onOpenOnlineManual);
setCommandHandler(MI_SupportTahoma2D, this, &MainWindow::onSupportTahoma2D); // setCommandHandler(MI_SupportTahoma2D, this,
// &MainWindow::onSupportTahoma2D);
setCommandHandler(MI_OpenWhatsNew, this, &MainWindow::onOpenWhatsNew); setCommandHandler(MI_OpenWhatsNew, this, &MainWindow::onOpenWhatsNew);
setCommandHandler(MI_OpenCommunityForum, this, setCommandHandler(MI_OpenCommunityForum, this,
&MainWindow::onOpenCommunityForum); &MainWindow::onOpenCommunityForum);
@ -1165,15 +1166,15 @@ void MainWindow::onOpenOnlineManual() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MainWindow::onSupportTahoma2D() { // void MainWindow::onSupportTahoma2D() {
QDesktopServices::openUrl(QUrl("http://patreon.com/jeremybullock")); // QDesktopServices::openUrl(QUrl("http://patreon.com/jeremybullock"));
} //}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MainWindow::onOpenWhatsNew() { void MainWindow::onOpenWhatsNew() {
QDesktopServices::openUrl( QDesktopServices::openUrl(
QUrl(tr("https://tahoma.readthedocs.io/en/latest/whats_new.html"))); QUrl(tr("https://tahoma2d.readthedocs.io/en/latest/whats_new.html")));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2385,8 +2386,9 @@ void MainWindow::defineActions() {
createMenuHelpAction(MI_OpenReportABug, QT_TR_NOOP("&Report a Bug..."), "", createMenuHelpAction(MI_OpenReportABug, QT_TR_NOOP("&Report a Bug..."), "",
"web"); "web");
createMenuHelpAction(MI_About, QT_TR_NOOP("&About Tahoma2D..."), "", "info"); createMenuHelpAction(MI_About, QT_TR_NOOP("&About Tahoma2D..."), "", "info");
createMenuHelpAction(MI_SupportTahoma2D, QT_TR_NOOP("&Support Tahoma2D..."), "", // createMenuHelpAction(MI_SupportTahoma2D, QT_TR_NOOP("&Support
"web"); // Tahoma2D..."), "",
// "web");
// Fill // Fill

2
toonz/sources/toonz/mainwindow.h
View file

@ -104,7 +104,7 @@ public:
void onUpgradeTabPro(); void onUpgradeTabPro();
void onAbout(); void onAbout();
void onOpenOnlineManual(); void onOpenOnlineManual();
void onSupportTahoma2D(); // void onSupportTahoma2D();
void onOpenWhatsNew(); void onOpenWhatsNew();
void onOpenCommunityForum(); void onOpenCommunityForum();
void onOpenReportABug(); void onOpenReportABug();

2
toonz/sources/toonz/menubar.cpp
View file

@ -667,7 +667,7 @@ void TopBar::loadMenubar() {
addMenuItem(helpMenu, MI_OpenWhatsNew); addMenuItem(helpMenu, MI_OpenWhatsNew);
addMenuItem(helpMenu, MI_OpenCommunityForum); addMenuItem(helpMenu, MI_OpenCommunityForum);
helpMenu->addSeparator(); helpMenu->addSeparator();
addMenuItem(helpMenu, MI_SupportTahoma2D); // addMenuItem(helpMenu, MI_SupportTahoma2D);
addMenuItem(helpMenu, MI_OpenReportABug); addMenuItem(helpMenu, MI_OpenReportABug);
helpMenu->addSeparator(); helpMenu->addSeparator();
addMenuItem(helpMenu, MI_About); addMenuItem(helpMenu, MI_About);