mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
parent
0fd1319013
commit
75b0a92be7
|
@ -5,23 +5,6 @@
|
||||||
#include "initializing.hh"
|
#include "initializing.hh"
|
||||||
#include <QCloseEvent>
|
#include <QCloseEvent>
|
||||||
|
|
||||||
#if defined( Q_OS_WIN32 )
|
|
||||||
#include <qt_windows.h>
|
|
||||||
#include <QOperatingSystemVersion>
|
|
||||||
|
|
||||||
WindowsStyle::WindowsStyle()
|
|
||||||
{
|
|
||||||
style = QStyleFactory::create( "windows" );
|
|
||||||
}
|
|
||||||
|
|
||||||
WindowsStyle & WindowsStyle::instance()
|
|
||||||
{
|
|
||||||
static WindowsStyle ws;
|
|
||||||
return ws;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Initializing::Initializing( QWidget * parent, bool showOnStartup ): QDialog( parent )
|
Initializing::Initializing( QWidget * parent, bool showOnStartup ): QDialog( parent )
|
||||||
{
|
{
|
||||||
ui.setupUi( this );
|
ui.setupUi( this );
|
||||||
|
@ -62,10 +45,3 @@ void Initializing::reject()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined( Q_OS_WIN32 )
|
|
||||||
|
|
||||||
Initializing::~Initializing()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -4,29 +4,8 @@
|
||||||
#ifndef __INITIALIZING_HH_INCLUDED__
|
#ifndef __INITIALIZING_HH_INCLUDED__
|
||||||
#define __INITIALIZING_HH_INCLUDED__
|
#define __INITIALIZING_HH_INCLUDED__
|
||||||
|
|
||||||
#include <QDialog>
|
|
||||||
#include "ui_initializing.h"
|
#include "ui_initializing.h"
|
||||||
|
|
||||||
#if defined( Q_OS_WIN32 )
|
|
||||||
|
|
||||||
#include <QtWidgets/QStyleFactory>
|
|
||||||
|
|
||||||
class WindowsStyle {
|
|
||||||
public:
|
|
||||||
/// The class is a singleton.
|
|
||||||
static WindowsStyle & instance();
|
|
||||||
|
|
||||||
QStyle * getStyle()
|
|
||||||
{ return style; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
WindowsStyle();
|
|
||||||
|
|
||||||
QStyle * style;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class Initializing: public QDialog
|
class Initializing: public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -34,9 +13,6 @@ class Initializing: public QDialog
|
||||||
public:
|
public:
|
||||||
|
|
||||||
Initializing( QWidget * parent, bool showOnStartup );
|
Initializing( QWidget * parent, bool showOnStartup );
|
||||||
#if defined( Q_OS_WIN32 )
|
|
||||||
~Initializing();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include <QRunnable>
|
#include <QRunnable>
|
||||||
#include <QThreadPool>
|
#include <QThreadPool>
|
||||||
#include <QSslConfiguration>
|
#include <QSslConfiguration>
|
||||||
|
#include <QStyleFactory>
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -45,7 +46,6 @@
|
||||||
#include "ui_authentication.h"
|
#include "ui_authentication.h"
|
||||||
#include "resourceschemehandler.hh"
|
#include "resourceschemehandler.hh"
|
||||||
|
|
||||||
#include "keyboardstate.hh"
|
|
||||||
#include "globalregex.hh"
|
#include "globalregex.hh"
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
|
|
Loading…
Reference in a new issue