Browse files

qt4-gui: Don't label close buttons "Done"

  • Loading branch information...
1 parent 9b85f23 commit b9fdf9cc969e06e89b96e835bc69f6005c42035e @flynd flynd committed May 23, 2012
View
3 qt4-gui/src/dialogs/editgrpdlg.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of Licq, an instant messaging client for UNIX.
- * Copyright (C) 1999-2011 Licq developers
+ * Copyright (C) 1999-2012 Licq developers <licq-dev@googlegroups.com>
*
* Licq is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -90,7 +90,6 @@ EditGrpDlg::EditGrpDlg(QWidget* parent)
QDialogButtonBox* buttons = new QDialogButtonBox();
connect(buttons, SIGNAL(rejected()), SLOT(close()));
btnDone = buttons->addButton(QDialogButtonBox::Close);
- btnDone->setText(tr("&Done"));
lay->addWidget(buttons);
RefreshList();
View
5 qt4-gui/src/dialogs/ownermanagerdlg.cpp
@@ -95,8 +95,7 @@ OwnerManagerDlg::OwnerManagerDlg(QWidget* parent)
myRemoveButton = new QPushButton(tr("R&emove..."));
buttons->addButton(myRemoveButton, QDialogButtonBox::ActionRole);
- closeButton = new QPushButton(tr("&Done"));
- buttons->addButton(closeButton, QDialogButtonBox::RejectRole);
+ buttons->addButton(QDialogButtonBox::Close);
// Connect all the signals
connect(myOwnerView, SIGNAL(itemSelectionChanged()), SLOT(listSelectionChanged()));
@@ -106,7 +105,7 @@ OwnerManagerDlg::OwnerManagerDlg(QWidget* parent)
connect(myRegisterButton, SIGNAL(clicked()), SLOT(registerPressed()));
connect(myModifyButton, SIGNAL(clicked()), SLOT(modify()));
connect(myRemoveButton, SIGNAL(clicked()), SLOT(remove()));
- connect(closeButton, SIGNAL(clicked()), SLOT(close()));
+ connect(buttons, SIGNAL(rejected()), SLOT(close()));
connect(gGuiSignalManager, SIGNAL(ownerAdded(const Licq::UserId&)), SLOT(updateList()));
connect(gGuiSignalManager, SIGNAL(ownerRemoved(const Licq::UserId&)), SLOT(updateList()));
connect(gGuiSignalManager, SIGNAL(protocolPluginLoaded(unsigned long)),
View
1 qt4-gui/src/dialogs/ownermanagerdlg.h
@@ -139,7 +139,6 @@ private slots:
QPushButton* myRegisterButton;
QPushButton* myModifyButton;
QPushButton* myRemoveButton;
- QPushButton* closeButton;
bool myPendingAdd;
bool myPendingRegister;

0 comments on commit b9fdf9c

Please sign in to comment.