diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-13 06:26:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-13 06:26:27 +0000 |
| commit | 9fab5b8a216e283e563f3457315715672bc8b55a (patch) | |
| tree | c1251952e4e0e28fad0bca829d49335ff15b6e98 /kopete/kopete/config | |
| parent | bcb704366cb5e333a626c18c308c7e0448a8e69f (diff) | |
| download | tdenetwork-9fab5b8a216e283e563f3457315715672bc8b55a.tar.gz tdenetwork-9fab5b8a216e283e563f3457315715672bc8b55a.zip | |
Update to Trinity 3.5.11
Will need to watch for commit warnings and rebuild test
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1061808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/kopete/config')
4 files changed, 35 insertions, 3 deletions
diff --git a/kopete/kopete/config/appearance/Makefile.am b/kopete/kopete/config/appearance/Makefile.am index 7e7fc8ca..f349297c 100644 --- a/kopete/kopete/config/appearance/Makefile.am +++ b/kopete/kopete/config/appearance/Makefile.am @@ -4,9 +4,10 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \ kde_module_LTLIBRARIES = kcm_kopete_appearanceconfig.la -kcm_kopete_appearanceconfig_la_SOURCES = appearanceconfig_emoticons.ui \ - appearanceconfig_colors.ui appearanceconfig_chatwindow.ui appearanceconfig_contactlist.ui \ - appearanceconfig.cpp tooltipeditwidget.ui tooltipeditdialog.cpp +kcm_kopete_appearanceconfig_la_SOURCES = appearanceconfig.cpp \ + appearanceconfig_chatwindow.ui appearanceconfig_colors.ui appearanceconfig_contactlist.ui \ + appearanceconfig_emoticons.ui emoticonseditdialog.cpp emoticonseditwidget.ui tooltipeditdialog.cpp \ + tooltipeditwidget.ui kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \ $(all_libraries) @@ -18,3 +19,4 @@ service_DATA = kopete_appearanceconfig.desktop servicedir = $(kde_servicesdir) # vim: set noet: +noinst_HEADERS = emoticonseditdialog.h diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index e3867d41..d83b0801 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -27,6 +27,7 @@ #include "appearanceconfig_contactlist.h" #include "tooltipeditdialog.h" +#include "emoticonseditdialog.h" #include <qcheckbox.h> #include <qdir.h> @@ -204,6 +205,8 @@ AppearanceConfig::AppearanceConfig(QWidget *parent, const char* /*name*/, const this, SLOT(slotGetEmoticonThemes())); connect(d->mPrfsEmoticons->btnRemoveTheme, SIGNAL(clicked()), this, SLOT(removeSelectedEmoticonTheme())); + connect(d->mPrfsEmoticons->btnEditThemes, SIGNAL(clicked()), + this, SLOT(editSelectedEmoticonTheme())); d->mAppearanceTabCtl->addTab(d->mPrfsEmoticons, i18n("&Emoticons")); @@ -866,5 +869,20 @@ void AppearanceConfig::slotEditTooltips() delete dlg; } +void AppearanceConfig::editSelectedEmoticonTheme() +{ + QListBoxItem *selected = d->mPrfsEmoticons->icon_theme_list->selectedItem(); + if(selected==0) + return; + + QString themeName = selected->text(); + + EmoticonsEditDialog *dlg = new EmoticonsEditDialog(this, themeName); + dlg->exec(); + delete dlg; + + updateEmoticonlist(); +} + #include "appearanceconfig.moc" // vim: set noet ts=4 sts=4 sw=4: diff --git a/kopete/kopete/config/appearance/appearanceconfig.h b/kopete/kopete/config/appearance/appearanceconfig.h index 22a23024..747117c6 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.h +++ b/kopete/kopete/config/appearance/appearanceconfig.h @@ -57,6 +57,7 @@ private slots: void slotGetChatStyles(); void slotLoadChatStyles(); void updateEmoticonsButton(bool); + void editSelectedEmoticonTheme(); private: void updateEmoticonlist(); void createPreviewChatSession(); diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui index 8649e4c2..01652e9f 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -111,6 +111,17 @@ </widget> <widget class="QPushButton"> <property name="name"> + <cstring>btnEditThemes</cstring> + </property> + <property name="text"> + <string>&Edit Theme...</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Edit the selected emoticons theme</string> + </property> + </widget> + <widget class="QPushButton"> + <property name="name"> <cstring>btnInstallTheme</cstring> </property> <property name="text"> |