diff -urN -X psidiff.ignore sources/options/default.xml work/options/default.xml --- sources/options/default.xml 2009-07-22 17:58:59.000000000 +0600 +++ work/options/default.xml 2009-07-22 18:03:42.000000000 +0600 @@ -138,6 +138,15 @@ true true + true + + true + 24 + 5 + + true + true + false false diff -urN -X psidiff.ignore sources/src/options/opt_application.cpp work/src/options/opt_application.cpp --- sources/src/options/opt_application.cpp 2009-07-16 03:57:42.000000000 +0600 +++ work/src/options/opt_application.cpp 2009-07-22 17:59:25.000000000 +0600 @@ -39,18 +39,9 @@ w = new OptApplicationUI(); OptApplicationUI *d = (OptApplicationUI *)w; - d->ck_alwaysOnTop->setWhatsThis( - tr("Makes the main Psi window always be in front of other windows.")); - d->ck_autoRosterSize->setWhatsThis( - tr("Makes the main Psi window resize automatically to fit all contacts.")); d->ck_keepSizes->setWhatsThis( tr("Makes Psi remember window size and positions for chats and messages." " If disabled, the windows will always appear in their default positions and sizes.")); - d->ck_useleft->setWhatsThis( - tr("Normally, right-clicking with the mouse on a contact will activate the context-menu." - " Check this option if you'd rather use a left-click.")); - d->ck_showMenubar->setWhatsThis( - tr("Shows the menubar in the application window.")); // docklet d->ck_docklet->setWhatsThis( @@ -65,8 +56,6 @@ "window use a small titlebar.")); #ifdef Q_WS_MAC - d->ck_alwaysOnTop->hide(); - d->ck_showMenubar->hide(); d->gb_docklet->hide(); #endif @@ -89,11 +78,7 @@ OptApplicationUI *d = (OptApplicationUI *)w; - PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked()); - PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked()); PsiOptions::instance()->setOption("options.ui.remember-window-sizes",d->ck_keepSizes->isChecked()); - PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked()); - PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked()); // Auto-update PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked()); @@ -116,11 +101,7 @@ OptApplicationUI *d = (OptApplicationUI *)w; - d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() ); - d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() ); d->ck_keepSizes->setChecked( PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool() ); - d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() ); - d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() ); d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool()); // docklet diff -urN -X psidiff.ignore sources/src/options/opt_application.ui work/src/options/opt_application.ui --- sources/src/options/opt_application.ui 2009-07-16 03:57:42.000000000 +0600 +++ work/src/options/opt_application.ui 2009-07-22 17:59:25.000000000 +0600 @@ -14,20 +14,6 @@ - - - Roster window always on top - - - - - - - Auto-resize contact list - - - - Remember window sizes @@ -35,23 +21,6 @@ - - - true - - - Use left-click for menu - - - - - - - Show menubar - - - - Enable docklet diff -urN -X psidiff.ignore sources/src/options/optionsdlg.cpp work/src/options/optionsdlg.cpp --- sources/src/options/optionsdlg.cpp 2009-07-16 03:57:42.000000000 +0600 +++ work/src/options/optionsdlg.cpp 2009-07-22 17:59:25.000000000 +0600 @@ -20,6 +20,7 @@ // tabs #include "opt_toolbars.h" #include "opt_application.h" +#include "opt_roster.h" #include "opt_appearance.h" #include "opt_chat.h" #include "opt_events.h" @@ -316,6 +317,7 @@ OptionsTabApplication* applicationTab = new OptionsTabApplication(this); applicationTab->setHaveAutoUpdater(psi->haveAutoUpdater()); tabs.append( new OptionsTabApplication(this) ); + tabs.append( new OptionsTabRoster(this) ); tabs.append( new OptionsTabChat(this) ); tabs.append( new OptionsTabEvents(this) ); tabs.append( new OptionsTabStatus(this) ); diff -urN -X psidiff.ignore sources/src/options/options.pri work/src/options/options.pri --- sources/src/options/options.pri 2009-07-22 17:58:58.000000000 +0600 +++ work/src/options/options.pri 2009-07-22 17:59:25.000000000 +0600 @@ -12,6 +12,7 @@ # additional tabs HEADERS += \ $$PWD/opt_application.h \ + $$PWD/opt_roster.h \ $$PWD/opt_chat.h \ $$PWD/opt_events.h \ $$PWD/opt_status.h \ @@ -28,6 +29,7 @@ SOURCES += \ $$PWD/opt_application.cpp \ + $$PWD/opt_roster.cpp \ $$PWD/opt_chat.cpp \ $$PWD/opt_events.cpp \ $$PWD/opt_status.cpp \ @@ -44,6 +46,7 @@ INTERFACES += \ $$PWD/opt_application.ui \ + $$PWD/opt_roster.ui \ $$PWD/opt_chat.ui \ $$PWD/opt_events.ui \ $$PWD/opt_status.ui \ diff -urN -X psidiff.ignore sources/src/options/opt_roster.cpp work/src/options/opt_roster.cpp --- sources/src/options/opt_roster.cpp 1970-01-01 05:00:00.000000000 +0500 +++ work/src/options/opt_roster.cpp 2009-07-22 18:22:07.000000000 +0600 @@ -0,0 +1,102 @@ +#include "opt_roster.h" +#include "common.h" +#include "iconwidget.h" +#include "psioptions.h" + + +#include "ui_opt_roster.h" + +class OptRosterUI : public QWidget, public Ui::OptRoster +{ +public: + OptRosterUI() : QWidget() { setupUi(this); } +}; + +//---------------------------------------------------------------------------- +// OptionsTabRoster +//---------------------------------------------------------------------------- + +OptionsTabRoster::OptionsTabRoster(QObject *parent) +: OptionsTab(parent, "roster", "", tr("Roster"), tr("Roster window options"), "psiplus/psiplus_icon") +{ + w = 0; +} + +OptionsTabRoster::~OptionsTabRoster() +{ +} + +QWidget *OptionsTabRoster::widget() +{ + if ( w ) + return 0; + + w = new OptRosterUI(); + OptRosterUI *d = (OptRosterUI *)w; + + d->ck_alwaysOnTop->setWhatsThis( + tr("Makes the main Psi window always be in front of other windows.")); + d->ck_autoRosterSize->setWhatsThis( + tr("Makes the main Psi window resize automatically to fit all contacts.")); + d->ck_useleft->setWhatsThis( + tr("Normally, right-clicking with the mouse on a contact will activate the context-menu." + " Check this option if you'd rather use a left-click.")); + d->ck_showMenubar->setWhatsThis( + tr("Shows the menubar in the application window.")); + + +#ifdef Q_WS_MAC + d->ck_alwaysOnTop->hide(); + d->ck_showMenubar->hide(); +#endif + + return w; +} + +void OptionsTabRoster::applyOptions() +{ + if ( !w ) + return; + + OptRosterUI *d = (OptRosterUI *)w; + + PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked()); + + //enabled icons + PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked()); + + //avatars settings + PsiOptions::instance()->setOption("options.ui.contactlist.avatars.size", d->sb_avatarsSize->value()); + PsiOptions::instance()->setOption("options.ui.contactlist.avatars.radius", d->sb_avatarsRadius->value()); +} + +void OptionsTabRoster::restoreOptions() +{ + if ( !w ) + return; + + OptRosterUI *d = (OptRosterUI *)w; + + d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() ); + d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() ); + d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() ); + d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() ); + d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() ); + + //enabled icons + d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() ); + d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() ); + d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() ); + d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() ); + + //avatars settings + d->sb_avatarsSize->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.size").toInt() ); + d->sb_avatarsRadius->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt() ); +} diff -urN -X psidiff.ignore sources/src/options/opt_roster.h work/src/options/opt_roster.h --- sources/src/options/opt_roster.h 1970-01-01 05:00:00.000000000 +0500 +++ work/src/options/opt_roster.h 2009-07-22 17:59:25.000000000 +0600 @@ -0,0 +1,24 @@ +#ifndef OPT_ROSTER_H +#define OPT_ROSTER_H + +#include "optionstab.h" + +class QWidget; +class QButtonGroup; + +class OptionsTabRoster : public OptionsTab +{ + Q_OBJECT +public: + OptionsTabRoster(QObject *parent); + ~OptionsTabRoster(); + + QWidget *widget(); + void applyOptions(); + void restoreOptions(); + +private: + QWidget *w; +}; + +#endif diff -urN -X psidiff.ignore sources/src/options/opt_roster.ui work/src/options/opt_roster.ui --- sources/src/options/opt_roster.ui 1970-01-01 05:00:00.000000000 +0500 +++ work/src/options/opt_roster.ui 2009-07-22 18:22:27.000000000 +0600 @@ -0,0 +1,209 @@ + + + OptRoster + + + + 0 + 0 + 343 + 401 + + + + OptApplicationUI + + + + 6 + + + 9 + + + + + Roster window always on top + + + + + + + Auto-resize contact list + + + + + + + true + + + Use left-click for menu + + + + + + + Show menubar + + + + + + + Disables scrollbar in the application window. + + + Disable scrollbar + + + + + + + Icons + + + + 6 + + + 10 + + + + + Show avatars in roster + + + Avatars + + + + + + + Show moods in roster + + + Moods + + + + + + + Show icon when contact is listening to music + + + Now playing + + + + + + + Show icon of user client + + + Clients + + + + + + + + + + Avatar settings + + + false + + + + + + + + Size + + + + + + + + 60 + 16777215 + + + + px + + + + + + 8 + + + 64 + + + 24 + + + + + + + + + + + Radius of corners + + + + + + + + 60 + 16777215 + + + + px + + + 5 + + + + + + + + + + + + qPixmapFromMimeSource + + ck_alwaysOnTop + ck_autoRosterSize + ck_useleft + ck_showMenubar + ck_showAvatarIcons + ck_showMoodIcons + ck_showTuneIcons + + + +