Hello community,
here is the log from the commit of package kdesdk4 for openSUSE:Factory
checked in at Fri Jan 16 01:46:08 CET 2009.
--------
--- KDE/kdesdk4/kdesdk4.changes 2009-01-09 14:56:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2009-01-13 18:50:24.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 13 18:49:03 CET 2009 - dmueller@suse.de
+
+- update to 4.1.96
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdesdk-4.1.87.tar.bz2
New:
----
kdesdk-4.1.96.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.p25145/_old 2009-01-16 01:45:54.000000000 +0100
+++ /var/tmp/diff_new_pack.p25145/_new 2009-01-16 01:45:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdesdk4 (Version 4.1.87)
+# spec file for package kdesdk4 (Version 4.1.96)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
Group: System/GUI/KDE
Summary: KDE SDK Package
Url: http://www.kde.org/
-Version: 4.1.87
+Version: 4.1.96
Release: 1
Source0: kdesdk-%version.tar.bz2
Source1: _upstream
@@ -538,6 +538,8 @@
/usr/share/strigi/fieldproperties/strigi_translation.fieldproperties
%changelog
+* Tue Jan 13 2009 dmueller@suse.de
+- update to 4.1.96
* Fri Jan 09 2009 dmueller@suse.de
- update to 4.1.87 (KDE 4.2 Januar snapshot)
* Tue Dec 16 2008 dmueller@suse.de
++++++ kdesdk-4.1.87.tar.bz2 -> kdesdk-4.1.96.tar.bz2 ++++++
Files old/kdesdk-4.1.87/doc/cervisia/index.cache.bz2 and new/kdesdk-4.1.96/doc/cervisia/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.1.96/doc/kapptemplate/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kate/index.cache.bz2 and new/kdesdk-4.1.96/doc/kate/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kate-plugins/index.cache.bz2 and new/kdesdk-4.1.96/doc/kate-plugins/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.1.96/doc/kbugbuster/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.1.96/doc/kcachegrind/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/kompare/index.cache.bz2 and new/kdesdk-4.1.96/doc/kompare/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.1.96/doc/scripts/kdesvn-build/index.cache.bz2 differ
Files old/kdesdk-4.1.87/doc/umbrello/index.cache.bz2 and new/kdesdk-4.1.96/doc/umbrello/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kapptemplate/CMakeLists.txt new/kdesdk-4.1.96/kapptemplate/CMakeLists.txt
--- old/kdesdk-4.1.87/kapptemplate/CMakeLists.txt 2008-12-21 21:20:16.000000000 +0100
+++ new/kdesdk-4.1.96/kapptemplate/CMakeLists.txt 2009-01-06 18:23:46.000000000 +0100
@@ -21,6 +21,8 @@
kde4_add_kcfg_files(kapptemplate_SRCS prefs.kcfgc )
+kde4_add_app_icon(kapptemplate_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kapptemplate.png")
+
kde4_add_executable(kapptemplate ${kapptemplate_SRCS})
target_link_libraries(kapptemplate ${KDE4_KIO_LIBS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop new/kdesdk-4.1.96/kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop
--- old/kdesdk-4.1.87/kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop 2009-01-01 17:26:52.000000000 +0100
+++ new/kdesdk-4.1.96/kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop 2009-01-06 18:23:46.000000000 +0100
@@ -11,6 +11,7 @@
Comment[gl]=Executor %{APPNAME}
Comment[it]=Esecutore di %{APPNAME}
Comment[km]=កម្មវិធីរត់ %{APPNAME}
+Comment[ko]=%{APPNAME} 실행기
Comment[lv]=%{APPNAME} darbinātājs
Comment[nds]=%{APPNAME}-Dreger
Comment[pa]=%{APPNAME} ਰਨਰ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kapptemplate/templates/C++/runner/runner.kdevtemplate new/kdesdk-4.1.96/kapptemplate/templates/C++/runner/runner.kdevtemplate
--- old/kdesdk-4.1.87/kapptemplate/templates/C++/runner/runner.kdevtemplate 2009-01-01 17:26:52.000000000 +0100
+++ new/kdesdk-4.1.96/kapptemplate/templates/C++/runner/runner.kdevtemplate 2009-01-06 18:23:46.000000000 +0100
@@ -10,6 +10,7 @@
Name[gl]=Modelo de executor de Plasma
Name[it]=Modello di esecutore Plasma
Name[km]=ពុម្ពកម្មវិធីរត់របស់ប្លាស្មា
+Name[ko]=Plasma 실행기 템플릿
Name[lv]=Plasma darbinātāja sagatave
Name[nds]=Plasma-Dregervörlaag
Name[pa]=ਪਲਾਜ਼ਮਾ ਰਨਰ ਟੈਪਲੇਟ
@@ -32,6 +33,7 @@
Comment[gl]=Un modelo de executor de Plasma
Comment[it]=Modello di esecutore Plasma
Comment[km]=ពុម្ពកម្មវិធីរត់ប្លាស្មា
+Comment[ko]=Plasma 실행기 템플릿
Comment[lv]=Plasma darbinātāja sagatave
Comment[nds]=En Dregervörlaag för Plasma
Comment[pa]=ਪਲਾਜ਼ਮਾ ਰਨਰ ਟੈਪਲੇਟ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/app/CMakeLists.txt new/kdesdk-4.1.96/kate/app/CMakeLists.txt
--- old/kdesdk-4.1.87/kate/app/CMakeLists.txt 2008-12-04 09:35:29.000000000 +0100
+++ new/kdesdk-4.1.96/kate/app/CMakeLists.txt 2009-01-06 18:23:44.000000000 +0100
@@ -48,11 +48,13 @@
list(APPEND kate_KDEINIT_SRCS ${CMAKE_CURRENT_BINARY_DIR}/kate_dummy.cpp)
- kde4_add_app_icon(kate_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/kate.png")
+ #kde4_add_app_icon(kate_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/kate.png")
+ kde4_add_app_icon(kate_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kate.png")
kde4_add_executable(kate ${kate_KDEINIT_SRCS} )
target_link_libraries( kate ${QT_QTMAIN_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kateinterfaces )
+
else (WIN32)
kde4_add_kdeinit_executable( kate ${kate_KDEINIT_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/data/kate.desktop new/kdesdk-4.1.96/kate/data/kate.desktop
--- old/kdesdk-4.1.87/kate/data/kate.desktop 2008-12-21 21:20:16.000000000 +0100
+++ new/kdesdk-4.1.96/kate/data/kate.desktop 2009-01-06 18:23:46.000000000 +0100
@@ -24,7 +24,7 @@
GenericName[pl]=Zaawansowany edytor tekstu
GenericName[pt]=Editor de Texto Avançado
GenericName[pt_BR]=Editor de Texto Avançado
-GenericName[ro]=Editor de text avansat
+GenericName[ro]=Redactor de text avansat
GenericName[ru]=Улучшенный текстовый редактор
GenericName[sr]=Напредни уређивач текста
GenericName[sr@latin]=Napredni uređivač teksta
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/plugins/filebrowser/katefileselector.cpp new/kdesdk-4.1.96/kate/plugins/filebrowser/katefileselector.cpp
--- old/kdesdk-4.1.87/kate/plugins/filebrowser/katefileselector.cpp 2008-10-23 01:04:06.000000000 +0200
+++ new/kdesdk-4.1.96/kate/plugins/filebrowser/katefileselector.cpp 2009-01-06 18:23:44.000000000 +0100
@@ -23,51 +23,39 @@
#include "katefileselector.h"
#include "katefileselector.moc"
-#include <QToolButton>
-#include
-#include
+#include <QApplication>
+#include <QCheckBox>
+#include <QDir>
+#include <QGroupBox>
+#include <QKeyEvent>
#include <QLabel>
#include <QLineEdit>
-#include <QApplication>
#include <QListWidget>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QCheckBox>
#include <QRegExp>
-#include <QDir>
-//Added by qt3to4:
-#include <QFocusEvent>
-#include <QEvent>
-#include <QShowEvent>
+#include <QSpinBox>
+#include <QToolButton>
#include <QVBoxLayout>
+#include
+#include
+
+#include
#include
#include
#include
#include
-#include
-#include
+#include
#include
#include
#include
#include
+#include
+#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
//END Includes
K_PLUGIN_FACTORY(KateFileSelectorFactory, registerPlugin<KateFileSelectorPlugin>();)
@@ -114,8 +102,8 @@
}
Kate::PluginConfigPage *KateFileSelectorPlugin::configPage (uint number, QWidget *parent, const char *name)
-{
- if (number != 0)
+{
+ if (number != 0)
return 0;
return new KFSConfigPage(parent, name, m_fileSelector);
}
@@ -139,24 +127,7 @@
return KIcon("document-open");
}
-//BEGIN Toolbar
-// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
-static void silenceQToolBar(QtMsgType, const char *)
-{}
-
-// helper classes to be able to have a toolbar without move handle
-KateFileSelectorToolBar::KateFileSelectorToolBar(QWidget *parent)
- : KToolBar( parent, "Kate FileSelector Toolbar", true )
-{
- setMinimumWidth(10);
-}
-
-KateFileSelectorToolBar::~KateFileSelectorToolBar()
-{}
-//END
-
//BEGIN Constructor/destructor
-
KateFileSelector::KateFileSelector( Kate::MainWindow *mainWindow,
QWidget * parent, const char * name )
: KVBox (parent),
@@ -166,11 +137,8 @@
setObjectName(name);
mActionCollection = new KActionCollection( this );
- QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
-
- toolbar = new KateFileSelectorToolBar(this);
+ toolbar = new KToolBar(this);
toolbar->setMovable(false);
- qInstallMsgHandler( oldHandler );
cmbPath = new KUrlComboBox( KUrlComboBox::Directories, true, this);
cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
@@ -181,14 +149,14 @@
// FIXME
// cmbPath->listBox()->installEventFilter( this );
- dir = new KDirOperator(KUrl(), this);
- dir->installEventFilter( this );
- dir->setView(KFile::/* Simple */Detail);
- dir->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
- connect ( dir, SIGNAL( viewChanged(QAbstractItemView *) ),
+ m_dirOperator = new KDirOperator(KUrl(), this);
+ m_dirOperator->installEventFilter( this );
+ m_dirOperator->setView(KFile::/* Simple */Detail);
+ m_dirOperator->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ connect ( m_dirOperator, SIGNAL( viewChanged(QAbstractItemView *) ),
this, SLOT( selectorViewChanged(QAbstractItemView *) ) );
- setStretchFactor(dir, 2);
- dir->setSizePolicy (QSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ setStretchFactor(m_dirOperator, 2);
+ m_dirOperator->setSizePolicy (QSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
// bookmarks action!
KActionMenu *acmBookmarks = new KActionMenu( KIcon("bookmarks"), i18n("Bookmarks"), this );
@@ -203,14 +171,14 @@
filter = new KHistoryComboBox( true, filterBox);
filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
- connect( btnFilter, SIGNAL( clicked() ), this, SLOT( btnFilterClick() ) );
+ connect( btnFilter, SIGNAL( clicked() ), this, SLOT( filterButtonClicked() ) );
connect( filter, SIGNAL( activated(const QString&) ),
SLOT( slotFilterChange(const QString&) ) );
connect( filter, SIGNAL( returnPressed(const QString&) ),
filter, SLOT( addToHistory(const QString&) ) );
- // kaction for the dir sync method
+ // kaction for the m_dirOperator sync method
acSyncDir = mActionCollection->addAction( "sync_dir" );
acSyncDir->setIcon( KIcon("curfiledir") );
acSyncDir->setText( i18n("Current Document Folder") );
@@ -223,13 +191,10 @@
this, SLOT( cmbPathActivated( const KUrl& ) ));
connect( cmbPath, SIGNAL( returnPressed( const QString& )),
this, SLOT( cmbPathReturnPressed( const QString& ) ));
- connect(dir, SIGNAL(urlEntered(const KUrl&)),
+ connect(m_dirOperator, SIGNAL(urlEntered(const KUrl&)),
this, SLOT(dirUrlEntered(const KUrl&)) );
- connect(dir, SIGNAL(finishedLoading()),
- this, SLOT(dirFinishedLoading()) );
-
- // enable dir sync button if current doc has a valid URL
+ // enable m_dirOperator sync button if current doc has a valid URL
connect ( mainwin, SIGNAL( viewChanged() ),
this, SLOT( kateViewChanged() ) );
@@ -250,7 +215,7 @@
btnFilter->setWhatsThis( i18n("<p>This button clears the name filter when toggled off, or "
"reapplies the last filter used when toggled on.</p>") );
- connect(dir, SIGNAL(fileSelected(const KFileItem&)), this, SLOT(fileSelected(const KFileItem&)));
+ connect(m_dirOperator, SIGNAL(fileSelected(const KFileItem&)), this, SLOT(fileSelected(const KFileItem&)));
readConfig();
@@ -272,8 +237,8 @@
void KateFileSelector::readConfig()
{
-// dir->setView( KFile::Default );
-// dir->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
+// m_dirOperator->setView( KFile::Default );
+// m_dirOperator->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
// set up the toolbar
KConfigGroup fileselectorConfigGroup(KGlobal::config(), "fileselector");
@@ -291,11 +256,11 @@
{
KConfigGroup cgView(config, name + ":view");
- dir->setViewConfig(cgView );
+ m_dirOperator->setViewConfig(cgView );
KConfigGroup cgDir(config, name + ":dir");
- dir->readConfig(cgDir);
- dir->setView(KFile::Default);
+ m_dirOperator->readConfig(cgDir);
+ m_dirOperator->setView(KFile::Default);
KConfigGroup cg (config, name );
cmbPath->setUrls( cg.readPathEntry( "dir history", QStringList() ) );
@@ -334,12 +299,12 @@
"bookmarks" << "sync_dir";
}
QAction *ac;
- for ( QStringList::Iterator it = actions.begin(); it != actions.end(); ++it )
+ for ( QStringList::ConstIterator it = actions.constBegin(); it != actions.constEnd(); ++it )
{
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = mActionCollection->action( (*it).toLatin1().constData() );
else
- ac = dir->actionCollection()->action( (*it).toLatin1().constData() );
+ ac = m_dirOperator->actionCollection()->action( (*it).toLatin1().constData() );
if ( ac )
toolbar->addAction( ac );
}
@@ -358,7 +323,7 @@
void KateFileSelector::writeSessionConfig(KConfigBase *config, const QString & name)
{
KConfigGroup cgDir(config, name + ":dir");
- dir->writeConfig(cgDir);
+ m_dirOperator->writeConfig(cgDir);
KConfigGroup cg = KConfigGroup( config, name );
QStringList l;
@@ -374,8 +339,8 @@
void ::KateFileSelector::setView(KFile::FileView view)
{
- dir->setView(view);
- dir->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ m_dirOperator->setView(view);
+ m_dirOperator->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
}
//END Public Methods
@@ -385,25 +350,26 @@
void ::KateFileSelector::slotFilterChange( const QString & nf )
{
QString f = nf.trimmed();
- bool empty = f.isEmpty() || f == "*";
+ const bool empty = f.isEmpty() || f == "*";
+
if ( empty )
{
- dir->clearFilter();
+ m_dirOperator->clearFilter();
filter->lineEdit()->setText( QString() );
- btnFilter->setToolTip(
- i18n("Apply last filter (\"%1\")", lastFilter )) ;
+ btnFilter->setToolTip( i18n("Apply last filter (\"%1\")", lastFilter) ) ;
}
else
{
- dir->setNameFilter( f );
+ m_dirOperator->setNameFilter( f );
lastFilter = f;
btnFilter->setToolTip( i18n("Clear filter") );
}
+
btnFilter->setChecked( !empty );
- dir->updateDir();
+ m_dirOperator->updateDir();
+
// this will be never true after the filter has been used;)
btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) );
-
}
bool kateFileSelectorIsReadable ( const KUrl& url )
@@ -411,7 +377,7 @@
if ( !url.isLocalFile() )
return true; // what else can we say?
- QDir dir (url.path());
+ QDir dir(url.path());
return dir.exists ();
}
@@ -433,7 +399,7 @@
if ( !kateFileSelectorIsReadable (newurl) )
newurl.setPath( QDir::homePath() );
- dir->setUrl(newurl, true);
+ m_dirOperator->setUrl(newurl, true);
}
//END Public Slots
@@ -447,14 +413,14 @@
void ::KateFileSelector::openSelectedFiles()
{
- const KFileItemList list = dir->selectedItems();
+ const KFileItemList list = m_dirOperator->selectedItems();
foreach (const KFileItem& item, list)
{
mainwin->openUrl(item.url());
}
- dir->view()->selectionModel()->clear();
+ m_dirOperator->view()->selectionModel()->clear();
}
@@ -468,10 +434,10 @@
void ::KateFileSelector::cmbPathReturnPressed( const QString& u )
{
// construct so that relative urls are ok
- KUrl typedURL( dir->url(), u );
-
- //dir->setFocus(); // is it really useful to set focus here?
- dir->setUrl( typedURL, true );
+ KUrl typedURL( m_dirOperator->url(), u );
+
+ //m_dirOperator->setFocus(); // is it really useful to set focus here?
+ m_dirOperator->setUrl( typedURL, true );
qobject_cast( cmbPath->completionObject() )->setDir( typedURL.pathOrUrl() );
// strip password (noop if there's none)
@@ -488,9 +454,6 @@
qobject_cast( cmbPath->completionObject() )->setDir( u.pathOrUrl() );
}
-void ::KateFileSelector::dirFinishedLoading()
-{}
-
/*
When the button in the filter box toggles:
@@ -499,7 +462,7 @@
If on:
Set last filter.
*/
-void ::KateFileSelector::btnFilterClick()
+void ::KateFileSelector::filterButtonClicked()
{
if ( !btnFilter->isChecked() )
{
@@ -567,7 +530,7 @@
void KateFileSelector::focusInEvent( QFocusEvent * )
{
- dir->setFocus();
+ m_dirOperator->setFocus();
}
void KateFileSelector::showEvent( QShowEvent * )
@@ -659,11 +622,11 @@
acSel = new KActionSelector( gbToolbar );
acSel->setAvailableLabel( i18n("A&vailable actions:") );
acSel->setSelectedLabel( i18n("S&elected actions:") );
-
+
QVBoxLayout *vbox = new QVBoxLayout;
vbox->addWidget(acSel);
gbToolbar->setLayout(vbox);
-
+
lo->addWidget( gbToolbar );
connect( acSel, SIGNAL( added( QListWidgetItem * ) ), this, SLOT( slotMyChanged() ) );
connect( acSel, SIGNAL( removed( QListWidgetItem * ) ), this, SLOT( slotMyChanged() ) );
@@ -674,12 +637,12 @@
QGroupBox *gbSync = new QGroupBox(i18n("Auto Synchronization"), this );
cbSyncActive = new QCheckBox( i18n("When a docu&ment becomes active"));
cbSyncShow = new QCheckBox( i18n("When the file selector becomes visible"));
-
+
vbox = new QVBoxLayout;
vbox->addWidget(cbSyncActive);
vbox->addWidget(cbSyncShow);
gbSync->setLayout(vbox);
-
+
lo->addWidget( gbSync );
connect( cbSyncActive, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) );
connect( cbSyncShow, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) );
@@ -703,12 +666,12 @@
QGroupBox *gbSession = new QGroupBox(i18n("Session"), this );
cbSesLocation = new QCheckBox( i18n("Restore loca&tion"));
cbSesFilter = new QCheckBox( i18n("Restore last f&ilter"));
-
+
vbox = new QVBoxLayout;
vbox->addWidget(cbSesLocation);
vbox->addWidget(cbSesFilter);
gbSession->setLayout(vbox);
-
+
lo->addWidget( gbSession );
connect( cbSesLocation, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) );
connect( cbSesFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/plugins/filebrowser/katefileselector.h new/kdesdk-4.1.96/kate/plugins/filebrowser/katefileselector.h
--- old/kdesdk-4.1.87/kate/plugins/filebrowser/katefileselector.h 2008-10-09 11:47:31.000000000 +0200
+++ new/kdesdk-4.1.96/kate/plugins/filebrowser/katefileselector.h 2009-01-06 18:23:44.000000000 +0100
@@ -30,10 +30,9 @@
#include
#include
-#include
-#include
-#include
-#include
+#include <KVBox>
+#include <KFile>
+#include <KUrl>
class KActionCollection;
@@ -41,6 +40,7 @@
class KDirOperator;
class KFileItem;
class KHistoryComboBox;
+class KToolBar;
class QToolButton;
class QCheckBox;
class QSpinBox;
@@ -99,14 +99,6 @@
allowing to filter the displayed files using a name filter.
*/
-class KateFileSelectorToolBar: public KToolBar
-{
- Q_OBJECT
- public:
- KateFileSelectorToolBar(QWidget *parent);
- virtual ~KateFileSelectorToolBar();
-};
-
class KateFileSelector : public KVBox
{
Q_OBJECT
@@ -127,22 +119,13 @@
void writeConfig();
void setupToolbar( QStringList actions );
void setView( KFile::FileView );
- KDirOperator *dirOperator()
- {
- return dir;
- }
- KActionCollection *actionCollection()
- {
- return mActionCollection;
- }
+ KDirOperator *dirOperator() { return m_dirOperator; }
+ KActionCollection *actionCollection() { return mActionCollection; }
public Q_SLOTS:
void slotFilterChange(const QString&);
void setDir(KUrl);
- void setDir( const QString& url )
- {
- setDir( KUrl( url ) );
- }
+ void setDir( const QString& url ) { setDir( KUrl( url ) ); }
void kateViewChanged();
void selectorViewChanged( QAbstractItemView * );
@@ -151,9 +134,8 @@
void cmbPathActivated( const KUrl& u );
void cmbPathReturnPressed( const QString& u );
void dirUrlEntered( const KUrl& u );
- void dirFinishedLoading();
void setActiveDocumentDir();
- void btnFilterClick();
+ void filterButtonClicked();
protected:
KUrl activeDocumentUrl();
@@ -169,11 +151,11 @@
return mainwin;
}
private:
- class KateFileSelectorToolBar *toolbar;
+ KToolBar *toolbar;
KActionCollection *mActionCollection;
class KBookmarkHandler *bookmarkHandler;
KUrlComboBox *cmbPath;
- KDirOperator * dir;
+ KDirOperator * m_dirOperator;
class QAction *acSyncDir;
KHistoryComboBox * filter;
QToolButton *btnFilter;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/plugins/katebuild-plugin/katebuildplugin.desktop new/kdesdk-4.1.96/kate/plugins/katebuild-plugin/katebuildplugin.desktop
--- old/kdesdk-4.1.87/kate/plugins/katebuild-plugin/katebuildplugin.desktop 2009-01-01 17:26:52.000000000 +0100
+++ new/kdesdk-4.1.96/kate/plugins/katebuild-plugin/katebuildplugin.desktop 2009-01-06 18:23:46.000000000 +0100
@@ -15,6 +15,7 @@
Name[it]=Estensione di generazione di Kate
Name[ja]=Kate ビルドプラグイン
Name[km]=កម្មវិធីជំនួយស្ថាបនា Kate
+Name[ko]=Kate 빌드 플러그인
Name[lv]=Kate build spraudnis
Name[nds]=Kate-Buumoduul
Name[pa]=ਕੇਟ ਬਿਲਡ ਪਲੱਗਇਨ
@@ -38,6 +39,7 @@
Comment[it]=Compila o esegui make ed elabora i messaggi di errore
Comment[ja]=コンパイルまたは make してエラーメッセージを解析します
Comment[km]=Compile ឬ Make និងញែកសារកំហុស
+Comment[ko]=컴파일, 메이크 실행 및 오류 메시지 처리
Comment[lv]=Kompilē un analizē kļūdu ziņojumus
Comment[nds]=Kompileren oder "Make" utföhren un Fehlermellen inlesen
Comment[pt]=Compila ou executa o Make e processa as mensagens de erro
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/plugins/kate-ctags/katectagsplugin.desktop new/kdesdk-4.1.96/kate/plugins/kate-ctags/katectagsplugin.desktop
--- old/kdesdk-4.1.87/kate/plugins/kate-ctags/katectagsplugin.desktop 2009-01-01 17:26:52.000000000 +0100
+++ new/kdesdk-4.1.96/kate/plugins/kate-ctags/katectagsplugin.desktop 2009-01-06 18:23:44.000000000 +0100
@@ -15,6 +15,7 @@
Name[it]=Estensione CTags
Name[ja]=CTags プラグイン
Name[km]=កម្មវិធីជំនួយ CTags
+Name[ko]=CTags 플러그인
Name[lv]=CTags spraudnis
Name[nds]=CTags-Moduul
Name[pa]=CTags ਪਲੱਗਇਨ
@@ -39,6 +40,7 @@
Comment[it]=Cerca definizioni e dichiarazioni con CTags
Comment[ja]=CTags を使って定義/宣言を検索します
Comment[km]=រកមើលនិយមន័យ/ការប្រកាសជាមួយ CTags
+Comment[ko]=CTags를 사용하여 선언/정의 찾기
Comment[lv]=Uzmeklē definīcijas/deklarācijas ar CTags
Comment[nds]=Definitschonen/Deklaratschonen mit CTags nakieken
Comment[pt]=Procurar definições/declarações com o CTags
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kate/plugins/kjswrapper/samples/katekjsselect.desktop new/kdesdk-4.1.96/kate/plugins/kjswrapper/samples/katekjsselect.desktop
--- old/kdesdk-4.1.87/kate/plugins/kjswrapper/samples/katekjsselect.desktop 2008-07-03 07:05:55.000000000 +0200
+++ new/kdesdk-4.1.96/kate/plugins/kjswrapper/samples/katekjsselect.desktop 2009-01-06 18:23:46.000000000 +0100
@@ -18,6 +18,7 @@
Name[it]=Seleziona il più piccolo blocco esterno
Name[ja]=囲っている最も内側のブロックを選択します
Name[km]=ជ្រើសប្លុកដែលរុំព័ទ្ធតូចបំផុត
+Name[ko]=가장 작은 둘러싸는 블록 선택하기
Name[lt]=Žymėti mažiausią bloką
Name[lv]=Izvēlieties mazāko ietverošo bloku
Name[nds]=Lüttst ümgeven Block utsöken
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kbugbuster/CMakeLists.txt new/kdesdk-4.1.96/kbugbuster/CMakeLists.txt
--- old/kdesdk-4.1.87/kbugbuster/CMakeLists.txt 2008-11-04 18:12:54.000000000 +0100
+++ new/kdesdk-4.1.96/kbugbuster/CMakeLists.txt 2009-01-06 18:23:50.000000000 +0100
@@ -59,6 +59,7 @@
set(kbugbuster_SRCS main.cpp ${libkbbmainwindow_SRCS} ${libkbbackend_SRCS})
+kde4_add_app_icon(kbugbuster_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/kbugbuster.png")
kde4_add_executable(kbugbuster ${kbugbuster_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kcachegrind/kcachegrind/CMakeLists.txt new/kdesdk-4.1.96/kcachegrind/kcachegrind/CMakeLists.txt
--- old/kdesdk-4.1.87/kcachegrind/kcachegrind/CMakeLists.txt 2008-05-29 13:19:27.000000000 +0200
+++ new/kdesdk-4.1.96/kcachegrind/kcachegrind/CMakeLists.txt 2009-01-06 18:23:49.000000000 +0100
@@ -53,6 +53,8 @@
configdlgbase.ui
)
+kde4_add_app_icon(kcachegrind_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kcachegrind.png")
+
kde4_add_executable(kcachegrind ${kcachegrind_SRCS})
target_link_libraries(kcachegrind ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kdeaccounts-plugin/kdeaccountsplugin.desktop new/kdesdk-4.1.96/kdeaccounts-plugin/kdeaccountsplugin.desktop
--- old/kdesdk-4.1.87/kdeaccounts-plugin/kdeaccountsplugin.desktop 2008-09-13 10:14:04.000000000 +0200
+++ new/kdesdk-4.1.96/kdeaccounts-plugin/kdeaccountsplugin.desktop 2009-01-06 18:23:48.000000000 +0100
@@ -31,6 +31,7 @@
Name[pl]=Konta w repozytorium KDE
Name[pt]=Contas do Repositório do KDE
Name[pt_BR]=Contas do Repositório do KDE
+Name[ro]=Conturi de depozit KDE
Name[ru]=Учётные записи репозитория KDE
Name[sk]=Účty KDE archívu
Name[sl]=Računi za skladišče KDE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kioslave/svn/svnhelper/subversion.desktop new/kdesdk-4.1.96/kioslave/svn/svnhelper/subversion.desktop
--- old/kdesdk-4.1.87/kioslave/svn/svnhelper/subversion.desktop 2009-01-01 17:26:53.000000000 +0100
+++ new/kdesdk-4.1.96/kioslave/svn/svnhelper/subversion.desktop 2009-01-06 18:23:50.000000000 +0100
@@ -286,7 +286,7 @@
Comment[nds]=En Datei lokaal un in't Archiv ümnömen. Bruuk beter dit, as "Tofögen" un "Wegdoon".
Comment[ne]=फाइललाई स्थानीय रुपमा र भण्डारमा पुन: नामकरण गर्नुहोस् । फाइललाई पुन: नामकरण गर्न थप्ने र मेट्ने भन्दा यसलाई प्रयोग गर्नुहोस् ।
Comment[nl]=Hernoem een bestand lokaal en in de repository. Gebruik dit bij voorkeur boven het verwijderen van een bestand en het toevoegen onder een andere naam.
-Comment[nn]=Gi ei fil nytt namn lokalt og i arkivet. Bruk dette heller enn å sletta og leggja inn på nytt for å endra namn på ei fil.
+Comment[nn]=Gje ei fil nytt namn lokalt og i arkivet. Bruk dette heller enn å sletta og leggja inn på nytt for å endra namn på ei fil.
Comment[pl]=Zmienia nazwę pliku lokalnie i w repozytorium. Należy tego używać zamiast dodawania i usuwania pliku.
Comment[pt]=Muda o nome de um ficheiro a nível local e no repositório. Use isto em vez de adicionar e remover o ficheiro para mudar o nome.
Comment[pt_BR]=Renomear um arquivo a nível local e no repositório. Use isto em vez de adicionar e remover o arquivo para mudar o nome.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/kuiviewer/CMakeLists.txt new/kdesdk-4.1.96/kuiviewer/CMakeLists.txt
--- old/kdesdk-4.1.87/kuiviewer/CMakeLists.txt 2008-05-29 13:19:27.000000000 +0200
+++ new/kdesdk-4.1.96/kuiviewer/CMakeLists.txt 2009-01-06 18:23:50.000000000 +0100
@@ -6,6 +6,7 @@
set(kuiviewer_SRCS main.cpp kuiviewer.cpp )
+kde4_add_app_icon(kuiviewer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kuiviewer.png")
kde4_add_executable(kuiviewer ${kuiviewer_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/lokalize/src/CMakeLists.txt new/kdesdk-4.1.96/lokalize/src/CMakeLists.txt
--- old/kdesdk-4.1.87/lokalize/src/CMakeLists.txt 2008-12-04 09:35:32.000000000 +0100
+++ new/kdesdk-4.1.96/lokalize/src/CMakeLists.txt 2009-01-06 18:23:50.000000000 +0100
@@ -106,6 +106,8 @@
qt4_add_dbus_adaptor(lokalize_SRCS tm/org.kde.lokalize.TranslationMemory.xml
tm/tmwindow.h TM::TMWindow)
+kde4_add_app_icon(lokalize_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-lokalize.png")
+
kde4_add_executable(lokalize ${lokalize_SRCS})
target_link_libraries(lokalize
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/scripts/kdesvn-build new/kdesdk-4.1.96/scripts/kdesvn-build
--- old/kdesdk-4.1.87/scripts/kdesvn-build 2008-10-09 11:47:35.000000000 +0200
+++ new/kdesdk-4.1.96/scripts/kdesvn-build 2009-01-06 18:23:47.000000000 +0100
@@ -3858,6 +3858,7 @@
sub get_lock
{
my $lockfile = "$ENV{HOME}/.kdesvn-lock";
+ $! = 0; # Force reset to non-error status
sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL;
my $errorCode = $!; # Save for later testing.
@@ -3927,13 +3928,26 @@
};
return 1; # Hope the sysopen worked.
}
+ elsif ($errorCode == ENOTTY)
+ {
+ # Stupid bugs... normally sysopen will return ENOTTY, not sure who's to blame between
+ # glibc and Perl but I know that setting PERLIO=:stdio in the environment "fixes" things.
+ ; # pass
+ }
+ elsif ($errorCode != 0) # Some other error occurred.
+ {
+ warning " r[*]: Error $errorCode while creating lock file (is home directory available?)";
+ warning " r[*]: Continuing the script for now...";
+
+ # Even if we fail it's generally better to allow the script to proceed
+ # without being a jerk about things, especially as more non-CLI-skilled
+ # users start using kdesvn-build to build KDE.
+ return 1;
+ }
print LOCKFILE "$$\n";
close LOCKFILE;
- # Even if we fail it's generally better to allow the script to proceed
- # without being a jerk about things, especially as more non-CLI-skilled
- # users start using kdesvn-build to build KDE.
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.87/scripts/qt4/adapt-to-kde4-api.pl new/kdesdk-4.1.96/scripts/qt4/adapt-to-kde4-api.pl
--- old/kdesdk-4.1.87/scripts/qt4/adapt-to-kde4-api.pl 2009-01-01 17:26:52.000000000 +0100
+++ new/kdesdk-4.1.96/scripts/qt4/adapt-to-kde4-api.pl 2009-01-06 18:23:47.000000000 +0100
@@ -147,7 +147,7 @@
#Remove this include
s!#include !!;
-
+ s!#include !!;
# kde3support
s!#include !#include !;
s!#include !#include !;
@@ -188,6 +188,7 @@
s!#include !#include !;
s!\bKListView\b!K3ListView!g;
s!\bKListViewSearchLine\b!K3ListViewSearchLine!g;
+ s!\bKListViewSearchLineWidget\b!K3ListViewSearchLineWidget!g;
s!\bKListViewItem\b!K3ListViewItem!g;
s!#include !#include !;
s!\bKAboutApplication\b!K3AboutApplication!g;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org