Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 11:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use QPushButton for some dialogs fixes translation problems, QButtonBox default translations are only available for few languages.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-03-09 20:56:57 +00:00
parent 0ea171e237
commit d0a772f5d9
44 changed files with 1837 additions and 1443 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/ShareManager.cpp
View file

@ -49,8 +49,7 @@ ShareManager::ShareManager(QWidget *parent, Qt::WFlags flags)
connect(ui.addButton, SIGNAL(clicked( bool ) ), this , SLOT( addShareDirectory() ) );
connect(ui.removeButton, SIGNAL(clicked( bool ) ), this , SLOT( removeShareDirectory() ) );
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui.closeButton, SIGNAL(accepted()), this, SLOT(close()));
connect( ui.shareddirList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( shareddirListCostumPopupMenu( QPoint ) ) );

11
retroshare-gui/src/gui/ShareManager.ui
View file

@ -109,7 +109,7 @@ p, li { white-space: pre-wrap; }
<property name="topMargin">
<number>6</number>
</property>
<item row="0" column="0" colspan="4">
<item row="0" column="0" colspan="5">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Shared Folder Manager</string>
@ -255,12 +255,9 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item row="1" column="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<widget class="QPushButton" name="closeButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>

13
retroshare-gui/src/gui/profile/StatusMessage.cpp
View file

@ -42,8 +42,8 @@ StatusMessage::StatusMessage(QWidget *parent, Qt::WFlags flags)
/* Create RshareSettings object */
_settings = new RshareSettings();
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(save()));
connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close()));
connect(ui.okButton, SIGNAL(clicked()), this, SLOT(save()));
load();
@ -79,13 +79,8 @@ void StatusMessage::save()
/** Loads the settings for this page */
void StatusMessage::load()
{
//_settings->beginGroup("Profile");
//ui.txt_StatusMessage->setText(_settings->value("StatusMessage","").toString());
//_settings->endGroup();
ui.txt_StatusMessage->setText(QString::fromStdString(rsMsgs->getCustomStateString())) ;
{
ui.txt_StatusMessage->setText(QString::fromStdString(rsMsgs->getCustomStateString()));
}

47
retroshare-gui/src/gui/profile/StatusMessage.ui
View file

@ -35,22 +35,6 @@
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>9</x>
<y>180</y>
<width>371</width>
<height>25</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QFrame" name="frame">
<property name="geometry">
<rect>
@ -168,9 +152,37 @@ border: 1px solid #CCCCCC;}
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QPushButton" name="okButton">
<property name="geometry">
<rect>
<x>220</x>
<y>180</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>OK</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="cancelButton">
<property name="geometry">
<rect>
<x>300</x>
<y>180</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</widget>
<zorder>frame_2</zorder>
<zorder>buttonBox</zorder>
<zorder>frame</zorder>
<zorder>label_3</zorder>
<zorder>label_2</zorder>
@ -184,6 +196,7 @@ border: 1px solid #CCCCCC;}
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>