rpms/yakuake/FC-5 yakuake-getSessionName.diff, NONE, 1.1 yakuake.spec, 1.3, 1.4
Dawid Gajownik (gajownik)
fedora-extras-commits at redhat.com
Sun Nov 5 16:44:16 UTC 2006
Author: gajownik
Update of /cvs/extras/rpms/yakuake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6100
Modified Files:
yakuake.spec
Added Files:
yakuake-getSessionName.diff
Log Message:
Add support for KonsoleScripts (#212862)
yakuake-getSessionName.diff:
--- NEW FILE yakuake-getSessionName.diff ---
diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h
--- yakuake-2.7.5/yakuake/src/dcop_interface.h 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h 2006-08-08 14:10:16.721056702 +0300
@@ -43,6 +43,8 @@
virtual void slotToggleState() = 0;
virtual void slotRenameSession(int id, const QString & name) = 0;
+
+ virtual QString slotSessionName(int id) = 0;
virtual void slotSetSessionTitleText(int id, const QString & name) = 0;
virtual void slotRunCommandInSession(int id, const QString & value) = 0;
};
diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp
--- yakuake-2.7.5/yakuake/src/main_window.cpp 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp 2006-08-08 14:12:08.191976212 +0300
@@ -290,6 +290,16 @@
/******************************************************************************
+** Gets caption from an item given its id
+*********************************/
+
+QString MainWindow::slotSessionName(int id)
+{
+ return tabs_bar->getCaption(id);
+}
+
+
+/******************************************************************************
** Open inline edit for the current item and show tab bar if necessary
************************************************************************/
diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h
--- yakuake-2.7.5/yakuake/src/main_window.h 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.h 2006-08-08 14:06:43.891845419 +0300
@@ -280,6 +280,7 @@
void slotPasteClipboard();
void slotRenameSession(int id, const QString & name);
+ QString slotSessionName(int id);
void slotInteractiveRename();
void slotSetSessionTitleText(int id, const QString & name);
void slotRunCommandInSession(int id, const QString & value);
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp
--- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp 2006-08-08 13:59:13.379880079 +0300
@@ -157,6 +157,18 @@
/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString TabbedWidget::getCaption(int id)
+{
+ int index = items.findIndex(id);
+
+ return captions[index];
+}
+
+
+/******************************************************************************
** Open inline edit for the current item
******************************************/
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h
--- yakuake-2.7.5/yakuake/src/tabbed_widget.h 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h 2006-08-08 14:08:45.551397384 +0300
@@ -145,6 +145,7 @@
void selectPreviousItem();
void renameItem(int id, const QString & name);
+ QString getCaption(int id);
void interactiveRename();
void setFontColor(const QColor & color);
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp
--- yakuake-2.7.5/yakuake/src/tabs_bar.cpp 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp 2006-08-08 14:14:43.405611033 +0300
@@ -86,6 +86,16 @@
tabs_widget->renameItem(id, name);
}
+/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString TabsBar::getCaption(int id)
+{
+ return tabs_widget->getCaption(id);
+}
+
+
/******************************************************************************
** Open inline edit for the current item
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h
--- yakuake-2.7.5/yakuake/src/tabs_bar.h 2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h 2006-08-08 14:15:04.210902512 +0300
@@ -127,6 +127,7 @@
int removeItem(int id);
void renameItem(int id, const QString & name);
+ QString getCaption(int id);
void interactiveRename();
Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yakuake.spec 20 May 2006 16:33:12 -0000 1.3
+++ yakuake.spec 5 Nov 2006 16:43:46 -0000 1.4
@@ -1,12 +1,14 @@
Name: yakuake
Version: 2.7.5
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Terminal emulator for KDE
Group: User Interface/Desktops
License: GPL
URL: http://extragear.kde.org/apps/yakuake/
Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2
+# http://www.kde-look.org/content/download.php?content=43873&id=2
+Patch0: http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -19,16 +21,17 @@
%prep
%setup -q
+%patch0 -p1
%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
%configure \
- --disable-debug \
- --disable-dependency-tracking \
- --disable-rpath \
- --enable-final
+ --disable-debug \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --enable-final
make %{?_smp_mflags}
@@ -39,12 +42,12 @@
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
- --add-category Application \
- --add-category Utility \
- --add-category KDE \
- --add-category Qt \
- --delete-original \
- %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop
+ --add-category Application \
+ --add-category Utility \
+ --add-category KDE \
+ --add-category Qt \
+ --delete-original \
+ %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop
chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh
%find_lang %{name}
@@ -53,7 +56,7 @@
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x ${_bindir}/gtk-update-icon-cache ] ; then
- ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
@@ -79,10 +82,17 @@
%changelog
-* Sat May 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.7.5-2
+* Mon Oct 30 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-4
+- Add support for KonsoleScripts (#212862)
+
+* Fri Sep 15 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-3
+- Update e-mail address
+- Fix mixed-use-of-spaces-and-tabs rpmlint warning
+
+* Sat May 20 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-2
- Add dist tag
-* Sat May 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.7.5-1
+* Sat May 20 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-1
- Update to 2.7.5
- Add `--disable-dependency-tracking' and `--enable-final' options
- Include translations
More information about the scm-commits
mailing list