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

Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-11-06 23:26:47 +00:00
parent 07d8db4505
commit 9b5ee85fd0
42 changed files with 86 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/style/StyleDialog.cpp
View file

@ -28,7 +28,8 @@
#include "gui/style/RSStyle.h"
/** Default constructor */
StyleDialog::StyleDialog(RSStyle &style, QWidget *parent, Qt::WFlags flags) : QDialog(parent, flags)
StyleDialog::StyleDialog(RSStyle &style, QWidget *parent)
: QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@ -42,9 +43,7 @@ StyleDialog::StyleDialog(RSStyle &style, QWidget *parent, Qt::WFlags flags) : QD
restoreGeometry(geometry);
}
// setWindowIcon(QIcon(":/images/rstray3.png"));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(onOK()));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui.color1Button, SIGNAL(clicked()), this, SLOT(chooseColor()));
@ -88,11 +87,6 @@ StyleDialog::~StyleDialog()
Settings->setValueToGroup("StyleDialog", "Geometry", saveGeometry());
}
void StyleDialog::onOK()
{
accept();
}
int StyleDialog::neededColors()
{
return RSStyle::neededColors((RSStyle::StyleType) ui.styleComboBox->itemData(ui.styleComboBox->currentIndex()).toInt());

3
retroshare-gui/src/gui/style/StyleDialog.h
View file

@ -36,14 +36,13 @@ class StyleDialog : public QDialog
public:
/** Default constructor */
StyleDialog(RSStyle &style, QWidget *parent = 0, Qt::WFlags flags = 0);
StyleDialog(RSStyle &style, QWidget *parent = 0);
/** Default destructor */
~StyleDialog();
void getStyle(RSStyle &style);
private slots:
void onOK();
void chooseColor();
void showButtons();