rev 12399 - in kde-extras/kdesvn/branches/experimental/debian: . patches

Michael Biebl biebl at alioth.debian.org
Sat Oct 11 12:06:24 UTC 2008 

Author: biebl
Date: 2008-10-11 12:06:24 +0000 (Sat, 11 Oct 2008)
New Revision: 12399

Added:
   kde-extras/kdesvn/branches/experimental/debian/patches/00-toolbar-actions.patch
Modified:
   kde-extras/kdesvn/branches/experimental/debian/changelog
   kde-extras/kdesvn/branches/experimental/debian/patches/series
Log:
* debian/patches/00-toolbar-actions.patch
  - Unclutter the toolbar. Patch cherry-picked from upstream svn.

Modified: kde-extras/kdesvn/branches/experimental/debian/changelog
===================================================================
--- kde-extras/kdesvn/branches/experimental/debian/changelog	2008-10-11 12:04:55 UTC (rev 12398)
+++ kde-extras/kdesvn/branches/experimental/debian/changelog	2008-10-11 12:06:24 UTC (rev 12399)
@@ -10,6 +10,8 @@
     - Update install files.
   * debian/patches/01-shortcuts.patch
     - Update to the new code base.
+  * debian/patches/00-toolbar-actions.patch
+    - Unclutter the toolbar. Patch cherry-picked from upstream svn.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 11 Oct 2008 12:42:48 +0200
 

