From 34c9c5b7df3f9382f6c1d896da076a1034c6cf2e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 3 Aug 2014 01:56:04 +0200 Subject: [PATCH] Renamed sample_blackgui -> swiftgui_standard and sample_blackcore -> swiftcore as discussed --- client.pro | 4 ++-- samples/blackcore/blackcore.qrc | 5 ----- samples/blackcore/blackcore.rc | 1 - samples/blackcore/readme.txt | 13 ------------- {samples/blackcore => src/swiftcore}/main.cpp | 12 ++++++++---- .../blackcore.ico => src/swiftcore/swiftcore.ico | Bin .../swiftcore/swiftcore.pro | 5 ++--- src/swiftcore/swiftcore.rc | 1 + {samples/blackcore => src/swiftcore}/tool.cpp | 0 {samples/blackcore => src/swiftcore}/tool.h | 0 .../swiftgui_standard}/guimodeenums.h | 0 .../swiftgui_standard}/introwindow.cpp | 0 .../swiftgui_standard}/introwindow.h | 0 .../swiftgui_standard}/introwindow.ui | 0 .../blackgui => src/swiftgui_standard}/main.cpp | 0 .../swiftgui_standard}/mainwindow.cpp | 0 .../swiftgui_standard}/mainwindow.h | 0 .../swiftgui_standard}/mainwindow.ui | 7 ------- .../swiftgui_standard}/mainwindow_aircraft.cpp | 0 .../swiftgui_standard}/mainwindow_init.cpp | 2 -- .../swiftgui_standard}/mainwindow_menus.cpp | 0 .../swiftgui_standard}/mainwindow_voice.cpp | 0 .../swiftgui_standard/swiftgui_standard.pro | 0 23 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 samples/blackcore/blackcore.qrc delete mode 100644 samples/blackcore/blackcore.rc delete mode 100644 samples/blackcore/readme.txt rename {samples/blackcore => src/swiftcore}/main.cpp (86%) rename samples/blackcore/blackcore.ico => src/swiftcore/swiftcore.ico (100%) rename samples/blackcore/sample_blackcore.pro => src/swiftcore/swiftcore.pro (92%) create mode 100644 src/swiftcore/swiftcore.rc rename {samples/blackcore => src/swiftcore}/tool.cpp (100%) rename {samples/blackcore => src/swiftcore}/tool.h (100%) rename {samples/blackgui => src/swiftgui_standard}/guimodeenums.h (100%) rename {samples/blackgui => src/swiftgui_standard}/introwindow.cpp (100%) rename {samples/blackgui => src/swiftgui_standard}/introwindow.h (100%) rename {samples/blackgui => src/swiftgui_standard}/introwindow.ui (100%) rename {samples/blackgui => src/swiftgui_standard}/main.cpp (100%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow.cpp (100%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow.h (100%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow.ui (99%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow_aircraft.cpp (100%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow_init.cpp (99%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow_menus.cpp (100%) rename {samples/blackgui => src/swiftgui_standard}/mainwindow_voice.cpp (100%) rename samples/blackgui/sample_blackgui.pro => src/swiftgui_standard/swiftgui_standard.pro (100%) diff --git a/client.pro b/client.pro index b67cdca76..9ef69ad74 100644 --- a/client.pro +++ b/client.pro @@ -20,10 +20,12 @@ contains(BLACK_CONFIG, BlackSim) { contains(BLACK_CONFIG, BlackCore) { SUBDIRS += src/blackcore + SUBDIRS += src/swiftcore/swiftcore.pro } contains(BLACK_CONFIG, BlackGui) { SUBDIRS += src/blackgui + SUBDIRS += src/swiftgui_standard/swiftgui_standard.pro } win32 { @@ -50,9 +52,7 @@ contains(BLACK_CONFIG, Samples) { SUBDIRS += samples/blackmiscvectorgeo/sample_vector_geo.pro SUBDIRS += samples/blackmiscquantities/sample_quantities_aviation.pro SUBDIRS += samples/blackmiscdbus/sample_blackmisc_dbus.pro - SUBDIRS += samples/blackgui/sample_blackgui.pro SUBDIRS += samples/blackgui2/sample_blackgui2.pro - SUBDIRS += samples/blackcore/sample_blackcore.pro SUBDIRS += samples/blackmisc/sample_blackmisc.pro SUBDIRS += samples/voiceclient/sample_voice_client.pro SUBDIRS += samples/blacksim/sample_blacksim.pro diff --git a/samples/blackcore/blackcore.qrc b/samples/blackcore/blackcore.qrc deleted file mode 100644 index e14908df9..000000000 --- a/samples/blackcore/blackcore.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - icons/tower.png - - diff --git a/samples/blackcore/blackcore.rc b/samples/blackcore/blackcore.rc deleted file mode 100644 index 18a4166b3..000000000 --- a/samples/blackcore/blackcore.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "blackcore.ico" diff --git a/samples/blackcore/readme.txt b/samples/blackcore/readme.txt deleted file mode 100644 index c2254ea4e..000000000 --- a/samples/blackcore/readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -Starting: dbus-daemon.exe --session -- blocks CMD (sometimes daemon continues to run when pressing CTRL/C) -- does not start without directory session.d, i.e. ..\Qt\Qt5.1.0DBus\qtbase\etc\dbus-1\session.d - -!!! The includes are set in the qmake file, there are the header files -!!! which are used in the interface -qdbuscpp2xml testservice.h -x blackmisc_cpp2xml.dll -o BlackMiscTest.Testservice.xml -qdbuscpp2xml datacontext.h -x blackmisc_cpp2xml.dll -o BlackMiscTest.Datacontext.xml -Set search path for plugins: env.var. QT_PLUGIN_PATH - -Done automatically (qmake), but if required manually -Interface: qdbusxml2cpp blackbus.testservice.xml -p itestservice -Adaptor: qdbusxml2cpp blackbus.testservice.xml -a atestservice diff --git a/samples/blackcore/main.cpp b/src/swiftcore/main.cpp similarity index 86% rename from samples/blackcore/main.cpp rename to src/swiftcore/main.cpp index c3479af2b..75d0e7a9a 100644 --- a/samples/blackcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * swift Project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ #include "tool.h" #include "blackcore/context_runtime.h" diff --git a/samples/blackcore/blackcore.ico b/src/swiftcore/swiftcore.ico similarity index 100% rename from samples/blackcore/blackcore.ico rename to src/swiftcore/swiftcore.ico diff --git a/samples/blackcore/sample_blackcore.pro b/src/swiftcore/swiftcore.pro similarity index 92% rename from samples/blackcore/sample_blackcore.pro rename to src/swiftcore/swiftcore.pro index dcae83a78..d0f259fa9 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/src/swiftcore/swiftcore.pro @@ -32,8 +32,7 @@ DESTDIR = ../../bin HEADERS += *.h SOURCES += *.cpp -OTHER_FILES += readme.txt blackcore.rc blackcore.ico -RESOURCES += -win32: RC_FILE = blackcore.rc +OTHER_FILES += swiftcore.ico swiftcore.rc +win32: RC_FILE = swiftcore.rc include (../../libraries.pri) diff --git a/src/swiftcore/swiftcore.rc b/src/swiftcore/swiftcore.rc new file mode 100644 index 000000000..6bcb7e983 --- /dev/null +++ b/src/swiftcore/swiftcore.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "swiftcore.ico" diff --git a/samples/blackcore/tool.cpp b/src/swiftcore/tool.cpp similarity index 100% rename from samples/blackcore/tool.cpp rename to src/swiftcore/tool.cpp diff --git a/samples/blackcore/tool.h b/src/swiftcore/tool.h similarity index 100% rename from samples/blackcore/tool.h rename to src/swiftcore/tool.h diff --git a/samples/blackgui/guimodeenums.h b/src/swiftgui_standard/guimodeenums.h similarity index 100% rename from samples/blackgui/guimodeenums.h rename to src/swiftgui_standard/guimodeenums.h diff --git a/samples/blackgui/introwindow.cpp b/src/swiftgui_standard/introwindow.cpp similarity index 100% rename from samples/blackgui/introwindow.cpp rename to src/swiftgui_standard/introwindow.cpp diff --git a/samples/blackgui/introwindow.h b/src/swiftgui_standard/introwindow.h similarity index 100% rename from samples/blackgui/introwindow.h rename to src/swiftgui_standard/introwindow.h diff --git a/samples/blackgui/introwindow.ui b/src/swiftgui_standard/introwindow.ui similarity index 100% rename from samples/blackgui/introwindow.ui rename to src/swiftgui_standard/introwindow.ui diff --git a/samples/blackgui/main.cpp b/src/swiftgui_standard/main.cpp similarity index 100% rename from samples/blackgui/main.cpp rename to src/swiftgui_standard/main.cpp diff --git a/samples/blackgui/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp similarity index 100% rename from samples/blackgui/mainwindow.cpp rename to src/swiftgui_standard/mainwindow.cpp diff --git a/samples/blackgui/mainwindow.h b/src/swiftgui_standard/mainwindow.h similarity index 100% rename from samples/blackgui/mainwindow.h rename to src/swiftgui_standard/mainwindow.h diff --git a/samples/blackgui/mainwindow.ui b/src/swiftgui_standard/mainwindow.ui similarity index 99% rename from samples/blackgui/mainwindow.ui rename to src/swiftgui_standard/mainwindow.ui index 8cc39e418..f53621a2a 100644 --- a/samples/blackgui/mainwindow.ui +++ b/src/swiftgui_standard/mainwindow.ui @@ -309,13 +309,6 @@ - - - - Foo - - - diff --git a/samples/blackgui/mainwindow_aircraft.cpp b/src/swiftgui_standard/mainwindow_aircraft.cpp similarity index 100% rename from samples/blackgui/mainwindow_aircraft.cpp rename to src/swiftgui_standard/mainwindow_aircraft.cpp diff --git a/samples/blackgui/mainwindow_init.cpp b/src/swiftgui_standard/mainwindow_init.cpp similarity index 99% rename from samples/blackgui/mainwindow_init.cpp rename to src/swiftgui_standard/mainwindow_init.cpp index 56f8ebf38..db4a98d97 100644 --- a/samples/blackgui/mainwindow_init.cpp +++ b/src/swiftgui_standard/mainwindow_init.cpp @@ -191,8 +191,6 @@ void MainWindow::initGuiSignals() Q_ASSERT(connected); connected = this->connect(this->ui->pb_MainKeypadOpacity100, SIGNAL(clicked()), this, SLOT(ps_changeWindowOpacity())); Q_ASSERT(connected); - connected = this->connect(this->ui->pb_Foo, SIGNAL(released()), this, SLOT(ps_setMainPage())); - Q_ASSERT(connected); // Sound buttons this->connect(this->ui->pb_SoundMute, &QPushButton::clicked, this, &MainWindow::ps_setAudioVolumes); diff --git a/samples/blackgui/mainwindow_menus.cpp b/src/swiftgui_standard/mainwindow_menus.cpp similarity index 100% rename from samples/blackgui/mainwindow_menus.cpp rename to src/swiftgui_standard/mainwindow_menus.cpp diff --git a/samples/blackgui/mainwindow_voice.cpp b/src/swiftgui_standard/mainwindow_voice.cpp similarity index 100% rename from samples/blackgui/mainwindow_voice.cpp rename to src/swiftgui_standard/mainwindow_voice.cpp diff --git a/samples/blackgui/sample_blackgui.pro b/src/swiftgui_standard/swiftgui_standard.pro similarity index 100% rename from samples/blackgui/sample_blackgui.pro rename to src/swiftgui_standard/swiftgui_standard.pro