Skip to content

fix: Remove the "Translate" option #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jul 24, 2025
Merged

fix: Remove the "Translate" option #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/editor/dtextedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void TextEdit::initRightClickedMenu()
m_toggleCommentAction = new QAction(tr("Add Comment"), this);
m_voiceReadingAction = new QAction(tr("Text to Speech"), this);
m_dictationAction = new QAction(tr("Speech to Text"), this);
m_translateAction = new QAction(tr("Translate"), this);
// m_translateAction = new QAction(tr("Translate"), this);
m_columnEditAction = new QAction(tr("Column Mode"), this);
m_addBookMarkAction = new QAction(tr("Add bookmark"), this);
m_cancelBookMarkAction = new QAction(tr("Remove Bookmark"), this);
Expand Down Expand Up @@ -375,7 +375,7 @@ void TextEdit::initRightClickedMenu()
connect(m_cancelComment, &QAction::triggered, this, &TextEdit::slotCancelComment);
connect(m_voiceReadingAction, &QAction::triggered, this, &TextEdit::slotVoiceReadingAction);
connect(m_dictationAction, &QAction::triggered, this, &TextEdit::slotdictationAction);
connect(m_translateAction, &QAction::triggered, this, &TextEdit::slot_translate);
// connect(m_translateAction, &QAction::triggered, this, &TextEdit::slot_translate);
connect(m_columnEditAction, &QAction::triggered, this, &TextEdit::slotColumnEditAction);
connect(m_addBookMarkAction, &QAction::triggered, this, &TextEdit::addOrDeleteBookMark);
connect(m_cancelBookMarkAction, &QAction::triggered, this, &TextEdit::addOrDeleteBookMark);
Expand Down Expand Up @@ -585,7 +585,7 @@ void TextEdit::popRightMenu(QPoint pos)
} else {
m_dictationAction->setEnabled(true);
}

/*
m_translateAction->setEnabled(false);
bool translateState = false;
QDBusMessage translateReadingMsg = QDBusMessage::createMethodCall("com.iflytek.aiassistant",
Expand All @@ -604,6 +604,7 @@ void TextEdit::popRightMenu(QPoint pos)
if ((textCursor().hasSelection() && translateState) || m_hasColumnSelection) {
m_translateAction->setEnabled(translateState);
}
*/
if (!this->document()->isEmpty()) {

m_colorMarkMenu->clear();
Expand Down Expand Up @@ -3800,10 +3801,10 @@ void TextEdit::restoreMarkStatus()
}


void TextEdit::slot_translate()
{
QProcess::startDetached("dbus-send --print-reply --dest=com.iflytek.aiassistant /aiassistant/deepinmain com.iflytek.aiassistant.mainWindow.TextToTranslate");
}
// void TextEdit::slot_translate()
// {
// QProcess::startDetached("dbus-send --print-reply --dest=com.iflytek.aiassistant /aiassistant/deepinmain com.iflytek.aiassistant.mainWindow.TextToTranslate");
// }

QString TextEdit::getWordAtCursor()
{
Expand Down Expand Up @@ -5663,9 +5664,9 @@ bool TextEdit::eventFilter(QObject *object, QEvent *event)
QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
QMouseEvent *event2 = static_cast<QMouseEvent *>(event);
DPlainTextEdit::mousePressEvent(event2);
if (touchPoints.count() == 3) {
slot_translate();
}
// if (touchPoints.count() == 3) {
// slot_translate();
// }
break;
}
default: break;
Expand Down Expand Up @@ -6387,9 +6388,9 @@ void TextEdit::onSelectionArea()

void TextEdit::fingerZoom(QString name, QString direction, int fingers)
{
if (name == "tap" && fingers == 3) {
slot_translate();
}
// if (name == "tap" && fingers == 3) {
// slot_translate();
// }
// 当前窗口被激活,且有焦点
if (hasFocus()) {
if (name == "pinch" && fingers == 2) {
Expand Down
4 changes: 2 additions & 2 deletions src/editor/dtextedit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ public slots:
void handleScrollFinish();
void setSyntaxDefinition(KSyntaxHighlighting::Definition def);

void slot_translate();
// void slot_translate();

//书签右键菜单功能
void setHighLineCurrentLine(bool ok);
Expand Down Expand Up @@ -677,7 +677,7 @@ private slots:
QAction *m_toggleCommentAction;
QAction *m_voiceReadingAction;
QAction *m_dictationAction;
QAction *m_translateAction;
// QAction *m_translateAction;
QAction *m_columnEditAction;

QAction *m_addBookMarkAction;
Expand Down
38 changes: 19 additions & 19 deletions tests/src/editor/ut_textedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4835,25 +4835,25 @@ TEST_F(test_textedit, handleScrollFinish)
}

// void slot_translate();
TEST_F(test_textedit, slot_translate)
{
QList<QTextEdit::ExtraSelection> listSelection;
QTextEdit::ExtraSelection selectio;
QScrollBar *p = new QScrollBar();
TextEdit *startManager = new TextEdit();
startManager->setVerticalScrollBar(p);
EditWrapper *ee = new EditWrapper();
Settings *s = new Settings();
startManager->setSettings(s);
startManager->setWrapper(ee);
startManager->slot_translate();

EXPECT_NE(ee->m_pTextEdit , nullptr);
s->deleteLater();
ee->deleteLater();
startManager->deleteLater();
p->deleteLater();
}
// TEST_F(test_textedit, slot_translate)
// {
// QList<QTextEdit::ExtraSelection> listSelection;
// QTextEdit::ExtraSelection selectio;
// QScrollBar *p = new QScrollBar();
// TextEdit *startManager = new TextEdit();
// startManager->setVerticalScrollBar(p);
// EditWrapper *ee = new EditWrapper();
// Settings *s = new Settings();
// startManager->setSettings(s);
// startManager->setWrapper(ee);
// startManager->slot_translate();

// EXPECT_NE(ee->m_pTextEdit , nullptr);
// s->deleteLater();
// ee->deleteLater();
// startManager->deleteLater();
// p->deleteLater();
// }

#if 0 //gerrit上段错误，暂且屏蔽
// void upcaseWord();
Expand Down
Loading