[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    kdebase catching up with kdelibs (kkey)
From:       Adriaan de Groot <groot () kde ! org>
Date:       2006-03-31 22:39:02
Message-ID: 200604010039.03149.groot () kde ! org
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


I'm a little fuzzy on how things ought to be developed right now. When should 
things in kdebase be ported to kdelibs trunk? For instance, the attached 
patch brings libkonq up to date wrt. Chuslove's i18n changes from tuesday. 
Should I wait with that until the libs snapshot is updated?

Similarly, there's Hamish's KAction changes, which break libkonq as well, in 

popup.insertItem(SmallIconSet("goto"), i18n( "&Move Here" ) + "\t" +
 KKey::modFlagLabel( KKey::SHIFT ), 2 );

OK, so KKey::SHIFT is now Qt::SHIFT, but what about modFlagLabel()? It wasn't 
in the 3.5 API, so it's vanished again without being documented.

-- 
These are your friends - Adem
    GPG: FEA2 A3FE Adriaan de Groot

["libkonq.diff" (text/x-diff)]

Index: libkonq/konq_operations.cc
===================================================================
--- libkonq/konq_operations.cc	(revision 525135)
+++ libkonq/konq_operations.cc	(working copy)
@@ -273,7 +273,7 @@
       {
       case DEL:
           result = KMessageBox::warningContinueCancelList( 0,
-             	i18n( "Do you really want to delete this item?", "Do you really want \
to delete these %n items?", prettyList.count()), +             	i18np( "Do you really \
want to delete this item?", "Do you really want to delete these %n items?", \
prettyList.count()),  prettyList,
 		i18n( "Delete Files" ),
 		KStdGuiItem::del(),
@@ -282,7 +282,7 @@
 
       case SHRED:
           result = KMessageBox::warningContinueCancelList( 0,
-                i18n( "Do you really want to shred this item?", "Do you really want \
to shred these %n items?", prettyList.count()), +                i18np( "Do you \
really want to shred this item?", "Do you really want to shred these %n items?", \
prettyList.count()),  prettyList,
                 i18n( "Shred Files" ),
 		KGuiItem( i18n( "Shred" ), "editshred" ),
@@ -292,10 +292,10 @@
       case MOVE:
       default:
           result = KMessageBox::warningContinueCancelList( 0,
-                i18n( "Do you really want to move this item to the trash?", "Do you \
really want to move these %n items to the trash?", prettyList.count()), +             \
i18np( "Do you really want to move this item to the trash?", "Do you really want to \
move these %n items to the trash?", prettyList.count()),  prettyList,
 		i18n( "Move to Trash" ),
-		KGuiItem( i18n( "Verb", "&Trash" ), "edittrash"),
+		KGuiItem( i18nc( "Verb", "&Trash" ), "edittrash"),
 		keyName, KMessageBox::Dangerous);
       }
       if (!keyName.isEmpty())


[Attachment #6 (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]