added Auto Resize and Click Through features

This commit is contained in:
Blu3train 2021-05-14 17:46:22 +02:00 committed by Akash Mozumdar
parent ad3f09d8ef
commit 2f08ab1e9b
2 changed files with 73 additions and 1 deletions

View File

@ -22,6 +22,8 @@ extern const char* OPACITY;
extern const char* SHOW_ORIGINAL; extern const char* SHOW_ORIGINAL;
extern const char* SHOW_ORIGINAL_INFO; extern const char* SHOW_ORIGINAL_INFO;
extern const char* SIZE_LOCK; extern const char* SIZE_LOCK;
extern const char* AUTO_RESIZE_WINDOW_HEIGHT;
extern const char* CLICK_THROUGH;
extern const char* DICTIONARY; extern const char* DICTIONARY;
extern const char* DICTIONARY_INSTRUCTIONS; extern const char* DICTIONARY_INSTRUCTIONS;
extern const char* BG_COLOR; extern const char* BG_COLOR;
@ -163,8 +165,10 @@ public:
for (auto [name, default, slot] : Array<const char*, bool, void(ExtraWindow::*)(bool)>{ for (auto [name, default, slot] : Array<const char*, bool, void(ExtraWindow::*)(bool)>{
{ TOPMOST, false, &ExtraWindow::SetTopmost }, { TOPMOST, false, &ExtraWindow::SetTopmost },
{ SIZE_LOCK, false, &ExtraWindow::SetLock }, { SIZE_LOCK, false, &ExtraWindow::SetLock },
{ AUTO_RESIZE_WINDOW_HEIGHT, false, &ExtraWindow::SetAutoResizeHeight },
{ SHOW_ORIGINAL, true, &ExtraWindow::SetShowOriginal }, { SHOW_ORIGINAL, true, &ExtraWindow::SetShowOriginal },
{ DICTIONARY, false, &ExtraWindow::SetUseDictionary }, { DICTIONARY, false, &ExtraWindow::SetUseDictionary },
{ CLICK_THROUGH, false, &ExtraWindow::SetClickThrough },
}) })
{ {
// delay processing anything until Textractor has finished initializing // delay processing anything until Textractor has finished initializing
@ -172,6 +176,12 @@ public:
auto action = menu.addAction(name, this, slot); auto action = menu.addAction(name, this, slot);
action->setCheckable(true); action->setCheckable(true);
action->setChecked(default); action->setChecked(default);
if (slot == &ExtraWindow::SetClickThrough)
{
action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T));
action->setShortcutContext(Qt::ApplicationShortcut);
addAction(action);
}
} }
menu.addAction(MAX_SENTENCE_SIZE, this, [this] menu.addAction(MAX_SENTENCE_SIZE, this, [this]
{ {
@ -201,6 +211,8 @@ public:
sentenceHistory.push_back(sentence); sentenceHistory.push_back(sentence);
historyIndex = sentenceHistory.size() - 1; historyIndex = sentenceHistory.size() - 1;
ui.display->setText(sentence); ui.display->setText(sentence);
AutoResize(sentence);
} }
private: private:
@ -217,6 +229,49 @@ private:
settings.setValue(SIZE_LOCK, this->locked = locked); settings.setValue(SIZE_LOCK, this->locked = locked);
}; };
void SetAutoResizeHeight(bool autoResizeHeight)
{
settings.setValue(AUTO_RESIZE_WINDOW_HEIGHT, this->autoResizeHeight = autoResizeHeight);
// If we disable this then we need to reset window to a default height. For now we will just use value from settings
if (!autoResizeHeight && settings.contains(WINDOW) && QApplication::screenAt(settings.value(WINDOW).toRect().bottomRight()))
{
setGeometry(settings.value(WINDOW).toRect());
}
};
void AutoResize(QString sentence)
{
if (!autoResizeHeight) return;
QFontMetrics fontMetrics(ui.display->font(), ui.display);
auto boundingRect = fontMetrics.boundingRect(0, 0, width(), INT_MAX, Qt::TextWordWrap, sentence);
int newHeight = boundingRect.height() + 30;
int currHeight = height();
if (newHeight != currHeight) {
QSize s = size();
s.setWidth(width());
s.setHeight(newHeight);
resize(s);
}
}
void SetClickThrough(bool clickThrough)
{
if (clickThrough)
{
setAttribute(Qt::WA_TransparentForMouseEvents, true);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
} else {
setAttribute(Qt::WA_TransparentForMouseEvents , false);
//setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint); // doesn't work
setWindowFlags(Qt::FramelessWindowHint);
SetTopmost(settings.value(TOPMOST, false).toBool());
}
show();
};
void SetShowOriginal(bool showOriginal) void SetShowOriginal(bool showOriginal)
{ {
if (!showOriginal && settings.value(SHOW_ORIGINAL, false).toBool()) QMessageBox::information(this, SHOW_ORIGINAL, SHOW_ORIGINAL_INFO); if (!showOriginal && settings.value(SHOW_ORIGINAL, false).toBool()) QMessageBox::information(this, SHOW_ORIGINAL, SHOW_ORIGINAL_INFO);
@ -298,9 +353,10 @@ private:
int scroll = event->angleDelta().y(); int scroll = event->angleDelta().y();
if (scroll > 0 && historyIndex > 0) ui.display->setText(sentenceHistory[--historyIndex]); if (scroll > 0 && historyIndex > 0) ui.display->setText(sentenceHistory[--historyIndex]);
if (scroll < 0 && historyIndex + 1 < sentenceHistory.size()) ui.display->setText(sentenceHistory[++historyIndex]); if (scroll < 0 && historyIndex + 1 < sentenceHistory.size()) ui.display->setText(sentenceHistory[++historyIndex]);
AutoResize(sentenceHistory[historyIndex]);
} }
bool locked, showOriginal, useDictionary; bool locked, autoResizeHeight, showOriginal, useDictionary, clickThrough;
int maxSentenceSize = 1000; int maxSentenceSize = 1000;
QPoint oldPos; QPoint oldPos;

