Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2016-06-20 10:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2016-05-31 12:14:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2016-06-20 10:59:34.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 14 21:31:14 UTC 2016 - wba...@tmo.at + +- Use shared-mime-info macros (boo#979301) + +------------------------------------------------------------------- +Fri Jun 10 17:56:01 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.2 + * KDE Applications 16.04.2 + * https://www.kde.org/announcements/announce-applications-16.04.2.php + + +------------------------------------------------------------------- Old: ---- kdepim-runtime-16.04.1.tar.xz New: ---- kdepim-runtime-16.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.QED0Ug/_old 2016-06-20 10:59:35.000000000 +0200 +++ /var/tmp/diff_new_pack.QED0Ug/_new 2016-06-20 10:59:35.000000000 +0200 @@ -17,9 +17,9 @@ %define kf5_version 5.1.0 -%define kf5_pimlibs_version 16.04.1 +%define kf5_pimlibs_version 16.04.2 Name: kdepim-runtime -Version: 16.04.1 +Version: 16.04.2 Release: 0 Summary: Runtime modules for kdepim License: GPL-2.0 @@ -99,11 +99,11 @@ %post /sbin/ldconfig -%{_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : +%mime_database_post %postun /sbin/ldconfig -%{_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : +%mime_database_postun %files %defattr(-,root,root) ++++++ kdepim-runtime-16.04.1.tar.xz -> kdepim-runtime-16.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/CMakeLists.txt new/kdepim-runtime-16.04.2/CMakeLists.txt --- old/kdepim-runtime-16.04.1/CMakeLists.txt 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/CMakeLists.txt 2016-05-12 21:26:25.000000000 +0200 @@ -35,7 +35,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION_NUMBER "5.2.1") +set(KDEPIM_RUNTIME_VERSION_NUMBER "5.2.2") set(KDEPIM_RUNTIME_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/birthdays/configdialog.ui new/kdepim-runtime-16.04.2/resources/birthdays/configdialog.ui --- old/kdepim-runtime-16.04.1/resources/birthdays/configdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/birthdays/configdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ConfigDialog</class> - <widget class="QWidget" name="ConfigDialog" > - <property name="geometry" > + <widget class="QWidget" name="ConfigDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,45 +10,57 @@ <height>364</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Reminder</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>false</bool> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="kcfg_EnableAlarm" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="kcfg_EnableAlarm"> + <property name="text"> <string>Set &reminder</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label" > - <property name="enabled" > + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > - <string>R&emind prior to event:</string> + <property name="text"> + <string>&Remind prior to event:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>kcfg_AlarmDays</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="KPluralHandlingSpinBox" name="kcfg_AlarmDays" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="KPluralHandlingSpinBox" name="kcfg_AlarmDays"> + <property name="enabled"> <bool>false</bool> </property> - <property name="prefix" > + <property name="prefix"> <string/> </property> - <property name="maximum" > + <property name="maximum"> <number>355</number> </property> </widget> @@ -56,21 +69,21 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Filter</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="kcfg_FilterOnCategories" > - <property name="text" > + <widget class="QCheckBox" name="kcfg_FilterOnCategories"> + <property name="text"> <string>&Filter by categories</string> </property> </widget> </item> <item> - <widget class="Akonadi::TagSelectWidget" name="FilterCategories" > - <property name="enabled" > + <widget class="Akonadi::TagSelectWidget" name="FilterCategories"> + <property name="enabled"> <bool>false</bool> </property> </widget> @@ -79,11 +92,11 @@ </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>18</height> @@ -97,7 +110,7 @@ <customwidget> <class>Akonadi::TagSelectWidget</class> <extends>QWidget</extends> - <header>AkonadiWidgets/tagselectwidget.h</header> + <header>tagselectwidget.h</header> </customwidget> <customwidget> <class>KPluralHandlingSpinBox</class> @@ -113,11 +126,11 @@ <receiver>label</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>97</x> <y>54</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>104</x> <y>75</y> </hint> @@ -129,11 +142,11 @@ <receiver>kcfg_AlarmDays</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>169</x> <y>51</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>292</x> <y>85</y> </hint> @@ -145,11 +158,11 @@ <receiver>FilterCategories</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>29</x> <y>151</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>81</x> <y>199</y> </hint> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/contacts/settingsdialog.ui new/kdepim-runtime-16.04.2/resources/contacts/settingsdialog.ui --- old/kdepim-runtime-16.04.1/resources/contacts/settingsdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/contacts/settingsdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -11,6 +11,18 @@ </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> @@ -22,7 +34,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>&Directory:</string> + <string>Di&rectory:</string> </property> <property name="buddy"> <cstring>kcfg_Path</cstring> @@ -80,6 +92,7 @@ <class>KUrlRequester</class> <extends>QFrame</extends> <header>kurlrequester.h</header> + <container>1</container> </customwidget> </customwidgets> <resources/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/icaldir/settingsdialog.ui new/kdepim-runtime-16.04.2/resources/icaldir/settingsdialog.ui --- old/kdepim-runtime-16.04.1/resources/icaldir/settingsdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/icaldir/settingsdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SettingsDialog</class> - <widget class="QWidget" name="SettingsDialog" > - <property name="geometry" > + <widget class="QWidget" name="SettingsDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,46 +10,58 @@ <height>386</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QTabWidget" name="ktabwidget" > - <property name="currentIndex" > + <widget class="QTabWidget" name="ktabwidget"> + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > + <widget class="QWidget" name="tab"> + <attribute name="title"> <string>Directory</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Directory Name</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>&Directory:</string> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Di&rectory:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>kcfg_Path</cstring> </property> </widget> </item> <item> - <widget class="KUrlRequester" name="kcfg_Path" /> + <widget class="KUrlRequester" name="kcfg_Path"/> </item> </layout> </item> <item> - <widget class="QLabel" name="label_3" > - <property name="text" > + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Select the directory whose contents should be represented by this resource. If the directory does not exist, it will be created.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -57,24 +70,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Access Rights</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QCheckBox" name="kcfg_ReadOnly" > - <property name="text" > + <widget class="QCheckBox" name="kcfg_ReadOnly"> + <property name="text"> <string>Read only</string> </property> </widget> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>If read-only mode is enabled, no changes will be written to the directory selected above. Read-only mode will be automatically enabled if you do not have write access to the directory.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -83,11 +96,11 @@ </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>4</height> @@ -97,46 +110,46 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > + <widget class="QWidget" name="tab_2"> + <attribute name="title"> <string>Tuning</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5" > + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QLabel" name="label_4" > - <property name="text" > + <widget class="QLabel" name="label_4"> + <property name="text"> <string>The options on this page allow you to change parameters that balance data safety and consistency against performance. In general you should be careful with changing anything here, the defaults are good enough in most cases.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QLabel" name="autosaveLabel" > - <property name="text" > + <widget class="QLabel" name="autosaveLabel"> + <property name="text"> <string>Autosave delay:</string> </property> </widget> </item> <item> - <widget class="KPluralHandlingSpinBox" name="kcfg_AutosaveInterval" > - <property name="value" > - <number>1</number> - </property> - <property name="minimum" > + <widget class="KPluralHandlingSpinBox" name="kcfg_AutosaveInterval"> + <property name="minimum"> <number>0</number> </property> + <property name="value"> + <number>1</number> + </property> </widget> </item> <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -147,11 +160,11 @@ </layout> </item> <item> - <spacer name="verticalSpacer_2" > - <property name="orientation" > + <spacer name="verticalSpacer_2"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>138</height> @@ -167,14 +180,15 @@ </widget> <customwidgets> <customwidget> - <class>KPluralHandlingSpinBox</class> - <extends>QSpinBox</extends> - <header>KPluralHandlingSpinBox</header> - </customwidget> - <customwidget> <class>KUrlRequester</class> <extends>QFrame</extends> <header>kurlrequester.h</header> + <container>1</container> + </customwidget> + <customwidget> + <class>KPluralHandlingSpinBox</class> + <extends>QSpinBox</extends> + <header>KPluralHandlingSpinBox</header> </customwidget> </customwidgets> <resources/> @@ -185,11 +199,11 @@ <receiver>kcfg_AutosaveInterval</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>273</x> <y>205</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>101</y> </hint> @@ -201,11 +215,11 @@ <receiver>autosaveLabel</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>273</x> <y>205</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>56</x> <y>101</y> </hint> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/imap/setupserverview_desktop.ui new/kdepim-runtime-16.04.2/resources/imap/setupserverview_desktop.ui --- old/kdepim-runtime-16.04.1/resources/imap/setupserverview_desktop.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/imap/setupserverview_desktop.ui 2016-05-12 21:26:25.000000000 +0200 @@ -7,10 +7,22 @@ <x>0</x> <y>0</y> <width>467</width> - <height>540</height> + <height>582</height> </rect> </property> <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> @@ -67,7 +79,7 @@ <string>The username.</string> </property> <property name="text"> - <string>&Username:</string> + <string>Use&rname:</string> </property> <property name="buddy"> <cstring>userName</cstring> @@ -677,7 +689,7 @@ <customwidget> <class>Akonadi::CollectionRequester</class> <extends>QFrame</extends> - <header>AkonadiWidgets/CollectionRequester</header> + <header>CollectionRequester</header> <container>1</container> </customwidget> </customwidgets> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/kalarm/kalarmdir/settingsdialog.ui new/kdepim-runtime-16.04.2/resources/kalarm/kalarmdir/settingsdialog.ui --- old/kdepim-runtime-16.04.1/resources/kalarm/kalarmdir/settingsdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/kalarm/kalarmdir/settingsdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -1,6 +1,7 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SettingsDialog</class> - <widget class="QWidget" name="SettingsDialog" > + <widget class="QWidget" name="SettingsDialog"> <property name="geometry"> <rect> <x>0</x> @@ -15,46 +16,58 @@ <height>10</height> </size> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QTabWidget" name="ktabwidget" > - <property name="currentIndex" > + <widget class="QTabWidget" name="ktabwidget"> + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > + <widget class="QWidget" name="tab"> + <attribute name="title"> <string>Directory</string> </attribute> - <layout class="QVBoxLayout" name="tabLayout" > + <layout class="QVBoxLayout" name="tabLayout"> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Directory Name</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>&Directory:</string> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Director&y:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>kcfg_Path</cstring> </property> </widget> </item> <item> - <widget class="KUrlRequester" name="kcfg_Path" /> + <widget class="KUrlRequester" name="kcfg_Path"/> </item> </layout> </item> <item> - <widget class="QLabel" name="label_3" > - <property name="text" > + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Select the directory whose contents should be represented by this resource. If the directory does not exist, it will be created.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -99,24 +112,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Access Rights</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QCheckBox" name="kcfg_ReadOnly" > - <property name="text" > + <widget class="QCheckBox" name="kcfg_ReadOnly"> + <property name="text"> <string>Read only</string> </property> </widget> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>If read-only mode is enabled, no changes will be written to the directory selected above. Read-only mode will be automatically enabled if you do not have write access to the directory.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -132,15 +145,18 @@ </widget> <customwidgets> <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - <customwidget> <class>KUrlRequester</class> <extends>QFrame</extends> <header>kurlrequester.h</header> + <container>1</container> + </customwidget> + <customwidget> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> + <container>1</container> </customwidget> </customwidgets> <resources/> + <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/maildir/settings.ui new/kdepim-runtime-16.04.2/resources/maildir/settings.ui --- old/kdepim-runtime-16.04.1/resources/maildir/settings.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/maildir/settings.ui 2016-05-12 21:26:25.000000000 +0200 @@ -15,6 +15,18 @@ <string>Mail Directory Settings</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/openxchange/configdialog.ui new/kdepim-runtime-16.04.2/resources/openxchange/configdialog.ui --- old/kdepim-runtime-16.04.1/resources/openxchange/configdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/openxchange/configdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -7,13 +7,25 @@ <x>0</x> <y>0</y> <width>410</width> - <height>200</height> + <height>202</height> </rect> </property> <property name="windowTitle"> <string>Open-Xchange Configuration</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> @@ -136,6 +148,7 @@ <class>KLineEdit</class> <extends>QLineEdit</extends> <header>klineedit.h</header> + <container>1</container> </customwidget> </customwidgets> <resources/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/pop3/popsettings.ui new/kdepim-runtime-16.04.2/resources/pop3/popsettings.ui --- old/kdepim-runtime-16.04.1/resources/pop3/popsettings.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/pop3/popsettings.ui 2016-05-12 21:26:25.000000000 +0200 @@ -7,10 +7,22 @@ <x>0</x> <y>0</y> <width>451</width> - <height>557</height> + <height>636</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QLabel" name="titleLabel"> <property name="font"> @@ -86,15 +98,15 @@ </item> <item> <widget class="KPluralHandlingSpinBox" name="intervalSpin"> - <property name="value"> - <number>5</number> - </property> <property name="minimum"> <number>1</number> </property> <property name="maximum"> <number>10000000</number> </property> + <property name="value"> + <number>5</number> + </property> </widget> </item> </layout> @@ -132,15 +144,15 @@ <property name="whatsThis"> <string>Account name: This defines the name displayed in the account list.</string> </property> - <property name="trapReturnKey"> - <bool>true</bool> - </property> + <property name="trapReturnKey" stdset="0"> + <bool>true</bool> + </property> </widget> </item> <item row="1" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> - <string>Incoming mail &server:</string> + <string>Incoming &mail server:</string> </property> <property name="buddy"> <cstring>hostEdit</cstring> @@ -155,15 +167,15 @@ <property name="whatsThis"> <string>The address of the POP3 server, e.g. pop3.yourprovider.org. You should get this address from your mail provider.</string> </property> - <property name="trapReturnKey"> - <bool>true</bool> - </property> + <property name="trapReturnKey" stdset="0"> + <bool>true</bool> + </property> </widget> </item> <item row="2" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> - <string>Username:</string> + <string>Use&rname:</string> </property> <property name="buddy"> <cstring>loginEdit</cstring> @@ -178,9 +190,9 @@ <property name="whatsThis"> <string>Your Internet Service Provider gave you a <em>user name</em> which is used to authenticate you with their servers. It usually is the first part of your email address (the part before <em>@</em>).</string> </property> - <property name="trapReturnKey"> - <bool>true</bool> - </property> + <property name="trapReturnKey" stdset="0"> + <bool>true</bool> + </property> </widget> </item> <item row="3" column="0"> @@ -204,9 +216,9 @@ <property name="echoMode"> <enum>QLineEdit::Password</enum> </property> - <property name="trapReturnKey"> - <bool>true</bool> - </property> + <property name="trapReturnKey" stdset="0"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -259,15 +271,15 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="value"> - <number>1</number> - </property> <property name="minimum"> <number>0</number> </property> <property name="maximum"> <number>365</number> </property> + <property name="value"> + <number>1</number> + </property> </widget> </item> <item row="2" column="0"> @@ -288,15 +300,15 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="value"> - <number>100</number> - </property> <property name="minimum"> <number>0</number> </property> <property name="maximum"> <number>999999</number> </property> + <property name="value"> + <number>99</number> + </property> </widget> </item> <item row="3" column="0"> @@ -317,8 +329,8 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="value"> - <number>10</number> + <property name="suffix"> + <string> MB</string> </property> <property name="minimum"> <number>1</number> @@ -326,8 +338,8 @@ <property name="maximum"> <number>999999</number> </property> - <property name="suffix"> - <string> MB</string> + <property name="value"> + <number>10</number> </property> </widget> </item> @@ -349,15 +361,15 @@ <property name="whatsThis"> <string>If you select this option, POP Filters will be used to decide what to do with messages. You can then select to download, delete or keep them on the server.</string> </property> - <property name="value"> - <number>50000</number> - </property> <property name="minimum"> <number>1</number> </property> <property name="maximum"> <number>10000000</number> </property> + <property name="value"> + <number>99</number> + </property> </widget> </item> <item row="5" column="0"> @@ -406,14 +418,13 @@ <property name="showClearButton" stdset="0"> <bool>true</bool> </property> - <property name="trapReturnKey"> + <property name="trapReturnKey" stdset="0"> <bool>true</bool> </property> </widget> </item> <item row="0" column="1"> - <widget class="Akonadi::CollectionRequester" name="folderRequester"> - </widget> + <widget class="Akonadi::CollectionRequester" name="folderRequester"/> </item> </layout> </item> @@ -498,7 +509,7 @@ <item> <widget class="QRadioButton" name="encryptionTLS"> <property name="text"> - <string>STARTTLS</string> + <string>STA&RTTLS</string> </property> </widget> </item> @@ -560,21 +571,21 @@ </widget> <customwidgets> <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - <container>1</container> - </customwidget> - <customwidget> <class>KSeparator</class> <extends>QFrame</extends> <header>kseparator.h</header> <container>1</container> </customwidget> <customwidget> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> + <container>1</container> + </customwidget> + <customwidget> <class>KPluralHandlingSpinBox</class> <extends>QSpinBox</extends> - <header>KPluralHandlingSpinBox</header> + <header>kpluralhandlingspinbox.h</header> </customwidget> <customwidget> <class>Akonadi::CollectionRequester</class> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/shared/filestore/abstractlocalstore.cpp new/kdepim-runtime-16.04.2/resources/shared/filestore/abstractlocalstore.cpp --- old/kdepim-runtime-16.04.1/resources/shared/filestore/abstractlocalstore.cpp 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/shared/filestore/abstractlocalstore.cpp 2016-05-12 21:26:25.000000000 +0200 @@ -367,7 +367,7 @@ collection.setName(d->mPathFileInfo.fileName()); EntityDisplayAttribute *attribute = collection.attribute<EntityDisplayAttribute>(); - if (attribute != Q_NULLPTR) { + if (attribute) { attribute->setDisplayName(d->mPathFileInfo.fileName()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.04.1/resources/shared/singlefileresource/settingsdialog.ui new/kdepim-runtime-16.04.2/resources/shared/singlefileresource/settingsdialog.ui --- old/kdepim-runtime-16.04.1/resources/shared/singlefileresource/settingsdialog.ui 2016-04-28 23:01:46.000000000 +0200 +++ new/kdepim-runtime-16.04.2/resources/shared/singlefileresource/settingsdialog.ui 2016-05-12 21:26:25.000000000 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SettingsDialog</class> - <widget class="QWidget" name="SettingsDialog" > - <property name="geometry" > + <widget class="QWidget" name="SettingsDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,46 +10,58 @@ <height>386</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QTabWidget" name="tabWidget" > - <property name="currentIndex" > + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > + <widget class="QWidget" name="tab"> + <attribute name="title"> <string>Directory</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Directory Name</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>&Directory:</string> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Director&y:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>kcfg_Path</cstring> </property> </widget> </item> <item> - <widget class="KUrlRequester" name="kcfg_Path" /> + <widget class="KUrlRequester" name="kcfg_Path"/> </item> </layout> </item> <item> - <widget class="QLabel" name="label_3" > - <property name="text" > + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Select the directory whose contents should be represented by this resource. If the directory does not exist, it will be created.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -57,24 +70,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Access Rights</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QCheckBox" name="kcfg_ReadOnly" > - <property name="text" > + <widget class="QCheckBox" name="kcfg_ReadOnly"> + <property name="text"> <string>Read only</string> </property> </widget> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>If read-only mode is enabled, no changes will be written to the directory selected above. Read-only mode will be automatically enabled if you do not have write access to the directory.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -83,11 +96,11 @@ </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>4</height> @@ -97,46 +110,46 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > + <widget class="QWidget" name="tab_2"> + <attribute name="title"> <string>Tuning</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5" > + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QLabel" name="label_4" > - <property name="text" > + <widget class="QLabel" name="label_4"> + <property name="text"> <string>The options on this page allow you to change parameters that balance data safety and consistency against performance. In general you should be careful with changing anything here, the defaults are good enough in most cases.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QLabel" name="autosaveLabel" > - <property name="text" > + <widget class="QLabel" name="autosaveLabel"> + <property name="text"> <string>Autosave delay:</string> </property> </widget> </item> <item> - <widget class="KPluralHandlingSpinBox" name="kcfg_AutosaveInterval" > - <property name="value" > - <number>1</number> - </property> - <property name="minimum" > + <widget class="KPluralHandlingSpinBox" name="kcfg_AutosaveInterval"> + <property name="minimum"> <number>0</number> </property> + <property name="value"> + <number>1</number> + </property> </widget> </item> <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -147,11 +160,11 @@ </layout> </item> <item> - <spacer name="verticalSpacer_2" > - <property name="orientation" > + <spacer name="verticalSpacer_2"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>138</height> @@ -167,14 +180,15 @@ </widget> <customwidgets> <customwidget> - <class>KPluralHandlingSpinBox</class> - <extends>QSpinBox</extends> - <header>KPluralHandlingSpinBox</header> - </customwidget> - <customwidget> <class>KUrlRequester</class> <extends>QFrame</extends> <header>kurlrequester.h</header> + <container>1</container> + </customwidget> + <customwidget> + <class>KPluralHandlingSpinBox</class> + <extends>QSpinBox</extends> + <header>KPluralHandlingSpinBox</header> </customwidget> </customwidgets> <resources/> @@ -185,11 +199,11 @@ <receiver>kcfg_AutosaveInterval</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>273</x> <y>205</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>101</y> </hint> @@ -201,11 +215,11 @@ <receiver>autosaveLabel</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>273</x> <y>205</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>56</x> <y>101</y> </hint>
