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/trunk@2914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-05-16 09:54:21 +00:00
parent 9606dce758
commit 5b119ca4ba
4 changed files with 4 additions and 20 deletions

View File

@ -91,7 +91,7 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
connect( ui.remoteDirTreeView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( shareddirtreeviewCostumPopupMenu( QPoint ) ) ); 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.downloadButton, SIGNAL( clicked()), this, SLOT( downloadRemoteSelected()));
connect(ui.indicatorCBox, SIGNAL(currentIndexChanged(int)), this, SLOT(indicatorChanged(int))); connect(ui.indicatorCBox, SIGNAL(currentIndexChanged(int)), this, SLOT(indicatorChanged(int)));

View File

@ -614,7 +614,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Automatically share incoming directory (recommended)</string> <string>Automatically share incoming directory (Recommended)</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>

View File

@ -49,7 +49,7 @@ RSettingsWin::RSettingsWin(QWidget * parent, Qt::WFlags flags)
initStackedWidget(); initStackedWidget();
connect(listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(setNewPage(int))); 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() RSettingsWin::~RSettingsWin()

View File

@ -262,9 +262,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="applyButton"> <widget class="QPushButton" name="applyButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -276,19 +273,6 @@
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
</layout> </layout>
@ -298,7 +282,7 @@
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>okButton</sender> <sender>applyButton</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>Settings</receiver> <receiver>Settings</receiver>
<slot>accept()</slot> <slot>accept()</slot>