View File

@ -179,6 +179,8 @@ const char* SHOW_ORIGINAL = u8"Original text";
const char* SHOW_ORIGINAL_INFO = u8R"(Original text will not be shown const char* SHOW_ORIGINAL_INFO = u8R"(Original text will not be shown
Only works if this extension is used directly after a translation extension)"; Only works if this extension is used directly after a translation extension)";
const char* SIZE_LOCK = u8"Size lock"; const char* SIZE_LOCK = u8"Size lock";
const char* AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
const char* CLICK_THROUGH = u8"Click Through";
const char* OPACITY = u8"Opacity"; const char* OPACITY = u8"Opacity";
const char* BG_COLOR = u8"Background color"; const char* BG_COLOR = u8"Background color";
const char* TEXT_COLOR = u8"Text color"; const char* TEXT_COLOR = u8"Text color";
@ -435,6 +437,8 @@ Clic y arrastra los bordes de la ventana para moverla, o en la esquina inferior
使)"; 使)";
OPACITY = u8"透明度"; OPACITY = u8"透明度";
SIZE_LOCK = u8"锁定窗口大小"; SIZE_LOCK = u8"锁定窗口大小";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
BG_COLOR = u8"背景颜色"; BG_COLOR = u8"背景颜色";
TEXT_COLOR = u8"文本颜色"; TEXT_COLOR = u8"文本颜色";
TEXT_OUTLINE = u8"文字边框"; TEXT_OUTLINE = u8"文字边框";
@ -624,6 +628,8 @@ Textractor отобразит конечный корневой термин, а
SHOW_ORIGINAL_INFO = u8R"(Исходный текст будет скрыт SHOW_ORIGINAL_INFO = u8R"(Исходный текст будет скрыт
Работает только если это расширение используется после расширения перевода)"; Работает только если это расширение используется после расширения перевода)";
SIZE_LOCK = u8"Фиксированный размер"; SIZE_LOCK = u8"Фиксированный размер";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
OPACITY = u8"Прозрачность"; OPACITY = u8"Прозрачность";
BG_COLOR = u8"Цвет заднего фона"; BG_COLOR = u8"Цвет заднего фона";
TEXT_COLOR = u8"Цвет текста"; TEXT_COLOR = u8"Цвет текста";
@ -884,6 +890,8 @@ Questo file deve essere codificato in UTF-8.)";
SHOW_ORIGINAL_INFO = u8R"(Testo originale non sarà mostrato SHOW_ORIGINAL_INFO = u8R"(Testo originale non sarà mostrato
Funziona solo se questa estenzione è usata direttamente dopo un'estensione di traduzione)"; Funziona solo se questa estenzione è usata direttamente dopo un'estensione di traduzione)";
SIZE_LOCK = u8"Lock delle dimensione"; SIZE_LOCK = u8"Lock delle dimensione";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize altezza finestra";
CLICK_THROUGH = u8"Clicca attraverso";
OPACITY = u8"Opacità"; OPACITY = u8"Opacità";
BG_COLOR = u8"Colore dello sfondo"; BG_COLOR = u8"Colore dello sfondo";
TEXT_COLOR = u8"Colore del testo"; TEXT_COLOR = u8"Colore del testo";
@ -998,6 +1006,8 @@ Clique e arraste nas beiradas da janela para mover, ou no canto inferior direito
SHOW_ORIGINAL_INFO = u8R"(Texto original não será mostrado SHOW_ORIGINAL_INFO = u8R"(Texto original não será mostrado
Apenas funciona se essa extensão for usada diretamente após uma extensão de tradução)"; Apenas funciona se essa extensão for usada diretamente após uma extensão de tradução)";
SIZE_LOCK = u8"Travar o Tamanho"; SIZE_LOCK = u8"Travar o Tamanho";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
BG_COLOR = u8"Cor de fundo"; BG_COLOR = u8"Cor de fundo";
TEXT_COLOR = u8"Cor do Texto"; TEXT_COLOR = u8"Cor do Texto";
FONT = u8"Fonte"; FONT = u8"Fonte";
@ -1073,6 +1083,8 @@ Source code สามารถหาได้จากส่วนของ GPLv
TOPMOST = u8"หน้าต่างอยู่บนโปรแกรมอื่น"; TOPMOST = u8"หน้าต่างอยู่บนโปรแกรมอื่น";
SHOW_ORIGINAL = u8"ข้อความดังเดิมก่อนแปลภาษา"; SHOW_ORIGINAL = u8"ข้อความดังเดิมก่อนแปลภาษา";
SIZE_LOCK = u8"ปรับให้ไม่สามารถเปลี่ยนขนาดได้"; SIZE_LOCK = u8"ปรับให้ไม่สามารถเปลี่ยนขนาดได้";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
FONT = u8"ฟ้อนต์"; FONT = u8"ฟ้อนต์";
#endif // THAI #endif // THAI
@ -1138,6 +1150,8 @@ Source code สามารถหาได้จากส่วนของ GPLv
SHOW_ORIGINAL_INFO = u8R"(원문이 출력되지 않음 SHOW_ORIGINAL_INFO = u8R"(원문이 출력되지 않음
)"; )";
SIZE_LOCK = u8"사이즈 고정"; SIZE_LOCK = u8"사이즈 고정";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
BG_COLOR = u8"배경색"; BG_COLOR = u8"배경색";
TEXT_COLOR = u8"글씨색"; TEXT_COLOR = u8"글씨색";
FONT = u8"폰트"; FONT = u8"폰트";
@ -1303,6 +1317,8 @@ Ce fichier doit être encodé en UTF-8.)";
SHOW_ORIGINAL_INFO = u8R"(Le texte d'origine ne sera pas affiché SHOW_ORIGINAL_INFO = u8R"(Le texte d'origine ne sera pas affiché
Fonctionne uniquement si cette extension est utilisée directement après une extension de traduction)"; Fonctionne uniquement si cette extension est utilisée directement après une extension de traduction)";
SIZE_LOCK = u8"Verouiller la taille"; SIZE_LOCK = u8"Verouiller la taille";
AUTO_RESIZE_WINDOW_HEIGHT = u8"Auto resize window height";
CLICK_THROUGH = u8"Click Through";
OPACITY = u8"Opacité"; OPACITY = u8"Opacité";
BG_COLOR = u8"Couleur d'arrière-plan"; BG_COLOR = u8"Couleur d'arrière-plan";
TEXT_COLOR = u8"Couleur du texte"; TEXT_COLOR = u8"Couleur du texte";