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

..

autotests

Simplify variables and remove unneeded code

2014-04-16 21:40:21 -04:00

settings

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

tests

Merge branch 'frameworks'

2014-09-05 08:54:48 -04:00

Application.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Application.h

Restore --background-mode

2014-02-07 09:00:51 -05:00

BookmarkHandler.cpp

…

BookmarkHandler.h

…

Character.h

…

CharacterColor.h

minor style changes - whitespace, blank lines

2014-04-20 09:56:07 -04:00

CMakeLists.txt

ki18n_wrap_ui

2014-07-21 12:30:41 +02:00

ColorScheme.cpp

Allow transparency to work when using images as backgrounds.

2014-02-17 09:17:07 -05:00

ColorScheme.h

Allow transparency to work when using images as backgrounds.

2014-02-17 09:17:07 -05:00

ColorSchemeEditor.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

ColorSchemeEditor.h

…

ColorSchemeEditor.ui

s/KLineEdit/QLineEdit

2014-01-18 14:10:54 -05:00

ColorSchemeManager.cpp

Port away from Q_WS_X11

2014-04-10 15:27:51 +02:00

ColorSchemeManager.h

…

config-konsole.h.cmake

Port away from Q_WS_X11

2014-04-10 15:27:51 +02:00

CopyInputDialog.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

CopyInputDialog.h

…

CopyInputDialog.ui

s/KLineEdit/QLineEdit

2014-01-18 14:19:03 -05:00

EditProfileDialog.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

EditProfileDialog.h

Allow konsole to store terminal size in the profile.

2014-02-17 09:26:18 -05:00

EditProfileDialog.ui

Make all the layout name's unique

2014-02-17 09:26:27 -05:00

Emulation.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Emulation.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Enumeration.h

…

ExtendedCharTable.cpp

…

ExtendedCharTable.h

…

Filter.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Filter.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

fontembedder.cpp

minor style changes - whitespace, blank lines

2014-04-20 09:56:07 -04:00

History.cpp

Fix members not being initialized in constructor

2014-04-16 21:40:28 -04:00

History.h

…

HistorySizeDialog.cpp

s/kde4_add_ui_files/qt5_wrap_ui cmake fix

2014-01-12 10:22:51 -05:00

HistorySizeDialog.h

…

HistorySizeDialog.ui

…

HistorySizeWidget.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

HistorySizeWidget.h

…

HistorySizeWidget.ui

…

IncrementalSearchBar.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

IncrementalSearchBar.h

s/KLineEdit/QLineEdit

2014-01-18 14:29:04 -05:00

KeyBindingEditor.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

KeyBindingEditor.h

…

KeyBindingEditor.ui

s/KLineEdit/QLineEdit

2014-01-18 14:35:35 -05:00

KeyboardTranslator.cpp

…

KeyboardTranslator.h

…

KeyboardTranslatorManager.cpp

…

KeyboardTranslatorManager.h

…

konsole_export.h

…

konsole_wcwidth.cpp

Remove unused _cjk() - these have never been used w/ Konsole

2014-03-14 09:33:19 -04:00

konsole_wcwidth.h

Remove unused _cjk() - these have never been used w/ Konsole

2014-03-14 09:33:19 -04:00

konsoleprofile

…

LineFont.h

Correct line drawing characters U+2532, U+2544, U+2546, U+2560

2014-05-30 09:12:09 -04:00

LineFont.src

Correct line drawing characters U+2532, U+2544, U+2546, U+2560

2014-05-30 09:12:09 -04:00

main.cpp

l10n fixes

2014-07-20 22:42:12 +02:00

MainWindow.cpp

remove accel markers

2014-07-15 20:19:46 +02:00

MainWindow.h

Fix translucency support.

2014-05-26 14:00:24 +02:00

ManageProfilesDialog.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

ManageProfilesDialog.h

…

ManageProfilesDialog.ui

…

Messages.sh

…

Part.cpp

l10n fixes

2014-07-20 22:42:12 +02:00

Part.h

…

PrintOptions.cpp

…

PrintOptions.h

…

PrintOptions.ui

…

ProcessInfo.cpp

Clarify QFile:: error enums

2014-04-16 21:39:43 -04:00

ProcessInfo.h

…

Profile.cpp

Allow konsole to store terminal size in the profile.

2014-02-17 09:26:18 -05:00

Profile.h

Allow konsole to store terminal size in the profile.

2014-02-17 09:26:18 -05:00

ProfileList.cpp

Merge branch 'frameworks'

2014-09-05 08:54:48 -04:00

ProfileList.h

…

ProfileManager.cpp

…

ProfileManager.h

…

ProfileReader.cpp

…

ProfileReader.h

…

ProfileWriter.cpp

…

ProfileWriter.h

…

Pty.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Pty.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

RenameTabDialog.cpp

s/kde4_add_ui_files/qt5_wrap_ui cmake fix

2014-01-12 10:22:51 -05:00

RenameTabDialog.h

…

RenameTabDialog.ui

…

RenameTabWidget.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

RenameTabWidget.h

…

RenameTabWidget.ui

s/KLineEdit/QLineEdit

2014-01-18 14:32:01 -05:00

Screen.cpp

Fix wrong rendering at the end of line when drawing colored whitespaces

2014-02-10 09:25:03 -05:00

Screen.h

…

ScreenWindow.cpp

Change constuctor - calls now have to give Screen

2014-04-16 21:40:15 -04:00

ScreenWindow.h

re-add explicit

2014-04-17 09:53:10 -04:00

Session.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Session.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

SessionController.cpp

Use QStringLiteral instead of QLatin1Literal

2014-07-18 10:15:25 +02:00

SessionController.h

All 'select line' for use with shortcut

2014-02-17 09:23:01 -05:00

SessionListModel.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

SessionListModel.h

…

SessionManager.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

SessionManager.h

…

ShellCommand.cpp

…

ShellCommand.h

…

TabTitleFormatButton.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

TabTitleFormatButton.h

…

TerminalCharacterDecoder.cpp

minor style changes - whitespace, blank lines

2014-04-20 09:56:07 -04:00

TerminalCharacterDecoder.h

…

TerminalDisplay.cpp

Fix Bug 318453 - Blinking cursor of "fullwidth" character are "halfwidth"

2014-08-03 21:18:52 +08:00

TerminalDisplay.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

TerminalDisplayAccessible.cpp

…

TerminalDisplayAccessible.h

…

ViewContainer.cpp

Fix crash on close

2014-06-20 14:01:27 +02:00

ViewContainer.h

Fix crash on close

2014-06-20 14:01:27 +02:00

ViewContainerTabBar.cpp

Use xi18n when markup

2014-07-16 13:23:03 +02:00

ViewContainerTabBar.h

…

ViewManager.cpp

Fix crash on close

2014-06-20 14:01:27 +02:00

ViewManager.h

Fix crash on close

2014-06-20 14:01:27 +02:00

ViewProperties.cpp

…

ViewProperties.h

…

ViewSplitter.cpp

Fix crash on close

2014-06-20 14:01:27 +02:00

ViewSplitter.h

…

Vt102Emulation.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

Vt102Emulation.h

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

WindowSystemInfo.cpp

Fix translucency support.

2014-05-26 14:00:24 +02:00

WindowSystemInfo.h

Fix translucency support.

2014-05-26 14:00:24 +02:00

ZModemDialog.cpp

Convert to Qt5 signal slot syntax

2014-04-30 19:16:54 +02:00

ZModemDialog.h

…