[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdepim
From: Pradeepto Bhattacharya <pradeepto () kde ! org>
Date: 2008-02-28 6:30:33
Message-ID: 1204180233.428726.1498.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 780160 by pradeepto:
Merged revisions 769035-769141 via svnmerge from
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r769035 | tilladam | 2008-01-31 14:58:46 +0530 (Thu, 31 Jan 2008) | 3 lines
Don't change the size and splitter layout when reloading the configuration.
kolab/issue1843
........
r769041 | tilladam | 2008-01-31 15:13:57 +0530 (Thu, 31 Jan 2008) | 2 lines
Better wording for the "encrypt to self" option.
........
r769042 | tilladam | 2008-01-31 15:16:01 +0530 (Thu, 31 Jan 2008) | 3 lines
Give a better hint what this action does.
kolab/issue2166
........
r769045 | osterfeld | 2008-01-31 15:38:58 +0530 (Thu, 31 Jan 2008) | 1 line
Make it possible to place the contact list above the extension widgets. Kolab issue \
2159
........
r769047 | tilladam | 2008-01-31 15:44:12 +0530 (Thu, 31 Jan 2008) | 2 lines
I'm being educated that one encrypts to certificates, not keys, even for openpgp.
........
r769051 | osterfeld | 2008-01-31 16:03:51 +0530 (Thu, 31 Jan 2008) | 1 line
documentation for kolab issue 2159
........
r769058 | tilladam | 2008-01-31 16:25:16 +0530 (Thu, 31 Jan 2008) | 5 lines
Consolidate defaults handling somewhat and make new tasks have a reminder and
due date by default. Usability research with our customers shows that this is
what people expect.
kolab/issue2167
........
r769140 | tilladam | 2008-01-31 22:17:11 +0530 (Thu, 31 Jan 2008) | 2 lines
Fix typo.
........
r769141 | vkrause | 2008-01-31 22:21:30 +0530 (Thu, 31 Jan 2008) | 4 lines
Forwardport SVN commit 769128 by vkrause from proko2 branch:
Add missing i18n calls. Patch by Bernhard Reiter.
........
_M . (directory)
M +28 -0 doc/kaddressbook/index.docbook
M +7 -2 kaddressbook/common/kaddressbook.kcfg
M +1 -1 kaddressbook/features/Makefile.am
M +13 -5 kaddressbook/kabcore.cpp
M +1 -0 kaddressbook/kabcore.h
M +1 -1 kmail/composercryptoconfiguration.ui
M +14 -13 kmail/kmcomposewin.cpp
M +1 -1 kmail/kmcomposewin.h
M +1 -1 kmail/messageactions.cpp
M +2 -4 kmail/objecttreeparser.cpp
M +0 -1 korganizer/calendarview.cpp
M +6 -0 korganizer/koeditorgeneral.cpp
M +1 -0 korganizer/koeditorgeneral.h
M +4 -8 korganizer/kotodoeditor.cpp
** branches/KDE/3.5/kdepim #property svnmerge-integrated
- /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-769034,769036-769040,769043-769044,769046,769048-769050,769052-769057,7690 \
59-769139,769142-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
+ /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
--- branches/KDE/3.5/kdepim/doc/kaddressbook/index.docbook #780159:780160
@@ -1134,6 +1134,34 @@
<userinput><option>--help-qt</option></userinput>.</para>
</chapter>
+<chapter id="configure-non-gui-options">
+<title>Options Without a User Interface Representation</title>
+<para>
+Apart from the options presented in the configuration dialog, some options
+can only be set directly in the configuration file \
($KDEHOME/share/config/kaddressbookrc) +or through KIOSK.
+</para>
+
+<variablelist>
+
+<varlistentry>
+<term><guilabel>ContactListAboveExtensions</guilabel></term>
+<listitem>
+<para>
+If enabled, extensions (e.g. the distribution list editor) are shown below the \
contact list, +not in an separate column. By default, this option is disabled.
+
+To enable this option, add a line reading (under [MainWindow] section):
+</para>
+<programlisting>ContactListAboveExtensions=true
+</programlisting>
+</listitem>
+</varlistentry>
+
+</variablelist>
+
+</chapter>
+
<chapter id="credits">
<title>Credits and License</title>
--- branches/KDE/3.5/kdepim/kaddressbook/common/kaddressbook.kcfg #780159:780160
@@ -50,10 +50,15 @@
<entry type="Bool" name="DetailsPageVisible">
<default>true</default>
</entry>
- <entry type="IntList" name="ExtensionsSplitter">
- </entry>
<entry type="IntList" name="DetailsSplitter">
</entry>
+ <entry type="IntList" name="LeftSplitter">
+ </entry>
+ <entry type="Bool" name="ContactListAboveExtensions">
+ <default>false</default>
+ <whatsthis>If true, the contact list will be placed above the extensions on \
the left (distribution list editor etc.) instead of in the middle of the main \
window</whatsthis> +
+ </entry>
</group>
<group name="ExtensionsGeneral">
--- branches/KDE/3.5/kdepim/kaddressbook/features/Makefile.am #780159:780160
@@ -19,7 +19,7 @@
libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) \
$(all_libraries) -no-undefined libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS)
else
-llibkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
+libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) \
$(all_libraries) -no-undefined libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
endif
--- branches/KDE/3.5/kdepim/kaddressbook/kabcore.cpp #780159:780160
@@ -224,6 +224,9 @@
}
mDetailsSplitter->setSizes( splitterSize );
+ const QValueList<int> leftSplitterSizes = KABPrefs::instance()->leftSplitter();
+ if ( !leftSplitterSizes.isEmpty() )
+ mLeftSplitter->setSizes( leftSplitterSizes );
}
void KABCore::saveSettings()
@@ -231,7 +234,8 @@
KABPrefs::instance()->setJumpButtonBarVisible( mActionJumpBar->isChecked() );
KABPrefs::instance()->setDetailsPageVisible( mActionDetails->isChecked() );
KABPrefs::instance()->setDetailsSplitter( mDetailsSplitter->sizes() );
-
+ KABPrefs::instance()->setLeftSplitter( mLeftSplitter->sizes() );
+
mExtensionManager->saveSettings();
mViewManager->saveSettings();
@@ -1094,18 +1098,22 @@
SLOT( incrementalTextSearch( const QString& ) ) );
mDetailsSplitter = new QSplitter( mWidget );
+
+ mLeftSplitter = new QSplitter( mDetailsSplitter );
+ mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() \
? Qt::Vertical : Qt::Horizontal ); +
topLayout->addWidget( searchTB );
topLayout->addWidget( mDetailsSplitter );
-
+
mDetailsStack = new QWidgetStack( mDetailsSplitter );
- mExtensionManager = new ExtensionManager( new QWidget( mDetailsSplitter ), \
mDetailsStack, this, this ); + mExtensionManager = new ExtensionManager( new \
QWidget( mLeftSplitter ), mDetailsStack, this, this ); connect( mExtensionManager, \
SIGNAL( detailsWidgetDeactivated( QWidget* ) ), this, SLOT( \
deactivateDetailsWidget( QWidget* ) ) ); connect( mExtensionManager, SIGNAL( \
detailsWidgetActivated( QWidget* ) ), this, SLOT( activateDetailsWidget( QWidget* ) \
) );
-
- QWidget *viewWidget = new QWidget( mDetailsSplitter );
+ QWidget *viewWidget = new QWidget( mLeftSplitter );
+ mLeftSplitter->moveToFirst( viewWidget );
QVBoxLayout *viewLayout = new QVBoxLayout( viewWidget );
viewLayout->setSpacing( KDialog::spacingHint() );
--- branches/KDE/3.5/kdepim/kaddressbook/kabcore.h #780159:780160
@@ -455,6 +455,7 @@
QWidget *mDetailsWidget;
QHBoxLayout *mDetailsLayout;
QSplitter *mDetailsSplitter;
+ QSplitter *mLeftSplitter;
QWidgetStack *mDetailsStack;
LDAPSearchDialog *mLdapSearchDialog;
QDict<AddresseeEditorDialog> mEditorDict;
--- branches/KDE/3.5/kdepim/kmail/composercryptoconfiguration.ui #780159:780160
@@ -56,7 +56,7 @@
<cstring>mEncToSelf</cstring>
</property>
<property name="text">
- <string>Always encr&ypt to self</string>
+ <string>When encrypting emails, always also encr&ypt to \
the certificate of my own identity</string> </property>
<property name="whatsThis" stdset="0">
<string>When this option is enabled, the message/file will \
not only be encrypted with the receiver's public key, but also with your key. This \
will enable you to decrypt the message/file at a later time. This is generally a good \
idea.</string>
--- branches/KDE/3.5/kdepim/kmail/kmcomposewin.cpp #780159:780160
@@ -646,7 +646,7 @@
}
//-----------------------------------------------------------------------------
-void KMComposeWin::readConfig(void)
+void KMComposeWin::readConfig( bool reload /* = false */ )
{
mDefCharset = KMMessage::defaultCharset();
mBtnIdentity->setChecked( GlobalSettings::self()->stickyIdentity() );
@@ -689,20 +689,21 @@
}
mEdtSubject->setFont(mBodyFont);
- QSize siz = GlobalSettings::self()->composerSize();
- if (siz.width() < 200) siz.setWidth(200);
- if (siz.height() < 200) siz.setHeight(200);
- resize(siz);
+ if ( !reload ) {
+ QSize siz = GlobalSettings::self()->composerSize();
+ if (siz.width() < 200) siz.setWidth(200);
+ if (siz.height() < 200) siz.setHeight(200);
+ resize(siz);
- if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) {
- mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() );
- } else {
- QValueList<int> defaults;
- defaults << (int)(width() * 0.8) << (int)(width() * 0.2);
- mSnippetSplitter->setSizes( defaults );
+ if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) {
+ mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() \
); + } else {
+ QValueList<int> defaults;
+ defaults << (int)(width() * 0.8) << (int)(width() * 0.2);
+ mSnippetSplitter->setSizes( defaults );
+ }
}
-
mIdentity->setCurrentIdentity( mId );
kdDebug(5006) << "KMComposeWin::readConfig. " << mIdentity->currentIdentityName() \
<< endl; @@ -4917,7 +4918,7 @@
void KMComposeWin::slotConfigChanged()
{
- readConfig();
+ readConfig( true /*reload*/);
updateAutoSave();
rethinkFields();
slotWordWrapToggled( mWordWrapAction->isChecked() );
--- branches/KDE/3.5/kdepim/kmail/kmcomposewin.h #780159:780160
@@ -348,7 +348,7 @@
/**
* Read settings from app's config file.
*/
- void readConfig(void);
+ void readConfig( bool reload = false );
/**
* Change window title to given string.
*/
--- branches/KDE/3.5/kdepim/kmail/messageactions.cpp #780159:780160
@@ -70,7 +70,7 @@
this, SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
- mCreateTodoAction = new KAction( i18n("Create Task..."), "mail_todo",
+ mCreateTodoAction = new KAction( i18n("Create Task/Reminder..."), "mail_todo",
0, this, SLOT(slotCreateTodo()), \
mActionCollection, "create_todo" );
--- branches/KDE/3.5/kdepim/kmail/objecttreeparser.cpp #780159:780160
@@ -2230,11 +2230,9 @@
QString msgFrom( KPIM::getEmailAddress(fromAddress) );
QString certificate;
if( block.keyId.isEmpty() )
- certificate = "certificate";
+ certificate = i18n("certificate");
else
- certificate = QString("%1%2</a>")
- .arg( startKeyHREF,
- "certificate" );
+ certificate = startKeyHREF + i18n("certificate") + "</a>";
if( !blockAddrs.empty() ){
if( blockAddrs.grep(
msgFrom,
--- branches/KDE/3.5/kdepim/korganizer/calendarview.cpp #780159:780160
@@ -1015,7 +1015,6 @@
KOTodoEditor *todoEditor = mDialogManager->getTodoEditor();
connectIncidenceEditor( todoEditor );
todoEditor->newTodo();
- todoEditor->setDates( QDateTime(), false );
todoEditor->setTexts( summary, description );
todoEditor->addAttachments( attachments, attachmentMimetypes, inlineAttachment );
todoEditor->addAttendees( attendees );
--- branches/KDE/3.5/kdepim/korganizer/koeditorgeneral.cpp #780159:780160
@@ -304,6 +304,12 @@
mAlarmEditButton->setEnabled( enable );
}
+
+void KOEditorGeneral::toggleAlarm( bool on )
+{
+ mAlarmButton->setChecked( on );
+}
+
void KOEditorGeneral::setCategories( const QStringList &categories )
{
mCategoriesLabel->setText( categories.join(",") );
--- branches/KDE/3.5/kdepim/korganizer/koeditorgeneral.h #780159:780160
@@ -86,6 +86,7 @@
bool validateInput() { return true; }
void enableAlarm( bool enable );
+ void toggleAlarm( bool on );
void setSummary( const QString & );
void setDescription( const QString & );
--- branches/KDE/3.5/kdepim/korganizer/kotodoeditor.cpp #780159:780160
@@ -47,7 +47,6 @@
#include "koeditorgeneraltodo.h"
#include "koeditordetails.h"
#include "koeditorrecurrence.h"
-#include "koeditoralarms.h"
#include "kotodoeditor.h"
#include "kocore.h"
@@ -117,8 +116,7 @@
mGeneral->initCompletion(topFrame2,completionLayout);
mGeneral->initAlarm(topFrame,topLayout);
- mGeneral->enableAlarm( false );
-
+
mGeneral->initSecrecy( topFrame2, topLayout2 );
mGeneral->initDescription(topFrame2,topLayout2);
} else {
@@ -132,7 +130,6 @@
mGeneral->initStatus(topFrame,topLayout);
QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
mGeneral->initAlarm(topFrame,alarmLineLayout);
- mGeneral->enableAlarm( false );
alarmLineLayout->addStretch( 1 );
mGeneral->initDescription(topFrame,topLayout);
mGeneral->initAttachments(topFrame,topLayout);
@@ -141,9 +138,7 @@
connect( this, SIGNAL( signalAddAttachments( const QStringList&, const \
QStringList&, bool ) ),
mGeneral, SLOT( addAttachments( const QStringList&, const QStringList&, \
bool ) ) ); }
- // By default, the To-do has no time associated and
- // neither a start nor end time.
- mGeneral->setDefaults( QDateTime(), false );
+ mGeneral->enableAlarm( true );
mGeneral->finishSetup();
}
@@ -185,6 +180,7 @@
mTodo = 0;
mCalendar = 0;
setCaption( i18n("New To-do") );
+ loadDefaults();
}
void KOTodoEditor::setTexts( const QString &summary, const QString &description )
@@ -205,6 +201,7 @@
{
kdDebug(5850) << k_funcinfo << endl;
setDates( QDateTime::currentDateTime().addDays(7), true, 0 );
+ mGeneral->toggleAlarm( true );
}
bool KOTodoEditor::processInput()
@@ -287,7 +284,6 @@
kdDebug(5850)<<"read todo"<<endl;
mGeneral->readTodo( todo, calendar );
mDetails->readEvent( todo );
-// mAlarms->readIncidence( todo );
mRecurrence->readIncidence( todo );
createEmbeddedURLPages( todo );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic