feat(Submit): Improve and add action menu

CHANGELOG.md

@@ -6,10 +6,11 @@
 -   Format python codes by YAPF. (#652)
 -   Now you can open the corresponding preferences page via a link when asked to check the setting in the message logger. (#659)
 -   Now you can toggle fullscreen mode by pressing F11 or clicking View->Full Screen. (#642, #660 and #670)
+-   Now you can set shortcut for submitting solution. (#201 and #681)
 
 ### Fixed
 
--   Fixed an issue that in some rare cases CP Editor could not get full data from Competitive Companion. (#345 and #624)
+-   Fixed an issue that in some rare cases CP Editor could not get full data from Competitive Companion. (#345 and #624) 
 
 ### Changed
 
@@ -19,6 +20,7 @@
 ### Improved
 
 -   Now unfinished checks will be cancelled at the new execution. (#635)
+-   If you use CF tool 1.0 or above, it will never fail to parse URL for submission. (#681) 
 
 ## v6.7
 

src/Extensions/CFTool.cpp

@@ -57,52 +57,64 @@ void CFTool::submit(const QString &filePath, const QString &url)
 
     LOG_INFO(INFO_OF(filePath) << INFO_OF(url));
 
-    if (parseCfUrl(url, problemContestId, problemCode))
+    auto version = getCFToolVersion();
+    if (version.isEmpty())
     {
-        if (problemCode == "0")
-        {
-            problemCode = "A";
-            log->warn(tr("CF Tool"),
-                      tr("The problem code is 0, now use A automatically. If the actual problem code is not A, "
-                         "please set the problem code manually in the right-click menu of the current tab."));
-        }
-        lastStatus = "Unknown"; // No tr here. We don't know what we'll get from network. Maybe a array for mapping.
-        CFToolProcess = new QProcess();
-        CFToolProcess->setProgram(CFToolPath);
-        auto version = getCFToolVersion();
-        if (version.isEmpty())
-        {
-            log->error(
-                tr("CF Tool"),
-                tr("Failed to get the version of CF Tool. Have you set the correct path to CF Tool in Preferences?"));
-            return;
-        }
-        if (version.split('.')[0] == "0")
-            CFToolProcess->setArguments({"submit", problemContestId, problemCode, filePath});
-        else
-            CFToolProcess->setArguments({"submit", "-f", filePath, url});
 
-        LOG_INFO(INFO_OF(CFToolProcess->arguments().join(' ')));
+        log->error(
+            tr("CF Tool"),
+            tr("Failed to get the version of CF Tool. Have you set the correct path to CF Tool in Preferences?"));
+        return;
+    }
+
+    lastStatus = "Unknown"; // No tr here. We don't know what we'll get from network. Maybe a array for mapping.
+    CFToolProcess = new QProcess();
+    CFToolProcess->setProgram(CFToolPath);
 
-        connect(CFToolProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadReady()));
-        connect(CFToolProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(onFinished(int)));
-        CFToolProcess->start();
-        bool started = CFToolProcess->waitForStarted(2000);
-        if (started)
+    if (version.split('.')[0] == "0")
+    {
+        log->warn(tr("CF Tool"),
+                  tr("You are using CF Tool %1. Please update to CF tools 1.0 or above.").append(version));
+        if (parseCfUrl(url, problemContestId, problemCode))
         {
-            log->info(tr("CF Tool"), tr("CF Tool has started"));
+
+            if (problemCode == "0")
+            {
+                problemCode = "A";
+                log->warn(tr("CF Tool"),
+                          tr("The problem code is 0, now use A automatically. If the actual problem code is not A, "
+                             "please set the problem code manually in the right-click menu of the current tab."));
+            }
+
+            CFToolProcess->setArguments({"submit", problemContestId, problemCode, filePath});
         }
         else
         {
-            CFToolProcess->kill();
-            log->error(
-                tr("CF Tool"),
-                tr("Failed to start CF Tool in 2 seconds. Have you set the correct path to CF Tool in Preferences?"));
+            log->error(tr("CF Tool"), tr("Failed to parse the URL [%1]").arg(url));
+            return;
         }
     }
     else
     {
-        log->error(tr("CF Tool"), tr("Failed to parse the URL [%1]").arg(url));
+        CFToolProcess->setArguments({"submit", "-f", filePath, url});
+    }
+
+    LOG_INFO(INFO_OF(CFToolProcess->arguments().join(' ')));
+
+    connect(CFToolProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadReady()));
+    connect(CFToolProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(onFinished(int)));
+    CFToolProcess->start();
+    bool started = CFToolProcess->waitForStarted(2000);
+    if (started)
+    {
+        log->info(tr("CF Tool"), tr("CF Tool has started"));
+    }
+    else
+    {
+        CFToolProcess->kill();
+        log->error(
+            tr("CF Tool"),
+            tr("Failed to start CF Tool in 2 seconds. Have you set the correct path to CF Tool in Preferences?"));
     }
 }
 

src/Settings/PreferencesWindow.cpp

@@ -261,7 +261,7 @@ PreferencesWindow::PreferencesWindow(QWidget *parent) : QMainWindow(parent)
             .page(TRKEY("Default Paths"), DefaultPathManager::actionSettingsList() << "Default Path/Names And Paths")
         .end()
         .page(TRKEY("Key Bindings"), {"Hotkey/Compile", "Hotkey/Run", "Hotkey/Compile Run", "Hotkey/Format", "Hotkey/Kill",
-                                   "Hotkey/Change View Mode", "Hotkey/Snippets"})
+                                   "Hotkey/Change View Mode", "Hotkey/Snippets", "Hotkey/Submit"})
         .dir(TRKEY("Advanced"))
             .page(TRKEY("Update"), {"Check Update", "Beta"})
             .page(TRKEY("Limits"), {"Default Time Limit", "Output Length Limit", "Output Display Length Limit", "Message Length Limit",

src/Settings/settings.json

@@ -668,6 +668,12 @@
         "old": [
             "hotkey_snippets"
         ]
+    },
+	{
+        "name": "Hotkey/Submit",
+        "desc": "Submit Solution",
+        "type": "QString",
+        "ui": "ShortcutItem"
     },
     {
         "name": "Hot Exit/Enable",
@@ -1224,4 +1230,4 @@
         "immediatelyApply": true,
         "tip": "Show only monospaced fonts when choosing a font"
     }
-]
+]

src/appwindow.cpp

@@ -354,6 +354,11 @@ void AppWindow::maybeSetHotkeys()
         hotkeyObjects.push_back(
             new QShortcut(SettingsHelper::getHotkeySnippets(), this, SLOT(on_actionUseSnippets_triggered())));
     }
+    if (!SettingsHelper::getHotkeySubmit().isEmpty())
+    {
+        hotkeyObjects.push_back(
+            new QShortcut(SettingsHelper::getHotkeySubmit(), this, SLOT(on_actionSubmit_triggered())));
+    }
 
     hotkeyObjects.push_back(new QShortcut(Qt::Key_Escape, this, [this] { ui->actionFullScreen->setChecked(false); }));
 }
@@ -894,6 +899,8 @@ void AppWindow::onTabChanged(int index)
         connect(tmp->getSplitter(), SIGNAL(splitterMoved(int, int)), this, SLOT(onSplitterMoved(int, int)));
     activeRightSplitterMoveConnection =
         connect(tmp->getRightSplitter(), SIGNAL(splitterMoved(int, int)), this, SLOT(onRightSplitterMoved(int, int)));
+
+    ui->actionSubmit->setEnabled(tmp->canSubmitSolution());
 }
 
 void AppWindow::onEditorFileChanged()
@@ -1550,3 +1557,9 @@ void AppWindow::onCompileOrRunTriggered()
     if (ui->actionEditorMode->isChecked())
         on_actionSplitMode_triggered();
 }
+
+void AppWindow::on_actionSubmit_triggered()
+{
+    if (currentWindow())
+        currentWindow()->submitSolution();
+}

src/appwindow.hpp

@@ -207,6 +207,8 @@ class AppWindow : public QMainWindow
 
     void onViewModeToggle();
 
+    void on_actionSubmit_triggered();
+
   private:
     Ui::AppWindow *ui;
     MessageLogger *activeLogger = nullptr;

src/mainwindow.cpp

@@ -701,6 +701,18 @@ void MainWindow::compileAndRun()
     compile();
 }
 
+void MainWindow::submitSolution()
+{
+    LOG_INFO("Requesting submit solution");
+    if (submitToCodeforces)
+        submitToCodeforces->click();
+}
+
+bool MainWindow::canSubmitSolution() const
+{
+    return submitToCodeforces != nullptr;
+}
+
 void MainWindow::formatSource(bool selectionOnly, bool logOnNoChange)
 {
     LOG_INFO("Requested code format");

src/mainwindow.hpp

@@ -105,6 +105,8 @@ class MainWindow : public QMainWindow
     void compileOnly();
     void runOnly();
     void compileAndRun();
+    void submitSolution();
+    bool canSubmitSolution() const;
     void formatSource(bool selectionOnly, bool logOnNoChange);
 
     void applyCompanion(const Extensions::CompanionData &data);

translations/ru_RU.ts

@@ -471,6 +471,14 @@ Git commit hash: %3
         <source>Full Screen</source>
         <translation>Полный экран</translation>
     </message>
+    <message>
+        <source>Submit</source>
+        <translation type="unfinished">Отправить</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+S</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeSnippetsPage</name>
@@ -737,6 +745,10 @@ Press any key to exit</source>
         <source>Contest %1 Problem %2</source>
         <translation>Соревнование %1 Задача %2</translation>
     </message>
+    <message>
+        <source>You are using CF Tool %1. Please update to CF tools 1.0 or above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Extensions::CodeFormatter</name>
@@ -2581,6 +2593,10 @@ You can learn about it by running `yapf --style-help`.</source>
         <source>Format the code when auto-saving it.</source>
         <translation>Форматировать код, когда он автоматически сохраняется.</translation>
     </message>
+    <message>
+        <source>Submit Solution</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShortcutItem</name>

translations/zh_CN.ts

@@ -471,6 +471,14 @@ git 提交编号: %3
         <source>Full Screen</source>
         <translation>全屏</translation>
     </message>
+    <message>
+        <source>Submit</source>
+        <translation type="unfinished">提交</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+S</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeSnippetsPage</name>
@@ -737,6 +745,10 @@ Press any key to exit</source>
         <source>Contest %1 Problem %2</source>
         <translation>比赛 %1 题目 %2</translation>
     </message>
+    <message>
+        <source>You are using CF Tool %1. Please update to CF tools 1.0 or above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Extensions::CodeFormatter</name>
@@ -2573,6 +2585,10 @@ You can learn about it by running `yapf --style-help`.</source>
         <source>Format the code when auto-saving it.</source>
         <translation>自动保存时格式化代码。</translation>
     </message>
+    <message>
+        <source>Submit Solution</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShortcutItem</name>

ui/appwindow.ui

@@ -45,7 +45,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -93,6 +93,7 @@
     <addaction name="separator"/>
     <addaction name="actionFormatCode"/>
     <addaction name="actionUseSnippets"/>
+    <addaction name="actionSubmit"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -491,6 +492,14 @@
     <string>Delete Log Files</string>
    </property>
   </action>
+  <action name="actionSubmit">
+   <property name="text">
+    <string>Submit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+S</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>