Added: kde-extras/kdesvn/branches/experimental/debian/patches/00-toolbar-actions.patch
===================================================================
--- kde-extras/kdesvn/branches/experimental/debian/patches/00-toolbar-actions.patch	                        (rev 0)
+++ kde-extras/kdesvn/branches/experimental/debian/patches/00-toolbar-actions.patch	2008-10-11 12:06:24 UTC (rev 12399)
@@ -0,0 +1,112 @@
+Index: kdesvn-1.2.1/src/kdesvn_part.rc
+===================================================================
+--- kdesvn-1.2.1.orig/src/kdesvn_part.rc	2008-06-20 15:05:14.000000000 +0200
++++ kdesvn-1.2.1/src/kdesvn_part.rc	2008-10-11 13:07:47.000000000 +0200
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kdesvn_part" version="17">
++<kpartgui name="kdesvn_part" version="18">
+ <MenuBar>
+   <Menu noMerge="1" name="settings">
+     <Action name="kdesvnpart_pref" />
+@@ -219,14 +219,12 @@
+   <text>Subversion toolbar</text>
+   <Action name="make_svn_headupdate" />
+   <Action name="make_svn_commit" />
+-  <Action name="make_check_updates" />
+   <Separator name="separator_3" />
+   <Action name="make_svn_log_full" />
+   <Action name="make_svn_info" />
+   <Action name="make_svn_blame" />
+   <Separator name="separator_2" />
+   <Action name="make_svn_add" />
+-  <Action name="make_check_unversioned" />
+   <Action name="make_svn_remove" />
+   <Action name="make_svn_merge_revisions" />
+   <Separator name="separator_1" />
+Index: kdesvn-1.2.1/src/svnfrontend/maintreewidget.cpp
+===================================================================
+--- kdesvn-1.2.1.orig/src/svnfrontend/maintreewidget.cpp	2008-10-02 11:21:29.000000000 +0200
++++ kdesvn-1.2.1/src/svnfrontend/maintreewidget.cpp	2008-10-11 13:07:47.000000000 +0200
+@@ -387,7 +387,8 @@
+     /* local and remote actions */
+     /* 1. actions on dirs AND files */
+     //new KAction(,"kdesvnlog",,this,SLOT(slotMakeLog()),m_Data->m_Collection,"make_svn_log_full");
+-    add_action("make_svn_log_full",i18n("Full Log"),KShortcut(Qt::CTRL+Qt::Key_L),KIcon("kdesvnlog"),this,SLOT(slotMakeLog()));
++    tmp_action = add_action("make_svn_log_full",i18n("Full Log"),KShortcut(Qt::CTRL+Qt::Key_L),KIcon("kdesvnlog"),this,SLOT(slotMakeLog()));
++    tmp_action->setIconText("Log");
+     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()));
+@@ -399,6 +400,7 @@
+     add_action("make_svn_copy",i18n("Copy"),KShortcut(Qt::CTRL+Qt::Key_C),KIcon("kdesvncopy"),this,SLOT(slotCopy()));
+     tmp_action = add_action("make_check_updates",i18n("Check for updates"),KShortcut(),KIcon("kdesvncheckupdates"),this,SLOT(slotCheckUpdates()));
+     tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository"));
++    tmp_action->setIconText(i18n("Check updates"));
+ 
+     /* 2. actions only on files */
+     tmp_action = add_action("make_svn_blame",i18n("Blame"),KShortcut(),KIcon("kdesvnblame"),this,SLOT(slotBlame()));
+@@ -423,6 +425,7 @@
+     tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url"));
+ 
+     tmp_action = add_action("make_check_unversioned",i18n("Check for unversioned items"),KShortcut(),KIcon("kdesvnaddrecursive"),this,SLOT(slotCheckNewItems()));
++    tmp_action->setIconText(i18n("Unversioned"));
+     tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted."));
+ 
+     tmp_action = add_action("make_switch_to_repo",i18n("Open repository of working copy"),KShortcut(),KIcon("kdesvnrepository"),
+@@ -439,11 +442,13 @@
+     /* 1. actions on files AND dirs*/
+     tmp_action = add_action("make_svn_add",i18n("Add selected files/dirs"),KShortcut(Qt::Key_Insert),KIcon("kdesvnadd"),m_Data->m_Model->svnWrapper(),SLOT(slotAdd()));
+     tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository"));
++    tmp_action->setIconText(i18n("Add"));
+     tmp_action = add_action("make_svn_addrec",i18n("Add selected files/dirs recursive"),KShortcut(Qt::CTRL+Qt::Key_Insert),KIcon("kdesvnaddrecursive"),
+                             m_Data->m_Model->svnWrapper(),SLOT(slotAddRec()));
+     tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders"));
+ 
+     tmp_action = add_action("make_svn_remove",i18n("Delete selected files/dirs"),KShortcut(Qt::Key_Delete),KIcon("kdesvndelete"),this,SLOT(slotDelete()));
++    tmp_action->setIconText(i18n("Delete"));
+     tmp_action->setToolTip(i18n("Deleting selected files and/or directories from repository"));
+     tmp_action  = add_action("make_svn_revert",i18n("Revert current changes"),KShortcut(),KIcon("kdesvnreverse"),m_Data->m_Model->svnWrapper(),SLOT(slotRevert()));
+ 
+@@ -455,8 +460,10 @@
+     tmp_action = add_action("make_svn_ignore",i18n("Ignore/Unignore current item"),KShortcut(),KIcon(),this,SLOT(slotIgnore()));
+ 
+     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->setIconText(i18n("Commit"));
+ 
+     tmp_action =
+         add_action("make_svn_basediff",i18n("Diff local changes"),KShortcut(Qt::CTRL+Qt::Key_D),KIcon("kdesvndiff"),this,SLOT(slotSimpleBaseDiff()));
+@@ -473,6 +480,7 @@
+ 
+     tmp_action =
+         add_action("make_svn_merge_revisions",i18n("Merge two revisions"),KShortcut(),KIcon("kdesvnmerge"),this,SLOT(slotMergeRevisions()));
++    tmp_action->setIconText(i18n("Merge"));
+     tmp_action->setToolTip(i18n("Merge two revisions of this entry into itself"));
+ 
+     tmp_action=
+@@ -483,6 +491,7 @@
+     /* remote actions only */
+     tmp_action =
+         add_action("make_svn_checkout_current",i18n("Checkout current repository path"),KShortcut(),KIcon("kdesvncheckout"), m_Data->m_Model->svnWrapper(),SLOT(slotCheckoutCurrent()));
++    tmp_action->setIconText(i18n("Checkout"));
+     tmp_action =
+         add_action("make_svn_export_current",i18n("Export current repository path"),KShortcut(),KIcon("kdesvnexport"), m_Data->m_Model->svnWrapper(),SLOT(slotExportCurrent()));
+     add_action("switch_browse_revision",i18n("Select browse revision"),KShortcut(),KIcon(),this,SLOT(slotSelectBrowsingRevision()));
+@@ -490,9 +499,11 @@
+     /* independe actions */
+     tmp_action =
+         add_action("make_svn_checkout",i18n("Checkout a repository"),KShortcut(),KIcon("kdesvncheckout"),m_Data->m_Model->svnWrapper(),SLOT(slotCheckout()));
+-    tmp_action =
+-        add_action("make_svn_export",i18n("Export a repository"),KShortcut(),KIcon("kdesvnexport"),m_Data->m_Model->svnWrapper(),SLOT(slotExport()));
+-        tmp_action = add_action("make_view_refresh",i18n("Refresh view"),KShortcut(Qt::Key_F5),KIcon("kdesvnrightreload"),this,SLOT(refreshCurrentTree()));
++    tmp_action->setIconText(i18n("Checkout"));
++    tmp_action = add_action("make_svn_export",i18n("Export a repository"),KShortcut(),KIcon("kdesvnexport"),m_Data->m_Model->svnWrapper(),SLOT(slotExport()));
++    tmp_action->setIconText(i18n("Export"));
++    tmp_action = add_action("make_view_refresh",i18n("Refresh view"),KShortcut(Qt::Key_F5),KIcon("kdesvnrightreload"),this,SLOT(refreshCurrentTree()));
++    tmp_action->setIconText(i18n("Refresh"));
+ 
+     add_action("make_revisions_diff",i18n("Diff revisions"),KShortcut(),KIcon("kdesvndiff"),this,SLOT(slotDiffRevisions()));
+ 

Modified: kde-extras/kdesvn/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/kdesvn/branches/experimental/debian/patches/series	2008-10-11 12:04:55 UTC (rev 12398)
+++ kde-extras/kdesvn/branches/experimental/debian/patches/series	2008-10-11 12:06:24 UTC (rev 12399)
@@ -1 +1,2 @@
+00-toolbar-actions.patch
 01-shortcuts.patch

More information about the pkg-kde-commits mailing list