Commit 3de7f18a authored by François Cartegnie's avatar François Cartegnie 🤞

Qt: standardbuttons are bad for win32 and translation. Only use custom

buttons in the managed layout.
parent 7e6beb9e
......@@ -43,10 +43,10 @@ ErrorsDialog::ErrorsDialog( intf_thread_t *_p_intf )
QGridLayout *layout = new QGridLayout( this );
QDialogButtonBox *buttonBox =
new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) );
QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal, this );
QPushButton *clearButton = new QPushButton( qtr( "Cl&ear" ), this );
buttonBox->addButton( clearButton, QDialogButtonBox::ActionRole );
buttonBox->addButton( new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
messages = new QTextEdit();
messages->setReadOnly( true );
......
......@@ -33,6 +33,7 @@
#include <QTabWidget>
#include <QGridLayout>
#include <QDialogButtonBox>
#include <QPushButton>
#include <vlc_modules.h>
ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
......@@ -87,8 +88,9 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
layout->addWidget( mainTabW );
QDialogButtonBox *closeButtonBox =
new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this );
closeButtonBox->addButton(
new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
layout->addWidget( closeButtonBox );
CONNECT( closeButtonBox, rejected(), this, close() );
......
......@@ -59,8 +59,9 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
QTextBrowser *helpBrowser = new QTextBrowser( this );
helpBrowser->setOpenExternalLinks( true );
helpBrowser->setHtml( qtr(I_LONGHELP) );
QDialogButtonBox *closeButtonBox =
new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this );
closeButtonBox->addButton(
new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
closeButtonBox->setFocus();
layout->addWidget( helpBrowser );
......@@ -85,6 +86,8 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
{
/* Build UI */
ui.setupUi( this );
ui.closeButtonBox->addButton(
new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
setWindowTitle( qtr( "About" ) );
setWindowRole( "vlc-about" );
......@@ -161,23 +164,20 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{
/* build Ui */
ui.setupUi( this );
ui.updateDialogButtonBox->addButton( new QPushButton( qtr("&Close"), this ),
QDialogButtonBox::RejectRole );
QPushButton *recheckButton = new QPushButton( qtr("&Recheck version"), this );
ui.updateDialogButtonBox->addButton( recheckButton, QDialogButtonBox::ActionRole );
ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&Yes"), this ),
QDialogButtonBox::AcceptRole );
ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&No"), this ),
QDialogButtonBox::RejectRole );
setWindowTitle( qtr( "VLC media player updates" ) );
setWindowRole( "vlc-update" );
QList<QAbstractButton *> buttonsList = ui.updateDialogButtonBox->buttons();
QAbstractButton *currentButton;
for ( int i = 0; i < buttonsList.size() ; ++i )
{
currentButton = buttonsList.at( i );
if ( ui.updateDialogButtonBox->standardButton( currentButton )
== QDialogButtonBox::Retry )
{
currentButton->setText( qtr( "&Recheck version" ) );
qobject_cast<QPushButton *>(currentButton)->setDefault( true );
}
}
CONNECT( ui.updateDialogButtonBox, accepted(), this, UpdateOrDownload() );
BUTTONACT( recheckButton, UpdateOrDownload() );
CONNECT( ui.updateDialogButtonBox, rejected(), this, close() );
CONNECT( ui.updateNotifyButtonBox, accepted(), this, UpdateOrDownload() );
......
......@@ -149,6 +149,7 @@ p, li { white-space: pre-wrap; }
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
......@@ -167,7 +168,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0">
<widget class="QDialogButtonBox" name="closeButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
......
......@@ -34,7 +34,7 @@
<item>
<widget class="QDialogButtonBox" name="updateDialogButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Retry</set>
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
......@@ -122,7 +122,7 @@
<item>
<widget class="QDialogButtonBox" name="updateNotifyButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment