formatted

v0.6
audoban 8 years ago
parent 4da7534f4b
commit dfbf25061b

@ -54,7 +54,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv); QApplication app(argc, argv);
app.setApplicationVersion(version); app.setApplicationVersion(version);
app.setOrganizationDomain(QStringLiteral("latte-dock")); app.setOrganizationDomain(QStringLiteral("latte-dock"));
KLocalizedString::setApplicationDomain("latte-dock"); KLocalizedString::setApplicationDomain("latte-dock");
app.setApplicationName(QStringLiteral("Latte Dock")); app.setApplicationName(QStringLiteral("Latte Dock"));

@ -83,7 +83,7 @@ void NowDockConfigView::syncGeometry()
{ {
if (!m_containment || !rootObject()) if (!m_containment || !rootObject())
return; return;
const auto location = m_containment->location(); const auto location = m_containment->location();
const auto sGeometry = screen()->geometry(); const auto sGeometry = screen()->geometry();
@ -93,7 +93,7 @@ void NowDockConfigView::syncGeometry()
setMaximumSize(size); setMaximumSize(size);
setMinimumSize(size); setMinimumSize(size);
resize(size); resize(size);
if (location == Plasma::Types::TopEdge) { if (location == Plasma::Types::TopEdge) {
setPosition(sGeometry.center().x() - size.width() / 2 setPosition(sGeometry.center().x() - size.width() / 2
, m_dockView->currentThickness()); , m_dockView->currentThickness());
@ -109,7 +109,7 @@ void NowDockConfigView::syncGeometry()
setMaximumSize(size); setMaximumSize(size);
setMinimumSize(size); setMinimumSize(size);
resize(size); resize(size);
if (location == Plasma::Types::LeftEdge) { if (location == Plasma::Types::LeftEdge) {
setPosition(m_dockView->currentThickness() setPosition(m_dockView->currentThickness()
, sGeometry.center().y() - size.height() / 2); , sGeometry.center().y() - size.height() / 2);
@ -131,26 +131,26 @@ void NowDockConfigView::syncSlideEffect()
{ {
if (!m_containment) if (!m_containment)
return; return;
KWindowEffects::SlideFromLocation slideLocation{KWindowEffects::NoEdge}; KWindowEffects::SlideFromLocation slideLocation{KWindowEffects::NoEdge};
switch (m_containment->location()) { switch (m_containment->location()) {
case Plasma::Types::TopEdge: case Plasma::Types::TopEdge:
slideLocation = KWindowEffects::TopEdge; slideLocation = KWindowEffects::TopEdge;
break; break;
case Plasma::Types::RightEdge: case Plasma::Types::RightEdge:
slideLocation = KWindowEffects::RightEdge; slideLocation = KWindowEffects::RightEdge;
break; break;
case Plasma::Types::BottomEdge: case Plasma::Types::BottomEdge:
slideLocation = KWindowEffects::BottomEdge; slideLocation = KWindowEffects::BottomEdge;
break; break;
case Plasma::Types::LeftEdge: case Plasma::Types::LeftEdge:
slideLocation = KWindowEffects::LeftEdge; slideLocation = KWindowEffects::LeftEdge;
break; break;
default: default:
qDebug() << staticMetaObject.className() << "wrong location";// << qEnumToStr(m_containment->location()); qDebug() << staticMetaObject.className() << "wrong location";// << qEnumToStr(m_containment->location());
break; break;
@ -172,7 +172,7 @@ void NowDockConfigView::showEvent(QShowEvent *ev)
if (m_containment) if (m_containment)
m_containment->setUserConfiguring(true); m_containment->setUserConfiguring(true);
// m_dockView->visibility()->forceShow(true); // m_dockView->visibility()->forceShow(true);
// m_dockView->visibility()->showImmediately(); // m_dockView->visibility()->showImmediately();
m_screenSyncTimer.start(); m_screenSyncTimer.start();
@ -202,8 +202,8 @@ void NowDockConfigView::focusOutEvent(QFocusEvent *ev)
if (focusWindow && focusWindow->flags().testFlag(Qt::Popup)) if (focusWindow && focusWindow->flags().testFlag(Qt::Popup))
return; return;
// hide(); // hide();
} }

@ -53,7 +53,7 @@ protected:
void syncGeometry(); void syncGeometry();
void syncSlideEffect(); void syncSlideEffect();
private Q_SLOTS: private Q_SLOTS:
void immutabilityChanged(Plasma::Types::ImmutabilityType type); void immutabilityChanged(Plasma::Types::ImmutabilityType type);

@ -54,11 +54,11 @@ NowDockCorona::NowDockCorona(QObject *parent)
setKPackage(package); setKPackage(package);
qmlRegisterTypes(); qmlRegisterTypes();
connect(this, &Corona::containmentAdded, this, &NowDockCorona::addDock); connect(this, &Corona::containmentAdded, this, &NowDockCorona::addDock);
loadLayout(); loadLayout();
/*QAction *addDock = actions()->add<QAction>(QStringLiteral("add dock")); /*QAction *addDock = actions()->add<QAction>(QStringLiteral("add dock"));
connect(addDock, &QAction::triggered, this, &NowDockCorona::loadDefaultLayout); connect(addDock, &QAction::triggered, this, &NowDockCorona::loadDefaultLayout);
addDock->setText(i18n("Add New Dock")); 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->setStatusTip(tr("Adds a new dock in the environment"));
addDock->setVisible(true); addDock->setVisible(true);
addDock->setEnabled(true); addDock->setEnabled(true);
addDock->setIcon(QIcon::fromTheme(QStringLiteral("object-locked"))); addDock->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
addDock->setData(Plasma::Types::ControlAction); addDock->setData(Plasma::Types::ControlAction);
addDock->setShortcut(QKeySequence(QStringLiteral("alt+d, l"))); 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"; qWarning() << "the requested containment plugin can not be located or loaded";
return; return;
} }
// the system tray is a containment that behaves as an applet // the system tray is a containment that behaves as an applet
// so a dockview shouldnt be created for it // so a dockview shouldnt be created for it
KPluginMetaData metadata = containment->kPackage().metadata(); KPluginMetaData metadata = containment->kPackage().metadata();
if (metadata.pluginId() == "org.kde.plasma.systemtray") { if (metadata.pluginId() == "org.kde.plasma.systemtray") {
return; return;
} }
foreach (NowDockView *dock, m_containments) { foreach (NowDockView *dock, m_containments) {
if (dock->containment() == containment) { if (dock->containment() == containment) {
return; return;
} }
} }
qWarning() << "Adding dock for container..."; qWarning() << "Adding dock for container...";
auto dockView = new NowDockView(this); auto dockView = new NowDockView(this);
@ -191,7 +191,7 @@ void NowDockCorona::loadDefaultLayout()
QVariantList args; QVariantList args;
auto defaultContainment = createContainmentDelayed("org.kde.latte.containment", args); auto defaultContainment = createContainmentDelayed("org.kde.latte.containment", args);
defaultContainment->setContainmentType(Plasma::Types::PanelContainment); defaultContainment->setContainmentType(Plasma::Types::PanelContainment);
defaultContainment->init(); defaultContainment->init();
@ -199,23 +199,23 @@ void NowDockCorona::loadDefaultLayout()
qWarning() << "the requested containment plugin can not be located or loaded"; qWarning() << "the requested containment plugin can not be located or loaded";
return; return;
} }
auto config = defaultContainment->config(); auto config = defaultContainment->config();
defaultContainment->restore(config); defaultContainment->restore(config);
switch (containments().size()) { switch (containments().size()) {
case 1: case 1:
defaultContainment->setLocation(Plasma::Types::LeftEdge); defaultContainment->setLocation(Plasma::Types::LeftEdge);
break; break;
case 2: case 2:
defaultContainment->setLocation(Plasma::Types::RightEdge); defaultContainment->setLocation(Plasma::Types::RightEdge);
break; break;
case 3: case 3:
defaultContainment->setLocation(Plasma::Types::TopEdge); defaultContainment->setLocation(Plasma::Types::TopEdge);
break; break;
default: default:
defaultContainment->setLocation(Plasma::Types::BottomEdge); defaultContainment->setLocation(Plasma::Types::BottomEdge);
break; break;
@ -224,14 +224,14 @@ void NowDockCorona::loadDefaultLayout()
//config.writeEntry("dock", "initial"); //config.writeEntry("dock", "initial");
//config.writeEntry("alignment", (int)Dock::Center); //config.writeEntry("alignment", (int)Dock::Center);
//config.deleteEntry("wallpaperplugin"); //config.deleteEntry("wallpaperplugin");
defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint); defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
defaultContainment->save(config); defaultContainment->save(config);
requestConfigSync(); requestConfigSync();
defaultContainment->flushPendingConstraintsEvents(); defaultContainment->flushPendingConstraintsEvents();
emit containmentAdded(defaultContainment); emit containmentAdded(defaultContainment);
emit containmentCreated(defaultContainment); emit containmentCreated(defaultContainment);
addDock(defaultContainment); addDock(defaultContainment);
defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid")); defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid"));

@ -119,7 +119,7 @@ void NowDockView::init()
rootContext()->setContextProperty(QStringLiteral("dock"), this); rootContext()->setContextProperty(QStringLiteral("dock"), this);
engine()->rootContext()->setContextObject(new KLocalizedContext(this)); engine()->rootContext()->setContextObject(new KLocalizedContext(this));
// engine()->rootContext()->setContextProperty(QStringLiteral("dock"), this); // engine()->rootContext()->setContextProperty(QStringLiteral("dock"), this);
setSource(corona()->kPackage().filePath("nowdockui")); setSource(corona()->kPackage().filePath("nowdockui"));
@ -189,7 +189,7 @@ void NowDockView::adaptToScreen(QScreen *screen)
void NowDockView::addNewDock() void NowDockView::addNewDock()
{ {
NowDockCorona *corona = dynamic_cast<NowDockCorona *>(m_corona); NowDockCorona *corona = dynamic_cast<NowDockCorona *>(m_corona);
if (corona) { if (corona) {
corona->loadDefaultLayout(); corona->loadDefaultLayout();
} }
@ -198,10 +198,10 @@ void NowDockView::addNewDock()
void NowDockView::removeDock() void NowDockView::removeDock()
{ {
NowDockCorona *corona = dynamic_cast<NowDockCorona *>(m_corona); NowDockCorona *corona = dynamic_cast<NowDockCorona *>(m_corona);
if (corona->containments().count() > 1) { if (corona->containments().count() > 1) {
QAction *removeAct = containment()->actions()->action(QStringLiteral("remove")); QAction *removeAct = containment()->actions()->action(QStringLiteral("remove"));
if (removeAct) { if (removeAct) {
removeAct->trigger(); removeAct->trigger();
} }

Loading…
Cancel
Save