Commit Graph

3111 Commits

Author SHA1 Message Date
Kurt Hindenburg
cb1f25d950 Add Enum to handle meta keys on Mac OS
Part of the rb 120323

René J.V. Bertin rjvberti @gmai .com

(cherry picked from commit b2cf60009e)
2014-10-06 10:14:47 -04:00
Kurt Hindenburg
5b1470c536 porting from KSharedPtr to QExplicitlySharedDataPointer
Patch by Michal Humpula michal humpula hudrydum cz

REVIEW: 120497
2014-10-05 10:37:44 -04:00
Kurt Hindenburg
b6429eadec port from K_GLOBAL_STATIC to Q_GLOBAL_STATIC
Patch by Michal Humpula michal humpula hudrydum cz

REVIEW: 120496
2014-10-05 10:01:00 -04:00
Kurt Hindenburg
abb83e8ef0 Add support for copying HTML formatted text from terminal
Currently, only text is supported - this add HTML

Thanks to Anonymous Koavohv koavohv gmail com

REVIEW: 119914
2014-10-04 11:57:54 -04:00
Kurt Hindenburg
b6304bcc59 Port KUrl to QUrl
Thanks to Michal Humpula michal humpula hudrydum cz

REVIEW: 120430
2014-10-04 11:41:50 -04:00
Kurt Hindenburg
b542df3420 Revert "No longer check for X11"
For now revert this, on non X11 systems it causes:

FAILURE (KCmdLineArgs):
Application requests for isSet("display") but the "display" option
has never been specified via addCmdLineOptions( ... )

This reverts commit d42ef186c8.
2014-09-17 08:57:55 -04:00
Kurt Hindenburg
676549a024 Minor: fix header guard name 2014-09-16 10:44:13 -04:00
Kurt Hindenburg
61f7683c5b Minor: use '' around single character 2014-09-16 10:40:39 -04:00
Kurt Hindenburg
f9ab2ff8dd add explicit to ctor 2014-09-15 09:49:46 -04:00
Kurt Hindenburg
7237b73b34 Fix spelling error in comment 2014-09-15 09:43:58 -04:00
Kurt Hindenburg
eda0e431b2 Minor whitespace changes 2014-09-15 09:37:42 -04:00
Kurt Hindenburg
47208fafba Remove X11 linking completely 2014-09-15 09:20:05 -04:00
Kurt Hindenburg
d42ef186c8 No longer check for X11
X11 check was only for checking parameters on the command line.  X11
wasn't actually needed.
2014-09-14 12:08:21 -04:00
Kurt Hindenburg
0e32816f8b Only use X11_X11_LIB instead of X11_LIBRARIES
Thanks to Bernd Steinhauser linux bernd steinhauser de

REVIEW: 119908
2014-09-14 09:30:06 -04:00
Kurt Hindenburg
d8be35b5c7 Allow the -e command line to work w/ arguments w and w/o spaces
This allows both these lines to work:
konsole -e man ls
konsole -e "man ls"

Thanks to Mark Raymond markr raymonds org uk for patch/testing.

CCBUG: 295648
REVIEW: 120001
FIXED-IN: 4.14.2
(cherry picked from commit bd56dba1a9)
2014-09-14 08:40:38 -04:00
Kurt Hindenburg
26e2da0d6b Version-ize konsoleprivate libraries
This allows (on packaging level at least) co-existence of kdelibs4 &
KF5 konsole-part.

Patch by Hrvoje Senjan hrvoje senjan gmail com

REVIEW: 119909
2014-09-14 08:33:48 -04:00
Montel Laurent
c3cbac07ae Remove kdelibs4support 2014-09-06 13:10:57 +02:00
Kurt Hindenburg
9e55c7880a Merge branch 'frameworks'
* frameworks: (200 commits)
  We can increase minimum version
  Fix Bug 318453 - Blinking cursor of "fullwidth" character are "halfwidth"
  Issue a warning when not matching a font exactly
  ki18n_wrap_ui
  l10n fixes
  Use QStringLiteral instead of QLatin1Literal
  Set the component name if a KPart
  setXMLFile doesn't need the path to "konsole/" after the adjustment to KXMLGUI_INSTALL_DIR
  Use xi18n when markup
  remove accel markers
  Use KXMLGUI_INSTALL_DIR
  Fix crash in Manage Profile Dialog
  Fix crash on close
  update boxs.txt which uses more box lines for testing purposes
  Correct line drawing characters U+2532, U+2544, U+2546, U+2560
  Fix spacing so next cherry-pick will apply
  Fix translucency support.
  Enable wordwrap on suspended message to avoid window resize
  Update dependency: KDE4Support to KDELibs4Support
  Convert to Qt5 signal slot syntax
  ...

Conflicts:
	CMakeLists.txt
	desktop/CMakeLists.txt
	desktop/konsolerun.desktop
	desktop/org.kde.konsole.desktop
	src/Application.cpp
	src/CharacterColor.h
	src/EditProfileDialog.cpp
	src/EditProfileDialog.ui
	src/Emulation.cpp
	src/IncrementalSearchBar.cpp
	src/IncrementalSearchBar.h
	src/LineFont.h
	src/MainWindow.cpp
	src/ScreenWindow.h
	src/Session.cpp
	src/SessionController.cpp
	src/TerminalCharacterDecoder.cpp
	src/TerminalDisplay.cpp
	src/autotests/ShellCommandTest.cpp
	src/autotests/TerminalCharacterDecoderTest.cpp
	src/config-konsole.h.cmake
	src/fontembedder.cpp
	src/main.cpp
	src/settings/GeneralSettings.cpp
	src/tests/CMakeLists.txt
	src/tests/PartManualTest.cpp
2014-09-05 08:54:48 -04:00
Feng Chao
5fd1276b8d Fix Bug 318453 - Blinking cursor of "fullwidth" character are "halfwidth"
Calculate the character width at current blinking cursor.

BUG: 318453
2014-08-03 21:18:52 +08:00
Casian Andrei
e6fa0276a5 Issue a warning when not matching a font exactly
When setting a font for the terminal, if it is not found properly by the
system, Qt attempts to use another font which is not an exact match. It
happens that the other font is not fixed-pitch, so konsole ends up using
an unsupported variable-pitch font for the terminal.

Place a warning when an exact match for the desired font has not been
found.
2014-07-21 16:50:38 +03:00
Lukáš Tinkl
419733fb0f ki18n_wrap_ui
otherwise English only
2014-07-21 12:30:41 +02:00
Lukáš Tinkl
9900747e0f l10n fixes 2014-07-20 22:42:12 +02:00
Luca Beltrame
3af526ff22 Use QStringLiteral instead of QLatin1Literal
As suggested by krop
2014-07-18 10:15:25 +02:00
Luca Beltrame
88ffcc8bed Set the component name if a KPart
This fixes the context menu not being shown in Yakuake.
2014-07-18 00:07:50 +02:00
Luca Beltrame
b8726f2f59 setXMLFile doesn't need the path to "konsole/" after the adjustment to
KXMLGUI_INSTALL_DIR

Fixes menus not appearing on right click in Konsole.
2014-07-16 23:51:20 +02:00
Montel Laurent
efd1d0ec08 Use xi18n when markup 2014-07-16 13:23:03 +02:00
Lukáš Tinkl
694b644bd2 remove accel markers
so that the top menubar doesn't conflict with Alt+<x> shortcuts
2014-07-15 20:19:46 +02:00
Kurt Hindenburg
254a59f975 Update master branch to version 2.14.999 for now 2014-07-09 08:56:32 -04:00
Kurt Hindenburg
86ee13f583 Fix crash in Manage Profile Dialog
In KDE5, KMenu* KActionMenu::menu() no longer creates a KMenu if it
doesn't exist.

Thanks to Arjun Ak arjunak234 gmail com

REVIEW: 119004
2014-07-02 10:26:05 -04:00
Aurélien Gâteau
dd1b2b4df0 Fix crash on close
Move code responsible for 'forgetting' a view outside of code responding to the
TerminalDisplay deletion.

This avoids a loop like this:

~MainWindow
=> ~QStackedWidget
=> ~TerminalDisplay
=> QObject::destroyed
=> ViewContainer::viewDestroyed
=> ViewContainer::removeViewWidget
   - internal cleanup
   - try to remove TerminalDisplay from QStackedWidget which is being deleted and
crash

Instead the code now does:

~MainWindow
=> ~QStackedWidget
=> ~TerminalDisplay
=> QObject::destroyed
=> ViewContainer::viewDestroyed
=> ViewContainer::forgetView (does the internal clean up)

And if one tries to explicitly remove a view, sequence is:

ViewContainer::removeView
=> ViewContainer::forgetView
=> ViewContainer::removeViewWidget

The patch also removes ViewManager::focusActiveView() because it causes a crash
when closing a TerminalDisplay as it tries to put the focus on the deleted
TerminalDisplay. I initially called it through a queued connection, but realized
it is actually not needed for focus to be passed to the correct view, so just
removed it.

BUG: 331724
REVIEW: 118839
2014-06-20 14:01:27 +02:00
Kurt Hindenburg
455f0106b9 Correct line drawing characters U+2532, U+2544, U+2546, U+2560
Fix box lines - using kmag is a great help

Thanks to Egmont Koblinger egmont gmail com for report and patch

BUG: 335339
FIXED-IN: 4.13.2
(cherry picked from commit 58d79e3624)
2014-05-30 09:12:09 -04:00
Kurt Hindenburg
0ba0f68a7a Fix spacing so next cherry-pick will apply 2014-05-30 09:11:52 -04:00
Eike Hein
c4f7f512f3 Fix translucency support.
CCBUG:332408
2014-05-26 14:00:24 +02:00
Kurt Hindenburg
58d79e3624 Correct line drawing characters U+2532, U+2544, U+2546, U+2560
Fix box lines - using kmag is a great help

Thanks to Egmont Koblinger egmont gmail com for report and patch

BUG: 335339
FIXED-IN: 4.13.2
2014-05-25 19:54:55 -04:00
Kurt Hindenburg
57a5f23f1b Enable wordwrap on suspended message to avoid window resize
BUG: 333890
FIXED-IN: 2.13.1
(cherry picked from commit 24c90c36e7)
2014-05-08 21:53:22 -04:00
Kurt Hindenburg
cc4602e1ee Update dependency: KDE4Support to KDELibs4Support
Thanks Elias Probst

REVIEW: 117988
2014-05-08 10:20:27 -04:00
Alex Richardson
a3ce74d4eb Convert to Qt5 signal slot syntax
REVIEW: 117482
2014-04-30 19:16:54 +02:00
Kurt Hindenburg
24c90c36e7 Enable wordwrap on suspended message to avoid window resize
BUG: 333890
FIXED-IN: 2.13.1
2014-04-26 12:53:03 -04:00
Kurt Hindenburg
d02f75199d minor style changes - whitespace, blank lines 2014-04-20 09:56:07 -04:00
Kurt Hindenburg
5dbdec7501 re-add explicit 2014-04-17 09:53:10 -04:00
Kurt Hindenburg
c725726ead correct misspelled header #defines 2014-04-17 09:44:19 -04:00
Kurt Hindenburg
cc24ae1ec3 Fix members not being initialized in constructor
(cherry picked from commit bda5e42729)
2014-04-16 21:40:28 -04:00
Kurt Hindenburg
93fef17cdd Simplify variables and remove unneeded code
(cherry picked from commit ab94ffce64)
2014-04-16 21:40:21 -04:00
Kurt Hindenburg
707f341de3 Change constuctor - calls now have to give Screen
new ScreenWindow() is only called from emulation - might as well
pass the Screen to it

(cherry picked from commit ffeaf3a33f)
2014-04-16 21:40:15 -04:00
Kurt Hindenburg
f92a45da2f Check return values of ::stat()
(cherry picked from commit 42240a7c6d)
2014-04-16 21:40:05 -04:00
Kurt Hindenburg
8523bcf657 Check return value of KDE::chmod
(cherry picked from commit fbffd35c31)
2014-04-16 21:39:51 -04:00
Kurt Hindenburg
00ecb8d005 Clarify QFile:: error enums
(cherry picked from commit b9b17cae4d)
2014-04-16 21:39:43 -04:00
Kurt Hindenburg
1be78df227 Clarify enums for ProcessInfo - possible match w/ QFile's enums
(cherry picked from commit 99059278ca)
2014-04-16 21:39:27 -04:00
Kurt Hindenburg
52b7d6f12b Encompass all the _colorTable in the check for null
Possible dereference after null - move the if() to include all checks

(cherry picked from commit e6316eb4d8)
2014-04-16 21:39:19 -04:00
Kurt Hindenburg
91fb70992b Remove commented code and dead-code that was used in commented code
(cherry picked from commit ffd9e56cce)
2014-04-16 21:39:11 -04:00