Commit 35ca51e2 authored by Allen Winter's avatar Allen Winter
Browse files

Put window icons on the config windows

The fixes most, but not all, mentioned in the bug report.
CCBUG: 306965
parent 3b97bc16
......@@ -90,7 +90,7 @@ Comment[zh_CN]=提供对存储在 KDE 地址簿文件夹中的联系人生日和
Comment[zh_TW]=提供存取儲存通訊錄中的生日與紀念日日期,做為行事曆的事件
Type=AkonadiResource
Exec=akonadi_birthdays_resource
Icon=preferences-web-browser-cookies
Icon=view-calendar-birthday
X-Akonadi-MimeTypes=text/calendar,application/x-vnd.akonadi.calendar.event
X-Akonadi-Capabilities=Resource,Unique
......
......@@ -27,6 +27,7 @@ ConfigDialog::ConfigDialog(QWidget* parent)
: KDialog( parent )
{
ui.setupUi( mainWidget() );
setWindowIcon( KIcon( "view-calendar-birthday" ) );
mManager = new KConfigDialogManager( this, Settings::self() );
mManager->updateWidgets();
ui.kcfg_AlarmDays->setSuffix( ki18np( " day", " days" ) );
......
......@@ -36,6 +36,7 @@ ConfigDialog::ConfigDialog( QWidget *parent )
: KDialog( parent )
{
mUi.setupUi( mainWidget() );
setWindowIcon( KIcon( "folder-remote" ) );
mModel = new QStandardItemModel();
QStringList headers;
......
......@@ -135,6 +135,7 @@ SetupWizard::SetupWizard( QWidget *parent )
: QWizard( parent )
{
setWindowTitle( i18n( "DAV groupware configuration wizard" ) );
setWindowIcon( KIcon( "folder-remote" ) );
setPage( W_CredentialsPage, new CredentialsPage );
setPage( W_PredefinedProviderPage, new PredefinedProviderPage );
setPage( W_ServerTypePage, new ServerTypePage );
......
......@@ -174,6 +174,7 @@ int ImapResource::configureDialog( WId windowId )
KWindowSystem::setMainWindow( &dlg, windowId );
dlg.exec();
dlg.setWindowIcon( KIcon( "network-server" ) );
if ( dlg.shouldClearCache() ) {
clearCache();
}
......
......@@ -65,6 +65,7 @@ bool KDEAccountsResource::retrieveItem( const Akonadi::Item &item, const QSet<QB
void KDEAccountsResource::customizeConfigDialog( SingleFileResourceConfigDialog<Settings>* dlg )
{
dlg->setWindowIcon( KIcon( "kde" ) );
dlg->setCaption( i18n( "Select KDE Accounts File" ) );
}
......
......@@ -290,6 +290,7 @@ void KolabProxyResource::configure( WId windowId )
if ( windowId )
KWindowSystem::setMainWindow( kolabConfigDialog, windowId );
kolabConfigDialog->setWindowIcon( KIcon( "kolab" ) );
kolabConfigDialog->exec();
emit configurationDialogAccepted();
......
......@@ -239,6 +239,7 @@ void MaildirResource::configure( WId windowId )
ConfigDialog dlg( mSettings );
if ( windowId )
KWindowSystem::setMainWindow( &dlg, windowId );
dlg.setWindowIcon( KIcon( "message-rfc822" ) );
if ( dlg.exec() ) {
// if we have no name, or the default one,
// better use the name of the top level collection
......
......@@ -83,6 +83,7 @@ MboxResource::~MboxResource()
void MboxResource::customizeConfigDialog( SingleFileResourceConfigDialog<Settings>* dlg )
{
dlg->setWindowIcon( KIcon( "message-rfc822" ) );
dlg->addPage( i18n( "Compact frequency" ), new CompactPage( mSettings->path() ) );
dlg->addPage( i18n( "Lock method" ), new LockMethodPage() );
dlg->setCaption( i18n( "Select MBox file" ) );
......
......@@ -191,6 +191,7 @@ void MicroblogResource::configure( WId windowId )
ConfigDialog dlg;
if ( windowId )
KWindowSystem::setMainWindow( &dlg, windowId );
dlg.setWindowIcon( KIcon( "view-pim-journal" ) );
if ( dlg.exec() ) {
emit configurationDialogAccepted();
} else {
......
......@@ -117,6 +117,7 @@ void MixedMaildirResource::configure( WId windowId )
if ( windowId ) {
KWindowSystem::setMainWindow( &dlg, windowId );
}
dlg.setWindowIcon( KIcon( "message-rfc822" ) );
bool fullSync = false;
......
......@@ -277,8 +277,10 @@ void NntpResource::fetchArticleResult(KJob * job)
void NntpResource::configure( WId windowId )
{
ConfigDialog dlg;
if ( windowId )
if ( windowId ) {
KWindowSystem::setMainWindow( &dlg, windowId );
}
dlg.setWindowIcon( KIcon( "message-news" ) );
if ( dlg.exec() ) {
emit configurationDialogAccepted();
} else {
......
......@@ -322,6 +322,7 @@ void OpenXchangeResource::configure( WId windowId )
const bool useIncrementalUpdates = Settings::self()->useIncrementalUpdates();
ConfigDialog dlg( windowId );
dlg.setWindowIcon( KIcon( "ox" ) );
if ( dlg.exec() ) { //krazy:exclude=crashy
// if the user has changed the incremental update settings we have to do
......
......@@ -72,6 +72,7 @@ void VCardResource::aboutToQuit()
void VCardResource::customizeConfigDialog( SingleFileResourceConfigDialog<Settings>* dlg )
{
dlg->setWindowIcon( KIcon( "text-directory" ) );
dlg->setFilter( "*.vcf|" + i18nc("Filedialog filter for *.vcf", "vCard Address Book File" ) );
dlg->setCaption( i18n("Select Address Book") );
}
......
......@@ -58,6 +58,7 @@ void VCardDirResource::aboutToQuit()
void VCardDirResource::configure( WId windowId )
{
SettingsDialog dlg( windowId );
dlg.setWindowIcon( KIcon( "text-directory" ) );
if ( dlg.exec() ) {
clearCache();
initializeVCardDirectory();
......
Supports Markdown
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