summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2011-11-30 20:12:57 +0100
committerFrancois Andriot <francois.andriot@free.fr>2011-11-30 20:12:57 +0100
commitd43bdcf04f32151b34af844a51a2f10021836388 (patch)
tree6b570a68fa62ac00a94dfeb40381858eced17e0a /redhat
parent11cd202f7fc1d6c25135969308f3d72ed57e7f3c (diff)
downloadtde-packaging-d43bdcf04f32151b34af844a51a2f10021836388.tar.gz
tde-packaging-d43bdcf04f32151b34af844a51a2f10021836388.zip
RHEL/Fedora: kdebase: add Kate patch
Diffstat (limited to 'redhat')
-rw-r--r--redhat/kdebase/kdebase-3.5.13-kate_mru.patch71
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec8
2 files changed, 78 insertions, 1 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-kate_mru.patch b/redhat/kdebase/kdebase-3.5.13-kate_mru.patch
new file mode 100644
index 000000000..232835f9e
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-kate_mru.patch
@@ -0,0 +1,71 @@
+diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.cpp /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp
+--- /dev/shm/kdebase/kate/app/kateconfigdialog.cpp 2011-07-09 01:16:52.000000000 -0500
++++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp 2011-11-29 11:06:22.000000000 -0600
+@@ -112,11 +112,32 @@
+ TQWhatsThis::add(cb_fullPath,i18n("If this option is checked, the full document path will be shown in the window caption."));
+ connect( cb_fullPath, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+
++ // sort filelist ? ### remove
++ cb_sortFiles = new TQCheckBox(bgStartup);
++ cb_sortFiles->setText(i18n("Sort &files alphabetically in the file list"));
++ cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName);
++ TQWhatsThis::add( cb_sortFiles, i18n(
++ "If this is checked, the files in the file list will be sorted alphabetically.") );
++ connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+
+ // GROUP with the one below: "Behavior"
+ bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral );
+ lo->addWidget( bgStartup );
+
++ // number of recent files
++ TQHBox *hbNrf = new TQHBox( bgStartup );
++ TQLabel *lNrf = new TQLabel( i18n("&Number of recent files:"), hbNrf );
++ sb_numRecentFiles = new TQSpinBox( 0, 1000, 1, hbNrf );
++ sb_numRecentFiles->setValue( mainWindow->fileOpenRecent->maxItems() );
++ lNrf->setBuddy( sb_numRecentFiles );
++ TQString youwouldnotbelieveit ( i18n(
++ "<qt>Sets the number of recent files remembered by Kate.<p><strong>NOTE: </strong>"
++ "If you set this lower than the current value, the list will be truncated and "
++ "some items forgotten.</qt>") );
++ TQWhatsThis::add( lNrf, youwouldnotbelieveit );
++ TQWhatsThis::add( sb_numRecentFiles, youwouldnotbelieveit );
++ connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
++
+ // sync the konsole ?
+ cb_syncKonsole = new TQCheckBox(bgStartup);
+ cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));
+@@ -389,6 +403,11 @@
+
+ mainWindow->syncKonsole = cb_syncKonsole->isChecked();
+
++ mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);
++
++ config->writeEntry( "Number of recent files", sb_numRecentFiles->value() );
++ mainWindow->fileOpenRecent->setMaxItems( sb_numRecentFiles->value() );
++
+ fileSelConfigPage->apply();
+
+ filelistConfigPage->apply();
+diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.h /dev/shm/kdebase.new/kate/app/kateconfigdialog.h
+--- /dev/shm/kdebase/kate/app/kateconfigdialog.h 2010-08-12 17:35:39.000000000 -0500
++++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.h 2011-11-29 11:09:03.000000000 -0600
+@@ -66,6 +66,8 @@
+
+ TQCheckBox *cb_fullPath;
+ TQCheckBox *cb_syncKonsole;
++ TQCheckBox *cb_sortFiles;
++ TQSpinBox *sb_numRecentFiles;
+ TQCheckBox *cb_modNotifications;
+ TQCheckBox *cb_saveMetaInfos;
+ TQSpinBox *sb_daysMetaInfos;
+diff -urN /dev/shm/kdebase/kate/app/katemainwindow.cpp /dev/shm/kdebase.new/kate/app/katemainwindow.cpp
+--- /dev/shm/kdebase/kate/app/katemainwindow.cpp 2011-07-09 01:16:52.000000000 -0500
++++ /dev/shm/kdebase.new/kate/app/katemainwindow.cpp 2011-11-29 11:10:05.000000000 -0600
+@@ -412,6 +412,7 @@
+
+ m_viewManager->setShowFullPath(config->readBoolEntry("Show Full Path in Title", false));
+
++ fileOpenRecent->setMaxItems( config->readNumEntry("Number of recent files", fileOpenRecent->maxItems() ) );
+ fileOpenRecent->loadEntries(config, "Recent Files");
+
+ fileselector->readConfig(config, "fileselector");
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 5c52d2732..e2a6aeaec 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 8
+%define release 9
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -74,6 +74,8 @@ Patch12: kdebase-3.5.13-kdm-crypt.patch
Patch8: kdebase-3.5.13-startkde_ldpreload.patch
## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
+## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
+Patch13: kdebase-3.5.13-kate_mru.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
@@ -245,6 +247,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p4
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -619,6 +622,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
+* Wed Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
+- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
+
* Fri Nov 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
- Updates Kickoff menu Fix [TDE Bugs #281, #508]
- Adds KDM gcrypt dependency