summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-03-26 12:59:26 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:25 +0100
commitd3aae70838e2e345f45fb84586e8884c2ebe1081 (patch)
tree389c4f0332b21a92f0706d143e2c5710ab7c0d51
parent96084e46cd590d49ed909c3b42f75d222fa5b74b (diff)
Fix load ui.rc. Fix load shortcut
-rw-r--r--kopete/chatwindow/kopetechatwindow.cpp14
-rw-r--r--plugins/latex/latexguiclient.cpp2
-rw-r--r--protocols/jabber/CMakeLists.txt2
-rw-r--r--protocols/jabber/jabberchatsession.cpp1
-rw-r--r--protocols/jabber/jabbergroupchatmanager.cpp1
5 files changed, 11 insertions, 9 deletions
diff --git a/kopete/chatwindow/kopetechatwindow.cpp b/kopete/chatwindow/kopetechatwindow.cpp
index 4192f21..95a53f9 100644
--- a/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/chatwindow/kopetechatwindow.cpp
@@ -379,7 +379,7 @@ void KopeteChatWindow::initActions(void)
//'Enter' is on the Numpad
QList<QKeySequence> chatSendShortcuts;
chatSendShortcuts << QKeySequence(Qt::Key_Return) << QKeySequence(Qt::Key_Enter);
- chatSend->setShortcuts(chatSendShortcuts);
+ coll->setDefaultShortcuts(chatSend, chatSendShortcuts);
chatSend->setEnabled(false);
chatSendFile = new QAction(QIcon::fromTheme(QStringLiteral("mail-attachment")), i18n("Send File..."), coll);
@@ -403,13 +403,13 @@ void KopeteChatWindow::initActions(void)
tabRight = new QAction(i18n("&Activate Next Tab"), coll);
coll->addAction(QStringLiteral("tabs_right"), tabRight);
- tabRight->setShortcuts(KStandardShortcut::tabNext());
+ coll->setDefaultShortcuts(tabRight, KStandardShortcut::tabNext());
tabRight->setEnabled(false);
connect(tabRight, SIGNAL(triggered(bool)), this, SLOT(slotNextTab()));
tabLeft = new QAction(i18n("&Activate Previous Tab"), coll);
coll->addAction(QStringLiteral("tabs_left"), tabLeft);
- tabLeft->setShortcuts(KStandardShortcut::tabPrev());
+ coll->setDefaultShortcuts(tabLeft, KStandardShortcut::tabPrev());
tabLeft->setEnabled(false);
connect(tabLeft, SIGNAL(triggered(bool)), this, SLOT(slotPreviousTab()));
@@ -417,7 +417,7 @@ void KopeteChatWindow::initActions(void)
// The actual "slot" is the eventFilter.
nickComplete = new QAction(i18n("Nic&k Completion"), coll);
coll->addAction(QStringLiteral("nick_complete"), nickComplete);
- nickComplete->setShortcut(QKeySequence(Qt::Key_Tab));
+ coll->setDefaultShortcut(nickComplete, QKeySequence(Qt::Key_Tab));
tabDetach = new QAction(QIcon::fromTheme(QStringLiteral("tab-detach")), i18n("&Detach Chat"), coll);
coll->addAction(QStringLiteral("tabs_detach"), tabDetach);
@@ -441,7 +441,7 @@ void KopeteChatWindow::initActions(void)
connect(actionTabPlacementMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(slotPreparePlacementMenu()));
connect(actionTabPlacementMenu->menu(), SIGNAL(triggered(QAction *)), this, SLOT(slotPlaceTabs(QAction *)));
- tabDetach->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
+ coll->setDefaultShortcut(tabDetach, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
KStandardAction::cut(this, SLOT(slotCut()), coll);
KStandardAction::copy(this, SLOT(slotCopy()), coll);
@@ -451,12 +451,12 @@ void KopeteChatWindow::initActions(void)
historyUp = new QAction(i18n("Previous History"), coll);
coll->addAction(QStringLiteral("history_up"), historyUp);
- historyUp->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
+ coll->setDefaultShortcut(historyUp, QKeySequence(Qt::CTRL + Qt::Key_Up));
connect(historyUp, SIGNAL(triggered(bool)), this, SLOT(slotHistoryUp()));
historyDown = new QAction(i18n("Next History"), coll);
coll->addAction(QStringLiteral("history_down"), historyDown);
- historyDown->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
+ coll->setDefaultShortcut(historyDown, QKeySequence(Qt::CTRL + Qt::Key_Down));
connect(historyDown, SIGNAL(triggered(bool)), this, SLOT(slotHistoryDown()));
action = KStandardAction::prior(this, SLOT(slotPageUp()), coll);
diff --git a/plugins/latex/latexguiclient.cpp b/plugins/latex/latexguiclient.cpp
index ef85858..1673588 100644
--- a/plugins/latex/latexguiclient.cpp
+++ b/plugins/latex/latexguiclient.cpp
@@ -45,7 +45,7 @@ LatexGUIClient::LatexGUIClient(Kopete::ChatSession *parent)
QAction *previewAction = new QAction(QIcon::fromTheme(QStringLiteral("latex")), i18n("Preview Latex Images"), this);
actionCollection()->addAction(QStringLiteral("latexPreview"), previewAction);
- previewAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
+ actionCollection()->setDefaultShortcut(previewAction, QKeySequence(Qt::CTRL + Qt::Key_L));
connect(previewAction, SIGNAL(triggered(bool)), this, SLOT(slotPreview()));
setXMLFile(QStringLiteral("latexchatui.rc"));
diff --git a/protocols/jabber/CMakeLists.txt b/protocols/jabber/CMakeLists.txt
index fe194b6..0c34745 100644
--- a/protocols/jabber/CMakeLists.txt
+++ b/protocols/jabber/CMakeLists.txt
@@ -177,4 +177,4 @@ install(TARGETS kopete_jabber DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
install( FILES kopete_jabber.desktop xmpp.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-install( FILES jabberchatui.rc DESTINATION ${KDE_INSTALL_DATADIR}/kopete_jabber)
+install( FILES jabberchatui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kopete)
diff --git a/protocols/jabber/jabberchatsession.cpp b/protocols/jabber/jabberchatsession.cpp
index a32a817..6a2bb14 100644
--- a/protocols/jabber/jabberchatsession.cpp
+++ b/protocols/jabber/jabberchatsession.cpp
@@ -48,6 +48,7 @@ JabberChatSession::JabberChatSession (JabberProtocol *protocol, const JabberBase
{
qCDebug(JABBER_PROTOCOL_LOG) << "New message manager for " << user->contactId();
+ setComponentName(QStringLiteral("kopete"), i18n("Kopete"));
// make sure Kopete knows about this instance
Kopete::ChatSessionManager::self()->registerChatSession(this);
diff --git a/protocols/jabber/jabbergroupchatmanager.cpp b/protocols/jabber/jabbergroupchatmanager.cpp
index d6a7628..182d558 100644
--- a/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/protocols/jabber/jabbergroupchatmanager.cpp
@@ -35,6 +35,7 @@ JabberGroupChatManager::JabberGroupChatManager ( JabberProtocol *protocol, const
: Kopete::ChatSession ( user, others, protocol )
{
qCDebug(JABBER_PROTOCOL_LOG) << "New message manager for " << user->contactId ();
+ setComponentName(QStringLiteral("kopete"), i18n("Kopete"));
mRoomJid = roomJid;