Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
fingerterm
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core
fingerterm
Commits
24efd650
Commit
24efd650
authored
Jul 17, 2013
by
John Brooks
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP Port to QtQuick2
parent
fed2dfbc
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
87 additions
and
97 deletions
+87
-97
dbusadaptor.cpp
dbusadaptor.cpp
+1
-2
fingerterm.pro
fingerterm.pro
+1
-1
keyloader.h
keyloader.h
+0
-1
main.cpp
main.cpp
+11
-16
mainwindow.cpp
mainwindow.cpp
+5
-4
mainwindow.h
mainwindow.h
+3
-3
qml/Button.qml
qml/Button.qml
+1
-1
qml/Key.qml
qml/Key.qml
+1
-1
qml/Keyboard.qml
qml/Keyboard.qml
+1
-1
qml/LayoutWindow.qml
qml/LayoutWindow.qml
+1
-1
qml/Lineview.qml
qml/Lineview.qml
+1
-1
qml/Main.qml
qml/Main.qml
+1
-3
qml/Menu.qml
qml/Menu.qml
+2
-1
qml/NotifyWin.qml
qml/NotifyWin.qml
+1
-1
qml/UrlWindow.qml
qml/UrlWindow.qml
+1
-1
rpm/fingerterm.spec
rpm/fingerterm.spec
+3
-2
terminal.cpp
terminal.cpp
+3
-3
terminal.h
terminal.h
+3
-3
textrender.cpp
textrender.cpp
+7
-10
textrender.h
textrender.h
+12
-15
util.cpp
util.cpp
+26
-24
util.h
util.h
+2
-2
No files found.
dbusadaptor.cpp
View file @
24efd650
...
...
@@ -17,8 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QApplication>
#include <QWidget>
#include <QGuiApplication>
#include "dbusadaptor.h"
#include "mainwindow.h"
...
...
fingerterm.pro
View file @
24efd650
QT
=
core
gui
declarative
opengl
dbus
QT
=
core
gui
qml
quick
dbus
contains
(
MEEGO_EDITION
,
harmattan
)
:
{
CONFIG
+=
meegotouch
...
...
keyloader.h
View file @
24efd650
...
...
@@ -21,7 +21,6 @@
#define KEYLOADER_H
#include <QtCore>
#include <QtDeclarative>
class
Util
;
...
...
main.cpp
View file @
24efd650
...
...
@@ -20,8 +20,7 @@
#include "qplatformdefs.h"
#include <QtGui>
#include <QtDeclarative>
#include <QtOpenGL>
#include <QtQml>
extern
"C"
{
#include <pty.h>
...
...
@@ -52,7 +51,7 @@ int main(int argc, char *argv[])
QSettings
*
settings
=
new
QSettings
(
QDir
::
homePath
()
+
"/.config/FingerTerm/settings.ini"
,
QSettings
::
IniFormat
);
defaultSettings
(
settings
);
// fork the child process before creating QApplication
// fork the child process before creating Q
Gui
Application
int
socketM
;
int
pid
=
forkpty
(
&
socketM
,
NULL
,
NULL
,
NULL
);
if
(
pid
==-
1
)
{
...
...
@@ -94,7 +93,7 @@ int main(int argc, char *argv[])
exit
(
0
);
}
QApplication
app
(
argc
,
argv
);
Q
Gui
Application
app
(
argc
,
argv
);
qmlRegisterType
<
TextRender
>
(
"TextRender"
,
1
,
0
,
"TextRender"
);
MainWindow
view
;
...
...
@@ -107,14 +106,6 @@ int main(int argc, char *argv[])
MComponentData
::
createInstance
(
argc
,
argv
,
"fingerterm"
,
dba
);
#endif
#ifdef MEEGO_EDITION_HARMATTAN
if
(
!
app
.
arguments
().
contains
(
"-nogl"
))
{
view
.
setViewport
(
new
QGLWidget
(
QGLFormat
(
QGL
::
DoubleBuffer
)));
view
.
setViewportUpdateMode
(
QGraphicsView
::
FullViewportUpdate
);
}
#endif
view
.
setResizeMode
(
QDeclarativeView
::
SizeRootObjectToView
);
Terminal
term
;
Util
util
(
settings
);
term
.
setUtil
(
&
util
);
...
...
@@ -137,7 +128,7 @@ int main(int argc, char *argv[])
qFatal
(
"failure loading keyboard layout"
);
}
Q
DeclarativeContext
*
context
=
view
.
rootContext
();
Q
QmlContext
*
context
=
view
.
rootContext
();
context
->
setContextProperty
(
"term"
,
&
term
);
context
->
setContextProperty
(
"util"
,
&
util
);
context
->
setContextProperty
(
"keyLoader"
,
&
keyLoader
);
...
...
@@ -159,7 +150,7 @@ int main(int argc, char *argv[])
util
.
setWindow
(
&
view
);
util
.
setTerm
(
&
term
);
util
.
setRenderer
(
tr
);
view
.
scene
()
->
installEventFilter
(
&
util
);
//for grabbing mouse drags
view
.
installEventFilter
(
&
util
);
//for grabbing mouse drags
QObject
::
connect
(
&
term
,
SIGNAL
(
displayBufferChanged
()),
win
,
SLOT
(
displayBufferChanged
()));
QObject
::
connect
(
view
.
engine
(),
SIGNAL
(
quit
()),
&
app
,
SLOT
(
quit
()));
...
...
@@ -167,10 +158,14 @@ int main(int argc, char *argv[])
#ifdef MEEGO_EDITION_HARMATTAN
view
.
showFullScreen
();
#else
if
((
QApplication
::
desktop
()
->
width
()
<
1024
||
QApplication
::
desktop
()
->
height
()
<
768
||
app
.
arguments
().
contains
(
"-fs"
))
QSize
screenSize
=
QGuiApplication
::
primaryScreen
()
->
size
();
view
.
rootObject
()
->
setWidth
(
screenSize
.
width
());
view
.
rootObject
()
->
setHeight
(
screenSize
.
height
());
if
((
screenSize
.
width
()
<
1024
||
screenSize
.
height
()
<
768
||
app
.
arguments
().
contains
(
"-fs"
))
&&
!
app
.
arguments
().
contains
(
"-nofs"
))
{
view
.
showFullScreen
();
else
}
else
view
.
show
();
#endif
...
...
mainwindow.cpp
View file @
24efd650
...
...
@@ -30,8 +30,9 @@
#include <X11/Xatom.h>
#endif //MEEGO_EDITION_HARMATTAN
MainWindow
::
MainWindow
(
QWidget
*
parent
)
:
QDeclarativeView
(
parent
)
MainWindow
::
MainWindow
()
{
// setResizeMode(SizeRootObjectToView);
}
MainWindow
::~
MainWindow
()
...
...
@@ -40,19 +41,19 @@ MainWindow::~MainWindow()
void
MainWindow
::
focusInEvent
(
QFocusEvent
*
event
)
{
Q
Declarative
View
::
focusInEvent
(
event
);
Q
Quick
View
::
focusInEvent
(
event
);
emit
focusChanged
(
true
);
}
void
MainWindow
::
focusOutEvent
(
QFocusEvent
*
event
)
{
Q
Declarative
View
::
focusOutEvent
(
event
);
Q
Quick
View
::
focusOutEvent
(
event
);
emit
focusChanged
(
false
);
}
void
MainWindow
::
minimize
()
{
setWindowState
(
windowState
()
|
Qt
::
WindowMinimized
);
setWindowState
(
Qt
::
WindowMinimized
);
}
void
MainWindow
::
disableSwipe
()
...
...
mainwindow.h
View file @
24efd650
...
...
@@ -20,13 +20,13 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <Q
Declarative
View>
#include <Q
Quick
View>
class
MainWindow
:
public
Q
Declarative
View
class
MainWindow
:
public
Q
Quick
View
{
Q_OBJECT
public:
explicit
MainWindow
(
QWidget
*
parent
=
0
);
explicit
MainWindow
();
virtual
~
MainWindow
();
void
minimize
();
...
...
qml/Button.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
button
...
...
qml/Key.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
key
...
...
qml/Keyboard.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
keyboard
...
...
qml/LayoutWindow.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
layoutWindow
...
...
qml/Lineview.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
lineView
...
...
qml/Main.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
import
TextRender
1.0
Rectangle
{
...
...
@@ -32,8 +32,6 @@ Rectangle {
id
:
window
objectName
:
"
window
"
width
:
854
height
:
480
color
:
bgcolor
NotifyWin
{
...
...
qml/Menu.qml
View file @
24efd650
...
...
@@ -17,7 +17,8 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
import
QtQuick
.
XmlListModel
2.0
Rectangle
{
id
:
menuWin
...
...
qml/NotifyWin.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
notifyWin
...
...
qml/UrlWindow.qml
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
import
QtQuick
1.1
import
QtQuick
2.0
Rectangle
{
id
:
urlWindow
...
...
rpm/fingerterm.spec
View file @
24efd650
...
...
@@ -9,8 +9,9 @@ URL: https://github.com/nemomobile/fingerterm
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Declarative)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
Requires: qt5-qtdeclarative-import-xmllistmodel
Obsoletes: meego-terminal <= 0.2.2
Provides: meego-terminal > 0.2.2
...
...
terminal.cpp
View file @
24efd650
...
...
@@ -17,7 +17,7 @@
along with FingerTerm. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QApplication>
#include <Q
Gui
Application>
#include <QClipboard>
#include "terminal.h"
...
...
@@ -1142,7 +1142,7 @@ void Terminal::resetTabs()
void
Terminal
::
pasteFromClipboard
()
{
QClipboard
*
cb
=
QApplication
::
clipboard
();
QClipboard
*
cb
=
Q
Gui
Application
::
clipboard
();
if
(
cb
->
mimeData
()
->
hasText
()
&&
!
cb
->
mimeData
()
->
text
().
isEmpty
())
{
if
(
iPtyIFace
)
{
resetBackBufferScrollPos
();
...
...
@@ -1275,7 +1275,7 @@ void Terminal::copySelectionToClipboard()
if
(
selection
().
isNull
())
return
;
QClipboard
*
cb
=
QApplication
::
clipboard
();
QClipboard
*
cb
=
Q
Gui
Application
::
clipboard
();
cb
->
clear
();
QString
text
;
...
...
terminal.h
View file @
24efd650
...
...
@@ -21,11 +21,11 @@
#define TERMINAL_H
#include <QtCore>
#include <QWidget>
class
TextRender
;
class
PtyIFace
;
class
Util
;
class
QQuickView
;
struct
TermChar
{
QChar
c
;
...
...
@@ -62,7 +62,7 @@ public:
virtual
~
Terminal
()
{}
void
setRenderer
(
TextRender
*
tr
);
void
setPtyIFace
(
PtyIFace
*
pty
);
void
setWindow
(
Q
Widget
*
win
)
{
iWindow
=
win
;
}
void
setWindow
(
Q
QuickView
*
win
)
{
iWindow
=
win
;
}
void
setUtil
(
Util
*
util
)
{
iUtil
=
util
;
}
void
insertInBuffer
(
const
QString
&
chars
);
...
...
@@ -128,7 +128,7 @@ private:
TextRender
*
iRenderer
;
PtyIFace
*
iPtyIFace
;
Q
Widget
*
iWindow
;
Q
QuickView
*
iWindow
;
Util
*
iUtil
;
QList
<
QList
<
TermChar
>
>
iBuffer
;
...
...
textrender.cpp
View file @
24efd650
...
...
@@ -22,15 +22,15 @@
#include "terminal.h"
#include "util.h"
TextRender
::
TextRender
(
Q
Declarative
Item
*
parent
)
:
Q
Declarative
Item
(
parent
),
TextRender
::
TextRender
(
Q
Quick
Item
*
parent
)
:
Q
QuickPainted
Item
(
parent
),
iTerm
(
0
),
iUtil
(
0
)
{
setFlag
(
QGraphicsItem
::
ItemHasNoContents
,
false
);
setFlag
(
ItemHasContents
);
connect
(
this
,
SIGNAL
(
w
idthChanged
(
int
)),
this
,
SLOT
(
updateTermSize
()));
connect
(
this
,
SIGNAL
(
h
eightChanged
(
int
)),
this
,
SLOT
(
updateTermSize
()));
connect
(
this
,
SIGNAL
(
myW
idthChanged
(
int
)),
this
,
SLOT
(
updateTermSize
()));
connect
(
this
,
SIGNAL
(
myH
eightChanged
(
int
)),
this
,
SLOT
(
updateTermSize
()));
connect
(
this
,
SIGNAL
(
fontSizeChanged
()),
this
,
SLOT
(
updateTermSize
()));
//normal
...
...
@@ -56,16 +56,13 @@ TextRender::TextRender(QDeclarativeItem *parent) :
qFatal
(
"invalid color table"
);
iShowBufferScrollIndicator
=
false
;
// caching results in considerably faster redrawing during animations
setCacheMode
(
QGraphicsItem
::
DeviceCoordinateCache
);
}
TextRender
::~
TextRender
()
{
}
void
TextRender
::
paint
(
QPainter
*
painter
,
const
QStyleOptionGraphicsItem
*
,
QWidget
*
)
void
TextRender
::
paint
(
QPainter
*
painter
)
{
if
(
!
iTerm
)
return
;
...
...
@@ -252,7 +249,7 @@ void TextRender::drawTextFragment(QPainter* painter, int x, int y, QString text,
void
TextRender
::
redraw
()
{
update
(
boundingRect
()
);
update
();
}
void
TextRender
::
setTerminal
(
Terminal
*
term
)
...
...
textrender.h
View file @
24efd650
...
...
@@ -20,18 +20,17 @@
#ifndef TEXTRENDER_H
#define TEXTRENDER_H
#include <Q
Declarative
Item>
#include <Q
QuickPainted
Item>
#include <QPainter>
#include <QGraphicsScene>
#include "terminal.h"
class
Util
;
class
TextRender
:
public
Q
Declarative
Item
class
TextRender
:
public
Q
QuickPainted
Item
{
Q_PROPERTY
(
int
myWidth
READ
width
WRITE
setWidth
NOTIFY
w
idthChanged
)
Q_PROPERTY
(
int
myHeight
READ
height
WRITE
setHeight
NOTIFY
h
eightChanged
)
Q_PROPERTY
(
int
myWidth
READ
myWidth
WRITE
setMyWidth
NOTIFY
myW
idthChanged
)
Q_PROPERTY
(
int
myHeight
READ
myHeight
WRITE
setMyHeight
NOTIFY
myH
eightChanged
)
Q_PROPERTY
(
int
fontWidth
READ
fontWidth
NOTIFY
fontSizeChanged
)
Q_PROPERTY
(
int
fontHeight
READ
fontHeight
NOTIFY
fontSizeChanged
)
Q_PROPERTY
(
int
fontPointSize
READ
fontPointSize
WRITE
setFontPointSize
NOTIFY
fontSizeChanged
)
...
...
@@ -39,17 +38,17 @@ class TextRender : public QDeclarativeItem
Q_OBJECT
public:
explicit
TextRender
(
Q
Declarative
Item
*
parent
=
0
);
explicit
TextRender
(
Q
Quick
Item
*
parent
=
0
);
virtual
~
TextRender
();
void
paint
(
QPainter
*
,
const
QStyleOptionGraphicsItem
*
,
QWidget
*
);
void
paint
(
QPainter
*
);
void
setTerminal
(
Terminal
*
term
);
void
setUtil
(
Util
*
util
)
{
iUtil
=
util
;
}
int
w
idth
()
{
return
iWidth
;
}
int
h
eight
()
{
return
iHeight
;
}
void
set
Width
(
int
w
)
{
if
(
iWidth
!=
w
)
{
iWidth
=
w
;
emit
w
idthChanged
(
w
);
}
}
void
set
Height
(
int
h
)
{
if
(
iHeight
!=
h
)
{
iHeight
=
h
;
emit
h
eightChanged
(
h
);
}
}
int
myW
idth
()
{
return
iWidth
;
}
int
myH
eight
()
{
return
iHeight
;
}
void
set
MyWidth
(
int
w
)
{
if
(
iWidth
!=
w
)
{
iWidth
=
w
;
emit
myW
idthChanged
(
w
);
}
}
void
set
MyHeight
(
int
h
)
{
if
(
iHeight
!=
h
)
{
iHeight
=
h
;
emit
myH
eightChanged
(
h
);
}
}
int
fontWidth
()
{
return
iFontWidth
;
}
int
fontHeight
()
{
return
iFontHeight
;
}
int
fontDescent
()
{
return
iFontDescent
;
}
...
...
@@ -62,8 +61,8 @@ public:
Q_INVOKABLE
QSize
cursorPixelSize
();
signals:
void
w
idthChanged
(
int
newWidth
);
void
h
eightChanged
(
int
newHeight
);
void
myW
idthChanged
(
int
newWidth
);
void
myH
eightChanged
(
int
newHeight
);
void
fontSizeChanged
();
void
showBufferScrollIndicatorChanged
();
...
...
@@ -93,6 +92,4 @@ private:
QList
<
QColor
>
iColorTable
;
};
QML_DECLARE_TYPE
(
TextRender
)
#endif // TEXTRENDER_H
util.cpp
View file @
24efd650
...
...
@@ -22,7 +22,8 @@
#include <QtCore>
#include <QtGui>
#include <QDBusInterface>
#include <QApplication>
#include <QGuiApplication>
#include <QQuickView>
#include "mainwindow.h"
#include "terminal.h"
...
...
@@ -48,7 +49,7 @@ Util::Util(QSettings *settings, QObject *parent) :
swipeModeSet
=
false
;
swipeAllowed
=
true
;
connect
(
QApplication
::
clipboard
(),
SIGNAL
(
dataChanged
()),
this
,
SIGNAL
(
clipboardOrSelectionChanged
()));
connect
(
Q
Gui
Application
::
clipboard
(),
SIGNAL
(
dataChanged
()),
this
,
SIGNAL
(
clipboardOrSelectionChanged
()));
}
Util
::~
Util
()
...
...
@@ -57,7 +58,7 @@ Util::~Util()
clearNotifications
();
}
void
Util
::
setWindow
(
Q
Widget
*
win
)
void
Util
::
setWindow
(
Q
QuickView
*
win
)
{
iWindow
=
dynamic_cast
<
MainWindow
*>
(
win
);
if
(
!
iWindow
)
...
...
@@ -68,7 +69,7 @@ void Util::setWindow(QWidget* win)
void
Util
::
setWindowTitle
(
QString
title
)
{
iCurrentWinTitle
=
title
;
iWindow
->
set
Window
Title
(
title
);
iWindow
->
setTitle
(
title
);
emit
windowTitleChanged
();
}
...
...
@@ -271,39 +272,40 @@ bool Util::eventFilter(QObject *, QEvent *ev)
if
(
!
iAllowGestures
)
return
false
;
if
(
ev
->
type
()
==
QEvent
::
GraphicsSceneMouse
Press
)
{
Q
GraphicsSceneMouseEvent
*
mev
=
static_cast
<
QGraphicsScene
MouseEvent
*>
(
ev
);
dragOrigin
=
mev
->
sceneP
os
();
if
(
ev
->
type
()
==
QEvent
::
MouseButton
Press
)
{
Q
MouseEvent
*
mev
=
static_cast
<
Q
MouseEvent
*>
(
ev
);
dragOrigin
=
mev
->
p
os
();
newSelection
=
true
;
}
else
if
(
ev
->
type
()
==
QEvent
::
GraphicsScene
MouseMove
)
{
Q
GraphicsSceneMouseEvent
*
mev
=
static_cast
<
QGraphicsScene
MouseEvent
*>
(
ev
);
else
if
(
ev
->
type
()
==
QEvent
::
MouseMove
)
{
Q
MouseEvent
*
mev
=
static_cast
<
Q
MouseEvent
*>
(
ev
);
if
(
settingsValue
(
"ui/dragMode"
)
==
"scroll"
)
{
scrollBackBuffer
(
mev
->
scenePos
(),
mev
->
lastScenePos
());
scrollBackBuffer
(
mev
->
pos
(),
dragOrigin
);
dragOrigin
=
mev
->
pos
();
}
else
if
(
settingsValue
(
"ui/dragMode"
)
==
"select"
&&
iRenderer
)
{
selectionHelper
(
mev
->
sceneP
os
());
selectionHelper
(
mev
->
p
os
());
}
}
else
if
(
ev
->
type
()
==
QEvent
::
GraphicsSceneMouse
Release
)
{
Q
GraphicsSceneMouseEvent
*
mev
=
static_cast
<
QGraphicsScene
MouseEvent
*>
(
ev
);
if
(
settingsValue
(
"ui/dragMode"
)
==
"gestures"
&&
mev
->
lastScenePos
()
!=
dragOrigin
)
{
int
xdist
=
qAbs
(
mev
->
sceneP
os
().
x
()
-
dragOrigin
.
x
());
int
ydist
=
qAbs
(
mev
->
sceneP
os
().
y
()
-
dragOrigin
.
y
());
if
(
mev
->
sceneP
os
().
x
()
<
dragOrigin
.
x
()
-
reqDragLength
&&
xdist
>
ydist
*
2
)
else
if
(
ev
->
type
()
==
QEvent
::
MouseButton
Release
)
{
Q
MouseEvent
*
mev
=
static_cast
<
Q
MouseEvent
*>
(
ev
);
if
(
settingsValue
(
"ui/dragMode"
)
==
"gestures"
)
{
int
xdist
=
qAbs
(
mev
->
p
os
().
x
()
-
dragOrigin
.
x
());
int
ydist
=
qAbs
(
mev
->
p
os
().
y
()
-
dragOrigin
.
y
());
if
(
mev
->
p
os
().
x
()
<
dragOrigin
.
x
()
-
reqDragLength
&&
xdist
>
ydist
*
2
)
doGesture
(
PanLeft
);
else
if
(
mev
->
sceneP
os
().
x
()
>
dragOrigin
.
x
()
+
reqDragLength
&&
xdist
>
ydist
*
2
)
else
if
(
mev
->
p
os
().
x
()
>
dragOrigin
.
x
()
+
reqDragLength
&&
xdist
>
ydist
*
2
)
doGesture
(
PanRight
);
else
if
(
mev
->
sceneP
os
().
y
()
>
dragOrigin
.
y
()
+
reqDragLength
&&
ydist
>
xdist
*
2
)
else
if
(
mev
->
p
os
().
y
()
>
dragOrigin
.
y
()
+
reqDragLength
&&
ydist
>
xdist
*
2
)
doGesture
(
PanDown
);
else
if
(
mev
->
sceneP
os
().
y
()
<
dragOrigin
.
y
()
-
reqDragLength
&&
ydist
>
xdist
*
2
)
else
if
(
mev
->
p
os
().
y
()
<
dragOrigin
.
y
()
-
reqDragLength
&&
ydist
>
xdist
*
2
)
doGesture
(
PanUp
);
}
else
if
(
settingsValue
(
"ui/dragMode"
)
==
"scroll"
)
{
scrollBackBuffer
(
mev
->
scenePos
(),
mev
->
lastScenePos
()
);
scrollBackBuffer
(
mev
->
pos
(),
dragOrigin
);
}
else
if
(
settingsValue
(
"ui/dragMode"
)
==
"select"
&&
iRenderer
)
{
selectionHelper
(
mev
->
sceneP
os
());
selectionHelper
(
mev
->
p
os
());
selectionFinished
();
}
}
...
...
@@ -370,7 +372,7 @@ void Util::notifyText(QString text)
void
Util
::
copyTextToClipboard
(
QString
str
)
{
QClipboard
*
cb
=
QApplication
::
clipboard
();
QClipboard
*
cb
=
Q
Gui
Application
::
clipboard
();
cb
->
clear
();
cb
->
setText
(
str
);
}
...
...
@@ -382,7 +384,7 @@ bool Util::terminalHasSelection()
bool
Util
::
canPaste
()
{
QClipboard
*
cb
=
QApplication
::
clipboard
();
QClipboard
*
cb
=
Q
Gui
Application
::
clipboard
();
if
(
cb
->
mimeData
()
->
hasText
()
&&
!
cb
->
mimeData
()
->
text
().
isEmpty
())
return
true
;
...
...
util.h
View file @
24efd650
...
...
@@ -21,11 +21,11 @@
#define UTIL_H
#include <QtCore>
#include <QWidget>
class
Terminal
;
class
MainWindow
;
class
TextRender
;
class
QQuickView
;
class
Util
:
public
QObject
{
...
...
@@ -33,7 +33,7 @@ class Util : public QObject
public:
explicit
Util
(
QSettings
*
settings
,
QObject
*
parent
=
0
);
virtual
~
Util
();
void
setWindow
(
Q
Widget
*
win
);
void
setWindow
(
Q
QuickView
*
win
);
void
setWindowTitle
(
QString
title
);
Q_INVOKABLE
QString
currentWindowTitle
();
void
setTerm
(
Terminal
*
term
)
{
iTerm
=
term
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment