From 6e5895771428d20bfb6a97c9eb067e8bfa08dc67 Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Thu, 15 Oct 2020 22:43:17 -0600 Subject: [PATCH] Add link to Google Group (#368) --- .github/ISSUE_TEMPLATE/config.yml | 6 ++-- .github/ISSUE_TEMPLATE/question.md | 15 --------- README.md | 2 +- .../rooms/Default/menubar_template.xml | 1 + toonz/sources/toonz/mainwindow.cpp | 31 +++++++++---------- toonz/sources/toonz/mainwindow.h | 6 ++-- toonz/sources/toonz/menubar.cpp | 2 +- toonz/sources/toonz/menubarcommandids.h | 2 +- 8 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b0098225..6c15ed92 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,8 +4,6 @@ contact_links: url: https://tahoma2d.readthedocs.io/ about: The official, extensive manual for OpenToonz - name: User forum - url: https://groups.google.com/forum/#!forum/opentoonz_en/categories/ + url: https://groups.google.com/g/tahoma2d about: You can ask and answer general questions here, and connect with other users - - name: ユーザーフォーラム - url: https://groups.google.com/forum/#!forum/opentoonz/categories/ - about: このフォーラムは、OpenToonz の利用者同士で情報共有を行うことを目的としています + diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index 9ced762e..00000000 --- a/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: Ask a question -about: Related questions only -title: '' -labels: 'question' -assignees: '' - ---- - - - - - -**Question** -Ask a question related to Tahoma2D. diff --git a/README.md b/README.md index 2e56615e..0bf2b14c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo ## Community -- To share tips or to troubleshoot, join the [Google OpenToonz Users forum](https://groups.google.com/forum/#!forum/opentoonz_en) +- To share tips or to troubleshoot, join the [Google OpenToonz Users forum](hhttps://groups.google.com/g/tahoma2d) - If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma2d/issues) and post there. ## Licensing diff --git a/stuff/profiles/layouts/rooms/Default/menubar_template.xml b/stuff/profiles/layouts/rooms/Default/menubar_template.xml index b0e67801..288e3103 100644 --- a/stuff/profiles/layouts/rooms/Default/menubar_template.xml +++ b/stuff/profiles/layouts/rooms/Default/menubar_template.xml @@ -325,6 +325,7 @@ MI_OpenOnlineManual MI_OpenWhatsNew + MI_OpenCommunityForum MI_SupportTahoma2D MI_OpenReportABug diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 99b37426..df65edc3 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -578,8 +578,8 @@ centralWidget->setLayout(centralWidgetLayout);*/ setCommandHandler(MI_OpenOnlineManual, this, &MainWindow::onOpenOnlineManual); setCommandHandler(MI_SupportTahoma2D, this, &MainWindow::onSupportTahoma2D); setCommandHandler(MI_OpenWhatsNew, this, &MainWindow::onOpenWhatsNew); - // setCommandHandler(MI_OpenCommunityForum, this, - // &MainWindow::onOpenCommunityForum); + setCommandHandler(MI_OpenCommunityForum, this, + &MainWindow::onOpenCommunityForum); setCommandHandler(MI_OpenReportABug, this, &MainWindow::onOpenReportABug); setCommandHandler(MI_MaximizePanel, this, &MainWindow::maximizePanel); @@ -1060,7 +1060,7 @@ void MainWindow::onOpenOnlineManual() { //----------------------------------------------------------------------------- void MainWindow::onSupportTahoma2D() { - QDesktopServices::openUrl(QUrl("http://patreon.com/jeremybullock")); + QDesktopServices::openUrl(QUrl("http://patreon.com/jeremybullock")); } //----------------------------------------------------------------------------- @@ -1072,10 +1072,9 @@ void MainWindow::onOpenWhatsNew() { //----------------------------------------------------------------------------- -// void MainWindow::onOpenCommunityForum() { -// QDesktopServices::openUrl( -// QUrl(tr("https://groups.google.com/forum/#!forum/opentoonz_en"))); -//} +void MainWindow::onOpenCommunityForum() { + QDesktopServices::openUrl(QUrl(tr("https://groups.google.com/g/tahoma2d"))); +} //----------------------------------------------------------------------------- @@ -1810,10 +1809,9 @@ void MainWindow::defineActions() { MI_PreviewSettings, tr("&Preview Settings..."), "", tr("Control the settings that will be used to preview the scene.")); menuAct->setIcon(createQIcon("preview_settings")); - menuAct = createMenuRenderAction( - MI_Render, tr("&Render"), "Ctrl+Shift+R", - tr("Renders according to the settings and " - "location set in Output Settings.")); + menuAct = createMenuRenderAction(MI_Render, tr("&Render"), "Ctrl+Shift+R", + tr("Renders according to the settings and " + "location set in Output Settings.")); menuAct->setIcon(createQIcon("render")); menuAct = createMenuRenderAction( MI_SaveAndRender, tr("&Save and Render"), "", @@ -2436,14 +2434,15 @@ void MainWindow::defineActions() { menuAct->setIconText(tr("What's New...")); menuAct->setIcon(createQIcon("web")); - menuAct = createMenuHelpAction(MI_SupportTahoma2D, tr("&Support Tahoma2D..."), ""); + menuAct = + createMenuHelpAction(MI_SupportTahoma2D, tr("&Support Tahoma2D..."), ""); menuAct->setIconText(tr("Support Tahoma2D")); menuAct->setIcon(createQIcon("web")); - // menuAct = createMenuHelpAction(MI_OpenCommunityForum, - // tr("&Community Forum..."), ""); - // menuAct->setIconText(tr("Community Forum...")); - // menuAct->setIcon(createQIcon("web")); + menuAct = createMenuHelpAction(MI_OpenCommunityForum, + tr("&Community Forum..."), ""); + menuAct->setIconText(tr("Community Forum...")); + menuAct->setIcon(createQIcon("web")); menuAct = createMenuHelpAction(MI_OpenReportABug, tr("&Report a Bug..."), ""); menuAct->setIconText(tr("Report a Bug...")); diff --git a/toonz/sources/toonz/mainwindow.h b/toonz/sources/toonz/mainwindow.h index 0a180499..d042760a 100644 --- a/toonz/sources/toonz/mainwindow.h +++ b/toonz/sources/toonz/mainwindow.h @@ -69,7 +69,7 @@ class MainWindow final : public QMainWindow { StatusBar *m_statusBar; AboutPopup *m_aboutPopup; QDialog *m_transparencyTogglerWindow; - QSlider* m_transparencySlider; + QSlider *m_transparencySlider; QActionGroup *m_toolsActionGroup; QStackedWidget *m_stackedWidget; @@ -105,7 +105,7 @@ public: void onOpenOnlineManual(); void onSupportTahoma2D(); void onOpenWhatsNew(); - // void onOpenCommunityForum(); + void onOpenCommunityForum(); void onOpenReportABug(); void checkForUpdates(); int getRoomCount() const; @@ -201,7 +201,7 @@ public: void TogglePlasticPaintRigid(); void TogglePlasticBuildSkeleton(); void TogglePlasticAnimate(); - + /*-- Brush Tool + mode switching shortcuts --*/ void ToggleBrushAutoFillOff(); void ToggleBrushAutoFillOn(); diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp index 58be0332..586d4fda 100644 --- a/toonz/sources/toonz/menubar.cpp +++ b/toonz/sources/toonz/menubar.cpp @@ -722,7 +722,7 @@ QMenuBar *StackedMenuBar::createFullMenuBar() { QMenu *helpMenu = addMenu(tr("Help"), fullMenuBar); addMenuItem(helpMenu, MI_OpenOnlineManual); addMenuItem(helpMenu, MI_OpenWhatsNew); - // addMenuItem(helpMenu, MI_OpenCommunityForum); + addMenuItem(helpMenu, MI_OpenCommunityForum); helpMenu->addSeparator(); addMenuItem(helpMenu, MI_SupportTahoma2D); addMenuItem(helpMenu, MI_OpenReportABug); diff --git a/toonz/sources/toonz/menubarcommandids.h b/toonz/sources/toonz/menubarcommandids.h index e87676bd..dc3585f7 100644 --- a/toonz/sources/toonz/menubarcommandids.h +++ b/toonz/sources/toonz/menubarcommandids.h @@ -436,7 +436,7 @@ #define MI_OpenOnlineManual "MI_OpenOnlineManual" #define MI_SupportTahoma2D "MI_SupportTahoma2D" #define MI_OpenWhatsNew "MI_OpenWhatsNew" -// #define MI_OpenCommunityForum "MI_OpenCommunityForum" +#define MI_OpenCommunityForum "MI_OpenCommunityForum" #define MI_OpenReportABug "MI_OpenReportABug" #define MI_ClearCacheFolder "MI_ClearCacheFolder"