diff --git a/fulltextsearch.cc b/fulltextsearch.cc index 02b24dce..7ad1e5d2 100644 --- a/fulltextsearch.cc +++ b/fulltextsearch.cc @@ -16,7 +16,6 @@ #include "initializing.hh" #include -#include #include #endif @@ -242,27 +241,6 @@ FullTextSearchDialog::FullTextSearchDialog( QWidget * parent, if( delegate ) ui.headwordsView->setItemDelegate( delegate ); -#if defined( Q_OS_WIN32 ) - - // Style "windowsvista" in Qt5 turn off progress bar animation for classic appearance - // We use simply "windows" style instead for this case - - oldBarStyle = 0; - - if( QOperatingSystemVersion::current () >= QOperatingSystemVersion::Windows7 - && !IsThemeActive() ) - { - QStyle * barStyle = WindowsStyle::instance().getStyle(); - - if( barStyle ) - { - oldBarStyle = ui.searchProgressBar->style(); - ui.searchProgressBar->setStyle( barStyle ); - } - } - -#endif - ui.searchLine->setText( static_cast< MainWindow * >( parent )->getTranslateLineText() ); ui.searchLine->selectAll(); } @@ -271,13 +249,6 @@ FullTextSearchDialog::~FullTextSearchDialog() { if( delegate ) delegate->deleteLater(); - -#if defined( Q_OS_WIN32 ) - - if( oldBarStyle ) - ui.searchProgressBar->setStyle( oldBarStyle ); - -#endif } void FullTextSearchDialog::stopSearch() diff --git a/fulltextsearch.hh b/fulltextsearch.hh index e588b3ae..27dc742b 100644 --- a/fulltextsearch.hh +++ b/fulltextsearch.hh @@ -188,10 +188,6 @@ class FullTextSearchDialog : public QDialog QRegExp searchRegExp; -#if defined( Q_OS_WIN32 ) - QStyle * oldBarStyle; -#endif - public: FullTextSearchDialog( QWidget * parent, Config::Class & cfg_, diff --git a/goldendict.pro b/goldendict.pro index 98d7c7b8..8545bf4a 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -119,8 +119,6 @@ win32 { !CONFIG( no_chinese_conversion_support ) { CONFIG += chinese_conversion_support } - - LIBS += -luxtheme } unix:!mac { diff --git a/initializing.cc b/initializing.cc index 8d1d4a81..f1b3120a 100644 --- a/initializing.cc +++ b/initializing.cc @@ -7,7 +7,6 @@ #if defined( Q_OS_WIN32 ) #include -#include #include WindowsStyle::WindowsStyle() @@ -35,27 +34,6 @@ Initializing::Initializing( QWidget * parent, bool showOnStartup ): QDialog( par setWindowIcon( QIcon( ":/icons/macicon.png" ) ); #endif -#if defined( Q_OS_WIN32 ) - - // Style "windowsvista" in Qt5 turn off progress bar animation for classic appearance - // We use simply "windows" style instead for this case - - oldBarStyle = 0; - - if( QOperatingSystemVersion::current () >= QOperatingSystemVersion::Windows7 - && !IsThemeActive() ) - { - QStyle * barStyle = WindowsStyle::instance().getStyle(); - - if( barStyle ) - { - oldBarStyle = ui.progressBar->style(); - ui.progressBar->setStyle( barStyle ); - } - } - -#endif - if ( showOnStartup ) { ui.operation->setText( tr( "Please wait..." ) ); @@ -88,8 +66,6 @@ void Initializing::reject() Initializing::~Initializing() { - if( oldBarStyle ) - ui.progressBar->setStyle( oldBarStyle ); } #endif diff --git a/initializing.hh b/initializing.hh index 3632f1e4..48314824 100644 --- a/initializing.hh +++ b/initializing.hh @@ -46,9 +46,6 @@ private: virtual void closeEvent( QCloseEvent * ); virtual void reject(); -#if defined( Q_OS_WIN32 ) - QStyle * oldBarStyle; -#endif Ui::Initializing ui; };