Some style-specific tweaks.
This commit is contained in:
parent
2ec20c2d02
commit
f689ce5646
@ -30,7 +30,7 @@
|
|||||||
#define VER_LAMEXP_MINOR_LO 7
|
#define VER_LAMEXP_MINOR_LO 7
|
||||||
#define VER_LAMEXP_TYPE Alpha
|
#define VER_LAMEXP_TYPE Alpha
|
||||||
#define VER_LAMEXP_PATCH 7
|
#define VER_LAMEXP_PATCH 7
|
||||||
#define VER_LAMEXP_BUILD 1220
|
#define VER_LAMEXP_BUILD 1221
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Tool versions (minimum expected versions!)
|
// Tool versions (minimum expected versions!)
|
||||||
|
@ -126,8 +126,8 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
|
|||||||
connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
|
connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
|
||||||
|
|
||||||
//Make transparent
|
//Make transparent
|
||||||
QStyle *style = qApp->style();
|
const type_info &styleType = typeid(*qApp->style());
|
||||||
if((dynamic_cast<QWindowsVistaStyle*>(style)) || (dynamic_cast<QWindowsXPStyle*>(style)))
|
if((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType))
|
||||||
{
|
{
|
||||||
MAKE_TRANSPARENT(ui->infoScrollArea);
|
MAKE_TRANSPARENT(ui->infoScrollArea);
|
||||||
MAKE_TRANSPARENT(ui->contributorsScrollArea);
|
MAKE_TRANSPARENT(ui->contributorsScrollArea);
|
||||||
|
@ -142,6 +142,14 @@ while(0)
|
|||||||
} \
|
} \
|
||||||
while(0)
|
while(0)
|
||||||
|
|
||||||
|
#define MAKE_TRANSPARENT(WIDGET, FLAG) do \
|
||||||
|
{ \
|
||||||
|
QPalette _p = (WIDGET)->palette(); \
|
||||||
|
_p.setColor(QPalette::Background, Qt::transparent); \
|
||||||
|
(WIDGET)->setPalette(FLAG ? _p : QPalette()); \
|
||||||
|
} \
|
||||||
|
while(0)
|
||||||
|
|
||||||
#define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "−"))
|
#define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "−"))
|
||||||
#define FSLINK(PATH) QString("<a href=\"file:///%1\">%2</a>").arg(PATH).arg(QString(PATH).replace("-", "−"))
|
#define FSLINK(PATH) QString("<a href=\"file:///%1\">%2</a>").arg(PATH).arg(QString(PATH).replace("-", "−"))
|
||||||
#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP))
|
#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP))
|
||||||
@ -1745,6 +1753,11 @@ void MainWindow::styleActionActivated(QAction *action)
|
|||||||
changeEvent(e);
|
changeEvent(e);
|
||||||
LAMEXP_DELETE(e);
|
LAMEXP_DELETE(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Make transparent
|
||||||
|
const type_info &styleType = typeid(*qApp->style());
|
||||||
|
const bool bTransparent = ((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType));
|
||||||
|
MAKE_TRANSPARENT(ui->scrollArea, bTransparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -3121,6 +3134,9 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if((sender == ui->outputFoldersFovoritesLabel) || (sender == ui->outputFoldersEditorLabel) || (sender == ui->outputFoldersGoUpLabel))
|
if((sender == ui->outputFoldersFovoritesLabel) || (sender == ui->outputFoldersEditorLabel) || (sender == ui->outputFoldersGoUpLabel))
|
||||||
|
{
|
||||||
|
const type_info &styleType = typeid(*qApp->style());
|
||||||
|
if((typeid(QPlastiqueStyle) == styleType) || (typeid(QWindowsStyle) == styleType))
|
||||||
{
|
{
|
||||||
switch(event->type())
|
switch(event->type())
|
||||||
{
|
{
|
||||||
@ -3137,6 +3153,11 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
|
|||||||
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
|
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
|
||||||
|
}
|
||||||
|
|
||||||
if((event->type() == QEvent::MouseButtonRelease) && ui->outputFolderView->isEnabled() && (mouseEvent))
|
if((event->type() == QEvent::MouseButtonRelease) && ui->outputFolderView->isEnabled() && (mouseEvent))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user