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

List:       kde-commits
Subject:    KDE/kdepim/akregator/src
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2010-06-10 12:29:59
Message-ID: 20100610122959.B76FCAC8CF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1136672 by cgiboudeaux:

"Fix the icons and shortcuts with RTL.
BUG: 205288
MERGE:4.4
FIXED-IN: 1.6.5



 M  +7 -4      actionmanagerimpl.cpp  


--- trunk/KDE/kdepim/akregator/src/actionmanagerimpl.cpp #1136671:1136672
@@ -54,6 +54,7 @@
 #include <kxmlguifactory.h>
 #include <kicon.h>
 
+#include <QApplication>
 #include <QHash>
 #include <QWidget>
 
@@ -559,16 +560,18 @@
 
     d->frameManager = frameManager;
 
-    KToolBarPopupAction* forward = new KToolBarPopupAction(KIcon("go-next"), \
i18nc("Go forward in browser history", "Forward"), this); +    bool isRTL = \
QApplication::isRightToLeft(); +
+    KToolBarPopupAction* forward = new KToolBarPopupAction(KIcon(isRTL ? \
"go-previous" : "go-next"), i18nc("Go forward in browser history", "Forward"), this); \
                d->actionCollection->addAction("browser_forward", forward);
-    forward->setShortcuts(KShortcut("Alt+Right"));
+    forward->setShortcuts(KShortcut(isRTL ? "Alt+Left" : "Alt+Right"));
     connect(forward, SIGNAL(triggered()), frameManager, SLOT(slotBrowserForward()));
 
     connect(forward->menu(), SIGNAL(aboutToShow()), frameManager, \
SLOT(slotBrowserForwardAboutToShow()));  
-    KToolBarPopupAction* back = new KToolBarPopupAction(KIcon("go-previous"), \
i18nc("Go back in browser history", "Back"), this); +    KToolBarPopupAction* back = \
new KToolBarPopupAction(KIcon(isRTL ? "go-next" : "go-previous"), i18nc("Go back in \
browser history", "Back"), this);  d->actionCollection->addAction("browser_back", \
                back);
-    back->setShortcuts(KShortcut("Alt+Left"));
+    back->setShortcuts(KShortcut(isRTL ?  "Alt+Right" : "Alt+Left"));
     connect(back, SIGNAL(triggered()), frameManager, SLOT(slotBrowserBack()));
 
     connect(back->menu(), SIGNAL(aboutToShow()), frameManager, \
SLOT(slotBrowserBackAboutToShow()));


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