[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kmail
From: Bertjan Broeksema <b.broeksema () home ! nl>
Date: 2008-10-17 0:03:54
Message-ID: 1224201834.871337.8252.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 872346 by bbroeksema:
EBN Fixes: Qt classes that should not be used.
M +2 -2 accountdialog.cpp
M +33 -34 localsettings.ui
M +18 -19 maildirsettings.ui
M +10 -15 popsettings.ui
M +1 -0 searchwindow.cpp
M +2 -2 searchwindow.h
M +19 -37 templatesconfiguration_base.ui
--- trunk/KDE/kdepim/kmail/accountdialog.cpp #872345:872346
@@ -37,6 +37,7 @@
using namespace MailTransport;
#include "globalsettings.h"
+#include <KComboBox>
#include <KGlobalSettings>
#include <KFileDialog>
#include <KLocale>
@@ -55,7 +56,6 @@
#include <QValidator>
#include <QLabel>
#include <QPushButton>
-#include <QComboBox>
#include <QToolButton>
#include <QGroupBox>
#include <QGridLayout>
@@ -532,7 +532,7 @@
void AccountDialog::setupSettings()
{
- QComboBox *folderCombo = 0;
+ KComboBox *folderCombo = 0;
bool intervalCheckingEnabled = ( mAccount->checkInterval() > 0 );
int interval = mAccount->checkInterval();
if ( !intervalCheckingEnabled ) // Default to 5 minutes when the user enables
--- trunk/KDE/kdepim/kmail/localsettings.ui #872345:872346
@@ -44,18 +44,8 @@
<property name="text" >
<string>File &location:</string>
</property>
- <property name="buddy" >
- <cstring>locationEdit</cstring>
- </property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QComboBox" name="locationEdit" >
- <property name="editable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item row="3" column="2" >
<widget class="QPushButton" name="choose" >
<property name="text" >
@@ -63,7 +53,7 @@
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3" >
+ <item row="5" column="0" colspan="3" >
<widget class="QGroupBox" name="group" >
<property name="title" >
<string>Locking Method</string>
@@ -76,9 +66,6 @@
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="procmailLockFileName" />
- </item>
<item row="1" column="0" colspan="2" >
<widget class="QRadioButton" name="lockMutt" >
<property name="text" >
@@ -86,45 +73,48 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
+ <item row="3" column="0" colspan="2" >
<widget class="QRadioButton" name="lockMuttPriv" >
<property name="text" >
<string>M&utt dotlock privileged</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
+ <item row="4" column="0" colspan="2" >
<widget class="QRadioButton" name="lockFcntl" >
<property name="text" >
<string>&FCNTL</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2" >
+ <item row="5" column="0" colspan="2" >
<widget class="QRadioButton" name="lockNone" >
<property name="text" >
<string>Non&e (use with care)</string>
</property>
</widget>
</item>
+ <item row="0" column="1" >
+ <widget class="KComboBox" name="procmailLockFileName" />
+ </item>
</layout>
</widget>
</item>
- <item row="5" column="0" colspan="3" >
+ <item row="6" column="0" colspan="3" >
<widget class="QCheckBox" name="includeInCheck" >
<property name="text" >
<string>Include in m&anual mail check</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="3" >
+ <item row="7" column="0" colspan="3" >
<widget class="QCheckBox" name="intervalCheck" >
<property name="text" >
<string>Enable &interval mail checking</string>
</property>
</widget>
</item>
- <item row="7" column="0" >
+ <item row="8" column="0" >
<widget class="QLabel" name="intervalLabel" >
<property name="text" >
<string>Check inter&val:</string>
@@ -134,27 +124,21 @@
</property>
</widget>
</item>
- <item row="7" column="1" >
- <widget class="KIntNumInput" native="1" name="intervalSpin" >
- <property name="suffix" stdset="0" >
+ <item row="8" column="1" >
+ <widget class="KIntNumInput" name="intervalSpin" >
+ <property name="suffix" >
<string> min</string>
</property>
</widget>
</item>
- <item row="8" column="0" >
+ <item row="9" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>&Destination folder:</string>
</property>
- <property name="buddy" >
- <cstring>folderCombo</cstring>
- </property>
</widget>
</item>
- <item row="8" column="1" >
- <widget class="QComboBox" name="folderCombo" />
- </item>
- <item row="9" column="0" >
+ <item row="10" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>&Pre-command</string>
@@ -164,15 +148,15 @@
</property>
</widget>
</item>
- <item row="9" column="1" >
+ <item row="10" column="1" >
<widget class="KLineEdit" name="precommand" />
</item>
- <item row="10" column="0" >
+ <item row="11" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>3</height>
@@ -180,10 +164,25 @@
</property>
</spacer>
</item>
+ <item row="9" column="1" >
+ <widget class="KComboBox" name="folderCombo" />
+ </item>
+ <item row="3" column="1" >
+ <widget class="KComboBox" name="locationEdit" >
+ <property name="editable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
<customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
+ <customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
--- trunk/KDE/kdepim/kmail/maildirsettings.ui #872345:872346
@@ -44,18 +44,8 @@
<property name="text" >
<string>Folder &location:</string>
</property>
- <property name="buddy" >
- <cstring>locationEdit</cstring>
- </property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QComboBox" name="locationEdit" >
- <property name="editable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item row="3" column="2" >
<widget class="QPushButton" name="choose" >
<property name="text" >
@@ -88,8 +78,8 @@
</widget>
</item>
<item row="6" column="1" >
- <widget class="KIntNumInput" native="1" name="intervalSpin" >
- <property name="suffix" stdset="0" >
+ <widget class="KIntNumInput" name="intervalSpin" >
+ <property name="suffix" >
<string> min</string>
</property>
</widget>
@@ -99,14 +89,8 @@
<property name="text" >
<string>&Destination folder:</string>
</property>
- <property name="buddy" >
- <cstring>folderCombo</cstring>
- </property>
</widget>
</item>
- <item row="7" column="1" >
- <widget class="QComboBox" name="folderCombo" />
- </item>
<item row="8" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
@@ -125,7 +109,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
@@ -133,10 +117,25 @@
</property>
</spacer>
</item>
+ <item row="7" column="1" >
+ <widget class="KComboBox" name="folderCombo" />
+ </item>
+ <item row="3" column="1" >
+ <widget class="KComboBox" name="locationEdit" >
+ <property name="editable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
<customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
+ <customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
--- trunk/KDE/kdepim/kmail/popsettings.ui #872345:872346
@@ -35,7 +35,7 @@
</sizepolicy>
</property>
<property name="currentIndex" >
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page1" >
<attribute name="title" >
@@ -318,21 +318,8 @@
<property name="text" >
<string>Des&tination folder:</string>
</property>
- <property name="buddy" >
- <cstring>folderCombo</cstring>
- </property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="folderCombo" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
<item row="1" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
@@ -353,9 +340,12 @@
</property>
</widget>
</item>
+ <item row="0" column="1" >
+ <widget class="KComboBox" name="folderCombo" />
+ </item>
</layout>
</item>
- <item row="7" column="0" colspan="2" >
+ <item row="8" column="0" colspan="2" >
<spacer name="verticalSpacer_3" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -557,6 +547,11 @@
</widget>
<customwidgets>
<customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
+ <customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
--- trunk/KDE/kdepim/kmail/searchwindow.cpp #872345:872346
@@ -250,6 +250,7 @@
hbl2->setObjectName( "kmfs_hbl2" );
mSearchFolderLbl = new QLabel( i18n("Search folder &name:"), searchWidget );
mSearchFolderEdt = new KLineEdit( searchWidget );
+ mSearchFolderEdt->setClearButtonShown( true );
if ( searchFolder )
mSearchFolderEdt->setText( searchFolder->folder()->name() );
else
--- trunk/KDE/kdepim/kmail/searchwindow.h #872345:872346
@@ -33,9 +33,9 @@
class QCloseEvent;
class QKeyEvent;
class QLabel;
-class QLineEdit;
class QRadioButton;
class KActionMenu;
+class KLineEdit;
class KMFolder;
class KMFolderSearch;
class KMMainWidget;
@@ -157,7 +157,7 @@
QCheckBox *mChkSubFolders;
MatchListView* mLbxMatches;
QLabel *mSearchFolderLbl;
- QLineEdit *mSearchFolderEdt;
+ KLineEdit *mSearchFolderEdt;
KPushButton *mSearchFolderOpenBtn;
KPushButton *mSearchResultOpenBtn;
KStatusBar* mStatusBar;
--- trunk/KDE/kdepim/kmail/templatesconfiguration_base.ui #872345:872346
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>316</height>
+ <width>450</width>
+ <height>541</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -52,50 +52,27 @@
<enum>QFrame::Sunken</enum>
</property>
<property name="currentIndex" >
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page_new" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>94</width>
- <height>60</height>
+ <width>426</width>
+ <height>345</height>
</rect>
</property>
<attribute name="label" >
<string>New Message</string>
</attribute>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QTextEdit" name="textEdit_new" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>3</horstretch>
- <verstretch>3</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="KTextEdit" name="textEdit_new" >
<property name="font" >
<font>
<family>Monospace</family>
<pointsize>9</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
</font>
</property>
<property name="lineWrapMode" >
@@ -113,8 +90,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>256</width>
- <height>192</height>
+ <width>426</width>
+ <height>345</height>
</rect>
</property>
<attribute name="label" >
@@ -161,8 +138,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>256</width>
- <height>192</height>
+ <width>426</width>
+ <height>345</height>
</rect>
</property>
<attribute name="label" >
@@ -209,8 +186,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>349</width>
- <height>192</height>
+ <width>426</width>
+ <height>345</height>
</rect>
</property>
<attribute name="label" >
@@ -308,6 +285,11 @@
<layoutdefault spacing="6" margin="11" />
<customwidgets>
<customwidget>
+ <class>KTextEdit</class>
+ <extends>QTextEdit</extends>
+ <header>ktextedit.h</header>
+ </customwidget>
+ <customwidget>
<class>TemplatesInsertCommand</class>
<extends>QWidget</extends>
<header>templatesinsertcommand.h</header>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic