From ee78d20cbbfdb56db511e4c5e8ebac209716d519 Mon Sep 17 00:00:00 2001
From: uwolfer <uwolfer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 1 Aug 2008 13:50:33 +0000
Subject: [PATCH] Rename 'Logout' to 'Disconnect' since this is what actually
 is done with this action. BUG:167814

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@840680 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 krdc/krdcui.rc      |  4 ++--
 krdc/mainwindow.cpp | 14 +++++++-------
 krdc/mainwindow.h   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/krdc/krdcui.rc b/krdc/krdcui.rc
index 8553475e5..37014236c 100644
--- a/krdc/krdcui.rc
+++ b/krdc/krdcui.rc
@@ -17,7 +17,7 @@
         <Action name="show_local_cursor" />
         <Action name="grab_all_keys" />
         <Action name="scale" />
-        <Action name="logout" />
+        <Action name="disconnect" />
     </Menu>
     <Action name="bookmark" />
     <Menu name="settings"><text>&amp;Settings</text>
@@ -40,7 +40,7 @@
     <Action name="view_only" />
     <Action name="grab_all_keys" />
     <Action name="scale" />
-    <Action name="logout" />
+    <Action name="disconnect" />
 </ToolBar>
 <ToolBar fullWidth="false" name="krdc_address_toolbar" iconText="icononly" newline="false"><text>Address Toolbar</text>
     <Action name="address_line" />
diff --git a/krdc/mainwindow.cpp b/krdc/mainwindow.cpp
index 398ed1262..093eee2a8 100644
--- a/krdc/mainwindow.cpp
+++ b/krdc/mainwindow.cpp
@@ -196,10 +196,10 @@ void MainWindow::setupActions()
     viewOnlyAction->setIcon(KIcon("document-preview"));
     connect(viewOnlyAction, SIGNAL(triggered(bool)), SLOT(viewOnly(bool)));
 
-    QAction *logoutAction = actionCollection()->addAction("logout");
-    logoutAction->setText(i18n("Log Out"));
-    logoutAction->setIcon(KIcon("system-log-out"));
-    connect(logoutAction, SIGNAL(triggered()), SLOT(logout()));
+    QAction *disconnectAction = actionCollection()->addAction("disconnect");
+    disconnectAction->setText(i18n("Disconnect"));
+    disconnectAction->setIcon(KIcon("system-log-out"));
+    connect(disconnectAction, SIGNAL(triggered()), SLOT(disconnect()));
 
     QAction *showLocalCursorAction = actionCollection()->addAction("show_local_cursor");
     showLocalCursorAction->setCheckable(true);
@@ -548,7 +548,7 @@ QScrollArea *MainWindow::createScrollArea(QWidget *parent, RemoteView *remoteVie
     return scrollArea;
 }
 
-void MainWindow::logout()
+void MainWindow::disconnect()
 {
     kDebug(5010);
 
@@ -669,7 +669,7 @@ void MainWindow::showRemoteViewToolbar()
         m_toolBar->addAction(actionCollection()->action("show_local_cursor"));
         m_toolBar->addAction(actionCollection()->action("grab_all_keys"));
         m_toolBar->addAction(actionCollection()->action("scale"));
-        m_toolBar->addAction(actionCollection()->action("logout"));
+        m_toolBar->addAction(actionCollection()->action("disconnect"));
 
         QAction *stickToolBarAction = new QAction(m_toolBar);
         stickToolBarAction->setCheckable(true);
@@ -702,7 +702,7 @@ void MainWindow::updateActionStatus()
     actionCollection()->action("view_only")->setEnabled(enabled);
     actionCollection()->action("grab_all_keys")->setEnabled(enabled);
     actionCollection()->action("scale")->setEnabled(enabled);
-    actionCollection()->action("logout")->setEnabled(enabled);
+    actionCollection()->action("disconnect")->setEnabled(enabled);
 
     bool viewOnlyChecked = false;
     if (m_currentRemoteView >= 0)
diff --git a/krdc/mainwindow.h b/krdc/mainwindow.h
index 17c70a795..8bc28964d 100644
--- a/krdc/mainwindow.h
+++ b/krdc/mainwindow.h
@@ -70,7 +70,7 @@ private slots:
     void showRemoteViewToolbar();
     void takeScreenshot();
     void switchFullscreen();
-    void logout();
+    void disconnect();
     void closeTab(QWidget *widget);
     void viewOnly(bool viewOnly);
     void showLocalCursor(bool showLocalCursor);
-- 
2.11.4.GIT