Commit 6f67e871 authored by Bernhard Landauer's avatar Bernhard Landauer

fix #154

parent e1b973d3
......@@ -27,21 +27,21 @@
QString
TimeDateCommon::getName()
{
return QString( "msm_timedate" );
return "msm_timedate";
}
QString
TimeDateCommon::getTitle()
{
return QString( tr ( "Time and Date" ) );
return tr ( "Time and Date" );
}
QString
TimeDateCommon::getDescription()
{
return QString( tr ( "Time and date configuration" ) );
return tr ( "Time and date configuration" );
}
......
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -26,6 +27,7 @@
class TimeDateCommon : public QObject
{
Q_OBJECT
public:
static QString getDescription();
static QString getName();
......
......@@ -52,7 +52,7 @@ TimeDateModule::TimeDateModule( QWidget* parent, const QVariantList& args ) :
PROJECT_VERSION,
TimeDateCommon::getDescription(),
KAboutLicense::LicenseKey::GPL_V3,
"(c) 2014 - 2017 Manjaro Settings Manager developers" );
"(c) 2014 - 2019 Manjaro Settings Manager developers" );
aboutData->addAuthor( "Ramon Buldó",
QStringLiteral( "ramon@manjaro.org" ) );
aboutData->setCustomAuthorText( QString(), MsmCommon::getBugReportLink() );
......@@ -123,8 +123,8 @@ TimeDateModule::load()
m_isTimeEdited = false;
m_isDateEdited = false;
m_timeZone = m_timeDateService->timeZone();
TimeDateCommon::updateUi( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
m_timeFieldsTimer->start( 1000 );
TimeDateCommon::updateUi( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
}
......@@ -132,7 +132,8 @@ void
TimeDateModule::save()
{
TimeDateCommon::save( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
load();
m_isTimeEdited = false;
m_isDateEdited = false;
}
......
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -26,7 +27,7 @@
namespace Ui
{
class PageTimeDate;
class PageTimeDate;
}
class TimeDateModule : public KCModule
......
......@@ -19,11 +19,10 @@
*/
#include "TimeDateCommon.h"
#include "TimeZoneDialog.h"
#include "TimeDatePage.h"
#include "ui_PageTimeDate.h"
#include "TimeZoneDialog.h"
#include <QtCore/QDebug>
#include <QtCore/QStringList>
#include <QtCore/QTimeZone>
......@@ -104,9 +103,9 @@ TimeDatePage::load()
m_isTimeEdited = false;
m_isDateEdited = false;
m_timeZone = m_timeDateService->timeZone();
TimeDateCommon::updateUi( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
m_timeFieldsTimer->start( 1000 );
QApplication::restoreOverrideCursor();
TimeDateCommon::updateUi( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
}
......@@ -115,5 +114,6 @@ TimeDatePage::save()
{
TimeDateCommon::save( ui, m_timeDateService, m_isTimeEdited, m_isDateEdited, m_timeZone );
this -> setApplyEnabled( this, false );
load();
m_isTimeEdited = false;
m_isDateEdited = false;
}
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -21,16 +22,13 @@
#define TIMEDATEPAGE_H
#include "TimeDateService.h"
#include "TimeZoneWidget.h"
#include "PageWidget.h"
namespace Ui
{
class PageTimeDate;
class PageTimeDate;
}
class TimeDatePage : public PageWidget
{
Q_OBJECT
......
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -29,6 +30,7 @@
class TimeDateService : public QObject
{
Q_OBJECT
public:
explicit TimeDateService( QObject* parent = 0 );
~TimeDateService();
......
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -20,12 +21,13 @@
#ifndef TIMEZONEDIALOG_H
#define TIMEZONEDIALOG_H
#include <QDialog>
#include "TimeZoneWidget.h"
#include <QDialog>
namespace Ui
{
class TimeZoneDialog;
class TimeZoneDialog;
}
class TimeZoneDialog : public QDialog
......@@ -41,7 +43,6 @@ public:
private:
Ui::TimeZoneDialog* ui;
TimeZoneWidget* m_timeZoneWidget;
bool m_blockTimeZoneWidgetSet;
};
......
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -61,4 +62,3 @@ private:
};
#endif // TIMEZONEWIDGET_H
......@@ -2,6 +2,7 @@
* This file is part of Manjaro Settings Manager.
*
* Ramon Buldó <ramon@manjaro.org>
* Kacper Piwiński
*
* Manjaro Settings Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -32,7 +33,7 @@ MsmApplication::MsmApplication( int& argc, char* argv[] )
setOrganizationName( "Manjaro" );
setOrganizationDomain( "Manjaro" );
setApplicationName( "Manjaro Settings Manager" );
setApplicationVersion( "0.5.3" );
setApplicationVersion( "0.5.5" );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment