From cb64fb12cf25abe0932a2a4cb9e93dfd69f002d1 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sun, 16 May 2010 09:33:35 +0000
Subject: [PATCH] Corrected typo, Replaced Ok Button by anabled Apply button in
 settings, suppressed double click action for download in Shared File lists

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/SharedFilesDialog.cpp   |  2 +-
 .../src/gui/settings/DirectoriesPage.ui        |  2 +-
 .../src/gui/settings/rsettingswin.cpp          |  2 +-
 retroshare-gui/src/gui/settings/settings.ui    | 18 +-----------------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp
index d5edbb7bf..9f389dad3 100644
--- a/retroshare-gui/src/gui/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp
@@ -92,7 +92,7 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
 
   connect( ui.remoteDirTreeView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( shareddirtreeviewCostumPopupMenu( QPoint ) ) );
 
-  connect( ui.remoteDirTreeView, SIGNAL( doubleClicked(const QModelIndex&)), this, SLOT( downloadRemoteSelected()));
+//  connect( ui.remoteDirTreeView, SIGNAL( doubleClicked(const QModelIndex&)), this, SLOT( downloadRemoteSelected()));
   connect( ui.downloadButton, SIGNAL( clicked()), this, SLOT( downloadRemoteSelected()));
 
 	connect(ui.indicatorCBox, SIGNAL(currentIndexChanged(int)), this, SLOT(indicatorChanged(int)));
diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.ui b/retroshare-gui/src/gui/settings/DirectoriesPage.ui
index 5d3e9be3e..e2a4390f9 100755
--- a/retroshare-gui/src/gui/settings/DirectoriesPage.ui
+++ b/retroshare-gui/src/gui/settings/DirectoriesPage.ui
@@ -614,7 +614,7 @@
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>Automatically share incoming directory (Recommanded)</string>
+         <string>Automatically share incoming directory (Recommended)</string>
         </property>
         <property name="checked">
          <bool>true</bool>
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index a14156a51..399177d5b 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -48,7 +48,7 @@ RSettingsWin::RSettingsWin(QWidget * parent, Qt::WFlags flags)
     initStackedWidget();
 
     connect(listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(setNewPage(int)));
-    connect(okButton, SIGNAL(clicked( bool )), this, SLOT( saveChanges()) );
+    connect(applyButton, SIGNAL(clicked( bool )), this, SLOT( saveChanges()) );
 }
 
 RSettingsWin::~RSettingsWin()
diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui
index cd53c1623..ce3bf8403 100755
--- a/retroshare-gui/src/gui/settings/settings.ui
+++ b/retroshare-gui/src/gui/settings/settings.ui
@@ -247,9 +247,6 @@
      </item>
      <item>
       <widget class="QPushButton" name="applyButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -261,19 +258,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="okButton">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>OK</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
@@ -283,7 +267,7 @@
  </resources>
  <connections>
   <connection>
-   <sender>okButton</sender>
+   <sender>applyButton</sender>
    <signal>clicked()</signal>
    <receiver>Settings</receiver>
    <slot>accept()</slot>