From dfbf25061bad570b3176de0f7be4aadc819f6f18 Mon Sep 17 00:00:00 2001 From: audoban Date: Thu, 29 Dec 2016 00:43:26 -0500 Subject: [PATCH] formatted --- app/main.cpp | 2 +- app/nowdockconfigview.cpp | 22 +++++++++++----------- app/nowdockconfigview.h | 2 +- app/nowdockcorona.cpp | 32 ++++++++++++++++---------------- app/nowdockview.cpp | 8 ++++---- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index 0f503c9cf..477ca7309 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); app.setApplicationVersion(version); - + app.setOrganizationDomain(QStringLiteral("latte-dock")); KLocalizedString::setApplicationDomain("latte-dock"); app.setApplicationName(QStringLiteral("Latte Dock")); diff --git a/app/nowdockconfigview.cpp b/app/nowdockconfigview.cpp index d6811bb65..e31414990 100644 --- a/app/nowdockconfigview.cpp +++ b/app/nowdockconfigview.cpp @@ -83,7 +83,7 @@ void NowDockConfigView::syncGeometry() { if (!m_containment || !rootObject()) return; - + const auto location = m_containment->location(); const auto sGeometry = screen()->geometry(); @@ -93,7 +93,7 @@ void NowDockConfigView::syncGeometry() setMaximumSize(size); setMinimumSize(size); resize(size); - + if (location == Plasma::Types::TopEdge) { setPosition(sGeometry.center().x() - size.width() / 2 , m_dockView->currentThickness()); @@ -109,7 +109,7 @@ void NowDockConfigView::syncGeometry() setMaximumSize(size); setMinimumSize(size); resize(size); - + if (location == Plasma::Types::LeftEdge) { setPosition(m_dockView->currentThickness() , sGeometry.center().y() - size.height() / 2); @@ -131,26 +131,26 @@ void NowDockConfigView::syncSlideEffect() { if (!m_containment) return; - + KWindowEffects::SlideFromLocation slideLocation{KWindowEffects::NoEdge}; switch (m_containment->location()) { case Plasma::Types::TopEdge: slideLocation = KWindowEffects::TopEdge; break; - + case Plasma::Types::RightEdge: slideLocation = KWindowEffects::RightEdge; break; - + case Plasma::Types::BottomEdge: slideLocation = KWindowEffects::BottomEdge; break; - + case Plasma::Types::LeftEdge: slideLocation = KWindowEffects::LeftEdge; break; - + default: qDebug() << staticMetaObject.className() << "wrong location";// << qEnumToStr(m_containment->location()); break; @@ -172,7 +172,7 @@ void NowDockConfigView::showEvent(QShowEvent *ev) if (m_containment) m_containment->setUserConfiguring(true); - + // m_dockView->visibility()->forceShow(true); // m_dockView->visibility()->showImmediately(); m_screenSyncTimer.start(); @@ -202,8 +202,8 @@ void NowDockConfigView::focusOutEvent(QFocusEvent *ev) if (focusWindow && focusWindow->flags().testFlag(Qt::Popup)) return; - - + + // hide(); } diff --git a/app/nowdockconfigview.h b/app/nowdockconfigview.h index a0ea591a2..ff4635ac6 100644 --- a/app/nowdockconfigview.h +++ b/app/nowdockconfigview.h @@ -53,7 +53,7 @@ protected: void syncGeometry(); void syncSlideEffect(); - + private Q_SLOTS: void immutabilityChanged(Plasma::Types::ImmutabilityType type); diff --git a/app/nowdockcorona.cpp b/app/nowdockcorona.cpp index a05269236..b6c414d5a 100644 --- a/app/nowdockcorona.cpp +++ b/app/nowdockcorona.cpp @@ -54,11 +54,11 @@ NowDockCorona::NowDockCorona(QObject *parent) setKPackage(package); qmlRegisterTypes(); - + connect(this, &Corona::containmentAdded, this, &NowDockCorona::addDock); - + loadLayout(); - + /*QAction *addDock = actions()->add(QStringLiteral("add dock")); connect(addDock, &QAction::triggered, this, &NowDockCorona::loadDefaultLayout); addDock->setText(i18n("Add New Dock")); @@ -66,7 +66,7 @@ NowDockCorona::NowDockCorona(QObject *parent) addDock->setStatusTip(tr("Adds a new dock in the environment")); addDock->setVisible(true); addDock->setEnabled(true); - + addDock->setIcon(QIcon::fromTheme(QStringLiteral("object-locked"))); addDock->setData(Plasma::Types::ControlAction); addDock->setShortcut(QKeySequence(QStringLiteral("alt+d, l"))); @@ -156,21 +156,21 @@ void NowDockCorona::addDock(Plasma::Containment *containment) qWarning() << "the requested containment plugin can not be located or loaded"; return; } - + // the system tray is a containment that behaves as an applet // so a dockview shouldnt be created for it KPluginMetaData metadata = containment->kPackage().metadata(); - + if (metadata.pluginId() == "org.kde.plasma.systemtray") { return; } - + foreach (NowDockView *dock, m_containments) { if (dock->containment() == containment) { return; } } - + qWarning() << "Adding dock for container..."; auto dockView = new NowDockView(this); @@ -191,7 +191,7 @@ void NowDockCorona::loadDefaultLayout() QVariantList args; auto defaultContainment = createContainmentDelayed("org.kde.latte.containment", args); - + defaultContainment->setContainmentType(Plasma::Types::PanelContainment); defaultContainment->init(); @@ -199,23 +199,23 @@ void NowDockCorona::loadDefaultLayout() qWarning() << "the requested containment plugin can not be located or loaded"; return; } - + auto config = defaultContainment->config(); defaultContainment->restore(config); - + switch (containments().size()) { case 1: defaultContainment->setLocation(Plasma::Types::LeftEdge); break; - + case 2: defaultContainment->setLocation(Plasma::Types::RightEdge); break; - + case 3: defaultContainment->setLocation(Plasma::Types::TopEdge); break; - + default: defaultContainment->setLocation(Plasma::Types::BottomEdge); break; @@ -224,14 +224,14 @@ void NowDockCorona::loadDefaultLayout() //config.writeEntry("dock", "initial"); //config.writeEntry("alignment", (int)Dock::Center); //config.deleteEntry("wallpaperplugin"); - + defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint); defaultContainment->save(config); requestConfigSync(); defaultContainment->flushPendingConstraintsEvents(); emit containmentAdded(defaultContainment); emit containmentCreated(defaultContainment); - + addDock(defaultContainment); defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid")); diff --git a/app/nowdockview.cpp b/app/nowdockview.cpp index 2da4fb75e..da60ad9cd 100644 --- a/app/nowdockview.cpp +++ b/app/nowdockview.cpp @@ -119,7 +119,7 @@ void NowDockView::init() rootContext()->setContextProperty(QStringLiteral("dock"), this); engine()->rootContext()->setContextObject(new KLocalizedContext(this)); - + // engine()->rootContext()->setContextProperty(QStringLiteral("dock"), this); setSource(corona()->kPackage().filePath("nowdockui")); @@ -189,7 +189,7 @@ void NowDockView::adaptToScreen(QScreen *screen) void NowDockView::addNewDock() { NowDockCorona *corona = dynamic_cast(m_corona); - + if (corona) { corona->loadDefaultLayout(); } @@ -198,10 +198,10 @@ void NowDockView::addNewDock() void NowDockView::removeDock() { NowDockCorona *corona = dynamic_cast(m_corona); - + if (corona->containments().count() > 1) { QAction *removeAct = containment()->actions()->action(QStringLiteral("remove")); - + if (removeAct) { removeAct->trigger(); }