Differential D18164 Diff 49636 src/dialogs/katedialogs.cpp

Changeset View

Standalone View

View Options

src/dialogs/katedialogs.cpp

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)
65#include <KLineEdit> 65​#include <KLineEdit>
66#include <KMessageBox> 66​#include <KMessageBox>
67#include <KProcess> 67​#include <KProcess>
68#include <KRun> 68​#include <KRun>
69#include <KSeparator> 69​#include <KSeparator>
70#include <KActionCollection> 70​#include <KActionCollection>
71 71​
72#include <QFile> 72​#include <QFile>
73​#include <QClipboard>
73#include <QMap> 74​#include <QMap>
74#include <QStringList> 75​#include <QStringList>
75#include <QTextCodec> 76​#include <QTextCodec>
76#include <QTextStream> 77​#include <QTextStream>
77#include <QTemporaryFile> 78​#include <QTemporaryFile>
78#include <QKeyEvent> 79​#include <QKeyEvent>
79#include <QPainter> 80​#include <QPainter>
80#include <QCheckBox> 81​#include <QCheckBox>
▲ Show 20 Lines • Show All 182 Lines • ▼ Show 20 Line(s)
1062KateGotoBar::KateGotoBar(KTextEditor::View *view, QWidget *parent) 1063​KateGotoBar::KateGotoBar(KTextEditor::View *view, QWidget *parent)
1063 : KateViewBarWidget(true, parent) 1064​ : KateViewBarWidget(true, parent)
1064 , m_view(view) 1065​ , m_view(view)
1065{ 1066​{
1066 Q_ASSERT(m_view != nullptr); // this bar widget is pointless w/o a view 1067​ Q_ASSERT(m_view != nullptr); // this bar widget is pointless w/o a view
1067 1068​
1068 QHBoxLayout *topLayout = new QHBoxLayout(centralWidget()); 1069​ QHBoxLayout *topLayout = new QHBoxLayout(centralWidget());
1069 topLayout->setMargin(0); 1070​ topLayout->setMargin(0);
1070 gotoRange = new QSpinBox(centralWidget()); ​
1071 1071​
1072 QLabel *label = new QLabel(i18n("&Go to line:"), centralWidget()); 1072​ QToolButton *btn = new QToolButton(this);
1073 label->setBuddy(gotoRange); 1073​ btn->setAutoRaise(true);
1074​ btn->setMinimumSize(QSize(1, btn->minimumSizeHint().height()));
1075​ btn->setText(i18n("&Line:"));
1076​ btn->setToolTip(i18n("Go to line number from clipboard"));
1077​ connect(btn, &QToolButton::clicked, this, &KateGotoBar::gotoClipboard);
1078​ topLayout->addWidget(btn);
1079​
1080​ m_gotoRange = new QSpinBox(this);
1081​ m_gotoRange->setMinimum(1);
1082​ topLayout->addWidget(m_gotoRange, 1);
1083​ topLayout->setStretchFactor(m_gotoRange, 0);
1084​
1085​ btn = new QToolButton(this);
1086​ btn->setAutoRaise(true);
1087​ btn->setMinimumSize(QSize(1, btn->minimumSizeHint().height()));
1088​ btn->setText(i18n("Go to"));
1089​ btn->setIcon(QIcon::fromTheme(QStringLiteral("go-jump")));
1090​ btn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
1091​ connect(btn, &QToolButton::clicked, this, &KateGotoBar::gotoLine);
1092​ topLayout->addWidget(btn);
1093​
1094​ btn = m_modifiedUp = new QToolButton(this);
1095​ btn->setAutoRaise(true);
1096​ btn->setMinimumSize(QSize(1, btn->minimumSizeHint().height()));
1097​ btn->setDefaultAction(m_view->action("modified_line_up"));
1098​ btn->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search")));
1099​ btn->setText(QString());
dhaumannUnsubmitted
Not Done

Please always use QString() in favor of QStringLiteral("")

dhaumann: Please always use QString() in favor of QStringLiteral("")
1100​ btn->installEventFilter(this);
1101​ topLayout->addWidget(btn);
1102​
1103​ btn = m_modifiedDown = new QToolButton(this);
1104​ btn->setAutoRaise(true);
1105​ btn->setMinimumSize(QSize(1, btn->minimumSizeHint().height()));
1106​ btn->setDefaultAction(m_view->action("modified_line_down"));
1107​ btn->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search")));
1108​ btn->setText(QString());
1109​ btn->installEventFilter(this);
1110​ topLayout->addWidget(btn);
1074 1111​
1075 QToolButton *btnOK = new QToolButton(centralWidget()); ​
1076 btnOK->setAutoRaise(true); ​
1077 btnOK->setIcon(QIcon::fromTheme(QStringLiteral("go-jump"))); ​
1078 btnOK->setText(i18n("Go")); ​
1079 btnOK->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); ​
1080 connect(btnOK, SIGNAL(clicked()), this, SLOT(gotoLine())); ​
1081 ​
1082 topLayout->addWidget(label); ​
1083 topLayout->addWidget(gotoRange, 1); ​
1084 topLayout->setStretchFactor(gotoRange, 0); ​
1085 topLayout->addWidget(btnOK); ​
1086 topLayout->addStretch(); 1112​ topLayout->addStretch();
1087 1113​
1088 setFocusProxy(gotoRange); 1114​ setFocusProxy(m_gotoRange);
1115​}
1116​
1117​bool KateGotoBar::eventFilter(QObject *object, QEvent *event)
1118​{
1119​ if (object == m_modifiedUp || object == m_modifiedDown) {
1120​ if (event->type() != QEvent::Wheel) {
1121​ return false;
1122​ }
1123​
1124​ int delta = static_cast<QWheelEvent *>(event)->delta();
1125​ // Reset m_wheelDelta when scroll direction change
1126​ if (m_wheelDelta != 0 && (m_wheelDelta < 0) != (delta < 0)) {
1127​ m_wheelDelta = 0;
1128​ }
1129​
1130​ m_wheelDelta += delta;
anthonyfieroniUnsubmitted
Not Done

https://doc.qt.io/qt-5/qwheelevent.html#angleDelta
It should be 120, also you can have 2 separate delta members

anthonyfieroni: https://doc.qt.io/qt-5/qwheelevent.html#angleDelta It should be 120, also you can have 2…
loh.tarAuthorUnsubmitted
Not Done

It should be 120,

Why? Have now read the doc, but without a new insight.

also you can have 2 separate delta members

How and why?

loh.tar: > It should be 120, Why? Have now read the doc, but without a new insight. > also you can have…
anthonyfieroniUnsubmitted
Not Done

you can either cumulatively add the delta values from events until the value of 120 is reached

I don't know what is unclear, it should be 120 not any other value.

if (object == m_ModifiedUp) {
    m_deltaUp += event->delta();
    if (m_deltaUp >= 120) {
        m_ModifiedUp->click();
}

and so on. If not do it right you can end up in partial value when it used finer-resolution wheels and mishmash.

anthonyfieroni: > you can either cumulatively add the delta values from events until the value of 120 is…
cullmannUnsubmitted
Not Done

I think 120 would be better to use, as that is the value one should start to handle given the docs.
I would not use a static delta but just have the delta as member of the class.

cullmann: I think 120 would be better to use, as that is the value one should start to handle given the…
1131​
1132​ if (m_wheelDelta >= 120) {
1133​ m_wheelDelta = 0;
1134​ m_modifiedUp->click();
1135​ } else if (m_wheelDelta <= -120) {
1136​ m_wheelDelta = 0;
1137​ m_modifiedDown->click();
1138​ }
1139​ }
1140​
1141​ return false;
1142​}
1143​
1144​void KateGotoBar::gotoClipboard()
1145​{
1146​ QRegularExpression rx(QStringLiteral("\\d+"));
1147​ int lineNo = rx.match(QApplication::clipboard()->text(QClipboard::Selection)).captured().toInt();
1148​ if (lineNo <= m_gotoRange->maximum() && lineNo >= 1) {
1149​ m_gotoRange->setValue(lineNo);
1150​ gotoLine();
1151​ } else {
1152​ QPointer<KTextEditor::Message> message = new KTextEditor::Message(
1153​ i18n("No valid line number found in clipboard"));
1154​ message->setWordWrap(true);
1155​ message->setAutoHide(2000);
1156​ message->setPosition(KTextEditor::Message::BottomInView);
dhaumannUnsubmitted
Not Done

You should also call message->setView(m_view), otherwise the message appears in all views, in case you have multiple views of a document.

dhaumann: You should also call message->setView(m_view), otherwise the message appears in all views, in…
1157​ message->setView(m_view),
1158​ m_view->document()->postMessage(message);
1159​ }
1089} 1160​}
1090 1161​
1091void KateGotoBar::updateData() 1162​void KateGotoBar::updateData()
1092{ 1163​{
1093 gotoRange->setMaximum(m_view->document()->lines()); 1164​ m_gotoRange->setMaximum(m_view->document()->lines());
1094 if (!isVisible()) { 1165​ if (!isVisible()) {
1095 gotoRange->setValue(m_view->cursorPosition().line() + 1); 1166​ m_gotoRange->setValue(m_view->cursorPosition().line() + 1);
1096 gotoRange->adjustSize(); // ### does not respect the range :-( 1167​ m_gotoRange->adjustSize(); // ### does not respect the range :-(
1097 } 1168​ }
1098 gotoRange->setFocus(Qt::OtherFocusReason); 1169​ m_gotoRange->setFocus(Qt::OtherFocusReason);
1099 gotoRange->selectAll(); 1170​ m_gotoRange->selectAll();
1100} 1171​}
1101 1172​
1102void KateGotoBar::keyPressEvent(QKeyEvent *event) 1173​void KateGotoBar::keyPressEvent(QKeyEvent *event)
1103{ 1174​{
1104 int key = event->key(); 1175​ int key = event->key();
1105 if (key == Qt::Key_Return || key == Qt::Key_Enter) { 1176​ if (key == Qt::Key_Return || key == Qt::Key_Enter) {
1106 gotoLine(); 1177​ gotoLine();
1107 return; 1178​ return;
1108 } 1179​ }
1109 KateViewBarWidget::keyPressEvent(event); 1180​ KateViewBarWidget::keyPressEvent(event);
1110} 1181​}
1111 1182​
1112void KateGotoBar::gotoLine() 1183​void KateGotoBar::gotoLine()
1113{ 1184​{
1114 KTextEditor::ViewPrivate *kv = qobject_cast<KTextEditor::ViewPrivate *>(m_view); 1185​ KTextEditor::ViewPrivate *kv = qobject_cast<KTextEditor::ViewPrivate *>(m_view);
1115 if (kv && kv->selection() && !kv->config()->persistentSelection()) { 1186​ if (kv && kv->selection() && !kv->config()->persistentSelection()) {
1116 kv->clearSelection(); 1187​ kv->clearSelection();
1117 } 1188​ }
1118 1189​
1119 m_view->setCursorPosition(KTextEditor::Cursor(gotoRange->value() - 1, 0)); 1190​ m_view->setCursorPosition(KTextEditor::Cursor(m_gotoRange->value() - 1, 0));
1120 m_view->setFocus(); 1191​ m_view->setFocus();
1121 emit hideMe(); 1192​ emit hideMe();
1122} 1193​}
1123//END KateGotoBar 1194​//END KateGotoBar
1124 1195​
1125//BEGIN KateDictionaryBar 1196​//BEGIN KateDictionaryBar
1126KateDictionaryBar::KateDictionaryBar(KTextEditor::ViewPrivate *view, QWidget *parent) 1197​KateDictionaryBar::KateDictionaryBar(KTextEditor::ViewPrivate *view, QWidget *parent)
1127 : KateViewBarWidget(true, parent) 1198​ : KateViewBarWidget(true, parent)
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines