kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Web: apply clang format

Browse Source
This commit is contained in:
wmayer
2023-09-03 15:27:51 +02:00
committed by wwmayer
parent c6bb13a118
commit 0e04d526ec
17 changed files with 882 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/Mod/Web/Gui/AppWebGui.cpp
View File

@@ -22,11 +22,11 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <string>
# include <QAbstractNativeEventFilter>
# include <QApplication>
# include <QIcon>
# include <QUrl>
#include <QAbstractNativeEventFilter>
#include <QApplication>
#include <QIcon>
#include <QUrl>
#include <string>
#endif
#ifdef Q_OS_WIN32
@@ -37,8 +37,8 @@
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Language/Translator.h>
#include <Gui/MainWindow.h>
#include "BrowserView.h"
#include "Workbench.h"
@@ -55,35 +55,35 @@ void loadWebResource()
Gui::Translator::instance()->refresh();
}
namespace WebGui {
class Module : public Py::ExtensionModule<Module>
namespace WebGui
{
class Module: public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("WebGui")
Module()
: Py::ExtensionModule<Module>("WebGui")
{
add_varargs_method("openBrowser",&Module::openBrowser
);
add_varargs_method("openBrowserHTML",&Module::openBrowserHTML
);
add_varargs_method("openBrowserWindow",&Module::openBrowserWindow
);
add_varargs_method("open",&Module::openBrowser,
"open(htmlcode,baseurl,[title,iconpath])\n"
"Load a local (X)HTML file."
);
add_varargs_method("insert",&Module::openBrowser,
"insert(string)\n"
"Load a local (X)HTML file."
);
initialize("This module is the WebGui module."); // register with Python
add_varargs_method("openBrowser", &Module::openBrowser);
add_varargs_method("openBrowserHTML", &Module::openBrowserHTML);
add_varargs_method("openBrowserWindow", &Module::openBrowserWindow);
add_varargs_method("open",
&Module::openBrowser,
"open(htmlcode,baseurl,[title,iconpath])\n"
"Load a local (X)HTML file.");
add_varargs_method("insert",
&Module::openBrowser,
"insert(string)\n"
"Load a local (X)HTML file.");
initialize("This module is the WebGui module.");// register with Python
}
private:
Py::Object openBrowser(const Py::Tuple& args)
{
const char* url;
if (!PyArg_ParseTuple(args.ptr(), "s",&url))
if (!PyArg_ParseTuple(args.ptr(), "s", &url)) {
throw Py::Exception();
}
WebGui::BrowserView* pcBrowserView;
@@ -92,8 +92,9 @@ private:
pcBrowserView->resize(400, 300);
pcBrowserView->load(url);
Gui::getMainWindow()->addWindow(pcBrowserView);
if (!Gui::getMainWindow()->activeWindow())
if (!Gui::getMainWindow()->activeWindow()) {
Gui::getMainWindow()->setActiveWindow(pcBrowserView);
}
return Py::None();
}
@@ -104,8 +105,15 @@ private:
const char* BaseUrl;
const char* IconPath;
char* TabName = nullptr;
if (! PyArg_ParseTuple(args.ptr(), "ss|ets", &HtmlCode, &BaseUrl, "utf-8", &TabName, &IconPath))
if (!PyArg_ParseTuple(args.ptr(),
"ss|ets",
&HtmlCode,
&BaseUrl,
"utf-8",
&TabName,
&IconPath)) {
throw Py::Exception();
}
std::string EncodedName = "Browser";
if (TabName) {
@@ -116,13 +124,15 @@ private:
WebGui::BrowserView* pcBrowserView = nullptr;
pcBrowserView = new WebGui::BrowserView(Gui::getMainWindow());
pcBrowserView->resize(400, 300);
pcBrowserView->setHtml(QString::fromUtf8(HtmlCode),QUrl(QString::fromLatin1(BaseUrl)));
pcBrowserView->setHtml(QString::fromUtf8(HtmlCode), QUrl(QString::fromLatin1(BaseUrl)));
pcBrowserView->setWindowTitle(QString::fromUtf8(EncodedName.c_str()));
if (IconPath)
if (IconPath) {
pcBrowserView->setWindowIcon(QIcon(QString::fromUtf8(IconPath)));
}
Gui::getMainWindow()->addWindow(pcBrowserView);
if (!Gui::getMainWindow()->activeWindow())
if (!Gui::getMainWindow()->activeWindow()) {
Gui::getMainWindow()->setActiveWindow(pcBrowserView);
}
return Py::None();
}
@@ -130,8 +140,9 @@ private:
Py::Object openBrowserWindow(const Py::Tuple& args)
{
char* TabName = nullptr;
if (!PyArg_ParseTuple(args.ptr(), "|et", "utf-8", &TabName))
if (!PyArg_ParseTuple(args.ptr(), "|et", "utf-8", &TabName)) {
throw Py::Exception();
}
std::string EncodedName = "Browser";
if (TabName) {
@@ -144,8 +155,9 @@ private:
pcBrowserView->resize(400, 300);
pcBrowserView->setWindowTitle(QString::fromUtf8(EncodedName.c_str()));
Gui::getMainWindow()->addWindow(pcBrowserView);
if (!Gui::getMainWindow()->activeWindow())
if (!Gui::getMainWindow()->activeWindow()) {
Gui::getMainWindow()->setActiveWindow(pcBrowserView);
}
return Py::asObject(pcBrowserView->getPyObject());
}
@@ -156,7 +168,7 @@ PyObject* initModule()
return Base::Interpreter().addModule(new Module);
}
class NativeEventFilter : public QAbstractNativeEventFilter
class NativeEventFilter: public QAbstractNativeEventFilter
{
public:
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -182,7 +194,7 @@ public:
}
};
} // namespace WebGui
}// namespace WebGui
/* Python entry */
@@ -205,7 +217,7 @@ PyMOD_INIT_FUNC(WebGui)
qApp->installNativeEventFilter(new WebGui::NativeEventFilter);
#endif
// add resources and reloads the translators
// add resources and reloads the translators
loadWebResource();
PyMOD_Return(mod);