rev 12398 - in kde-extras/kdesvn/branches/experimental/debian: . patches
Michael Biebl
biebl at alioth.debian.org
Sat Oct 11 12:04:55 UTC 2008
Author: biebl
Date: 2008-10-11 12:04:55 +0000 (Sat, 11 Oct 2008)
New Revision: 12398
Modified:
kde-extras/kdesvn/branches/experimental/debian/changelog
kde-extras/kdesvn/branches/experimental/debian/patches/01-shortcuts.patch
Log:
* debian/patches/01-shortcuts.patch
- Update to the new code base.
Modified: kde-extras/kdesvn/branches/experimental/debian/changelog
===================================================================
--- kde-extras/kdesvn/branches/experimental/debian/changelog 2008-10-11 10:49:46 UTC (rev 12397)
+++ kde-extras/kdesvn/branches/experimental/debian/changelog 2008-10-11 12:04:55 UTC (rev 12398)
@@ -8,6 +8,8 @@
and the library is now called libsvnqt4.
* debian/*.install
- Update install files.
+ * debian/patches/01-shortcuts.patch
+ - Update to the new code base.
-- Michael Biebl <biebl at debian.org> Sat, 11 Oct 2008 12:42:48 +0200
Modified: kde-extras/kdesvn/branches/experimental/debian/patches/01-shortcuts.patch
===================================================================
--- kde-extras/kdesvn/branches/experimental/debian/patches/01-shortcuts.patch 2008-10-11 10:49:46 UTC (rev 12397)
+++ kde-extras/kdesvn/branches/experimental/debian/patches/01-shortcuts.patch 2008-10-11 12:04:55 UTC (rev 12398)
@@ -1,37 +1,24 @@
Make sure we assign unique shortcuts which don't interfere with other
kparts when embedded e.g. into konqueror. See also bug #452245
-Index: kdesvn-1.0.2/src/svnfrontend/kdesvnfilelist.cpp
+Index: kdesvn-1.2.1/src/svnfrontend/maintreewidget.cpp
===================================================================
---- kdesvn-1.0.2.orig/src/svnfrontend/kdesvnfilelist.cpp 2008-09-20 10:21:43.000000000 +0200
-+++ kdesvn-1.0.2/src/svnfrontend/kdesvnfilelist.cpp 2008-09-20 10:27:16.000000000 +0200
-@@ -268,18 +268,18 @@
- new KAction(i18n("Properties"),"edit",
- KShortcut(CTRL+Key_P),m_SvnWrapper,SLOT(slotProperties()),m_filesAction,"make_svn_property");
- new KAction(i18n("Display Properties"),"edit",
-- KShortcut(Key_P),this,SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
-+ KShortcut(SHIFT+CTRL+Key_P),this,SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
+--- kdesvn-1.2.1.orig/src/svnfrontend/maintreewidget.cpp 2008-10-11 13:07:47.000000000 +0200
++++ kdesvn-1.2.1/src/svnfrontend/maintreewidget.cpp 2008-10-11 13:08:25.000000000 +0200
+@@ -392,7 +392,7 @@
+ add_action("make_svn_tree",i18n("Full revision tree"),KShortcut(Qt::CTRL+Qt::Key_T),KIcon("kdesvntree"),this,SLOT(slotMakeTree()));
+ add_action("make_svn_partialtree",i18n("Partial revision tree"),KShortcut(Qt::SHIFT+Qt::CTRL+Qt::Key_T),KIcon("kdesvntree"),this,SLOT(slotMakePartTree()));
+ add_action("make_svn_property",i18n("Properties"),KShortcut(Qt::CTRL+Qt::Key_P),KIcon(),m_Data->m_Model->svnWrapper(),SLOT(slotProperties()));
+- add_action("get_svn_property",i18n("Display Properties"),KShortcut(Qt::Key_P),KIcon(),this,SLOT(slotDisplayProperties()));
++ add_action("get_svn_property",i18n("Display Properties"),KShortcut(Qt::SHIFT+Qt::CTRL+Qt::Key_P),KIcon(),this,SLOT(slotDisplayProperties()));
+ tmp_action = add_action("make_last_change",i18n("Display last changes"),KShortcut(),KIcon("kdesvndiff"),this,SLOT(slotDisplayLastDiff()));
+ if (tmp_action) tmp_action->setToolTip(i18n("Display last changes as difference to previous commit."));
+ add_action("make_svn_info",i18n("Details"),KShortcut(Qt::CTRL+Qt::Key_I),KIcon("kdesvninfo"),this,SLOT(slotInfo()));
+@@ -462,7 +462,7 @@
+ tmp_action = add_action("make_svn_headupdate",i18n("Update to head"),KShortcut(),KIcon("kdesvnupdate"),m_Data->m_Model->svnWrapper(),SLOT(slotUpdateHeadRec()));
+ tmp_action->setIconText(i18n("Update"));
+ tmp_action = add_action("make_svn_revupdate",i18n("Update to revision..."),KShortcut(),KIcon("kdesvnupdate"),m_Data->m_Model->svnWrapper(),SLOT(slotUpdateTo()));
+- tmp_action = add_action("make_svn_commit",i18n("Commit"),KShortcut("#"),KIcon("kdesvncommit"),m_Data->m_Model->svnWrapper(),SLOT(slotCommit()));
++ tmp_action = add_action("make_svn_commit",i18n("Commit"),KShortcut("CTRL+#"),KIcon("kdesvncommit"),m_Data->m_Model->svnWrapper(),SLOT(slotCommit()));
+ tmp_action->setIconText(i18n("Commit"));
- tmp_action = new KAction(i18n("Display last changes"),"kdesvndiff",
- KShortcut(),this,SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
- tmp_action->setToolTip(i18n("Display last changes as difference to previous commit."));
-
- m_InfoAction = new KAction(i18n("Details"),"kdesvninfo",
-- KShortcut(Key_I),this,SLOT(slotInfo()),m_filesAction,"make_svn_info");
-+ KShortcut(CTRL+Key_I),this,SLOT(slotInfo()),m_filesAction,"make_svn_info");
- m_RenameAction = new KAction(i18n("Move"),"move",
- KShortcut(Key_F2),this,SLOT(slotRename()),m_filesAction,"make_svn_rename");
- m_CopyAction = new KAction(i18n("Copy"),"kdesvncopy",
-- KShortcut(Key_C),this,SLOT(slotCopy()),m_filesAction,"make_svn_copy");
-+ KShortcut(CTRL+Key_C),this,SLOT(slotCopy()),m_filesAction,"make_svn_copy");
- tmp_action = new KAction(i18n("Check for updates"),"kdesvncheckupdates",KShortcut(),this,SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates");
- tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository"));
-
-@@ -355,7 +355,7 @@
- m_UpdateRev = new KAction(i18n("Update to revision..."),"kdesvnupdate",
- KShortcut(),m_SvnWrapper,SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate");
- m_commitAction = new KAction(i18n("Commit"),"kdesvncommit",
-- KShortcut("#"),m_SvnWrapper,SLOT(slotCommit()),m_filesAction,"make_svn_commit");
-+ KShortcut("CTRL+#"),m_SvnWrapper,SLOT(slotCommit()),m_filesAction,"make_svn_commit");
-
- tmp_action = new KAction(i18n("Diff local changes"),"kdesvndiff",
- KShortcut(CTRL+Key_D),this,SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff");
+ tmp_action =
More information about the pkg-kde-commits
mailing list