blob: ff0c0bc0f6c50eb8ba19884a599623d00ea9ed24 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
commit ca2b5f22bedec6dbfa85863e8611ac6c40f1174c
Author: David Rosca <nowrep@gmail.com>
Date: Sun Dec 3 10:13:10 2017 +0100
SearchToolbar: Don't set shortcuts from UI file
Fixes build with Qt 5.10
Closes #2515
--- src/lib/webtab/searchtoolbar.cpp.orig 2015-11-11 15:13:24 UTC
+++ src/lib/webtab/searchtoolbar.cpp
@@ -35,7 +35,9 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* p
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown));
+ ui->next->setShortcut(QKeySequence("Ctrl+G"));
ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp));
+ ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G"));
connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide()));
connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext()));
--- src/lib/webtab/searchtoolbar.ui.orig 2015-11-11 15:13:24 UTC
+++ src/lib/webtab/searchtoolbar.ui
@@ -64,9 +64,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="shortcut">
- <string notr="true">Ctrl+Shift+G</string>
- </property>
<property name="autoRaise">
<bool>true</bool>
</property>
@@ -79,9 +76,6 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- </property>
- <property name="shortcut">
- <string notr="true">Ctrl+G</string>
</property>
<property name="autoRaise">
<bool>true</bool>
|
