mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-27 19:25:49 +08:00
refactor: Rename blackgui to swift::gui
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "swiftlauncher.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "gui/guiapplication.h"
|
||||
#include "core/db/databasereaderconfig.h"
|
||||
#include "misc/directoryutils.h"
|
||||
#include "misc/icons.h"
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <QPushButton>
|
||||
#include <QCommandLineParser>
|
||||
|
||||
using namespace BlackGui;
|
||||
using namespace swift::gui;
|
||||
using namespace swift::misc;
|
||||
using namespace swift::core;
|
||||
using namespace swift::core::db;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
#include "swiftlauncher.h"
|
||||
#include "ui_swiftlauncher.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackgui/components/configurationwizard.h"
|
||||
#include "blackgui/components/texteditdialog.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/stylesheetutility.h"
|
||||
#include "gui/overlaymessagesframe.h"
|
||||
#include "gui/components/configurationwizard.h"
|
||||
#include "gui/components/texteditdialog.h"
|
||||
#include "gui/guiapplication.h"
|
||||
#include "gui/stylesheetutility.h"
|
||||
#include "core/context/contextapplicationproxy.h"
|
||||
#include "core/setupreader.h"
|
||||
#include "sound/audioutilities.h"
|
||||
@@ -36,8 +36,8 @@
|
||||
#include <qcompilerdetection.h>
|
||||
|
||||
using namespace swift::config;
|
||||
using namespace BlackGui;
|
||||
using namespace BlackGui::Components;
|
||||
using namespace swift::gui;
|
||||
using namespace swift::gui::components;
|
||||
using namespace swift::core;
|
||||
using namespace swift::core::context;
|
||||
using namespace swift::core::data;
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#ifndef SWIFTLAUNCHER_H
|
||||
#define SWIFTLAUNCHER_H
|
||||
|
||||
#include "blackgui/enableforframelesswindow.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackgui/mainwindowaccess.h"
|
||||
#include "gui/enableforframelesswindow.h"
|
||||
#include "gui/overlaymessagesframe.h"
|
||||
#include "gui/mainwindowaccess.h"
|
||||
#include "core/data/globalsetup.h"
|
||||
#include "core/data/launchersetup.h"
|
||||
#include "core/coremodeenums.h"
|
||||
@@ -30,7 +30,7 @@ namespace Ui
|
||||
{
|
||||
class CSwiftLauncher;
|
||||
}
|
||||
namespace BlackGui::Components
|
||||
namespace swift::gui::components
|
||||
{
|
||||
class CConfigurationWizard;
|
||||
class CTextEditDialog;
|
||||
@@ -44,13 +44,13 @@ namespace BlackGui::Components
|
||||
*/
|
||||
class CSwiftLauncher :
|
||||
public QMainWindow,
|
||||
public BlackGui::CEnableForFramelessWindow,
|
||||
public BlackGui::IMainWindowAccess,
|
||||
public swift::gui::CEnableForFramelessWindow,
|
||||
public swift::gui::IMainWindowAccess,
|
||||
public swift::misc::simulation::data::CCentralMultiSimulatorModelSetCachesAware,
|
||||
public swift::misc::CIdentifiable
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(BlackGui::IMainWindowAccess)
|
||||
Q_INTERFACES(swift::gui::IMainWindowAccess)
|
||||
|
||||
public:
|
||||
//! Pages
|
||||
@@ -98,8 +98,8 @@ private slots:
|
||||
|
||||
private:
|
||||
QScopedPointer<Ui::CSwiftLauncher> ui;
|
||||
QScopedPointer<BlackGui::Components::CConfigurationWizard> m_wizard;
|
||||
QScopedPointer<BlackGui::Components::CTextEditDialog> m_textEditDialog;
|
||||
QScopedPointer<swift::gui::components::CConfigurationWizard> m_wizard;
|
||||
QScopedPointer<swift::gui::components::CTextEditDialog> m_textEditDialog;
|
||||
swift::misc::CData<swift::core::data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
|
||||
swift::misc::CLogHistoryReplica m_logHistory { this }; //!< for the overlay
|
||||
#ifdef Q_OS_MAC
|
||||
@@ -117,7 +117,7 @@ private:
|
||||
swift::core::CoreModes::CoreMode getCoreMode() const;
|
||||
|
||||
//! Selected window mode
|
||||
BlackGui::CEnableForFramelessWindow::WindowMode getWindowMode() const;
|
||||
swift::gui::CEnableForFramelessWindow::WindowMode getWindowMode() const;
|
||||
|
||||
//! Init
|
||||
void init();
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="BlackGui::COverlayMessagesFrame" name="fr_SwiftLauncherMain">
|
||||
<widget class="swift::gui::COverlayMessagesFrame" name="fr_SwiftLauncherMain">
|
||||
<layout class="QVBoxLayout" name="vl_SwiftLauncherMain">
|
||||
<property name="spacing">
|
||||
<number>20</number>
|
||||
@@ -90,7 +90,7 @@
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="vl_About">
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CAboutHtmlComponent" name="comp_AboutHTML"/>
|
||||
<widget class="swift::gui::components::CAboutHtmlComponent" name="comp_AboutHTML"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@@ -304,7 +304,7 @@
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_DBusSelector">
|
||||
<widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_DBusSelector">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
@@ -368,7 +368,7 @@
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CUpdateInfoComponent" name="comp_UpdateInfo">
|
||||
<widget class="swift::gui::components::CUpdateInfoComponent" name="comp_UpdateInfo">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
@@ -429,7 +429,7 @@
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
|
||||
<widget class="swift::gui::components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
@@ -439,7 +439,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CDbLoadOverviewComponent" name="comp_DataUpdates">
|
||||
<widget class="swift::gui::components::CDbLoadOverviewComponent" name="comp_DataUpdates">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
@@ -740,7 +740,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" colspan="3">
|
||||
<widget class="BlackGui::Components::CScaleScreenFactor" name="comp_Scale">
|
||||
<widget class="swift::gui::components::CScaleScreenFactor" name="comp_Scale">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
@@ -780,7 +780,7 @@
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="BlackGui::Components::CLogComponent" name="comp_SwiftLauncherLog">
|
||||
<widget class="swift::gui::components::CLogComponent" name="comp_SwiftLauncherLog">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
@@ -809,51 +809,51 @@
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>BlackGui::COverlayMessagesFrame</class>
|
||||
<class>swift::gui::COverlayMessagesFrame</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/overlaymessagesframe.h</header>
|
||||
<header>gui/overlaymessagesframe.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CDbLoadOverviewComponent</class>
|
||||
<class>swift::gui::components::CDbLoadOverviewComponent</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/dbloadoverviewcomponent.h</header>
|
||||
<header>gui/components/dbloadoverviewcomponent.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CLogComponent</class>
|
||||
<class>swift::gui::components::CLogComponent</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/logcomponent.h</header>
|
||||
<header>gui/components/logcomponent.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CInfoBarWebReadersStatusSmallComponent</class>
|
||||
<class>swift::gui::components::CInfoBarWebReadersStatusSmallComponent</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/infobarwebreadersstatussmallcomponent.h</header>
|
||||
<header>gui/components/infobarwebreadersstatussmallcomponent.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CUpdateInfoComponent</class>
|
||||
<class>swift::gui::components::CUpdateInfoComponent</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/updateinfocomponent.h</header>
|
||||
<header>gui/components/updateinfocomponent.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CDBusServerAddressSelector</class>
|
||||
<class>swift::gui::components::CDBusServerAddressSelector</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/dbusserveraddressselector.h</header>
|
||||
<header>gui/components/dbusserveraddressselector.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CAboutHtmlComponent</class>
|
||||
<class>swift::gui::components::CAboutHtmlComponent</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/abouthtmlcomponent.h</header>
|
||||
<header>gui/components/abouthtmlcomponent.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BlackGui::Components::CScaleScreenFactor</class>
|
||||
<class>swift::gui::components::CScaleScreenFactor</class>
|
||||
<extends>QFrame</extends>
|
||||
<header>blackgui/components/scalescreenfactor.h</header>
|
||||
<header>gui/components/scalescreenfactor.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
|
||||
Reference in New Issue
Block a user