Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2013-10-03 15:50:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2013-09-07 07:33:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2013-10-03 15:50:41.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:06:27 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +------------------------------------------------------------------- Old: ---- kate-4.11.1.tar.xz New: ---- kate-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.YQ490j/_old 2013-10-03 15:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.YQ490j/_new 2013-10-03 15:50:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: kate -Version: 4.11.1 +Version: 4.11.2 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ ++++++ kate-4.11.1.tar.xz -> kate-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/addons/kate/pate/src/pate.desktop new/kate-4.11.2/addons/kate/pate/src/pate.desktop --- old/kate-4.11.1/addons/kate/pate/src/pate.desktop 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/addons/kate/pate/src/pate.desktop 2013-09-26 21:18:55.000000000 +0200 @@ -75,7 +75,7 @@ Comment[pt]=Máquina do Pâté para os 'plugins' de Python Comment[pt_BR]=Máquina do Pâté para os plugins de Python Comment[ro]=Gazdă Pâté pentru extensii Python -Comment[ru]=Хост Pâté для модулей Python +Comment[ru]=Среда Pâté для модулей Python Comment[sk]=Pâté host pre pluginy Python Comment[sl]=Gostitelj Pâté za vstavke za Python Comment[sr]=Паштета као домаћин питонских прикључака diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/addons/kate/search/plugin_search.cpp new/kate-4.11.2/addons/kate/search/plugin_search.cpp --- old/kate-4.11.1/addons/kate/search/plugin_search.cpp 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/addons/kate/search/plugin_search.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -34,6 +34,7 @@ #include <ktexteditor/movingrange.h> #include <ktexteditor/configinterface.h> +#include "kacceleratormanager.h" #include <kaction.h> #include <kactioncollection.h> #include <klocale.h> @@ -233,6 +234,7 @@ connect(a, SIGNAL(triggered(bool)), this, SLOT(goToPreviousMatch())); m_ui.resultTabWidget->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectLeftTab); + KAcceleratorManager::setNoAccel(m_ui.resultTabWidget); m_ui.displayOptions->setIcon(KIcon("arrow-down-double")); m_ui.searchButton->setIcon(KIcon("edit-find")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/addons/kate/tabify/tabify.cpp new/kate-4.11.2/addons/kate/tabify/tabify.cpp --- old/kate-4.11.1/addons/kate/tabify/tabify.cpp 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/addons/kate/tabify/tabify.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -20,6 +20,7 @@ #include <kate/documentmanager.h> #include <kate/application.h> +#include <kacceleratormanager.h> #include <kaction.h> #include <klocale.h> #include <kstandarddirs.h> @@ -45,6 +46,8 @@ : Kate::PluginView(mainwindow) { m_tabBar = new KTabBar(mainWindow()->centralWidget()); + KAcceleratorManager::setNoAccel(m_tabBar); + m_tabIsDeleting = false; m_tabBar->setTabsClosable(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/syntax/data/tcsh.xml new/kate-4.11.2/part/syntax/data/tcsh.xml --- old/kate-4.11.1/part/syntax/data/tcsh.xml 2013-06-28 19:14:32.000000000 +0200 +++ new/kate-4.11.2/part/syntax/data/tcsh.xml 2013-09-26 21:18:55.000000000 +0200 @@ -8,7 +8,7 @@ <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> ]> -<language name="Tcsh" version="0.1" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_tr...@users.sourceforge.net)" license="LGPL"> +<language name="Tcsh" version="0.2" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_tr...@users.sourceforge.net)" license="LGPL"> <!-- (c) 2006 Matthew Woehlke (mw_tr...@users.sourceforge.net) Based on the bash highlighter by Wilbert Berendsen (wilb...@kde.nl) @@ -521,8 +521,8 @@ <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9][A-Za-z0-9_]*" /> <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" /> <!-- handle variable assignments --> -<!--R--><RegExpr attribute="Keyword" context="Cmd@" String="\b@\s" /> -<!--R--><RegExpr attribute="Keyword" context="CmdSet" String="\bset\s" /> +<!--R--><RegExpr attribute="Keyword" context="#stay" String="\b@\s" /> +<!--R--><RegExpr attribute="Keyword" context="#stay" String="\bset\s" /> <RegExpr attribute="Keyword" context="CmdSetEnv" String="\bsetenv\s" /> <!-- handle functions with function keyword before keywords --> <!--!--><StringDetect attribute="Function" context="#stay" String=":()" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/view/kateanimation.cpp new/kate-4.11.2/part/view/kateanimation.cpp --- old/kate-4.11.1/part/view/kateanimation.cpp 2013-08-29 20:32:16.000000000 +0200 +++ new/kate-4.11.2/part/view/kateanimation.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -76,10 +76,11 @@ emit widgetShown(); } else { // launch show effect + // NOTE: use a singleShot timer to avoid resizing issues when showing the message widget the first time (bug #316666) if (m_fadeEffect) { - m_fadeEffect->fadeIn(); + QTimer::singleShot(0, m_fadeEffect, SLOT(fadeIn())); } else { - m_widget->animatedShow(); + QTimer::singleShot(0, m_widget, SLOT(animatedShow())); } // start timer in order to track when showing is done (this effectively works diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/view/katemessagewidget.cpp new/kate-4.11.2/part/view/katemessagewidget.cpp --- old/kate-4.11.1/part/view/katemessagewidget.cpp 2013-08-29 20:32:16.000000000 +0200 +++ new/kate-4.11.2/part/view/katemessagewidget.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -269,6 +269,7 @@ || m_autoHideTime < 0 // message does not want auto-hide || m_autoHideTimer->isActive() // auto-hide timer is already active || m_animation->hideAnimationActive() // widget is in hide animation phase + || m_animation->showAnimationActive() // widget is in show animation phase ) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/view/kateviewhelpers.cpp new/kate-4.11.2/part/view/kateviewhelpers.cpp --- old/kate-4.11.1/part/view/kateviewhelpers.cpp 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/part/view/kateviewhelpers.cpp 2013-09-29 15:59:23.000000000 +0200 @@ -1347,7 +1347,7 @@ , m_annotationBorderOn( false ) , m_dynWrapIndicators( 0 ) , m_cachedLNWidth( 0 ) - , m_maxCharWidth( 0 ) + , m_maxCharWidth( 0.0 ) , iconPaneWidth (16) , m_annotationBorderWidth (6) , m_foldingRange(0) @@ -1483,11 +1483,11 @@ void KateIconBorder::updateFont() { const QFontMetricsF &fm = m_view->renderer()->config()->fontMetrics(); - m_maxCharWidth = 0; + m_maxCharWidth = 0.0; // Loop to determine the widest numeric character in the current font. // 48 is ascii '0' for (int i = 48; i < 58; i++) { - int charWidth = fm.width( QChar(i) ); + const qreal charWidth = ceil(fm.width( QChar(i) )); m_maxCharWidth = qMax(m_maxCharWidth, charWidth); } @@ -1501,7 +1501,9 @@ int KateIconBorder::lineNumberWidth() const { - int width = m_lineNumbersOn ? ((int)log10((double)(m_view->doc()->lines())) + 1) * m_maxCharWidth + 4 : 0; + // width = (number of digits + 1) * char width + const int digits = (int) ceil(log10((double)(m_view->doc()->lines() + 1))); + int width = m_lineNumbersOn ? (int)ceil((digits + 1) * m_maxCharWidth) : 0; if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { // HACK: 16 == style().scrollBarExtent().width() @@ -1760,8 +1762,10 @@ if (realLine > -1) { if (m_viewInternal->cache()->viewLine(z).startCol() == 0) { - if (m_lineNumbersOn) - p.drawText( lnX, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg( realLine + 1 ) ); + if (m_lineNumbersOn) { + p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h, + Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg( realLine + 1 ) ); + } } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { p.drawPixmap(lnX + lnWidth - m_arrow.width() - 2, y, m_arrow); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/view/kateviewhelpers.h new/kate-4.11.2/part/view/kateviewhelpers.h --- old/kate-4.11.1/part/view/kateviewhelpers.h 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/part/view/kateviewhelpers.h 2013-09-26 21:18:55.000000000 +0200 @@ -218,7 +218,7 @@ int m_cachedLNWidth; - int m_maxCharWidth; + qreal m_maxCharWidth; int iconPaneWidth; int m_annotationBorderWidth; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/part/vimode/katevinormalmode.cpp new/kate-4.11.2/part/vimode/katevinormalmode.cpp --- old/kate-4.11.1/part/vimode/katevinormalmode.cpp 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/part/vimode/katevinormalmode.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -3290,7 +3290,7 @@ // In temporary normal mode, p/P act as gp/gP. isgPaste |= m_viInputModeManager->getTemporaryNormalMode(); - if ( textToInsert.isNull() ) { + if ( textToInsert.isEmpty() ) { error(i18n("Nothing in register %1", reg )); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.11.1/tests/vimode_test.cpp new/kate-4.11.2/tests/vimode_test.cpp --- old/kate-4.11.1/tests/vimode_test.cpp 2013-08-28 19:00:34.000000000 +0200 +++ new/kate-4.11.2/tests/vimode_test.cpp 2013-09-26 21:18:55.000000000 +0200 @@ -830,6 +830,7 @@ // Testing "X" DoTest("ABCD", "$XX", "AD"); + DoTest("foo", "XP", "foo"); // Testing "gu" DoTest("FOO\nBAR BAZ", "guj", "foo\nbar baz"); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
