mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 10:22:52 +00:00
kdeplasma-addons: adjust to Katie changes
includes seconds handling for frame applet auto-update feature Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
052d7bb86e
commit
e423875071
5 changed files with 7 additions and 17 deletions
|
@ -39,7 +39,10 @@ ConfigDialog::ConfigDialog(QWidget *parent)
|
|||
|
||||
imageUi.addDirButton->setIcon(KIcon("list-add"));
|
||||
imageUi.removeDirButton->setIcon(KIcon("list-remove"));
|
||||
imageUi.slideShowDelay->setMinimumTime(QTime(0, 0, 1)); // minimum to 1 second
|
||||
imageUi.slideShowDelay->setTimeRange(
|
||||
QTime(0, 0, 1), // minimum to 1 second
|
||||
imageUi.slideShowDelay->maximumTime()
|
||||
);
|
||||
|
||||
QString monitorPath = KStandardDirs::locate("data", "kcontrol/pics/monitor.png");
|
||||
// Size of monitor image: 200x186
|
||||
|
|
|
@ -585,7 +585,7 @@ void Frame::createConfigurationInterface(KConfigDialog *parent)
|
|||
m_configDialog->imageUi.removeDirButton->setEnabled(!m_slideShowPaths.isEmpty());
|
||||
m_configDialog->imageUi.slideShowDelay->setTime(QTime(m_slideshowTime / 3600, (m_slideshowTime / 60) % 60, m_slideshowTime % 60));
|
||||
m_configDialog->previewPicture(m_mySlideShow->image());
|
||||
m_configDialog->imageUi.autoUpdateTime->setTime(QTime(m_autoUpdateIntervall / 3600, (m_autoUpdateIntervall / 60) % 60));
|
||||
m_configDialog->imageUi.autoUpdateTime->setTime(QTime(m_autoUpdateIntervall / 3600, (m_autoUpdateIntervall / 60) % 60, m_autoUpdateIntervall % 60));
|
||||
|
||||
connect(m_configDialog->imageUi.slideShowDelay, SIGNAL(timeChanged(QTime)),
|
||||
parent, SLOT(settingsModified()));
|
||||
|
@ -663,7 +663,7 @@ void Frame::configAccepted()
|
|||
m_autoUpdateTimer->stop();
|
||||
|
||||
QTime AutoUpdateTimer = m_configDialog->imageUi.autoUpdateTime->time();
|
||||
m_autoUpdateIntervall = AutoUpdateTimer.minute() * 60 + AutoUpdateTimer.hour() * 3600;
|
||||
m_autoUpdateIntervall = AutoUpdateTimer.second() + AutoUpdateTimer.minute() * 60 + AutoUpdateTimer.hour() * 3600;
|
||||
cg.writeEntry("autoupdate time", m_autoUpdateIntervall);
|
||||
|
||||
QString potdProvider = m_configDialog->imageUi.potdComboBox->itemData(m_configDialog->imageUi.potdComboBox->currentIndex()).toString();
|
||||
|
|
|
@ -141,12 +141,6 @@
|
|||
<string>Updates the picture from the source in the given time.
|
||||
Useful if you want a live cam or weather data to be up to date.</string>
|
||||
</property>
|
||||
<property name="specialValueText">
|
||||
<string>never</string>
|
||||
</property>
|
||||
<property name="displayFormat">
|
||||
<string>hh'h' mm'min'</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
|
@ -310,12 +304,6 @@ Useful if you want a live cam or weather data to be up to date.</string>
|
|||
<day>1</day>
|
||||
</datetime>
|
||||
</property>
|
||||
<property name="currentSection">
|
||||
<enum>QDateTimeEdit::HourSection</enum>
|
||||
</property>
|
||||
<property name="displayFormat">
|
||||
<string comment="(qtdt-format) Please do not change the quotes (') and translate only the content of the quotes.">hh 'Hours' mm 'Mins' ss 'Secs'</string>
|
||||
</property>
|
||||
<property name="time">
|
||||
<time>
|
||||
<hour>0</hour>
|
||||
|
|
|
@ -23,4 +23,4 @@ install(FILES plasma-applet-timer.desktop
|
|||
DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
|
||||
|
||||
install(FILES timer.svgz
|
||||
DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
|
||||
DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
|
||||
|
|
|
@ -28,7 +28,6 @@ CustomTimeEditor::CustomTimeEditor()
|
|||
: QObject()
|
||||
{
|
||||
timeEdit=new QTimeEdit();
|
||||
timeEdit->setDisplayFormat(toLocalizedTimer(TIME_FORMAT));
|
||||
editor=new KLineEdit();
|
||||
customEditor=new KEditListWidget::CustomEditor(timeEdit, editor);
|
||||
connect(timeEdit, SIGNAL(timeChanged(QTime)), this, SLOT(setEdit(QTime)));
|
||||
|
|
Loading…
Add table
Reference in a new issue