diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 915ca17..06aec66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,47 +1,46 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) set(amor_SRCS main.cpp queueitem.cpp - amorsessionwidget.cpp amordialog.cpp amor.cpp amorwidget.cpp amoranimation.cpp amorthememanager.cpp amorpixmapmanager.cpp amorbubble.cpp amorconfig.cpp amortips.cpp ) ecm_qt_declare_logging_category(amor_SRCS HEADER amor_debug.h IDENTIFIER AMOR_LOG CATEGORY_NAME org.kde.amor) qt5_add_dbus_adaptor(amor_SRCS org.kde.amor.xml amor.h Amor) add_executable(amor ${amor_SRCS}) target_link_libraries(amor Qt5::Core Qt5::DBus Qt5::Gui Qt5::Widgets Qt5::X11Extras KF5::CoreAddons KF5::DBusAddons KF5::WidgetsAddons KF5::I18n KF5::ConfigCore KF5::WindowSystem KF5::XmlGui ${XCB_LIBRARIES} ) install(TARGETS amor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.kde.amor.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.amor.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) diff --git a/src/amorsessionwidget.cpp b/src/amorsessionwidget.cpp deleted file mode 100644 index 20ebf3a..0000000 --- a/src/amorsessionwidget.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 1999 by Martin R. Jones - * Copyright 2010 by Stefan Böhmann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include "amorsessionwidget.h" - -#include - - -AmorSessionWidget::AmorSessionWidget() -{ - // the only function of this widget is to catch & forward the - // saveYourself() signal from the session manager - connect( qApp, &QGuiApplication::saveStateRequest, this, &AmorSessionWidget::wm_saveyourself); -} - - -void AmorSessionWidget::wm_saveyourself() -{ - // no action required currently. -} - - -// kate: word-wrap off; encoding utf-8; indent-width 4; tab-width 4; line-numbers on; mixed-indent off; remove-trailing-space-save on; replace-tabs-save on; replace-tabs on; space-indent on; -// vim:set spell et sw=4 ts=4 nowrap cino=l1,cs,U1: diff --git a/src/amorsessionwidget.h b/src/amorsessionwidget.h deleted file mode 100644 index 0a2f04d..0000000 --- a/src/amorsessionwidget.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 1999 by Martin R. Jones - * Copyright 2010 by Stefan Böhmann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef AMORSESSIONWIDGET_H -#define AMORSESSIONWIDGET_H - -#include - - -class AmorSessionWidget : public QWidget -{ - Q_OBJECT - - public: - AmorSessionWidget(); - - public slots: - void wm_saveyourself(); -}; - - -#endif - -// kate: word-wrap off; encoding utf-8; indent-width 4; tab-width 4; line-numbers on; mixed-indent off; remove-trailing-space-save on; replace-tabs-save on; replace-tabs on; space-indent on; -// vim:set spell et sw=4 ts=4 nowrap cino=l1,cs,U1: diff --git a/src/main.cpp b/src/main.cpp index 9ada584..59c3ecc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,74 +1,69 @@ /* * Copyright 1999 by Martin R. Jones * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "amor.h" -#include "amorsessionwidget.h" #include "version.h" #include #include #include #include #include static const char description[] = I18N_NOOP("KDE creature for your desktop"); int main(int argc, char **argv) { QApplication app(argc, argv); KLocalizedString::setApplicationDomain("amor"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); KAboutData about(QStringLiteral("amor"), i18n( "amor" ), QStringLiteral(AMOR_VERSION_STRING)); about.setLicense(KAboutLicense::GPL); about.setShortDescription(i18n(description)); about.setCopyrightStatement(i18n("1999 by Martin R. Jones\n2010 by Stefan Böhmann")); about.addAuthor( i18n("Stefan Böhmann"), i18n("Current maintainer"), QStringLiteral("kde@hilefoks.org"), QStringLiteral("http://www.hilefoks.org"), QStringLiteral("hilefoks") ); about.addAuthor(i18n("Martin R. Jones"), {}, QStringLiteral("mjones@kde.org")); about.addAuthor(i18n("Gerardo Puga"), {}, QStringLiteral("gpuga@gioia.ing.unlp.edu.ar")); about.setOrganizationDomain(QByteArray("kde.org")); about.setDesktopFileName(QStringLiteral("org.kde.amor")); KAboutData::setApplicationData(about); KDBusService service(KDBusService::Unique); - AmorSessionWidget *sessionWidget = new AmorSessionWidget; // session management - // FIXME Qt5 - //app.setTopWidget(sessionWidget); - Amor amor; QDBusConnection::sessionBus().registerObject(QStringLiteral( "/Amor" ), &amor); return app.exec(); } // kate: word-wrap off; encoding utf-8; indent-width 4; tab-width 4; line-numbers on; mixed-indent off; remove-trailing-space-save on; replace-tabs-save on; replace-tabs on; space-indent on; // vim:set spell et sw=4 ts=4 nowrap cino=l1,cs,U1: