diff --git a/CMakeLists.txt b/CMakeLists.txt index d0e3b2c45..21aeabba4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,7 +275,6 @@ set(APP_SOURCES src/gui/iconthemefactory.cpp src/gui/skinfactory.cpp src/gui/formsettings.cpp - src/gui/formwelcome.cpp src/gui/formabout.cpp src/gui/shortcutcatcher.cpp src/gui/shortcutbutton.cpp @@ -346,7 +345,6 @@ set(APP_HEADERS src/gui/iconthemefactory.h src/gui/skinfactory.h src/gui/formsettings.h - src/gui/formwelcome.h src/gui/formabout.h src/gui/shortcutcatcher.h src/gui/shortcutbutton.h @@ -394,7 +392,6 @@ set(APP_FORMS src/gui/formupdate.ui src/gui/formmain.ui src/gui/formsettings.ui - src/gui/formwelcome.ui src/gui/formabout.ui src/gui/formstandardcategorydetails.ui src/gui/formstandardfeeddetails.ui diff --git a/src/gui/formwelcome.cpp b/src/gui/formwelcome.cpp deleted file mode 100644 index 285c602a7..000000000 --- a/src/gui/formwelcome.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// This file is part of RSS Guard. -// -// Copyright (C) 2011-2014 by Martin Rotter -// -// RSS Guard 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 3 of the License, or -// (at your option) any later version. -// -// RSS Guard 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 RSS Guard. If not, see . - -#include "gui/formwelcome.h" - -#include "core/defs.h" - -#if !defined(Q_OS_WIN) -#include "gui/messagebox.h" -#endif - -#include -#include -#include -#include - - -FormWelcome::FormWelcome(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormWelcome) { - m_ui->setupUi(this); - - // Set flags. - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); - -#if !defined(Q_OS_WIN) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - - // Set icon. - setWindowIcon(QIcon(APP_ICON_PATH)); - m_ui->m_lblLogo->setPixmap(QPixmap(APP_ICON_PATH)); - - // Move the dialog into the middle of the screen. - QRect screen = qApp->desktop()->screenGeometry(); - move(screen.center() - rect().center()); - - // Make sure that clicked hyperlinks are opened in defult web browser. - connect(m_ui->m_lblInfo, SIGNAL(linkActivated(QString)), - this, SLOT(openLink(QString))); - - // Setup the text. - m_ui->m_lblCaption->setText(tr("Welcome to %1").arg(APP_NAME)); - m_ui->m_lblInfo->setText( - tr("

%3 is a (very) easy-to-use feed reader. " - "It supports all major feed formats, including RSS, " - "ATOM and RDF.

" - "

Make sure you explore all available features. " - "If you find a bug or if you want to propose new " - "feature, then create new " - "issue " - "report.

" - "

%3 can be translated to any language. " - "Contact its author " - "in case of your interest.


").arg(APP_URL_ISSUES, - APP_EMAIL, - APP_NAME)); -} - -void FormWelcome::openLink(const QString &link) { - QDesktopServices::openUrl(QUrl(link)); -} - -FormWelcome::~FormWelcome() { - delete m_ui; -} diff --git a/src/gui/formwelcome.h b/src/gui/formwelcome.h deleted file mode 100644 index 4116a9fdb..000000000 --- a/src/gui/formwelcome.h +++ /dev/null @@ -1,46 +0,0 @@ -// This file is part of RSS Guard. -// -// Copyright (C) 2011-2014 by Martin Rotter -// -// RSS Guard 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 3 of the License, or -// (at your option) any later version. -// -// RSS Guard 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 RSS Guard. If not, see . - -#ifndef FORMWELCOME_H -#define FORMWELCOME_H - -#include "ui_formwelcome.h" - -#include - - -namespace Ui { - class FormWelcome; -} - -class FormWelcome : public QDialog { - Q_OBJECT - - public: - // Constructors and destructors. - explicit FormWelcome(QWidget *parent = 0); - virtual ~FormWelcome(); - - private slots: - // Opens given link in a default web browser. - void openLink(const QString &link); - - private: - Ui::FormWelcome *m_ui; -}; - -#endif // FORMWELCOME_H diff --git a/src/gui/formwelcome.ui b/src/gui/formwelcome.ui deleted file mode 100644 index 188885fa4..000000000 --- a/src/gui/formwelcome.ui +++ /dev/null @@ -1,124 +0,0 @@ - - - FormWelcome - - - Qt::ApplicationModal - - - - 0 - 0 - 435 - 237 - - - - Welcome - - - true - - - - - - - 0 - 0 - - - - - 110 - 110 - - - - - 110 - 110 - - - - - - - true - - - false - - - Qt::NoTextInteraction - - - - - - - - 16777215 - 20 - - - - - 11 - 50 - false - - - - - - - Qt::AlignCenter - - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - - - m_buttonBox - accepted() - FormWelcome - accept() - - - 248 - 254 - - - 157 - 274 - - - - - diff --git a/src/main.cpp b/src/main.cpp index c56659056..2f68ad34e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,6 @@ #include "gui/iconthemefactory.h" #include "gui/skinfactory.h" #include "gui/formmain.h" -#include "gui/formwelcome.h" #include "gui/systemtrayicon.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" @@ -104,12 +103,6 @@ int main(int argc, char *argv[]) { // Now is a good time to initialize dynamic keyboard shortcuts. DynamicShortcuts::load(main_window.allActions()); - // Display welcome dialog if application is launched for the first time. - if (Settings::instance()->value(APP_CFG_GEN, "first_start", true).toBool()) { - Settings::instance()->setValue(APP_CFG_GEN, "first_start", false); - FormWelcome(&main_window).exec(); - } - // Display main window. if (Settings::instance()->value(APP_CFG_GUI, "start_hidden", false).toBool() &&