diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index 838e49312..c68436711 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -49,6 +49,7 @@ /* Images for context menu icons */ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" #define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" +#define IMAGE_PEERINFO ":/images/peerdetails_16x16.png" #define IMAGE_CHAT ":/images/chat.png" #define IMAGE_MSG ":/images/message-mail.png" /* Images for Status icons */ @@ -117,7 +118,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point ) connectfriendAct = new QAction( tr( "Connect To Friend" ), this ); connect( connectfriendAct , SIGNAL( triggered() ), this, SLOT( connectfriend() ) ); - configurefriendAct = new QAction( tr( "Configure Friend" ), this ); + configurefriendAct = new QAction(QIcon(IMAGE_PEERINFO), tr( "Peer Details" ), this ); connect( configurefriendAct , SIGNAL( triggered() ), this, SLOT( configurefriend() ) ); exportfriendAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Export Friend" ), this ); @@ -131,9 +132,9 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point ) contextMnu.addAction( chatAct); contextMnu.addAction( msgAct); contextMnu.addSeparator(); - contextMnu.addAction( connectfriendAct); - contextMnu.addSeparator(); contextMnu.addAction( configurefriendAct); + contextMnu.addSeparator(); + contextMnu.addAction( connectfriendAct); contextMnu.addAction( exportfriendAct); contextMnu.addAction( removefriendAct); contextMnu.exec( mevent->globalPos() ); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index e50921e71..d113403c4 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -28,7 +28,7 @@ /** Default constructor */ ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags) - : QMainWindow(parent, flags) + : QDialog(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); @@ -38,7 +38,7 @@ ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags) connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); - setFixedSize(QSize(434, 462)); + //setFixedSize(QSize(434, 462)); } @@ -51,7 +51,7 @@ ConfCertDialog::show() { //loadSettings(); if(!this->isVisible()) { - QMainWindow::show(); + QDialog::show(); } } diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.h b/retroshare-gui/src/gui/connect/ConfCertDialog.h index 3b6129687..4e31d5c38 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.h +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.h @@ -23,11 +23,11 @@ #ifndef _CONFCERTDIALOG_H #define _CONFCERTDIALOG_H -#include +#include #include "ui_ConfCertDialog.h" -class ConfCertDialog : public QMainWindow +class ConfCertDialog : public QDialog { Q_OBJECT diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 3d9654bf1..2e3081ac4 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -1,12 +1,12 @@ ConfCertDialog - + 0 0 - 425 - 449 + 510 + 445 @@ -498,311 +498,320 @@ Qt::NoContextMenu + + Details + :/images/rstray3.png - - - - 9 - 279 - 407 - 127 - - - - Trust Settings - - - - - - Trust Level - - - - - - - true - - - - - - - Sign The Certificate - - - - - - - Trust Their Signature - - - - - - - - - 9 - 415 - 199 - 25 - - - - Cancel - - - - - - 218 - 415 - 198 - 25 - - - - OK - - - false - - - true - - - - - - 9 - 143 - 407 - 127 - - - - Peer Address - - - - - - Local Address: - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - 0 - - - 65535 - - - 7812 - - - - - - - Port: - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Port:</p></body></html> - - - - - - - - - false - - - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">External Address:</p></body></html> - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">External Name</p></body></html> - - - - - - - - - 9 - 7 - 407 - 127 - - - - Peer Info - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + 0 + + + + Details + + + :/images/peerdetails_16x16.png + + + + + + Peer Info + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Name:</p></body></html> - - - - - - - true - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + true + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Org / Loc:</p></body></html> - - - - - - - true - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + true + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Country/State:</p></body></html> - + + + + + + + true + + + + + + + + + + Peer Address + + + + + + Local Address: + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + 0 + + + 65535 + + + 7812 + + + + + + + Port: + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + + + + 0 + + + 65535 + + + 7812 + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Port:</p></body></html> + + + + + + + + + false + + + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">External Address:</p></body></html> + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">External Name</p></body></html> + + + + + + + + + + Trust Settings + + + + + + Trust Level + + + + + + + true + + + + + + + Sign The Certificate + + + + + + + Trust Their Signature + + + + + + + - - - - - true - - - - - + + + + + + + + Qt::Horizontal + + + + 311 + 20 + + + + + + + + Cancel + + + + + + + OK + + + false + + + true + + + + + + name diff --git a/retroshare-gui/src/release/qss/arachnophobia.qss b/retroshare-gui/src/release/qss/arachnophobia.qss index 6daee0b29..dc751ab9b 100644 --- a/retroshare-gui/src/release/qss/arachnophobia.qss +++ b/retroshare-gui/src/release/qss/arachnophobia.qss @@ -13,44 +13,26 @@ QToolBar { } -QPushButton#addfriendButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - color: white; - min-height: 34px; - min-width: 48px; -} - QPushButton#okButton { - color: white; min-height: 27px; min-width: 77px; } +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 77px; +} + QPushButton#cancelButton { - color: white; - min-height: 25px; + min-height: 25px; + max-height: 25px; + min-width: 75px; +} + + +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; min-width: 75px; } diff --git a/retroshare-gui/src/release/qss/black.qss b/retroshare-gui/src/release/qss/black.qss index 1f80425ea..560ad7c69 100644 --- a/retroshare-gui/src/release/qss/black.qss +++ b/retroshare-gui/src/release/qss/black.qss @@ -18,45 +18,29 @@ QPushButton { } -QPushButton#addfriendButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - color: white; - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - color: white; - min-height: 34px; - min-width: 48px; -} QPushButton#okButton { color: white; - min-height: 27px; + min-height: 27px; min-width: 77px; } -QPushButton#cancelButton#afcancelButton#doneButton { +QPushButton#applyButton { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#cancelButton { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#afcancelButton#doneButton#refreshButtonv#nviewsettingsButton#checkButton +{ color: white; - min-height: 25px; + min-height: 25px; min-width: 75px; } @@ -68,7 +52,7 @@ QPushButton#fileButton#emailButton { QPushButton#cancelprefButton { color: white; - min-height: 25px; + min-height: 27px; min-width: 75px; } @@ -82,6 +66,42 @@ QPushButton#pushButtonDownload{ min-width: 34px; } +QPushButton#Sendbtn { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#sendButton { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#newmessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#replymessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#removemessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#printbutton{ + + min-height: 27px; + min-width: 47px; +} + QPushButton { border-image: url(qss/black/button.png) ; diff --git a/retroshare-gui/src/release/qss/blue.qss b/retroshare-gui/src/release/qss/blue.qss index b956f97a8..cd170731f 100644 --- a/retroshare-gui/src/release/qss/blue.qss +++ b/retroshare-gui/src/release/qss/blue.qss @@ -9,38 +9,29 @@ QToolBar { } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} QPushButton#okButton { min-height: 27px; min-width: 77px; } +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 77px; +} + QPushButton#cancelButton { - min-height: 25px; + min-height: 25px; + max-height: 25px; + min-width: 75px; +} + + +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; min-width: 75px; } @@ -48,4 +39,3 @@ QPushButton#cancelButton { - diff --git a/retroshare-gui/src/release/qss/default.qss b/retroshare-gui/src/release/qss/default.qss index 95efbf857..e866506a6 100644 --- a/retroshare-gui/src/release/qss/default.qss +++ b/retroshare-gui/src/release/qss/default.qss @@ -8,37 +8,39 @@ QToolBar { } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; +/* Customize the Menu Bar. */ +QMenuBar { + border-image: url(:/qss/default/retrotoolbar.png); + } -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} QPushButton#okButton { - min-height: 27px; + + min-height: 27px; min-width: 77px; + max-width: 77px; +} + +QPushButton#cancelprefButton { + + min-height: 27px; + min-width: 77px; + max-width: 77px; +} + +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; + min-width: 77px; + max-width: 77px; } QPushButton#cancelButton { - min-height: 25px; - min-width: 75px; + + min-height: 25px; + max-height: 25px; + min-width: 77px; + max-width: 77px; } diff --git a/retroshare-gui/src/release/qss/ed2k.qss b/retroshare-gui/src/release/qss/ed2k.qss index cea7a656b..f106d02eb 100644 --- a/retroshare-gui/src/release/qss/ed2k.qss +++ b/retroshare-gui/src/release/qss/ed2k.qss @@ -31,31 +31,6 @@ border-image: url(qss/ed2k/button-up.png) ; } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} - QPushButton#okButton { min-height: 27px; min-width: 77px; @@ -71,3 +46,78 @@ QPushButton#cancelprefButton { min-height: 25px; min-width: 75px; } + +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; + min-width: 75px; +} + +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 75px; +} + +QPushButton#Sendbtn { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#sendButton { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#newmessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#replymessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#removemessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#printbutton +{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#afcancelButton +{ + min-height: 25px; + min-width: 75px; +} + +QPushButton#refreshButton +{ + min-height: 25px; + min-width: 75px; +} + +QPushButton#checkButton +{ + min-height: 25px; + min-width: 75px; +} + + +QPushButton#nviewsettingsButton +{ + min-height: 25px; + min-width: 75px; +} + diff --git a/retroshare-gui/src/release/qss/over.qss b/retroshare-gui/src/release/qss/over.qss index 835f7f379..9341c0621 100644 --- a/retroshare-gui/src/release/qss/over.qss +++ b/retroshare-gui/src/release/qss/over.qss @@ -32,30 +32,6 @@ color: white; border-image: url(qss/over/greentop.png) ; } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} QPushButton#okButton { min-height: 27px; @@ -67,9 +43,77 @@ QPushButton#cancelButton { min-width: 75px; } +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; + min-width: 75px; +} + QPushButton#cancelprefButton { - color: white; - min-height: 25px; + min-height: 27px; + min-width: 75px; +} + +QPushButton#Sendbtn { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#sendButton { + + min-height: 25px; + min-width: 77px; +} + +QPushButton#newmessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#replymessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#removemessageButton{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#printbutton +{ + + min-height: 27px; + min-width: 47px; +} + +QPushButton#afcancelButton +{ + min-height: 25px; + min-width: 75px; +} + +QPushButton#refreshButton +{ + min-height: 25px; + min-width: 75px; +} + +QPushButton#checkButton +{ + min-height: 25px; + min-width: 75px; +} + + +QPushButton#nviewsettingsButton +{ + min-height: 25px; min-width: 75px; } diff --git a/retroshare-gui/src/release/qss/silver.qss b/retroshare-gui/src/release/qss/silver.qss index e5c140652..af7c9a8ac 100644 --- a/retroshare-gui/src/release/qss/silver.qss +++ b/retroshare-gui/src/release/qss/silver.qss @@ -7,39 +7,26 @@ QToolBar { -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} - QPushButton#okButton { min-height: 27px; min-width: 77px; } +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 77px; +} + QPushButton#cancelButton { - min-height: 25px; + min-height: 25px; + max-height: 25px; min-width: 75px; } +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; + min-width: 75px; +} \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/skin2.qss b/retroshare-gui/src/release/qss/skin2.qss index 48bf476c0..dacce6572 100644 --- a/retroshare-gui/src/release/qss/skin2.qss +++ b/retroshare-gui/src/release/qss/skin2.qss @@ -7,37 +7,26 @@ QToolBar { } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} - QPushButton#okButton { min-height: 27px; min-width: 77px; } +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 77px; +} + QPushButton#cancelButton { - min-height: 25px; + min-height: 25px; + max-height: 25px; + min-width: 75px; +} + + +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; min-width: 75px; } diff --git a/retroshare-gui/src/release/qss/wx.qss b/retroshare-gui/src/release/qss/wx.qss index a74fac0e3..7dc7990a3 100644 --- a/retroshare-gui/src/release/qss/wx.qss +++ b/retroshare-gui/src/release/qss/wx.qss @@ -6,41 +6,28 @@ QToolBar { } -QPushButton#addfriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#invitefriendButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#addshareButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#optionsButton { - min-height: 34px; - min-width: 48px; -} - -QPushButton#quitButton { - min-height: 34px; - min-width: 48px; -} - QPushButton#okButton { min-height: 27px; min-width: 77px; } +QPushButton#cancelprefButton { + min-height: 27px; + min-width: 77px; +} + QPushButton#cancelButton { - min-height: 25px; + min-height: 25px; + max-height: 25px; min-width: 75px; } +QPushButton#applyButton { + + min-height: 25px; + max-height: 25px; + min-width: 75px; +} diff --git a/retroshare-gui/src/util/AnimatedButton.cpp b/retroshare-gui/src/util/AnimatedButton.cpp index 5b31522cb..238abead7 100644 --- a/retroshare-gui/src/util/AnimatedButton.cpp +++ b/retroshare-gui/src/util/AnimatedButton.cpp @@ -21,14 +21,13 @@ #include -//#include -//#include + #include static const char * MNG_FORMAT = "MNG"; -AnimatedButton::AnimatedButton(QAbstractButton * button, const QString & animatedIconFilename) { +AnimatedButton::AnimatedButton(QToolButton * button, const QString & animatedIconFilename) { _button = button; _animatedIcon = new QMovie(animatedIconFilename, MNG_FORMAT, _button); connect(_animatedIcon, SIGNAL(frameChanged(int)), SLOT(updateButtonIcon())); diff --git a/retroshare-gui/src/util/AnimatedButton.h b/retroshare-gui/src/util/AnimatedButton.h index b3657b50b..4417f1c79 100644 --- a/retroshare-gui/src/util/AnimatedButton.h +++ b/retroshare-gui/src/util/AnimatedButton.h @@ -28,7 +28,7 @@ #include -class QAbstractButton; +class QToolButton; class QMovie; class QString; @@ -49,7 +49,7 @@ public: * @param button button' icon to animate * @param animatedIconFilename mng filename to animate the button icon */ - AnimatedButton(QAbstractButton * button, const QString & animatedIconFilename); + AnimatedButton(QToolButton * button, const QString & animatedIconFilename); ~AnimatedButton(); @@ -62,7 +62,7 @@ private Q_SLOTS: private: - QAbstractButton * _button; + QToolButton * _button; QMovie * _animatedIcon; };