Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Some style-specific tweaks.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-12-19 23:43:27 +01:00
parent 2ec20c2d02
commit f689ce5646
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 7
#define VER_LAMEXP_BUILD 1220
#define VER_LAMEXP_BUILD 1221
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

4
src/Dialog_About.cpp
View File

@ -126,8 +126,8 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
//Make transparent
QStyle *style = qApp->style();
if((dynamic_cast<QWindowsVistaStyle*>(style)) || (dynamic_cast<QWindowsXPStyle*>(style)))
const type_info &styleType = typeid(*qApp->style());
if((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType))
{
MAKE_TRANSPARENT(ui->infoScrollArea);
MAKE_TRANSPARENT(ui->contributorsScrollArea);

47
src/Dialog_MainWindow.cpp
View File

@ -142,6 +142,14 @@ 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("-", "&minus;"))
#define FSLINK(PATH) QString("<a href=\"file:///%1\">%2</a>").arg(PATH).arg(QString(PATH).replace("-", "&minus;"))
#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);
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);
}
/*
@ -3122,20 +3135,28 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
if((sender == ui->outputFoldersFovoritesLabel) || (sender == ui->outputFoldersEditorLabel) || (sender == ui->outputFoldersGoUpLabel))
{
switch(event->type())
const type_info &styleType = typeid(*qApp->style());
if((typeid(QPlastiqueStyle) == styleType) || (typeid(QWindowsStyle) == styleType))
{
case QEvent::Enter:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break;
case QEvent::MouseButtonPress:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
break;
case QEvent::MouseButtonRelease:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break;
case QEvent::Leave:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
break;
switch(event->type())
{
case QEvent::Enter:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break;
case QEvent::MouseButtonPress:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
break;
case QEvent::MouseButtonRelease:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break;
case QEvent::Leave:
dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
break;
}
}
else
{
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
}
if((event->type() == QEvent::MouseButtonRelease) && ui->outputFolderView->isEnabled() && (mouseEvent))