options/newprofile.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!DOCTYPE psi>  -<psi version="defaults" > +<psi version="defaults"> <options comment="Client options"> <account comment="Default account options"> - <domain comment="Always use the same domain to register with. Leave this empty to allow the user to choose his server." type="QString" /> + <domain comment="Always use the same domain to register with. Leave this empty to allow the user to choose his server." type="QString"/> </account> <enable-multicast comment="Enable multicasting messages to multiple recipients" type="bool">false</enable-multicast> <html comment="Hypertext markup options"> @@ -44,6 +45,7 @@ <seconds comment="The maximum number of context seconds that should be sent when entering a room. Use a negative number for an unlimited amount." type="int">-1</seconds> </context> <recent-joins> + <jids type="QStringList" /> <maximum comment="The maximum number of recently joined rooms that should be remembered" type="int">10</maximum> </recent-joins> </muc> @@ -73,6 +75,13 @@ </account> <message comment="Message options"> <enabled comment="Enable message (i.e. non-chat) functionality" type="bool">true</enabled> + <auto-grab-urls-from-clipboard type="bool">false</auto-grab-urls-from-clipboard> + <auto-popup type="bool">false</auto-popup> + <auto-popup-headlines type="bool">false</auto-popup-headlines> + <show-character-count type="bool">false</show-character-count> + <show-subjects type="bool">true</show-subjects> + <use-jid-auto-completion type="bool">true</use-jid-auto-completion> + <size type="QString"></size>  </message> <chat comment="Chat dialog options"> <central-toolbar comment="Have a central toolbar" type="bool">false</central-toolbar> @@ -86,6 +95,13 @@ <size comment="Maximum size of the avatar" type="int">32</size> <show comment="Show avatars in the chat dialog" type="bool">true</show> </avatars> + <alert-for-already-open-chats type="bool">true</alert-for-already-open-chats> + <auto-popup type="bool">false</auto-popup> + <delete-contents-after type="QString">hour</delete-contents-after> + <raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages> + <use-chat-says-style type="bool">false</use-chat-says-style> + <use-expanding-line-edit type="bool">true</use-expanding-line-edit> + <use-small-chats type="bool">false</use-small-chats> </chat> <contactlist comment="Contact list options"> <auto-delete-unlisted comment="Automatically remove an unlisted contact from the contact list if it does not have any pending messages anymore" type="bool">false</auto-delete-unlisted> @@ -101,6 +117,36 @@ <pgp comment="Display PGP information" type="bool">true</pgp> </tooltip> <temp-no-roster-animation comment="Disable animated icons. This option will be removed as soon as the contactlist code is optimized enough" type="bool">false</temp-no-roster-animation> + <account-sort-style type="QString">alpha</account-sort-style> + <always-on-top type="bool">false</always-on-top> + <automatically-resize-roster type="bool">false</automatically-resize-roster> + <grow-roster-upwards type="bool">true</grow-roster-upwards> + <contact-sort-style type="QString">status</contact-sort-style> + <disable-service-discovery type="bool">false</disable-service-discovery> + <ensure-contact-visible-on-event type="bool">true</ensure-contact-visible-on-event> + <group-sort-style type="QString">alpha</group-sort-style> + <lockdown-roster type="bool">false</lockdown-roster> + <raise-on-new-event type="bool">false</raise-on-new-event> + <show> + <agent-contacts type="bool">true</agent-contacts> + <away-contacts type="bool">true</away-contacts> + <hidden-contacts-group type="bool">true</hidden-contacts-group> + <offline-contacts type="bool">true</offline-contacts> + <self-contact type="bool">true</self-contact> + </show> + <show-group-counts type="bool">true</show-group-counts> + <show-menubar type="bool">true</show-menubar> + <toolbars></toolbars> + <use-left-click type="bool">false</use-left-click> + <use-single-click type="bool">false</use-single-click> + <use-status-change-animation type="bool">true</use-status-change-animation> + <use-transport-icons type="bool">false</use-transport-icons> + <saved-window-geometry type="QRect" > + <x>64</x> + <y>64</y> + <width>150</width> + <height>360</height> + </saved-window-geometry> </contactlist> <menu comment="Options for the menu"> <account comment="Options for the account-specific menu"> @@ -124,10 +170,12 @@ </view> </menu> <muc comment="Multi-User Chat options"> + <highlight-words type="QStringList" /> <size comment="Remembered window size" type="QSize"> <width>580</width> <height>420</height> </size> + <use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring> </muc> <show-deprecated comment="Deprecated functionality or protocols"> <service-discovery comment="Service discovery dialog"> @@ -139,12 +187,126 @@ </spell-check> <systemtray comment="Options related to the system tray"> <use-old comment="Use the old system tray code (deprecated)" type="bool">false</use-old> + <enable type="bool">true</enable> + <use-double-click type="bool">false</use-double-click> </systemtray> <tip comment="Tip of the day options"> <show comment="Show the tip of the day upon startup" type="bool">true</show> <number comment="The next tip to show" type="int">0</number> </tip> <flash-windows comment="Allow windows to flash upon activity" type="bool">true</flash-windows> + <automatically-copy-selected-text type="bool">false</automatically-copy-selected-text> + <emoticons> + <use-emoticons type="bool">false</use-emoticons> + </emoticons> + <file-transfer> + <auto-popup type="bool">false</auto-popup> + </file-transfer> + <last-used-open-path type="QString">/home/martin</last-used-open-path> + <last-used-save-path type="QString">/home/martin</last-used-save-path> + <look> + <colors> + <contactlist> + <background type="QColor">#ffffff</background> + <grouping> + <header-background type="QColor">#f0f0f0</header-background> + <header-foreground type="QColor">#5a5a5a</header-foreground> + </grouping> + <profile> + <header-background type="QColor">#969696</header-background> + <header-foreground type="QColor">#ffffff</header-foreground> + </profile> + <status> + <away type="QColor">#004bb4</away> + <do-no-disturb type="QColor">#7e0000</do-no-disturb> + <offline type="QColor">#646464</offline> + <online type="QColor">#000000</online> + </status> + <status-messages type="QColor">#808080</status-messages> + </contactlist> + <muc> + <nick-colors type="QStringList" > + <item>Blue</item> + <item>Green</item> + <item>Orange</item> + <item>Purple</item> + <item>Red</item> + </nick-colors> + </muc> + <passive-popup> + <border type="QColor">#5297f9</border> + </passive-popup> + </colors> + <contactlist> + <status-change-animation> + <color1 type="QColor">#000000</color1> + <color2 type="QColor">#969696</color2> + </status-change-animation> + <use-outlined-group-headings type="bool">false</use-outlined-group-headings> + <use-slim-group-headings type="bool">false</use-slim-group-headings> + </contactlist> + + <chat type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</chat> + <contactlist type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</contactlist> + <message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</message> + <passive-popup type="QString">Sans Serif,7,-1,5,50,0,0,0,0,0</passive-popup> + + </look> + <mac> + <use-brushed-metal-windows type="bool">false</use-brushed-metal-windows> + </mac> + <notifications> + <alert-style type="QString">animate</alert-style> + <bounce-dock type="QString">forever</bounce-dock> + <passive-popups> + <duration type="int">10000</duration> + <enabled type="bool">false</enabled> + <incoming-chat type="bool">true</incoming-chat> + <incoming-file-transfer type="bool">true</incoming-file-transfer> + <incoming-headline type="bool">true</incoming-headline> + <incoming-message type="bool">true</incoming-message> + <maximum-jid-length type="int">25</maximum-jid-length> + <maximum-text-length type="int">300</maximum-text-length> + <maximum-status-length type="int">-1</maximum-status-length> + <status> + <offline type="bool">true</offline> + <online type="bool">true</online> + <other-changes type="bool">false</other-changes> + </status> + </passive-popups> + <popup-dialogs> + <suppress-when-not-on-roster type="bool">false</suppress-when-not-on-roster> + <suppress-while-away type="bool">false</suppress-while-away> + </popup-dialogs> + <sounds> + <chat-message type="QString">sound/chat2.wav</chat-message> + <completed-file-transfer type="QString">sound/ft_complete.wav</completed-file-transfer> + <contact-offline type="QString">sound/offline.wav</contact-offline> + <contact-online type="QString">sound/online.wav</contact-online> + <enable type="bool">true</enable> + <incoming-file-transfer type="QString">sound/ft_incoming.wav</incoming-file-transfer> + <incoming-headline type="QString">sound/chat2.wav</incoming-headline> + <incoming-message type="QString">sound/chat2.wav</incoming-message> + <new-chat type="QString">sound/chat1.wav</new-chat> + <notify-every-muc-message type="bool">false</notify-every-muc-message> + <outgoing-chat type="QString">sound/send.wav</outgoing-chat> + <silent-while-away type="bool">false</silent-while-away> + <system-message type="QString">sound/chat2.wav</system-message> + <unix-sound-player type="QString"/> + </sounds> + <successful-subscription type="bool">false</successful-subscription> + </notifications> + <remember-window-sizes type="bool">true</remember-window-sizes> + <service-discovery> + <automatically-browse-into type="bool">true</automatically-browse-into> + <automatically-get-items type="bool">false</automatically-get-items> + <recent-jids type="QStringList" /> + </service-discovery> + <tabs> + <put-tabs-at-bottom type="bool">false</put-tabs-at-bottom> + <use-tabs type="bool">false</use-tabs> + <size type="QString"></size>  + </tabs> </ui> <shortcuts comment="Shortcuts"> <chat comment="Shortcuts in the chat dialog"> @@ -161,11 +323,11 @@ <item type="QKeySequence">Return</item> <item type="QKeySequence">Enter</item> </send> - <clear type="QKeySequence" comment="Clear the text" /> + <clear type="QKeySequence" comment="Clear the text"/> </chat> - <contactlist comment="Shortcuts in the contactlist" > - <assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact" /> - <clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact" /> + <contactlist comment="Shortcuts in the contactlist"> + <assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/> + <clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/> <delete type="QKeySequence" comment="Delete the selected contact">Del</delete> <chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat> <message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message> @@ -173,7 +335,7 @@ <rename type="QKeySequence" comment="Rename the selected contact">F2</rename> <login-transport type="QKeySequence" comment="Log on to the selected transport">Ctrl+L</login-transport> </contactlist> - <common comment="Common actions" > + <common comment="Common actions"> <scroll-up type="QKeySequence" comment="Scroll up">Shift+PgUp</scroll-up> <scroll-down type="QKeySequence" comment="Scroll down">Shift+PgDown</scroll-down> <close type="QVariantList" comment="Close the current window/tab"> @@ -184,10 +346,10 @@ <user-info type="QKeySequence" comment="Show the user info of the contact">Ctrl+I</user-info> </common> <global comment="Shortcuts available from outside of the application"> - <event type="QKeySequence" comment="Receive incoming event" /> - <toggle-visibility type="QKeySequence" comment="Show/hide the application" /> - <bring-to-front type="QKeySequence" comment="Bring the application to front" /> - <new-blank-message type="QKeySequence" comment="Send new message" /> + <event type="QKeySequence" comment="Receive incoming event"/> + <toggle-visibility type="QKeySequence" comment="Show/hide the application"/> + <bring-to-front type="QKeySequence" comment="Bring the application to front"/> + <new-blank-message type="QKeySequence" comment="Send new message"/> </global> <message comment="Shortcuts in the message dialog"> <send type="QVariantList" comment="Send the message"> @@ -207,7 +369,69 @@ </status> <service-discovery comment="Shortcuts in the service discovery dialog"/> </shortcuts> + <contactlist> + <hide-on-start type="bool">false</hide-on-start> + <resolve-nicks-on-contact-add type="bool">false</resolve-nicks-on-contact-add> + <use-toolwindow type="bool">false</use-toolwindow> + </contactlist> + <external-control> + <adhoc-remote-control> + <enable type="bool">false</enable> + </adhoc-remote-control> + </external-control> + <iconsets> + <service-status> + </service-status> + <emoticons type="QStringList" > + <item>default</item> + </emoticons> + <status type="QString">default</status> + <system type="QString">default</system> + </iconsets> + <messages> + <default-outgoing-message-type type="QString">chat</default-outgoing-message-type> + <exclude-muc-from-ignore type="bool">true</exclude-muc-from-ignore> + <force-incoming-message-type type="QString">no</force-incoming-message-type> + <ignore-headlines type="bool">false</ignore-headlines> + <ignore-non-roster-contacts type="bool">false</ignore-non-roster-contacts> + <send-composing-events type="bool">true</send-composing-events> + <send-inactivity-events type="bool">false</send-inactivity-events> + </messages> + <p2p> + <bytestreams> + <external-address type="QString"/> + <listen-port type="int">8010</listen-port> + </bytestreams> + </p2p> + <service-discovery> + <enable-entity-capabilities type="bool">true</enable-entity-capabilities> + </service-discovery> + <status> + <ask-for-message-on-offline type="bool">false</ask-for-message-on-offline> + <ask-for-message-on-online type="bool">false</ask-for-message-on-online> + <auto-away> + <away-after type="int">10</away-after> + <message type="QString">Auto Status (idle)</message> + <not-availible-after type="int">30</not-availible-after> + <offline-after type="int">0</offline-after> + <use-away type="bool">true</use-away> + <use-not-availible type="bool">true</use-not-availible> + <use-offline type="bool">false</use-offline> + </auto-away> + <last-message type="QString"/> + <presets> + </presets> + </status> + <subscriptions> + <automatically-allow-authorisation type="bool">false</automatically-allow-authorisation> + </subscriptions> + <vcard> + <query-own-vcard-on-login type="bool">true</query-own-vcard-on-login> + </vcard> + <xml-console> + <enable-at-login type="bool">false</enable-at-login> + </xml-console> </options> - <accounts comment="Account definitions and options"></accounts> - <plugins comment="Plugin options"></plugins> + <accounts comment="Account definitions and options"/> + <plugins comment="Plugin options"/> </psi> options/default.xml @@ -6,5 +6,6 @@ <file>options/default.xml</file> <file>options/windows.xml</file> <file>options/macosx.xml</file> + <file>options/newprofile.xml</file> </qresource> </RCC> psi.qrc @@ -103,7 +103,7 @@ void AccountAddDlg::add() int port = w->port(); bool legacy_ssl_probe = w->legacySSLProbe(); UserAccount::SSLFlag ssl = w->ssl(); - int proxy = w->proxy(); + QString proxy = w->proxy(); delete w; src/accountadddlg.cpp @@ -179,7 +179,7 @@ void AccountRemoveDlg::remove() Jid j = d->acc.jid; QString pass = le_pass->text(); j.setResource(d->acc.resource); - client->connectToServer(j, d->acc.legacy_ssl_probe, d->acc.ssl == UserAccount::SSL_Legacy, d->acc.ssl == UserAccount::SSL_Yes, d->acc.opt_host ? d->acc.host : QString(), d->acc.port, d->proxyman, d->acc.proxy_index, &pass); + client->connectToServer(j, d->acc.legacy_ssl_probe, d->acc.ssl == UserAccount::SSL_Legacy, d->acc.ssl == UserAccount::SSL_Yes, d->acc.opt_host ? d->acc.host : QString(), d->acc.port, d->proxyman, d->acc.proxyID, &pass); } void AccountRemoveDlg::client_handshaken() src/accountmanagedlg.cpp @@ -27,7 +27,6 @@ #include "iconset.h" #include "psioptions.h" #include "jidutil.h" -#include "profiles.h" #include "psicon.h" #include "proxy.h" #include "privacymanager.h" @@ -152,7 +151,7 @@ void AccountModifyDlg::init() pc = psi->proxy()->createProxyChooser(tab_connection); replaceWidget(lb_proxychooser, pc); - pc->setCurrentItem(acc.proxy_index); + pc->setCurrentItem(acc.proxyID); // Security level cb_security_level->addItem(tr("None"),QCA::SL_None); @@ -528,7 +527,7 @@ void AccountModifyDlg::save() acc.pgpSecretKey = key; - acc.proxy_index = pc->currentItem(); + acc.proxyID = pc->currentItem(); if(pa && pa->isActive()) { QMessageBox::information(this, tr("Warning"), tr("This account is currently active, so certain changes may not take effect until the next login.")); src/accountmodifydlg.cpp @@ -55,7 +55,7 @@ public: int port() const { return port_; } bool legacySSLProbe() { return legacy_ssl_probe_; } UserAccount::SSLFlag ssl() const { return ssl_; } - int proxy() const { return proxy_; } + QString proxy() const { return proxy_; } public slots: void done(int); @@ -100,7 +100,7 @@ private: QString host_; int port_; QString pass_; - int proxy_; + QString proxy_; }; #endif src/accountregdlg.h @@ -21,7 +21,6 @@ #include <qdir.h> #include <qfileinfo.h> -#include "common.h" #include "psiaccount.h" #include "adhoc_fileserver.h" #include "xmpp_xdata.h" src/adhoc_fileserver.cpp @@ -19,7 +19,7 @@ */ #include "alerticon.h" -#include "common.h" +#include "psioptions.h" #include <qtimer.h> #include <qapplication.h> //Added by qt3to4: @@ -148,7 +148,7 @@ void AlertIcon::Private::init() connect(metaAlertIcon, SIGNAL(update()), SLOT(update())); connect(real, SIGNAL(iconModified()), SLOT(pixmapChanged())); - if ( option.alertStyle == 2 && real->isAnimated() ) + if ( PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "animate" && real->isAnimated() ) impix = real->frameImpix(); else impix = real->impix(); @@ -162,14 +162,14 @@ void AlertIcon::Private::update() void AlertIcon::Private::activated(bool playSound) { - if ( option.alertStyle == 2 && real->isAnimated() ) { + if ( PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "animate" && real->isAnimated() ) { if ( !isActivated ) { connect(real, SIGNAL(pixmapChanged()), SLOT(pixmapChanged())); real->activated(playSound); isActivated = true; } } - else if ( option.alertStyle == 1 || (option.alertStyle == 2 && !real->isAnimated()) ) { + else if ( PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "blink" || (PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "animate" && !real->isAnimated()) ) { connect(metaAlertIcon, SIGNAL(updateFrame(int)), SLOT(updateFrame(int))); } else { @@ -266,10 +266,10 @@ const Impix &AlertIcon::impix() const int AlertIcon::frameNumber() const { - if ( option.alertStyle == 2 && d->real->isAnimated() ) { + if ( PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "animate" && d->real->isAnimated() ) { return d->real->frameNumber(); } - else if ( option.alertStyle == 1 || (option.alertStyle == 2 && !d->real->isAnimated()) ) { + else if ( PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "blink" || (PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() == "animate" && !d->real->isAnimated()) ) { return metaAlertIcon->framenumber(); } src/alerticon.cpp @@ -60,7 +60,7 @@ using namespace QCA; static QByteArray scaleAvatar(const QByteArray& b) { - //int maxSize = (option.avatarsSize > MAX_AVATAR_SIZE ? MAX_AVATAR_SIZE : option.avatarsSize); + //int maxSize = (LEGOPTS.avatarsSize > MAX_AVATAR_SIZE ? MAX_AVATAR_SIZE : LEGOPTS.avatarsSize); int maxSize = AvatarFactory::maxAvatarSize(); QImage i(b); if (i.isNull()) { src/avatars.cpp @@ -48,9 +48,7 @@ #include <QDragEnterEvent> #include <QTextDocument> // for Qt::escape() -#include "profiles.h" #include "psiaccount.h" -#include "common.h" #include "userlist.h" #include "stretchwidget.h" #include "psiiconset.h" @@ -92,7 +90,7 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager) : TabbableWidget(jid, pa, tabManager) , highlightersInstalled_(false) { - if (option.brushedMetal) { + if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) { setAttribute(Qt::WA_MacMetalStyle); } @@ -187,7 +185,7 @@ void ChatDlg::setShortcuts() act_scrollup_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up")); act_scrolldown_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down")); - //if(!option.useTabs) { + //if(!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) { // act_close_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close")); //} } @@ -208,7 +206,7 @@ void ChatDlg::scrollDown() void ChatDlg::keyPressEvent(QKeyEvent *e) { QKeySequence key = e->key() + (e->modifiers() & ~Qt::KeypadModifier); - if (!option.useTabs && ShortcutManager::instance()->shortcuts("common.close").contains(key)) { + if (!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() && ShortcutManager::instance()->shortcuts("common.close").contains(key)) { close(); } else if (ShortcutManager::instance()->shortcuts("chat.send").contains(key)) { @@ -227,7 +225,7 @@ void ChatDlg::keyPressEvent(QKeyEvent *e) void ChatDlg::resizeEvent(QResizeEvent *e) { - if (option.keepSizes) { + if (PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool()) { PsiOptions::instance()->setOption("options.ui.chat.size", e->size()); } } @@ -262,14 +260,14 @@ bool ChatDlg::readyToHide() } // destroy the dialog if delChats is dcClose - if (option.delChats == dcClose) { + if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "instant") { setAttribute(Qt::WA_DeleteOnClose); } else { - if (option.delChats == dcHour) { + if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "hour") { setSelfDestruct(60); } - else if (option.delChats == dcDay) { + else if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "day") { setSelfDestruct(60 * 24); } } @@ -470,7 +468,7 @@ void ChatDlg::updateContact(const Jid &j, bool fromPresence) QString msg = tr("%1 is %2").arg(Qt::escape(dispNick_)).arg(status2txt(status_)); if (!statusString_.isEmpty()) { QString ss = TextUtil::linkify(TextUtil::plain2rich(statusString_)); - if (option.useEmoticons) { + if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) { ss = TextUtil::emoticonify(ss); } if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool()) { @@ -516,7 +514,7 @@ void ChatDlg::setLooks() { // update the font QFont f; - f.fromString(option.font[fChat]); + f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString()); chatView()->setFont(f); chatEdit()->setFont(f); @@ -530,7 +528,7 @@ void ChatDlg::setLooks() #endif /*QBrush brush; - brush.setPixmap( QPixmap( option.chatBgImage ) ); + brush.setPixmap( QPixmap( LEGOPTS.chatBgImage ) ); chatView()->setPaper(brush); chatView()->setStaticBackground(true);*/ @@ -543,15 +541,15 @@ void ChatDlg::optionsUpdate() setShortcuts(); if (isHidden()) { - if (option.delChats == dcClose) { + if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "instant") { deleteLater(); return; } else { - if (option.delChats == dcHour) { + if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "hour") { setSelfDestruct(60); } - else if (option.delChats == dcDay) { + else if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "day") { setSelfDestruct(60 * 24); } else { @@ -686,7 +684,7 @@ void ChatDlg::doSend() m_ = m; // Request events - if (option.messageEvents) { + if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) { // Only request more events when really necessary if (sendComposingEvents_) { m.addEvent(ComposingEvent); @@ -846,8 +844,8 @@ void ChatDlg::appendMessage(const Message &m, bool local) if (PsiOptions::instance()->getOption("options.ui.flash-windows").toBool()) { doFlash(true); } - if (option.raiseChatWindow) { - if (option.useTabs) { + if (PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool()) { + if (PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) { TabDlg* tabSet = getManagingTabDlg(); tabSet->selectTab(this); ::bringToFront(tabSet, false); @@ -884,7 +882,7 @@ void ChatDlg::updateIsComposing(bool b) void ChatDlg::setChatState(ChatState state) { - if (option.messageEvents && (sendComposingEvents_ || (contactChatState_ != XMPP::StateNone))) { + if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool() && (sendComposingEvents_ || (contactChatState_ != XMPP::StateNone))) { // Don't send to offline resource QList<UserListItem*> ul = account()->findRelevant(jid()); if (ul.isEmpty()) { @@ -901,7 +899,7 @@ void ChatDlg::setChatState(ChatState state) } // Transform to more privacy-enabled chat states if necessary - if (!option.inactiveEvents && (state == XMPP::StateGone || state == XMPP::StateInactive)) { + if (!PsiOptions::instance()->getOption("options.messages.send-inactivity-events").toBool() && (state == XMPP::StateGone || state == XMPP::StateInactive)) { state = XMPP::StatePaused; } @@ -1076,7 +1074,7 @@ QString ChatDlg::messageText(const XMPP::Message& m) // qWarning("regular body:\n%s\n",qPrintable(txt)); } - if (option.useEmoticons) + if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) txt = TextUtil::emoticonify(txt); if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool()) txt = TextUtil::legacyFormat(txt); src/chatdlg.cpp @@ -24,7 +24,6 @@ #include "msgmle.h" #include "psioptions.h" -#include "common.h" ChatEditProxy::ChatEditProxy(QWidget* parent) : QWidget(parent) @@ -112,10 +111,10 @@ void ChatEditProxy::updateLayout() /** * Update ChatEdit widget according to current options. - * FIXME: When option.chatLineEdit finally makes it to PsiOptions, make this slot + * FIXME: When PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() finally makes it to PsiOptions, make this slot * private. */ void ChatEditProxy::optionsChanged() { - setLineEditEnabled(option.chatLineEdit); + setLineEditEnabled(PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool()); } src/chateditproxy.cpp @@ -25,7 +25,6 @@ #include <QChildEvent> #include "psioptions.h" -#include "common.h" /** * Handy widget that masquerades itself as QSplitter, and could work @@ -135,10 +134,10 @@ void ChatSplitter::updateLayout() /** * Updates layout according to current options. - * FIXME: When option.chatLineEdit finally makes it to PsiOptions, make this slot + * FIXME: When PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() finally makes it to PsiOptions, make this slot * private. */ void ChatSplitter::optionsChanged() { - setSplitterEnabled(!option.chatLineEdit); + setSplitterEnabled(!PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool()); } src/chatsplitter.cpp @@ -24,6 +24,7 @@ #include "psievent.h" #include "psiiconset.h" #include "applicationinfo.h" +#include "psioptions.h" #include <QUrl> #include <QProcess> @@ -56,7 +57,11 @@ Qt::WFlags psi_dialog_flags = (Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); -Options option; +// used to be part of the global options struct. +// FIXME find it a new home! +int common_smallFontSize=0; + + bool useSound; @@ -225,12 +230,30 @@ bool fileCopy(const QString &src, const QString &dest) } -void soundPlay(const QString &str) +/** Detect default player helper on unix like systems + */ +QString soundDetectPlayer() { + // prefer ALSA on linux + if (QFile("/proc/asound").exists()) { + return "aplay"; + } + // fallback to "play" + return "play"; + +} + +void soundPlay(const QString &s) +{ + QString str = s; if(str == "!beep") { QApplication::beep(); return; } + + if (QDir::isRelativePath(str)) { + str = ApplicationInfo::resourcesDir() + "/" + str; + } if(!QFile::exists(str)) return; @@ -238,13 +261,13 @@ void soundPlay(const QString &str) #if defined(Q_WS_WIN) || defined(Q_WS_MAC) QSound::play(str); #else - if(!option.player.isEmpty()) { - QStringList args; - args = QStringList::split(' ', option.player); - args += str; - QString prog = args.takeFirst(); - QProcess::startDetached(prog, args); - } + QString player = PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString(); + if (player == "") player = soundDetectPlayer(); + QStringList args; + args = QStringList::split(' ', player); + args += str; + QString prog = args.takeFirst(); + QProcess::startDetached(prog, args); #endif } src/common.cpp @@ -34,162 +34,45 @@ // Options // ----------------------------------------------------------------------------- -enum { - cOnline, - cOffline, - cAway, - cDND, - cProfileFore, - cProfileBack, - cGroupFore, - cGroupBack, - cListBack, - cAnimFront, - cAnimBack, - cStatus, - cNumColors // A guard to store the number of colors -}; -enum { fRoster, fMessage, fChat, fPopup }; -enum { eMessage, eChat1, eChat2, eHeadline, eSystem, eOnline, eOffline, eSend, eIncomingFT, eFTComplete }; enum { dcClose, dcHour, dcDay, dcNever }; -struct Options -{ - QColor color[cNumColors]; - QString font[4]; - int smallFontSize; // do not modify or save/load this value! it is calculated at run time! - int alertStyle; - - QString systemIconset; - QStringList emoticons; - QString defaultRosterIconset; - QMap<QString, QString> serviceRosterIconset; - QMap<QString, QString> customRosterIconset; - - bool useleft, singleclick, hideMenubar, askOnline, askOffline, popupMsgs, popupChats, popupHeadlines, popupFiles, raise; - bool alwaysOnTop, noAwaySound, noAwayPopup, noUnlistedPopup, rosterAnim, autoVCardOnLogin, xmlConsoleOnLogin; - bool useDock, dockDCstyle, dockHideMW, dockToolMW; - bool smallChats, chatLineEdit, useTabs, putTabsAtBottom, usePerTabCloseButton, autoRosterSize, autoRosterSizeGrowTop, autoResolveNicksOnAdd, brushedMetal; - - bool autoCopy; // although this setting is ignored under linux, - // it is preserved in case user uses the same config file on different platforms - bool useCaps; - - bool oldSmallChats; //Filthy hack, see chat code. - int delChats, browser; - - bool useRC; - - int defaultAction; - int incomingAs; - QStringList recentStatus; //recent status messages - QMap<QString,StatusPreset> sp; // Status message presets. - int asAway, asXa, asOffline; - bool use_asAway, use_asXa, use_asOffline; - QString asMessage; - QString onevent[10]; +struct ToolbarPrefs { + bool dirty; - // Added by Kiko 020621: points to the directory where the trusted - // certificates used in validating the server's certificate are kept - QString trustCertStoreDir; + QString name; + bool on; + bool locked; + bool stretchable; + QStringList keys; - QString player; + Qt::Dock dock; + int index; + bool nl; + int extraOffset; +}; - bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats; - bool raiseChatWindow, showSubjects, showCounter, chatSays, showGroupCounts; - QSize sizeEventDlg, sizeChatDlg, sizeTabDlg; - bool jidComplete, grabUrls, noGCSound; +struct lateMigrationOptions +{ - struct ToolbarPrefs { - bool dirty; + QMap<QString, QString> serviceRosterIconset; + QMap<QString, QString> customRosterIconset; - QString name; - bool on; - bool locked; - bool stretchable; - QStringList keys; + QMap<QString,StatusPreset> sp; // Status message presets. - Qt::Dock dock; - int index; - bool nl; - int extraOffset; - }; QMap< QString, QList<ToolbarPrefs> > toolbars; - - // groupchat highlighting/nick colouring - bool gcHighlighting, gcNickColoring; - QStringList gcHighlights, gcNickColors; - - bool clNewHeadings; - bool outlineHeadings; - - // passive popups - bool ppIsOn; - bool ppMessage, ppHeadline, ppChat, ppOnline, ppStatus, ppOffline, ppFile; - int ppJidClip, ppStatusClip, ppTextClip, ppHideTime; - QColor ppBorderColor; - - // Bouncing of the dock (Mac OS X) - typedef enum { NoBounce, BounceOnce, BounceForever } BounceDockSetting; - BounceDockSetting bounceDock; - - struct { - bool roster, services; - } lockdown; - - bool useTransportIconsForContacts; - - // roster sorting styles - typedef enum Roster_ContactSortStyle { - ContactSortStyle_Status = 0, - ContactSortStyle_Alpha - }; - Roster_ContactSortStyle rosterContactSortStyle; - - typedef enum Roster_GroupSortStyle { - GroupSortStyle_Alpha = 0, - GroupSortStyle_Rank - }; - Roster_GroupSortStyle rosterGroupSortStyle; - - typedef enum Roster_AccountSortStyle { - AccountSortStyle_Alpha = 0, - AccountSortStyle_Rank - }; - Roster_AccountSortStyle rosterAccountSortStyle; - - bool discoItems, discoInfo; - - bool autoAuth, notifyAuth; - - // event priority - enum { EventPriorityDontCare = -1 }; - int eventPriorityHeadline; - int eventPriorityChat; - int eventPriorityMessage; - int eventPriorityAuth; - int eventPriorityFile; - int eventPriorityRosterExchange; - - // Message events - bool messageEvents; - bool inactiveEvents; - - int dtPort; - QString dtExternal; - - // Last used path remembering - QString lastPath; - QString lastSavePath; - - //background images - QString chatBgImage, rosterBgImage; }; -extern -Options option; +// used to be part of the global options struct. +// do not modify or save/load this value! it is calculated at run time! +// FIXME find it a new home! +extern int common_smallFontSize; + +// used to be part of the global options struct. +// FIXME find it a new home! +enum { EventPriorityDontCare = -1 }; + // ----------------------------------------------------------------------------- // Status @@ -252,9 +135,11 @@ bool operator!=(const QMap<QString, QString> &, const QMap<QString, QString> &); bool fileCopy(const QString &src, const QString &dest); + +// used in option migration +QString soundDetectPlayer(); void soundPlay(const QString &); extern Qt::WFlags psi_dialog_flags; -extern bool useSound; #endif src/common.h @@ -641,7 +641,7 @@ void ContactProfile::setAlert(const Jid &j, const PsiIcon *anim) for(ContactViewItem *i; (i = it.current()); ++it) i->setAlert(anim); - if(option.scrollTo) + if(PsiOptions::instance()->getOption("options.ui.contactlist.ensure-contact-visible-on-event").toBool()) ensureVisible(e); } } @@ -811,10 +811,10 @@ void ContactProfile::updateGroupInfo(ContactViewItem *group) else { total = group->childCount(); } - if (option.showGroupCounts) + if (PsiOptions::instance()->getOption("options.ui.contactlist.show-group-counts").toBool()) group->setGroupInfo(QString("(%1/%2)").arg(online).arg(total)); } - else if (option.showGroupCounts) { + else if (PsiOptions::instance()->getOption("options.ui.contactlist.show-group-counts").toBool()) { int inGroup = contactSizeFromCVGroup(group); group->setGroupInfo(QString("(%1)").arg(inGroup)); } @@ -865,7 +865,7 @@ void ContactProfile::updateGroups() if(e->u.isAvailable()) ++totalOnline; } - if(d->cvi && option.showGroupCounts) + if(d->cvi && PsiOptions::instance()->getOption("options.ui.contactlist.show-group-counts").toBool()) d->cvi->setGroupInfo(QString("(%1/%2)").arg(totalOnline).arg(d->roster.count())); } @@ -1027,7 +1027,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) if (PsiOptions::instance()->getOption("options.ui.message.enabled").toBool()) pm.insertItem(IconsetFactory::icon("psi/sendMessage").icon(), tr("Send message to group"), 0); - if(!option.lockdown.roster) { + if(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { // disable if it's not a user group if(!online || i->groupType() != ContactViewItem::gUser || gname == ContactView::tr("Hidden")) { d->cv->qa_ren->setEnabled(false); @@ -1051,7 +1051,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) int x = pm.exec(pos); // restore actions - if(option.lockdown.roster) + if(PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) d->cv->qa_ren->setEnabled(false); else d->cv->qa_ren->setEnabled(true); @@ -1122,7 +1122,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) Q3PopupMenu pm; - if(!self && !inList && !isPrivate && !option.lockdown.roster) { + if(!self && !inList && !isPrivate && !PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { pm.insertItem(IconsetFactory::icon("psi/addContact").icon(), tr("Add/Authorize to contact list"), 10); if(!online) pm.setItemEnabled(10, false); @@ -1266,14 +1266,14 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) if(!self) { if(inList) { - if(!option.lockdown.roster) { + if(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { d->cv->qa_ren->setEnabled(online); d->cv->qa_ren->addTo(&pm); } } if(!isAgent) { - if(inList && !option.lockdown.roster) { + if(inList && !PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { Q3PopupMenu *gm = new Q3PopupMenu(&pm); gm->setCheckable(true); @@ -1328,7 +1328,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) } } - if(inList && !option.lockdown.roster) { + if(inList && !PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { Q3PopupMenu *authm = new Q3PopupMenu (&pm); authm->insertItem(tr("Resend authorization to"), 6); @@ -1341,7 +1341,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) } if(!self) { - if(!option.lockdown.roster) { + if(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { if(online || !inList) d->cv->qa_rem->setEnabled(true); else @@ -1382,7 +1382,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos) int x = pm.exec(pos); // restore actions - if(option.lockdown.roster) { + if(PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { d->cv->qa_ren->setEnabled(false); d->cv->qa_rem->setEnabled(false); } @@ -1868,7 +1868,7 @@ public slots: autoRosterResizeInProgress = true; QRect desktop = qApp->desktop()->availableGeometry( (QWidget *)topParent ); - if ( option.autoRosterSizeGrowTop ) { + if ( PsiOptions::instance()->getOption("options.ui.contactlist.grow-roster-upwards").toBool() ) { int newy = topParent->y() - dh; // check, if we need to move roster lower @@ -1909,8 +1909,8 @@ public slots: int top_offs = abs( desktop.top() - topParent->frameGeometry().top() ); int bottom_offs = abs( desktop.bottom() - topParent->frameGeometry().bottom() ); - option.autoRosterSizeGrowTop = bottom_offs < top_offs; - //qWarning("growTop = %d", option.autoRosterSizeGrowTop); + PsiOptions::instance()->setOption("options.ui.contactlist.grow-roster-upwards", (bool) bottom_offs < top_offs); + //qWarning("growTop = %d", PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool()GrowTop); } /* @@ -1971,13 +1971,14 @@ ContactView::ContactView(QWidget *parent, const char *name) connect(this, SIGNAL(doubleClicked(Q3ListViewItem *)),SLOT(qlv_doubleclick(Q3ListViewItem *)) ); connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem *, const QPoint &, int)), SLOT(qlv_contextMenuRequested(Q3ListViewItem *, const QPoint &, int))); - v_showOffline = true; - v_showAway = true; - v_showHidden = true; - v_showAgents = true; - v_showSelf = true; + v_showOffline = PsiOptions::instance()->getOption("options.ui.contactlist.show.offline-contacts").toBool(); + v_showAway = PsiOptions::instance()->getOption("options.ui.contactlist.show.away-contacts").toBool(); + v_showHidden = PsiOptions::instance()->getOption("options.ui.contactlist.show.hidden-contacts-group").toBool(); + v_showAgents = PsiOptions::instance()->getOption("options.ui.contactlist.show.agent-contacts").toBool(); + v_showSelf = PsiOptions::instance()->getOption("options.ui.contactlist.show.self-contact").toBool(); v_showStatusMsg = PsiOptions::instance()->getOption("options.ui.contactlist.status-messages.show").toBool(); + d->lastSize = QSize( 0, 0 ); // animation timer @@ -2013,7 +2014,7 @@ ContactView::ContactView(QWidget *parent, const char *name) qa_vcard = new IconAction("", "psi/vCard", tr("User &Info"), 0, this); connect(qa_vcard, SIGNAL(activated()), SLOT(doVCard())); - if(option.lockdown.roster) { + if(PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) { qa_ren->setEnabled(false); qa_rem->setEnabled(false); } @@ -2175,6 +2176,8 @@ void ContactView::setShowOffline(bool x) { bool oldstate = v_showOffline; v_showOffline = x; + PsiOptions::instance()->setOption("options.ui.contactlist.show.offline-contacts", x); + if(v_showOffline != oldstate) { showOffline(v_showOffline); @@ -2193,7 +2196,8 @@ void ContactView::setShowAway(bool x) { bool oldstate = v_showAway; v_showAway = x; - + PsiOptions::instance()->setOption("options.ui.contactlist.show.away-contacts", x); + if(v_showAway != oldstate) { showAway(v_showAway); @@ -2211,6 +2215,7 @@ void ContactView::setShowHidden(bool x) { bool oldstate = v_showHidden; v_showHidden = x; + PsiOptions::instance()->setOption("options.ui.contactlist.show.hidden-contacts-group", x); if(v_showHidden != oldstate) { showHidden(v_showHidden); @@ -2250,6 +2255,7 @@ void ContactView::setShowSelf(bool x) { if (v_showSelf != x) { v_showSelf = x; + PsiOptions::instance()->setOption("options.ui.contactlist.show.self-contact", x); showSelf(v_showSelf); Q3PtrListIterator<ContactProfile> it(d->profiles); @@ -2288,6 +2294,7 @@ void ContactView::setShowAgents(bool x) { bool oldstate = v_showAgents; v_showAgents = x; + PsiOptions::instance()->setOption("options.ui.contactlist.show.agent-contacts", x); if(v_showAgents != oldstate) { showAgents(v_showAgents); @@ -2305,7 +2312,7 @@ void ContactView::setShowAgents(bool x) // right-click context menu void ContactView::qlv_contextMenuRequested(Q3ListViewItem *lvi, const QPoint &pos, int c) { - if(option.useleft) + if(PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool()) return; qlv_contextPopup(lvi, pos, c); @@ -2339,9 +2346,9 @@ void ContactView::qlv_singleclick(int button, Q3ListViewItem *i, const QPoint &p if (button == Qt::LeftButton && item->type() == ContactViewItem::Group && pix && viewport()->mapFromGlobal(pos).x() <= pix->width() + treeStepSize()) { setOpen(item, !item->isOpen()); } - else if(option.useleft) { + else if(PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool()) { if(button == Qt::LeftButton) { - if(option.singleclick) { + if(PsiOptions::instance()->getOption("options.ui.contactlist.use-single-click").toBool()) { qlv_contextPopup(i, pos, c); } else { @@ -2351,7 +2358,7 @@ void ContactView::qlv_singleclick(int button, Q3ListViewItem *i, const QPoint &p QTimer::singleShot(QApplication::doubleClickInterval()/2, this, SLOT(leftClickTimeOut())); } } - else if(option.singleclick && button == Qt::RightButton) { + else if(PsiOptions::instance()->getOption("options.ui.contactlist.use-single-click").toBool() && button == Qt::RightButton) { if(item->type() == ContactViewItem::Contact) item->contactProfile()->scActionDefault(item); } @@ -2360,7 +2367,7 @@ void ContactView::qlv_singleclick(int button, Q3ListViewItem *i, const QPoint &p //if(button == QListView::RightButton) { // qlv_contextPopup(i, pos, c); //} - /*else*/if(button == Qt::LeftButton && option.singleclick) { + /*else*/if(button == Qt::LeftButton && PsiOptions::instance()->getOption("options.ui.contactlist.use-single-click").toBool()) { if(item->type() == ContactViewItem::Contact) item->contactProfile()->scActionDefault(item); } @@ -2377,7 +2384,7 @@ void ContactView::qlv_doubleclick(Q3ListViewItem *i) if(!i) return; - if(option.singleclick) + if(PsiOptions::instance()->getOption("options.ui.contactlist.use-single-click").toBool()) return; ContactViewItem *item = (ContactViewItem *)i; @@ -2404,13 +2411,13 @@ void ContactView::optionsUpdate() { // set the font QFont f; - f.fromString(option.font[fRoster]); + f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString()); Q3ListView::setFont(f); // set the text and background colors QPalette mypal = Q3ListView::palette(); - mypal.setColor(QColorGroup::Text, option.color[cOnline]); - mypal.setColor(QColorGroup::Base, option.color[cListBack]); + mypal.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.online").value<QColor>()); + mypal.setColor(QColorGroup::Base, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.background").value<QColor>()); Q3ListView::setPalette(mypal); // reload the icons @@ -2425,7 +2432,7 @@ void ContactView::optionsUpdate() setShortcuts(); // resize if necessary - if (option.autoRosterSize) + if (PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool()) recalculateSize(); update(); @@ -2581,7 +2588,7 @@ Q3DragObject *ContactView::dragObject() bool ContactView::allowResize() const { - if ( !option.autoRosterSize ) + if ( !PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() ) return false; if ( window()->isMaximized() ) @@ -3075,15 +3082,15 @@ void ContactViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, QColorGroup xcg = cg; if(d->status == STATUS_AWAY || d->status == STATUS_XA) - xcg.setColor(QColorGroup::Text, option.color[cAway]); + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.away").value<QColor>()); else if(d->status == STATUS_DND) - xcg.setColor(QColorGroup::Text, option.color[cDND]); + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.do-no-disturb").value<QColor>()); else if(d->status == STATUS_OFFLINE) - xcg.setColor(QColorGroup::Text, option.color[cOffline]); + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.offline").value<QColor>()); if(d->animatingNick) { - xcg.setColor(QColorGroup::Text, d->animateNickColor ? option.color[cAnimFront] : option.color[cAnimBack]); - xcg.setColor(QColorGroup::HighlightedText, d->animateNickColor ? option.color[cAnimFront] : option.color[cAnimBack]); + xcg.setColor(QColorGroup::Text, d->animateNickColor ? PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color1").value<QColor>() : PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color2").value<QColor>()); + xcg.setColor(QColorGroup::HighlightedText, d->animateNickColor ? PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color1").value<QColor>() : PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color2").value<QColor>()); } RichListViewItem::paintCell(p, xcg, column, width, alignment); @@ -3113,24 +3120,24 @@ void ContactViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, QColorGroup xcg = cg; if(type_ == Profile) { - xcg.setColor(QColorGroup::Text, option.color[cProfileFore]); + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.profile.header-foreground").value<QColor>()); #if QT_VERSION < 0x040301 - xcg.setColor(QColorGroup::Background, option.color[cProfileBack]); + xcg.setColor(QColorGroup::Background, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.profile.header-background").value<QColor>()); #else - xcg.setColor(QColorGroup::Base, option.color[cProfileBack]); + xcg.setColor(QColorGroup::Base, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.profile.header-background").value<QColor>()); #endif } else if(type_ == Group) { QFont f = p->font(); - f.setPointSize(option.smallFontSize); + f.setPointSize(common_smallFontSize); p->setFont(f); - xcg.setColor(QColorGroup::Text, option.color[cGroupFore]); - if (!option.clNewHeadings) { + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>()); + if (!PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool()) { #if QT_VERSION < 0x040301 - xcg.setColor(QColorGroup::Background, option.color[cGroupBack]); + xcg.setColor(QColorGroup::Background, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>()); #else - xcg.setColor(QColorGroup::Base, option.color[cGroupBack]); + xcg.setColor(QColorGroup::Base, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>()); #endif } } @@ -3154,7 +3161,7 @@ void ContactViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, p->setPen(xcg.text()); QFont f_info = p->font(); - f_info.setPointSize(option.smallFontSize); + f_info.setPointSize(common_smallFontSize); p->setFont(f_info); QFontMetrics fm_info(p->font()); //int info_x = width - fm_info.width(d->groupInfo) - 8; @@ -3162,23 +3169,23 @@ void ContactViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int info_y = ((height() - fm_info.height()) / 2) + fm_info.ascent(); p->drawText((info_x > x ? info_x : x), info_y, d->groupInfo); - if(type_ == Group && option.clNewHeadings && !isSelected()) { + if(type_ == Group && PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool() && !isSelected()) { x += fm.width(d->groupInfo) + 8; if(x < width - 8) { int h = (height() / 2) - 1; - p->setPen(QPen(option.color[cGroupBack])); + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>())); p->drawLine(x, h, width - 8, h); h++; - p->setPen(QPen(option.color[cGroupFore])); + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>())); /*int h = height() / 2; - p->setPen(QPen(option.color[cGroupBack], 2));*/ + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>(), 2));*/ p->drawLine(x, h, width - 8, h); } } else { - if (option.outlineHeadings) { - p->setPen(QPen(option.color[cGroupFore])); + if (PsiOptions::instance()->getOption("options.ui.look.contactlist.use-outlined-group-headings").toBool()) { + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>())); p->drawRect(0, 0, width, height()); } } @@ -3248,7 +3255,7 @@ int ContactViewItem::compare(Q3ListViewItem *lvi, int, bool) const if(i->type() == Group) ret = -1; else { - if ( option.rosterContactSortStyle == Options::ContactSortStyle_Status ) { + if ( PsiOptions::instance()->getOption("options.ui.contactlist.contact-sort-style").toString() == "status" ) { ret = rankStatus(d->status) - rankStatus(i->status()); if(ret == 0) ret = text(0).lower().localeAwareCompare(i->text(0).lower()); @@ -3263,7 +3270,7 @@ int ContactViewItem::compare(Q3ListViewItem *lvi, int, bool) const if(i->type() == Contact) ret = 1; else if(i->type() == Group) { - if ( option.rosterGroupSortStyle == Options::GroupSortStyle_Rank ) { + if ( PsiOptions::instance()->getOption("options.ui.contactlist.group-sort-style").toString() == "rank") { int ourRank = d->groupData().rank; int theirRank = i->d->groupData().rank; @@ -3276,7 +3283,7 @@ int ContactViewItem::compare(Q3ListViewItem *lvi, int, bool) const } } else if(i->type() == Profile) { - if ( option.rosterAccountSortStyle == Options::AccountSortStyle_Rank ) { + if ( PsiOptions::instance()->getOption("options.ui.contactlist.account-sort-style").toString() == "rank" ) { int ourRank = d->groupData().rank; int theirRank = i->d->groupData().rank; @@ -3365,7 +3372,7 @@ void ContactViewItem::resetName(bool forceNoStatusMsg) statusMsg.replace(">",">"); statusMsg = statusMsg.simplifyWhiteSpace(); if (!statusMsg.isEmpty()) - s += " " + statusMsg + ""; + s += " getOption("options.ui.look.colors.contactlist.status-messages").value<QColor>().name() + "'>" + statusMsg + ""; } else { statusMsg.replace('\n'," "); src/contactview.cpp @@ -202,7 +202,7 @@ public: bool isShowHidden() const { return v_showHidden; } bool isShowSelf() const { return v_showSelf; } bool isShowStatusMsg() const { return v_showStatusMsg; } - + bool filterContact(ContactViewItem *item, bool refineSearch = false); bool filterGroup(ContactViewItem *item, bool refineSearch = false); void setFilter(QString const &text); src/contactview.h @@ -45,7 +45,6 @@ #include "psiaccount.h" #include "psicon.h" #include "busywidget.h" -#include "common.h" #include "iconaction.h" #include "psiiconset.h" #include "psitooltip.h" @@ -1432,8 +1431,8 @@ DiscoDlg::DiscoDlg(PsiAccount *pa, const Jid &jid, const QString &node) setAttribute(Qt::WA_DeleteOnClose); setupUi(this); // restore options - ck_autoItems->setChecked(option.discoItems); - ck_autoInfo->setChecked(option.discoInfo); + ck_autoItems->setChecked(PsiOptions::instance()->getOption("options.ui.service-discovery.automatically-get-items").toBool()); + ck_autoInfo->setChecked(PsiOptions::instance()->getOption("options.ui.service-discovery.automatically-browse-into").toBool()); // initialize d = new Private(this, pa); @@ -1470,8 +1469,8 @@ DiscoDlg::~DiscoDlg() delete d; // save options - option.discoItems = ck_autoItems->isChecked(); - option.discoInfo = ck_autoInfo->isChecked(); + PsiOptions::instance()->setOption("options.ui.service-discovery.automatically-get-items", (bool) ck_autoItems->isChecked()); + PsiOptions::instance()->setOption("options.ui.service-discovery.automatically-browse-into", (bool) ck_autoInfo->isChecked()); } void DiscoDlg::doDisco(QString host, QString node) src/discodlg.cpp @@ -29,7 +29,7 @@ #include <qtimer.h> #include <qtextstream.h> -#include "profiles.h" +#include "common.h" #include "applicationinfo.h" #include "psievent.h" #include "jidutil.h" src/eventdb.cpp @@ -450,7 +450,7 @@ void AttachView::addUrlList(const UrlList &list) AddUrlDlg::AddUrlDlg(QWidget *parent) :QDialog(parent) { - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); setupUi(this); #ifndef Q_WS_MAC @@ -580,7 +580,7 @@ EventDlg::EventDlg(const QString &to, PsiCon *psi, PsiAccount *pa) : AdvancedWidget<QWidget>(0) { setAttribute(Qt::WA_DeleteOnClose); - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); d = new Private(this); d->composing = true; @@ -605,7 +605,7 @@ EventDlg::EventDlg(const QString &to, PsiCon *psi, PsiAccount *pa) d->le_to->setText(expandAddresses(to, false)); d->le_to->setCursorPosition(0); - if(option.grabUrls) { + if(PsiOptions::instance()->getOption("options.ui.message.auto-grab-urls-from-clipboard").toBool()) { // url in clipboard? QClipboard *cb = QApplication::clipboard(); QString text = cb->text(QClipboard::Clipboard); @@ -813,7 +813,7 @@ void EventDlg::init() QHBoxLayout *hb3 = new QHBoxLayout(vb1); // if(d->composing /* && config->showsubject */) { - if(option.showSubjects) { + if(PsiOptions::instance()->getOption("options.ui.message.show-subjects").toBool()) { // third row l = new QLabel(tr("Subject:"), this); hb3->addWidget(l); @@ -991,7 +991,11 @@ void EventDlg::init() connect(d->pa, SIGNAL(pgpKeyChanged()), SLOT(updatePGP())); connect(d->pa, SIGNAL(encryptedMessageSent(int, bool, int)), SLOT(encryptedMessageSent(int, bool, int))); - resize(option.sizeEventDlg); + if (PsiOptions::instance()->getOption("options.ui.message.size").toSize().isValid()) { + resize(PsiOptions::instance()->getOption("options.ui.message.size").toSize()); + } else { + resize(defaultSize()); + } optionsUpdate(); //ShortcutManager::connect("common.close", this, SLOT(close())); @@ -1199,7 +1203,7 @@ void EventDlg::to_changeResource(const QString &r) void EventDlg::to_tryComplete() { - if(!option.jidComplete) + if(!PsiOptions::instance()->getOption("options.ui.message.use-jid-auto-completion").toBool()) return; QString str = d->le_to->text(); @@ -1336,18 +1340,18 @@ void EventDlg::optionsUpdate() { // update the font QFont f; - f.fromString(option.font[fMessage]); + f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.message").toString()); d->mle->setFont(f); // update status icon doWhois(true); - if ( option.showCounter && d->composing ) + if ( PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && d->composing ) d->lb_count->show(); else d->lb_count->hide(); - if ( option.useEmoticons ) + if ( PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool() ) d->tb_icon->show(); else d->tb_icon->hide(); @@ -1398,8 +1402,8 @@ void EventDlg::showEvent(QShowEvent *e) void EventDlg::resizeEvent(QResizeEvent *e) { - if(option.keepSizes) - option.sizeEventDlg = e->size(); + if(PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool()) + PsiOptions::instance()->getOption("options.ui.message.size").toSize() = e->size(); } void EventDlg::keyPressEvent(QKeyEvent *e) @@ -1857,11 +1861,11 @@ void EventDlg::updateEvent(PsiEvent *e) QString txt = xhtml ? m.html().toString("div") : TextUtil::plain2rich(m.body()); // show subject line if the incoming message has one - if(m.subject() != "" && !option.showSubjects) + if(m.subject() != "" && !PsiOptions::instance()->getOption("options.ui.message.show-subjects").toBool()) txt = "" + tr("Subject:") + " " + TextUtil::plain2rich(m.subject()) + "" + (xhtml? "" : " ") + txt; if (!xhtml) { - if(option.useEmoticons) + if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) txt = TextUtil::emoticonify(txt); if( PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() ) txt = TextUtil::legacyFormat(txt); src/eventdlg.cpp @@ -26,19 +26,18 @@ #include "psicon.h" #include "psiaccount.h" #include "userlist.h" -#include "common.h" #include "iconwidget.h" #include "s5b.h" #include "busywidget.h" #include "filetransfer.h" #include "accountscombobox.h" -#include "profiles.h" #include "psiiconset.h" #include "msgmle.h" #include "jidutil.h" #include "psitooltip.h" #include "psicontactlist.h" #include "accountlabel.h" +#include "psioptions.h" typedef Q_UINT64 LARGE_TYPE; @@ -586,7 +585,7 @@ FileRequestDlg::FileRequestDlg(const Jid &jid, PsiCon *psi, PsiAccount *pa, cons return; } - option.lastPath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = fi.dirPath(); le_fname->setText(QDir::convertSeparators(fi.filePath())); lb_size->setText(tr("%1 byte(s)").arg(fi.size())); // TODO: large file support } @@ -754,16 +753,16 @@ void FileRequestDlg::unblockWidgets() void FileRequestDlg::chooseFile() { while(1) { - if(option.lastPath.isEmpty()) - option.lastPath = QDir::homeDirPath(); - QString str = QFileDialog::getOpenFileName(this, tr("Choose a file"), option.lastPath, tr("All files (*)")); + if(PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString().isEmpty()) + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = QDir::homeDirPath(); + QString str = QFileDialog::getOpenFileName(this, tr("Choose a file"), PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString(), tr("All files (*)")); if(!str.isEmpty()) { QFileInfo fi(str); if(!fi.exists()) { QMessageBox::information(this, tr("Error"), tr("The file specified does not exist.")); continue; } - option.lastPath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = fi.dirPath(); le_fname->setText(QDir::convertSeparators(fi.filePath())); lb_size->setText(tr("%1 byte(s)").arg(fi.size())); // TODO: large file support } @@ -808,13 +807,13 @@ void FileRequestDlg::doStart() } else { QString fname, savename; - if(option.lastSavePath.isEmpty()) - option.lastSavePath = QDir::homeDirPath(); - fname = QFileDialog::getSaveFileName(this, tr("Save As"), QDir(option.lastSavePath).filePath(d->fileName), tr("All files (*)")); + if(PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString().isEmpty()) + PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString() = QDir::homeDirPath(); + fname = QFileDialog::getSaveFileName(this, tr("Save As"), QDir(PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString()).filePath(d->fileName), tr("All files (*)")); if(fname.isEmpty()) return; QFileInfo fi(fname); - option.lastSavePath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString() = fi.dirPath(); savename = fname + ".part"; fname = fi.fileName(); @@ -1533,7 +1532,7 @@ public: } } - pa->playSound(option.onevent[eFTComplete]); + pa->playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.completed-file-transfer").toString()); } } }; src/filetransdlg.cpp @@ -32,6 +32,7 @@ #include "psiiconset.h" #include "groupchatdlg.h" #include "common.h" +#include "psioptions.h" static bool caseInsensitiveLessThan(const QString &s1, const QString &s2) { @@ -74,26 +75,26 @@ void GCUserViewGroupItem::paintCell(QPainter *p, const QColorGroup & cg, int col { QColorGroup xcg = cg; QFont f = p->font(); - f.setPointSize(option.smallFontSize); + f.setPointSize(common_smallFontSize); p->setFont(f); - xcg.setColor(QColorGroup::Text, option.color[cGroupFore]); - if (!option.clNewHeadings) { + xcg.setColor(QColorGroup::Text, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>()); + if (!PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool()) { #if QT_VERSION < 0x040301 - xcg.setColor(QColorGroup::Background, option.color[cGroupBack]); + xcg.setColor(QColorGroup::Background, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>()); #else - xcg.setColor(QColorGroup::Base, option.color[cGroupBack]); + xcg.setColor(QColorGroup::Base, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>()); #endif } Q3ListViewItem::paintCell(p, xcg, column, width, alignment); - if (option.clNewHeadings && !isSelected()) { + if (PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool() && !isSelected()) { QFontMetrics fm(p->font()); int x = fm.width(text(column)) + 8; if(x < width - 8) { int h = (height() / 2) - 1; - p->setPen(QPen(option.color[cGroupBack])); + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>())); p->drawLine(x, h, width - 8, h); h++; - p->setPen(QPen(option.color[cGroupFore])); + p->setPen(QPen(PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>())); p->drawLine(x, h, width - 8, h); } } @@ -310,7 +311,7 @@ void GCUserView::qlv_doubleClicked(Q3ListViewItem *i) return; GCUserViewItem *lvi = (GCUserViewItem *)i; - if(option.defaultAction == 0) + if(PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message") action(lvi->text(0), lvi->s, 0); else action(lvi->text(0), lvi->s, 1); src/gcuserview.cpp @@ -65,11 +65,9 @@ #include "stretchwidget.h" #include "mucmanager.h" #include "busywidget.h" -#include "common.h" #include "msgmle.h" #include "iconwidget.h" #include "iconselect.h" -#include "psitoolbar.h" #include "iconaction.h" #include "psitooltip.h" #include "psioptions.h" @@ -455,7 +453,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager) : TabbableWidget(j.userHost(), pa, tabManager) { setAttribute(Qt::WA_DeleteOnClose); - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); nicknumber=0; d = new Private(this); @@ -613,7 +611,7 @@ void GCMainDlg::scrollDown() { void GCMainDlg::keyPressEvent(QKeyEvent *e) { QKeySequence key = e->key() + ( e->modifiers() & ~Qt::KeypadModifier); - if(!option.useTabs && ShortcutManager::instance()->shortcuts("common.close").contains(key)) + if(!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() && ShortcutManager::instance()->shortcuts("common.close").contains(key)) close(); else if(ShortcutManager::instance()->shortcuts("chat.send").contains(key)) mle_returnPressed(); @@ -632,7 +630,7 @@ void GCMainDlg::closeEvent(QCloseEvent *e) void GCMainDlg::resizeEvent(QResizeEvent* e) { - if (option.keepSizes) + if (PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool()) PsiOptions::instance()->setOption("options.ui.muc.size", e->size()); } @@ -1168,8 +1166,8 @@ void GCMainDlg::message(const Message &_m) if (m.body().left(d->self.length()) == d->self) d->lastReferrer = m.from().resource(); - if(option.gcHighlighting) { - for(QStringList::Iterator it=option.gcHighlights.begin();it!=option.gcHighlights.end();it++) { + if(PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool()) { + for(QStringList::Iterator it=PsiOptions::instance()->getOption("options.ui.muc.highlight-words").toStringList().begin();it!=PsiOptions::instance()->getOption("options.ui.muc.highlight-words").toStringList().end();it++) { if(m.body().contains((*it), Qt::CaseInsensitive)) { alert = true; } @@ -1179,11 +1177,11 @@ void GCMainDlg::message(const Message &_m) // play sound? if(from == d->self) { if(!m.spooled()) - account()->playSound(option.onevent[eSend]); + account()->playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.outgoing-chat").toString()); } else { - if(alert || (!option.noGCSound && !m.spooled() && !from.isEmpty()) ) - account()->playSound(option.onevent[eChat2]); + if(alert || (PsiOptions::instance()->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) + account()->playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.chat-message").toString()); } if(from.isEmpty()) @@ -1219,7 +1217,7 @@ void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts if (d->trackBar) d->doTrackBar(); - if (!option.gcHighlighting) + if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool()) alert=false; QDateTime time = QDateTime::currentDateTime(); @@ -1247,22 +1245,22 @@ QString GCMainDlg::getNickColor(QString nick) sender=nicks[nick]; } - if(!option.gcNickColoring || option.gcNickColors.empty()) { + if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList().empty()) { return "#000000"; } - else if(sender == -1 || option.gcNickColors.size() == 1) { - return option.gcNickColors[option.gcNickColors.size()-1]; + else if(sender == -1 || PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList().size() == 1) { + return PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList()[PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList().size()-1]; } else { - int n = sender % (option.gcNickColors.size()-1); - return option.gcNickColors[n]; + int n = sender % (PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList().size()-1); + return PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList()[n]; } } void GCMainDlg::appendMessage(const Message &m, bool alert) { //QString who, color; - if (!option.gcHighlighting) + if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool()) alert=false; QString who, textcolor, nickcolor,alerttagso,alerttagsc; @@ -1299,7 +1297,7 @@ void GCMainDlg::appendMessage(const Message &m, bool alert) txt = TextUtil::linkify(txt); - if(option.useEmoticons) + if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) txt = TextUtil::emoticonify(txt); if( PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() ) txt = TextUtil::legacyFormat(txt); @@ -1309,7 +1307,7 @@ void GCMainDlg::appendMessage(const Message &m, bool alert) ui_.log->appendText(QString("").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(Qt::escape(who)) + alerttagso + txt + alerttagsc + ""); } else { - if(option.chatSays) { + if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) { //ui_.log->append(QString("").arg(color) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(Qt::escape(who)) + " " + txt); ui_.log->appendText(QString("").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(Qt::escape(who)) + " " + QString("").arg(textcolor) + alerttagso + txt + alerttagsc + ""); } @@ -1370,11 +1368,11 @@ void GCMainDlg::setLooks() // update the fonts QFont f; - f.fromString(option.font[fChat]); + f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString()); ui_.log->setFont(f); ui_.mle->chatEdit()->setFont(f); - f.fromString(option.font[fRoster]); + f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString()); ui_.lv_users->Q3ListView::setFont(f); if (PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) { @@ -1384,7 +1382,7 @@ void GCMainDlg::setLooks() } else { ui_.toolbar->hide(); - ui_.tb_emoticons->setVisible(option.useEmoticons); + ui_.tb_emoticons->setVisible(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()); ui_.tb_actions->show(); } src/groupchatdlg.cpp @@ -48,6 +48,7 @@ #include "textutil.h" #include "jidutil.h" #include "userlist.h" +#include "psioptions.h" static QString getNext(QString *str) { @@ -130,7 +131,7 @@ HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) : QWidget(0, 0) { setAttribute(Qt::WA_DeleteOnClose); - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); d = new Private; d->pa = pa; @@ -287,19 +288,19 @@ void HistoryDlg::doNext() void HistoryDlg::doSave() { - if(option.lastSavePath.isEmpty()) { - option.lastSavePath = QDir::homeDirPath(); + if(PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString().isEmpty()) { + PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString() = QDir::homeDirPath(); } UserListItem *u = d->pa->findFirstRelevant(d->jid); QString them = JIDUtil::nickOrJid(u->name(), u->jid().full()); QString s = JIDUtil::encode(them).toLower(); - QString str = option.lastSavePath + "/" + s + ".txt"; + QString str = PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString() + "/" + s + ".txt"; str = QFileDialog::getSaveFileName(this, tr("Export message history"), str, tr("Text files (*.txt);;All files (*.*)")); if(!str.isEmpty()) { QFileInfo fi(str); - option.lastSavePath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-save-path").toString() = fi.dirPath(); exportHistory(str); } } src/historydlg.cpp @@ -43,6 +43,8 @@ #include "iconwidget.h" #include "contactview.h" #include "psirichtext.h" +#include "psioptions.h" +#include "psioptions.h" using namespace XMPP; @@ -69,7 +71,7 @@ InfoDlg::InfoDlg(int type, const Jid &j, const VCard &vcard, PsiAccount *pa, QWi : QDialog(parent) { setAttribute(Qt::WA_DeleteOnClose); - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); ui_.setupUi(this); d = new Private; @@ -496,16 +498,16 @@ void InfoDlg::textChanged() void InfoDlg::selectPhoto() { while(1) { - if(option.lastPath.isEmpty()) - option.lastPath = QDir::homeDirPath(); - QString str = QFileDialog::getOpenFileName(this, tr("Choose a file"), option.lastPath, tr("Images (*.png *.xpm *.jpg *.PNG *.XPM *.JPG)")); + if(PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString().isEmpty()) + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = QDir::homeDirPath(); + QString str = QFileDialog::getOpenFileName(this, tr("Choose a file"), PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString(), tr("Images (*.png *.xpm *.jpg *.PNG *.XPM *.JPG)")); if(!str.isEmpty()) { QFileInfo fi(str); if(!fi.exists()) { QMessageBox::information(this, tr("Error"), tr("The file specified does not exist.")); continue; } - option.lastPath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = fi.dirPath(); //printf(QDir::convertSeparators(fi.filePath())); // put the image in the preview box src/infodlg.cpp @@ -36,7 +36,6 @@ #include <stdlib.h> #include <time.h> -#include "profiles.h" #include "profiledlg.h" #include "activeprofiles.h" src/main.cpp @@ -238,7 +238,7 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon *psi, const char *name) { setObjectName(name); setAttribute(Qt::WA_AlwaysShowToolTips); - if ( option.brushedMetal ) { + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) { setAttribute(Qt::WA_MacMetalStyle); } d = new Private(psi, this); @@ -382,7 +382,7 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon *psi, const char *name) d->getAction("help_psi_muc")->addTo (helpMenu); d->getAction("help_report_bug")->addTo (helpMenu); #else - if (option.hideMenubar) { + if (!PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool()) { mainMenuBar()->hide(); } //else @@ -391,7 +391,7 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon *psi, const char *name) d->optionsButton->setMenu( d->optionsMenu ); d->statusButton->setMenu( d->statusMenu ); - buildToolbars(); + buildinitialToolbars(); setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.contactlist.opacity").toInt()))/100); @@ -488,7 +488,7 @@ void MainWin::registerAction( IconAction *action ) // special cases if ( aName == "menu_play_sounds" ) { - action->setChecked( useSound ); + action->setChecked(PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool()); } //else if ( aName == "foobar" ) // ; @@ -500,14 +500,15 @@ void MainWin::registerAction( IconAction *action ) QObject *sender; const char *signal; const char *slot; + bool checked; } reverseactionlist[] = { - { "show_away", cvlist, SIGNAL( showAway(bool) ), setChecked }, - { "show_hidden", cvlist, SIGNAL( showHidden(bool) ), setChecked }, - { "show_offline", cvlist, SIGNAL( showOffline(bool) ), setChecked }, - { "show_self", cvlist, SIGNAL( showSelf(bool) ), setChecked }, - { "show_agents", cvlist, SIGNAL( showAgents(bool) ), setChecked }, - { "show_statusmsg", cvlist, SIGNAL( showStatusMsg(bool) ), setChecked }, - { "", 0, 0, 0 } + { "show_away", cvlist, SIGNAL( showAway(bool) ), setChecked, cvlist->isShowAway()}, + { "show_hidden", cvlist, SIGNAL( showHidden(bool) ), setChecked, cvlist->isShowHidden()}, + { "show_offline", cvlist, SIGNAL( showOffline(bool) ), setChecked, cvlist->isShowOffline()}, + { "show_self", cvlist, SIGNAL( showSelf(bool) ), setChecked, cvlist->isShowSelf()}, + { "show_agents", cvlist, SIGNAL( showAgents(bool) ), setChecked, cvlist->isShowAgents()}, + { "show_statusmsg", cvlist, SIGNAL( showStatusMsg(bool) ), setChecked, cvlist->isShowStatusMsg()}, + { "", 0, 0, 0, false } }; for ( i = 0; !(aName = QString(reverseactionlist[i].name)).isEmpty(); i++ ) { @@ -519,7 +520,7 @@ void MainWin::registerAction( IconAction *action ) action->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.status-messages.show").toBool() ); } else - action->setChecked( true ); + action->setChecked( reverseactionlist[i].checked ); } } } @@ -629,51 +630,35 @@ QMenuBar* MainWin::mainMenuBar() const #endif } -void MainWin::buildToolbars() +void MainWin::addToolbar(const QString &base) { - while ( option.toolbars["mainWin"].count() < toolbars.count() && toolbars.count() ) { - PsiToolBar *tb = toolbars.last(); - toolbars.removeLast(); - delete tb; - } - - for (int i = 0; i < option.toolbars["mainWin"].count(); i++) { - PsiToolBar *tb = 0; - if ( i < toolbars.count() ) { - tb = toolbars.at(i); - } - - Options::ToolbarPrefs &tbPref = option.toolbars["mainWin"][i]; - if ( tb && !tbPref.dirty ) { - continue; - } - - if ( tb ) { - delete tb; - } - - tb = new PsiToolBar(tbPref.name, this, d->psi); - moveDockWindow ( tb, tbPref.dock, tbPref.nl, tbPref.index, tbPref. extraOffset ); + PsiToolBar *tb = PsiToolBar::fromOptions(base, this, d->psi, PsiActionList::Actions_MainWin); + + //connect( tb, SIGNAL( registerAction( IconAction * ) ), SLOT( registerAction( IconAction * ) ) ); + + toolbars << tb; +} - tb->setGroup( "mainWin", i ); - tb->setType( PsiActionList::Actions_MainWin ); - //connect( tb, SIGNAL( registerAction( IconAction * ) ), SLOT( registerAction( IconAction * ) ) ); - tb->initialize( tbPref, false ); - if ( i < toolbars.count() ) { - toolbars.removeAt(i); - } - toolbars.insert(i, tb); +void MainWin::buildinitialToolbars() +{ + QStringList bases = PsiOptions::instance()->getChildOptionNames("options.ui.contactlist.toolbars", true, true); + foreach(QString base, bases) { + addToolbar(base); } } + void MainWin::saveToolbarsPositions() { +/* + LEGOPTFIXME for (int i = 0; i < toolbars.count(); i++) { - Options::ToolbarPrefs &tbPref = option.toolbars["mainWin"][i]; + Options::ToolbarPrefs &tbPref = LEGOPTS.toolbars["mainWin"][i]; getLocation ( toolbars.at(i), tbPref.dock, tbPref.index, tbPref.nl, tbPref.extraOffset ); tbPref.on = toolbars.at(i)->isVisible(); } +*/ } bool MainWin::showDockMenu(const QPoint &) @@ -818,7 +803,7 @@ void MainWin::actAboutQtActivated () void MainWin::actPlaySoundsActivated (bool state) { - useSound = state; + PsiOptions::instance()->setOption("options.ui.notifications.sounds.enable", state); } void MainWin::actPublishTuneActivated (bool state) @@ -888,7 +873,7 @@ void MainWin::decorateButton(int status) if(status == -1) { d->statusButton->setText(tr("Connecting")); - if (option.alertStyle != 0) { + if (PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() != "no") { d->statusButton->setAlert(IconsetFactory::iconPtr("psi/connect")); d->statusGroup->setPsiIcon(IconsetFactory::iconPtr("psi/connect")); } @@ -1020,7 +1005,7 @@ void MainWin::optionsUpdate() decorateButton(status); #ifndef Q_WS_MAC - if (option.hideMenubar) { + if (!PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool()) { mainMenuBar()->hide(); } else { @@ -1068,7 +1053,7 @@ void MainWin::setTrayToolTip(const Status &status, bool) void MainWin::trayClicked(const QPoint &, int button) { - if(option.dockDCstyle) { + if(PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) { return; } @@ -1087,7 +1072,7 @@ void MainWin::trayClicked(const QPoint &, int button) void MainWin::trayDoubleClicked() { - if(!option.dockDCstyle) { + if(!PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) { return; } src/mainwin.cpp @@ -61,9 +61,8 @@ public: QMap<QString, QAction*> actions; ContactView *cvlist; - QList<PsiToolBar*> toolbars; + void addToolbar(const QString &base); - void buildToolbars(); void saveToolbarsPositions(); PsiCon *psiCon() const; @@ -154,6 +153,7 @@ public slots: private: void buildGeneralMenu(QMenu *); + void buildinitialToolbars(); QString numEventsString(int) const; bool askQuit(); @@ -165,6 +165,7 @@ private: class Private; Private *d; friend class Private; + QList<PsiToolBar*> toolbars; }; #endif src/mainwin.h @@ -18,7 +18,6 @@ * */ -#include "common.h" #include "mainwin_p.h" #include <qapplication.h> src/mainwin_p.cpp @@ -62,7 +62,7 @@ void MiniClient::reset() conn = 0; } -void MiniClient::connectToServer(const Jid &jid, bool legacy_ssl_probe, bool legacy_ssl, bool forcessl, const QString &_host, int _port, ProxyManager *pm, int proxy, QString *_pass) +void MiniClient::connectToServer(const Jid &jid, bool legacy_ssl_probe, bool legacy_ssl, bool forcessl, const QString &_host, int _port, ProxyManager *pm, QString proxy, QString *_pass) { j = jid; @@ -77,8 +77,8 @@ void MiniClient::connectToServer(const Jid &jid, bool legacy_ssl_probe, bool leg } AdvancedConnector::Proxy p; - if(proxy > 0) { - const ProxyItem &pi = pm->getItem(proxy-1); + if(proxy != "") { + const ProxyItem &pi = pm->getItem(proxy); if(pi.type == "http") // HTTP Connect p.setHttpConnect(pi.settings.host, pi.settings.port); else if(pi.type == "socks") // SOCKS src/miniclient.cpp @@ -46,7 +46,7 @@ public: ~MiniClient(); void reset(); - void connectToServer(const XMPP::Jid &j, bool legacy_ssl_probe, bool legacy_ssl, bool force_ssl, const QString &host, int port, ProxyManager *pm, int proxy, QString *pass = NULL); + void connectToServer(const XMPP::Jid &j, bool legacy_ssl_probe, bool legacy_ssl, bool force_ssl, const QString &host, int port, ProxyManager *pm, QString proxy, QString *pass = NULL); void close(); XMPP::Client *client(); void setErrorOnDisconnect(bool); src/miniclient.h @@ -32,7 +32,6 @@ #include <QTextDocument> #include <QTimer> -#include "common.h" #include "msgmle.h" #include "shortcutmanager.h" #include "spellhighlighter.h" @@ -128,7 +127,7 @@ void ChatView::keyPressEvent(QKeyEvent *e) */ void ChatView::autoCopy() { - if (isReadOnly() && option.autoCopy) { + if (isReadOnly() && PsiOptions::instance()->getOption("options.ui.automatically-copy-selected-text").toBool()) { copy(); } } @@ -285,7 +284,7 @@ void ChatEdit::keyPressEvent(QKeyEvent *e) e->ignore(); else*/ if(e->key() == Qt::Key_U && (e->modifiers() & Qt::ControlModifier)) setText(""); -/* else if((e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && !((e->modifiers() & Qt::ShiftModifier) || (e->modifiers() & Qt::AltModifier)) && option.chatSoftReturn) +/* else if((e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && !((e->modifiers() & Qt::ShiftModifier) || (e->modifiers() & Qt::AltModifier)) && LEGOPTS.chatSoftReturn) e->ignore(); else if((e->key() == Qt::Key_PageUp || e->key() == Qt::Key_PageDown) && (e->modifiers() & Qt::ShiftModifier)) e->ignore(); src/msgmle.cpp @@ -72,6 +72,11 @@ QWidget *OptionsTabAdvanced::widget() "Normal - messages come as messages, chats come as chats." "Messages - All messages/chats come as messages, no matter what their original form was." "Chats - All messages/chats come as chats, no matter what their original form was.")); + + d->cb_incomingAs->setItemData(0, "no"); + d->cb_incomingAs->setItemData(1, "message"); + d->cb_incomingAs->setItemData(2, "chat"); + d->cb_incomingAs->setItemData(3, "current-open"); QWhatsThis::add(d->ck_showSubjects, tr("Makes Psi show separate subject line in messages. Uncheck this if you want to save some screen space.")); QWhatsThis::add(d->ck_showCounter, @@ -92,56 +97,56 @@ QWidget *OptionsTabAdvanced::widget() return w; } -void OptionsTabAdvanced::applyOptions(Options *opt) +void OptionsTabAdvanced::applyOptions() { if ( !w ) return; OptAdvancedUI *d = (OptAdvancedUI *)w; - opt->messageEvents = d->ck_messageevents->isChecked(); - opt->inactiveEvents = d->ck_inactiveevents->isChecked(); - opt->useRC = d->ck_rc->isChecked(); + PsiOptions::instance()->setOption("options.messages.send-composing-events", d->ck_messageevents->isChecked()); + PsiOptions::instance()->setOption("options.messages.send-inactivity-events", d->ck_inactiveevents->isChecked()); + PsiOptions::instance()->setOption("options.external-control.adhoc-remote-control.enable", d->ck_rc->isChecked()); if ( SpellChecker::instance()->available() ) PsiOptions::instance()->setOption("options.ui.spell-check.enabled",d->ck_spell->isChecked()); PsiOptions::instance()->setOption("options.html.chat.render", d->ck_contactsMessageFormatting->isChecked()); - opt->autoCopy = d->ck_autocopy->isChecked(); - opt->singleclick = d->ck_singleclick->isChecked(); - opt->jidComplete = d->ck_jidComplete->isChecked(); - opt->grabUrls = d->ck_grabUrls->isChecked(); - opt->incomingAs = d->cb_incomingAs->currentItem(); - opt->showSubjects = d->ck_showSubjects->isChecked(); - opt->showCounter = d->ck_showCounter->isChecked(); - opt->autoVCardOnLogin = d->ck_autoVCardOnLogin->isChecked(); - opt->rosterAnim = d->ck_rosterAnim->isChecked(); - opt->scrollTo = d->ck_scrollTo->isChecked(); - opt->ignoreHeadline = d->ck_ignoreHeadline->isChecked(); + PsiOptions::instance()->setOption("options.ui.automatically-copy-selected-text", d->ck_autocopy->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.use-single-click", d->ck_singleclick->isChecked()); + PsiOptions::instance()->setOption("options.ui.message.use-jid-auto-completion", d->ck_jidComplete->isChecked()); + PsiOptions::instance()->setOption("options.ui.message.auto-grab-urls-from-clipboard", d->ck_grabUrls->isChecked()); + PsiOptions::instance()->setOption("options.messages.force-incoming-message-type", d->cb_incomingAs->itemData(d->cb_incomingAs->currentItem())); + PsiOptions::instance()->setOption("options.ui.message.show-subjects", d->ck_showSubjects->isChecked()); + PsiOptions::instance()->setOption("options.ui.message.show-character-count", d->ck_showCounter->isChecked()); + PsiOptions::instance()->setOption("options.vcard.query-own-vcard-on-login", d->ck_autoVCardOnLogin->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.use-status-change-animation", d->ck_rosterAnim->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.ensure-contact-visible-on-event", d->ck_scrollTo->isChecked()); + PsiOptions::instance()->setOption("options.messages.ignore-headlines", d->ck_ignoreHeadline->isChecked()); } -void OptionsTabAdvanced::restoreOptions(const Options *opt) +void OptionsTabAdvanced::restoreOptions() { if ( !w ) return; OptAdvancedUI *d = (OptAdvancedUI *)w; - d->ck_messageevents->setChecked( opt->messageEvents ); - d->ck_inactiveevents->setChecked( opt->inactiveEvents ); - d->ck_rc->setChecked( opt->useRC ); + d->ck_messageevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool() ); + d->ck_inactiveevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-inactivity-events").toBool() ); + d->ck_rc->setChecked( PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool() ); if ( !SpellChecker::instance()->available() ) d->ck_spell->setChecked(false); else d->ck_spell->setChecked(PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool()); d->ck_contactsMessageFormatting->setChecked(PsiOptions::instance()->getOption("options.html.chat.render").toBool()); - d->ck_autocopy->setChecked( opt->autoCopy ); - d->ck_singleclick->setChecked( opt->singleclick ); - d->ck_jidComplete->setChecked( opt->jidComplete ); - d->ck_grabUrls->setChecked( opt->grabUrls ); - d->cb_incomingAs->setCurrentItem( opt->incomingAs ); - d->ck_showSubjects->setChecked( opt->showSubjects ); - d->ck_showCounter->setChecked( opt->showCounter ); - d->ck_autoVCardOnLogin->setChecked( opt->autoVCardOnLogin ); - d->ck_rosterAnim->setChecked( opt->rosterAnim ); - d->ck_scrollTo->setChecked( opt->scrollTo ); - d->ck_ignoreHeadline->setChecked( opt->ignoreHeadline ); + d->ck_autocopy->setChecked( PsiOptions::instance()->getOption("options.ui.automatically-copy-selected-text").toBool() ); + d->ck_singleclick->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-single-click").toBool() ); + d->ck_jidComplete->setChecked( PsiOptions::instance()->getOption("options.ui.message.use-jid-auto-completion").toBool() ); + d->ck_grabUrls->setChecked( PsiOptions::instance()->getOption("options.ui.message.auto-grab-urls-from-clipboard").toBool() ); + d->cb_incomingAs->setCurrentItem(d->cb_incomingAs->findData( PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString())); + d->ck_showSubjects->setChecked( PsiOptions::instance()->getOption("options.ui.message.show-subjects").toBool() ); + d->ck_showCounter->setChecked( PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() ); + d->ck_autoVCardOnLogin->setChecked( PsiOptions::instance()->getOption("options.vcard.query-own-vcard-on-login").toBool() ); + d->ck_rosterAnim->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-status-change-animation").toBool() ); + d->ck_scrollTo->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.ensure-contact-visible-on-event").toBool() ); + d->ck_ignoreHeadline->setChecked( PsiOptions::instance()->getOption("options.messages.ignore-headlines").toBool() ); } src/options/opt_advanced.cpp @@ -4,7 +4,6 @@ #include "optionstab.h" class QWidget; -struct Options; class OptionsTabAdvanced : public OptionsTab { @@ -14,8 +13,8 @@ public: ~OptionsTabAdvanced(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private: QWidget *w; src/options/opt_advanced.h @@ -86,12 +86,10 @@ OptionsTabAppearanceMisc::OptionsTabAppearanceMisc(QObject *parent) : OptionsTab(parent, "appearance_misc", "", tr("Misc."), tr("Miscellaneous Settings")) { w = 0; - o = new Options; } OptionsTabAppearanceMisc::~OptionsTabAppearanceMisc() { - delete o; } QWidget *OptionsTabAppearanceMisc::widget() @@ -104,31 +102,31 @@ QWidget *OptionsTabAppearanceMisc::widget() return w; } -void OptionsTabAppearanceMisc::applyOptions(Options *opt) +void OptionsTabAppearanceMisc::applyOptions() { if ( !w ) return; OptAppearanceMiscUI *d = (OptAppearanceMiscUI *)w; - opt->clNewHeadings = d->ck_newHeadings->isChecked(); - opt->outlineHeadings = d->ck_outlineHeadings->isChecked(); + PsiOptions::instance()->setOption("options.ui.look.contactlist.use-slim-group-headings", d->ck_newHeadings->isChecked()); + PsiOptions::instance()->setOption("options.ui.look.contactlist.use-outlined-group-headings", d->ck_outlineHeadings->isChecked()); PsiOptions::instance()->setOption("options.ui.contactlist.opacity", d->sl_rosterop->value()); PsiOptions::instance()->setOption("options.ui.chat.opacity", d->sl_chatdlgop->value()); } -void OptionsTabAppearanceMisc::restoreOptions(const Options *opt) +void OptionsTabAppearanceMisc::restoreOptions() { if ( !w ) return; OptAppearanceMiscUI *d = (OptAppearanceMiscUI *)w; - d->ck_newHeadings->setChecked( opt->clNewHeadings ); - d->ck_outlineHeadings->setChecked( opt->outlineHeadings ); + d->ck_newHeadings->setChecked(PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool()); + d->ck_outlineHeadings->setChecked(PsiOptions::instance()->getOption("options.ui.look.contactlist.use-outlined-group-headings").toBool()); - d->sl_rosterop->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.opacity").toInt() ); - d->sl_chatdlgop->setValue( PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt() ); + d->sl_rosterop->setValue(PsiOptions::instance()->getOption("options.ui.contactlist.opacity").toInt()); + d->sl_chatdlgop->setValue(PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()); } void OptionsTabAppearanceMisc::setData(PsiCon *, QWidget *parentDialog) @@ -146,7 +144,6 @@ OptionsTabAppearanceGeneral::OptionsTabAppearanceGeneral(QObject *parent) w = 0; bg_font = 0; bg_color = 0; - o = new Options; } OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral() @@ -155,12 +152,10 @@ OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral() delete bg_font; if ( bg_color ) delete bg_color; - delete o; } -static QPixmap name2color(QString name) // taken from opt_general.cpp +static QPixmap color2pixmap(QColor c) // taken from opt_general.cpp { - QColor c(name); QPixmap pix(16, 16); QPainter p(&pix); @@ -256,38 +251,71 @@ QWidget *OptionsTabAppearanceGeneral::widget() return w; } -void OptionsTabAppearanceGeneral::applyOptions(Options *opt) + +static QColor getColor(QToolButton *button) +{ + return button->property("psi_color").value<QColor>(); +} + +void OptionsTabAppearanceGeneral::applyOptions() { if ( !w ) return; - //OptAppearanceUI *d = (OptAppearanceUI *)w; - //opt->avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars + OptAppearanceUI *d = (OptAppearanceUI *)w; + //LEGOPTS.avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars + PsiOptions::instance()->setOption("options.ui.look.font.contactlist", d->le_fRoster->fontName()); + PsiOptions::instance()->setOption("options.ui.look.font.message", d->le_fMessage->fontName()); + PsiOptions::instance()->setOption("options.ui.look.font.chat", d->le_fChat->fontName()); + PsiOptions::instance()->setOption("options.ui.look.font.passive-popup", d->le_fPopup->fontName()); int n; - for (n = 0; n < 4; ++n) - opt->font[n] = le_font[n]->fontName(); - for (n = 0; n < cNumColors; ++n) - opt->color[n] = o->color[n]; + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.online", getColor(d->pb_cOnline)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.offline", getColor(d->pb_cOffline)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.away", getColor(d->pb_cAway)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.do-no-disturb", getColor(d->pb_cDND)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.profile.header-foreground", getColor(d->pb_cProfileFore)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.profile.header-background", getColor(d->pb_cProfileBack)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.grouping.header-foreground", getColor(d->pb_cGroupFore)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.grouping.header-background", getColor(d->pb_cGroupBack)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.background", getColor(d->pb_cListBack)); + PsiOptions::instance()->setOption("options.ui.look.contactlist.status-change-animation.color1", getColor(d->pb_cAnimFront)); + PsiOptions::instance()->setOption("options.ui.look.contactlist.status-change-animation.color2", getColor(d->pb_cAnimBack)); + PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status-messages", getColor(d->pb_cStatus)); } -void OptionsTabAppearanceGeneral::restoreOptions(const Options *opt) +static void restoreColor(QToolButton *button, QColor c) +{ + button->setProperty("psi_color", c); + button->setPixmap(color2pixmap(c)); +} + +void OptionsTabAppearanceGeneral::restoreOptions() { if ( !w ) return; - //OptAppearanceUI *d = (OptAppearanceUI *)w; - //d->ck_avatarsChatdlg->setChecked( opt->avatarsChatdlgEnabled ); // Avatars - - int n; - for (n = 0; n < 4; ++n) - le_font[n]->setFont(opt->font[n]); - - for (n = 0; n < cNumColors; ++n) { - o->color[n] = opt->color[n]; - ((QPushButton*) (bg_color->buttons()[n]))->setPixmap(name2color(opt->color[n].name())); - } + OptAppearanceUI *d = (OptAppearanceUI *)w; + //d->ck_avatarsChatdlg->setChecked( LEGOPTS.avatarsChatdlgEnabled ); // Avatars + + d->le_fRoster->setFont(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString()); + d->le_fMessage->setFont(PsiOptions::instance()->getOption("options.ui.look.font.message").toString()); + d->le_fChat->setFont(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString()); + d->le_fPopup->setFont(PsiOptions::instance()->getOption("options.ui.look.font.passive-popup").toString()); + + restoreColor(d->pb_cOnline, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.online").value<QColor>()); + restoreColor(d->pb_cOffline, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.offline").value<QColor>()); + restoreColor(d->pb_cAway, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.away").value<QColor>()); + restoreColor(d->pb_cDND, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.do-no-disturb").value<QColor>()); + restoreColor(d->pb_cProfileFore, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.profile.header-foreground").value<QColor>()); + restoreColor(d->pb_cProfileBack, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.profile.header-background").value<QColor>()); + restoreColor(d->pb_cGroupFore, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-foreground").value<QColor>()); + restoreColor(d->pb_cGroupBack, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.grouping.header-background").value<QColor>()); + restoreColor(d->pb_cListBack, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.background").value<QColor>()); + restoreColor(d->pb_cAnimFront, PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color1").value<QColor>()); + restoreColor(d->pb_cAnimBack, PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color2").value<QColor>()); + restoreColor(d->pb_cStatus, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status-messages").value<QColor>()); } void OptionsTabAppearanceGeneral::setData(PsiCon *, QWidget *parentDialog) @@ -312,14 +340,15 @@ void OptionsTabAppearanceGeneral::chooseFont(QAbstractButton* button) void OptionsTabAppearanceGeneral::chooseColor(QAbstractButton* button) { QColor c; - int x = (bg_color->buttons()).indexOf(button); + //int x = (bg_color->buttons()).indexOf(button); - c = o->color[x]; + c = button->property("psi_color").value<QColor>(); c = QColorDialog::getColor(c, parentWidget); if(c.isValid()) { - o->color[x] = c; - ((QPushButton*) bg_color->buttons()[x])->setPixmap(name2color(o->color[x].name())); + button->setProperty("psi_color", c); + //((QPushButton*) bg_color->buttons()[x])->setPixmap(name2color(o->color[x].name())); + button->setPixmap(color2pixmap(c)); emit dataChanged(); } src/options/opt_appearance.cpp @@ -23,7 +23,6 @@ private: }; class QWidget; -struct Options; class QButtonGroup; class QLineEdit; @@ -42,15 +41,14 @@ public: ~OptionsTabAppearanceMisc(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private slots: void setData(PsiCon *, QWidget *); private: QWidget *w, *parentWidget; - Options *o; }; class OptionsTabAppearanceGeneral : public OptionsTab @@ -61,8 +59,8 @@ public: ~OptionsTabAppearanceGeneral(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private slots: void setData(PsiCon *, QWidget *); @@ -74,7 +72,6 @@ private: QButtonGroup *bg_color; FontLabel *le_font[4]; QButtonGroup *bg_font; - Options *o; }; #endif src/options/opt_appearance.h @@ -1,6 +1,7 @@ #include "opt_application.h" #include "common.h" #include "iconwidget.h" +#include "psioptions.h" #include <qcheckbox.h> #include <qcombobox.h> @@ -72,50 +73,50 @@ QWidget *OptionsTabApplication::widget() return w; } -void OptionsTabApplication::applyOptions(Options *opt) +void OptionsTabApplication::applyOptions() { if ( !w ) return; OptApplicationUI *d = (OptApplicationUI *)w; - opt->alwaysOnTop = d->ck_alwaysOnTop->isChecked(); - opt->autoRosterSize = d->ck_autoRosterSize->isChecked(); - opt->keepSizes = d->ck_keepSizes->isChecked(); - opt->useleft = d->ck_useleft->isChecked(); - opt->hideMenubar = !d->ck_showMenubar->isChecked(); + 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()); // docklet - opt->useDock = d->ck_docklet->isChecked(); - opt->dockDCstyle = d->ck_dockDCstyle->isChecked(); - opt->dockHideMW = d->ck_dockHideMW->isChecked(); - opt->dockToolMW = d->ck_dockToolMW->isChecked(); + PsiOptions::instance()->setOption("options.ui.systemtray.enable", d->ck_docklet->isChecked()); + PsiOptions::instance()->setOption("options.ui.systemtray.use-double-click", d->ck_dockDCstyle->isChecked()); + PsiOptions::instance()->setOption("options.contactlist.hide-on-start", d->ck_dockHideMW->isChecked()); + PsiOptions::instance()->setOption("options.contactlist.use-toolwindow", d->ck_dockToolMW->isChecked()); // data transfer - opt->dtPort = d->le_dtPort->text().toInt(); - opt->dtExternal = d->le_dtExternal->text().trimmed(); + PsiOptions::instance()->setOption("options.p2p.bytestreams.listen-port", d->le_dtPort->text().toInt()); + PsiOptions::instance()->setOption("options.p2p.bytestreams.external-address", d->le_dtExternal->text().trimmed()); } -void OptionsTabApplication::restoreOptions(const Options *opt) +void OptionsTabApplication::restoreOptions() { if ( !w ) return; OptApplicationUI *d = (OptApplicationUI *)w; - d->ck_alwaysOnTop->setChecked( opt->alwaysOnTop ); - d->ck_autoRosterSize->setChecked( opt->autoRosterSize ); - d->ck_keepSizes->setChecked( opt->keepSizes ); - d->ck_showMenubar->setChecked( !opt->hideMenubar ); - d->ck_useleft->setChecked( opt->useleft ); + 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() ); // docklet - d->ck_docklet->setChecked( opt->useDock ); - d->ck_dockDCstyle->setChecked( opt->dockDCstyle ); - d->ck_dockHideMW->setChecked( opt->dockHideMW ); - d->ck_dockToolMW->setChecked( opt->dockToolMW ); + d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() ); + d->ck_dockDCstyle->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool() ); + d->ck_dockHideMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool() ); + d->ck_dockToolMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool() ); // data transfer - d->le_dtPort->setText( QString::number(opt->dtPort) ); - d->le_dtExternal->setText( opt->dtExternal ); + d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) ); + d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() ); } src/options/opt_application.cpp @@ -4,7 +4,6 @@ #include "optionstab.h" class QWidget; -struct Options; class QButtonGroup; class OptionsTabApplication : public OptionsTab @@ -15,8 +14,8 @@ public: ~OptionsTabApplication(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private: QWidget *w; src/options/opt_application.h @@ -90,21 +90,36 @@ QWidget *OptionsTabChat::widget() return w; } -void OptionsTabChat::applyOptions(Options *opt) +void OptionsTabChat::applyOptions() { if ( !w ) return; OptChatUI *d = (OptChatUI *)w; - opt->defaultAction = bg_defAct->buttons().indexOf(bg_defAct->checkedButton()); - opt->alertOpenChats = d->ck_alertOpenChats->isChecked(); - opt->raiseChatWindow = d->ck_raiseChatWindow->isChecked(); - opt->oldSmallChats = opt->smallChats; - opt->smallChats = d->ck_smallChats->isChecked(); - opt->delChats = bg_delChats->buttons().indexOf( bg_delChats->checkedButton() ); - opt->useTabs = d->ck_tabChats->isChecked(); - opt->chatLineEdit = d->ck_autoResize->isChecked(); + PsiOptions::instance()->setOption("options.messages.default-outgoing-message-type", bg_defAct->buttons().indexOf(bg_defAct->checkedButton()) ? "message" : "chat"); + PsiOptions::instance()->setOption("options.ui.chat.alert-for-already-open-chats", d->ck_alertOpenChats->isChecked()); + PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked()); + PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked()); + + QString delafter; + switch (bg_delChats->buttons().indexOf( bg_delChats->checkedButton() )) { + case 0: + delafter = "instant"; + break; + case 1: + delafter = "hour"; + break; + case 2: + delafter = "day"; + break; + case 3: + delafter = "never"; + break; + } + PsiOptions::instance()->setOption("options.ui.chat.delete-contents-after", delafter); + PsiOptions::instance()->setOption("options.ui.tabs.use-tabs", d->ck_tabChats->isChecked()); + PsiOptions::instance()->setOption("options.ui.chat.use-expanding-line-edit", d->ck_autoResize->isChecked()); // Soft return. // Only update this if the value actually changed, or else custom presets @@ -122,20 +137,28 @@ void OptionsTabChat::applyOptions(Options *opt) } } -void OptionsTabChat::restoreOptions(const Options *opt) +void OptionsTabChat::restoreOptions() { if ( !w ) return; OptChatUI *d = (OptChatUI *)w; - bg_defAct->buttons()[opt->defaultAction]->setChecked(true); - d->ck_alertOpenChats->setChecked( opt->alertOpenChats ); - d->ck_raiseChatWindow->setChecked( opt->raiseChatWindow ); - d->ck_smallChats->setChecked( opt->smallChats ); - d->ck_tabChats->setChecked( opt->useTabs ); - d->ck_autoResize->setChecked( opt->chatLineEdit ); - bg_delChats->buttons()[opt->delChats]->setChecked(true); + bg_defAct->buttons()[PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message" ? 0 : 1]->setChecked(true); + d->ck_alertOpenChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() ); + d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() ); + d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() ); + d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() ); + d->ck_autoResize->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() ); + QString delafter = PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString(); + if (delafter == "instant") { + d->rb_delChatsClose->setChecked(true); + } else if (delafter == "hour") { + d->rb_delChatsHour->setChecked(true); + } else if (delafter == "day") { + d->rb_delChatsDay->setChecked(true); + } else if (delafter == "never") { + d->rb_delChatsNever->setChecked(true); + } d->ck_chatSoftReturn->setChecked(ShortcutManager::instance()->shortcuts("chat.send").contains(QKeySequence(Qt::Key_Return))); - } src/options/opt_chat.cpp @@ -4,7 +4,6 @@ #include "optionstab.h" class QWidget; -struct Options; class QButtonGroup; class OptionsTabChat : public OptionsTab @@ -15,8 +14,8 @@ public: ~OptionsTabChat(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private: QWidget *w; src/options/opt_chat.h @@ -8,6 +8,7 @@ #include <qlabel.h> #include <qcombobox.h> #include <qlineedit.h> +#include "psioptions.h" #include "ui_opt_events.h" @@ -54,6 +55,10 @@ QWidget *OptionsTabEvents::widget() " not already in your list of contacts.")); QWhatsThis::add(d->cb_animation, tr("What kind of animation should psi use for incoming event icons on the main window?")); + + d->cb_animation->setItemData ( 0, "no"); + d->cb_animation->setItemData ( 1, "blink"); + d->cb_animation->setItemData ( 2, "animate"); /* QWhatsThis::add(d->rb_aSolid, tr("Does not animate or blink incoming event icons on the main window as they are received.")); QWhatsThis::add(d->rb_aBlink, @@ -65,6 +70,11 @@ QWidget *OptionsTabEvents::widget() QWhatsThis::add(d->ck_notifyAuth, tr("Makes Psi notify you when your authorization request was approved.")); + + d->cb_bounce->setItemData(0, "never"); + d->cb_bounce->setItemData(1, "once"); + d->cb_bounce->setItemData(2, "forever"); + #ifndef Q_WS_MAC d->cb_bounce->hide(); d->lb_bounce->hide(); @@ -77,58 +87,58 @@ QWidget *OptionsTabEvents::widget() return w; } -void OptionsTabEvents::applyOptions(Options *opt) +void OptionsTabEvents::applyOptions() { if ( !w ) return; OptEventsUI *d = (OptEventsUI *)w; - opt->popupMsgs = d->ck_popupMsgs->isChecked(); - opt->popupChats = d->ck_popupMsgs->isChecked(); - opt->popupHeadlines = d->ck_popupHeadlines->isChecked(); - opt->popupFiles = d->ck_popupFiles->isChecked(); - opt->noAwayPopup = !d->ck_allowAwayPopup->isChecked(); - opt->noUnlistedPopup = !d->ck_allowUnlistedPopup->isChecked(); - opt->raise = d->ck_raise->isChecked(); - opt->ignoreNonRoster = d->ck_ignoreNonRoster->isChecked(); - opt->alertStyle = d->cb_animation->currentIndex(); - opt->autoAuth = d->ck_autoAuth->isChecked(); - opt->notifyAuth = d->ck_notifyAuth->isChecked(); - opt->bounceDock = (Options::BounceDockSetting) d->cb_bounce->currentItem(); + PsiOptions::instance()->setOption("options.ui.message.auto-popup", d->ck_popupMsgs->isChecked()); + PsiOptions::instance()->setOption("options.ui.chat.auto-popup", d->ck_popupMsgs->isChecked()); + PsiOptions::instance()->setOption("options.ui.message.auto-popup-headlines", d->ck_popupHeadlines->isChecked()); + PsiOptions::instance()->setOption("options.ui.file-transfer.auto-popup", d->ck_popupFiles->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.popup-dialogs.suppress-while-away", !d->ck_allowAwayPopup->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.popup-dialogs.suppress-when-not-on-roster", !d->ck_allowUnlistedPopup->isChecked()); + PsiOptions::instance()->setOption("options.ui.contactlist.raise-on-new-event", d->ck_raise->isChecked()); + PsiOptions::instance()->setOption("options.messages.ignore-non-roster-contacts", d->ck_ignoreNonRoster->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.alert-style", d->cb_animation->itemData(d->cb_animation->currentIndex())); + PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorisation", d->ck_autoAuth->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.successful-subscription", d->ck_notifyAuth->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.bounce-dock", d->cb_bounce->itemData( d->cb_bounce->currentItem())); - opt->ppIsOn = d->ck_popupOn->isChecked(); - opt->ppMessage = d->ck_popupOnMessage->isChecked(); - opt->ppChat = d->ck_popupOnMessage->isChecked(); - opt->ppHeadline = d->ck_popupOnHeadline->isChecked(); - opt->ppFile = d->ck_popupOnFile->isChecked(); - opt->ppOnline = d->ck_popupOnOnline->isChecked(); - opt->ppOffline = d->ck_popupOnOffline->isChecked(); - opt->ppStatus = d->ck_popupOnStatus->isChecked(); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.enabled", d->ck_popupOn->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-message", d->ck_popupOnMessage->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-chat", d->ck_popupOnMessage->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-headline", d->ck_popupOnHeadline->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-file-transfer", d->ck_popupOnFile->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.online", d->ck_popupOnOnline->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.offline", d->ck_popupOnOffline->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.other-changes", d->ck_popupOnStatus->isChecked()); } -void OptionsTabEvents::restoreOptions(const Options *opt) +void OptionsTabEvents::restoreOptions() { if ( !w ) return; OptEventsUI *d = (OptEventsUI *)w; - d->ck_popupMsgs->setChecked( opt->popupMsgs || opt->popupChats ); - d->ck_popupHeadlines->setChecked( opt->popupHeadlines ); - d->ck_popupFiles->setChecked( opt->popupFiles ); - d->ck_allowAwayPopup->setChecked( !opt->noAwayPopup ); - d->ck_allowUnlistedPopup->setChecked( !opt->noUnlistedPopup ); - d->ck_raise->setChecked( opt->raise ); - d->ck_ignoreNonRoster->setChecked( opt->ignoreNonRoster ); - d->cb_animation->setCurrentItem(opt->alertStyle); - d->ck_autoAuth->setChecked( opt->autoAuth ); - d->ck_notifyAuth->setChecked( opt->notifyAuth ); - d->cb_bounce->setCurrentItem( opt->bounceDock ); + d->ck_popupMsgs->setChecked( PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool() || PsiOptions::instance()->getOption("options.ui.chat.auto-popup").toBool() ); + d->ck_popupHeadlines->setChecked( PsiOptions::instance()->getOption("options.ui.message.auto-popup-headlines").toBool() ); + d->ck_popupFiles->setChecked( PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool() ); + d->ck_allowAwayPopup->setChecked( !PsiOptions::instance()->getOption("options.ui.notifications.popup-dialogs.suppress-while-away").toBool() ); + d->ck_allowUnlistedPopup->setChecked( !PsiOptions::instance()->getOption("options.ui.notifications.popup-dialogs.suppress-when-not-on-roster").toBool() ); + d->ck_raise->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.raise-on-new-event").toBool() ); + d->ck_ignoreNonRoster->setChecked( PsiOptions::instance()->getOption("options.messages.ignore-non-roster-contacts").toBool() ); + d->cb_animation->setCurrentItem(d->cb_animation->findData(PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toInt())); + d->ck_autoAuth->setChecked( PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorisation").toBool() ); + d->ck_notifyAuth->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.successful-subscription").toBool() ); + d->cb_bounce->setCurrentItem( d->cb_bounce->findData(PsiOptions::instance()->getOption("options.ui.notifications.bounce-dock").toString()) ); - d->ck_popupOn->setChecked( opt->ppIsOn ); - d->ck_popupOnMessage->setChecked( opt->ppMessage || opt->ppChat ); - d->ck_popupOnHeadline->setChecked( opt->ppHeadline ); - d->ck_popupOnFile->setChecked( opt->ppFile ); - d->ck_popupOnOnline->setChecked( opt->ppOnline ); - d->ck_popupOnOffline->setChecked( opt->ppOffline ); - d->ck_popupOnStatus->setChecked( opt->ppStatus ); + d->ck_popupOn->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool() ); + d->ck_popupOnMessage->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool() || PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool() ); + d->ck_popupOnHeadline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool() ); + d->ck_popupOnFile->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool() ); + d->ck_popupOnOnline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool() ); + d->ck_popupOnOffline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool() ); + d->ck_popupOnStatus->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool() ); } src/options/opt_events.cpp @@ -5,7 +5,6 @@ #include "qradiobutton.h" class QWidget; -struct Options; class OptionsTabEvents : public OptionsTab { @@ -14,8 +13,8 @@ public: OptionsTabEvents(QObject *parent); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private: QWidget *w; src/options/opt_events.h @@ -1,6 +1,7 @@ #include "opt_groupchat.h" #include "common.h" #include "iconwidget.h" +#include "psioptions.h" #include <qbuttongroup.h> #include <qwhatsthis.h> @@ -58,28 +59,28 @@ QWidget *OptionsTabGroupchat::widget() return w; } -void OptionsTabGroupchat::applyOptions(Options *opt) +void OptionsTabGroupchat::applyOptions() { if ( !w ) return; GeneralGroupchatUI *d = (GeneralGroupchatUI *)w; - opt->gcHighlighting = d->ck_gcHighlights->isChecked(); - opt->gcNickColoring = d->ck_gcNickColoring->isChecked(); + PsiOptions::instance()->setOption("options.ui.muc.use-highlighting", d->ck_gcHighlights->isChecked()); + PsiOptions::instance()->setOption("options.ui.muc.use-nick-coloring", d->ck_gcNickColoring->isChecked()); QStringList highlight; int i; for (i = 0; i < (int)d->lw_highlightWords->count(); i++) highlight << d->lw_highlightWords->item(i)->text(); - opt->gcHighlights = highlight; + PsiOptions::instance()->setOption("options.ui.muc.highlight-words", highlight); QStringList colors; for (i = 0; i < (int)d->lw_nickColors->count(); i++) colors << d->lw_nickColors->item(i)->text(); - opt->gcNickColors = colors; + PsiOptions::instance()->setOption("options.ui.look.colors.muc.nick-colors", colors); } -void OptionsTabGroupchat::restoreOptions(const Options *opt) +void OptionsTabGroupchat::restoreOptions() { if ( !w ) return; @@ -92,16 +93,17 @@ void OptionsTabGroupchat::restoreOptions(const Options *opt) connect(d->le_newNickColor, SIGNAL(textChanged(const QString &)), SLOT(displayGCNickColor())); d->ck_gcHighlights->setChecked( true ); - d->ck_gcHighlights->setChecked( opt->gcHighlighting ); + d->ck_gcHighlights->setChecked( PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool() ); d->ck_gcNickColoring->setChecked( true ); - d->ck_gcNickColoring->setChecked( opt->gcNickColoring ); + d->ck_gcNickColoring->setChecked( PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() ); d->lw_highlightWords->clear(); - d->lw_highlightWords->addItems( opt->gcHighlights ); + d->lw_highlightWords->addItems( PsiOptions::instance()->getOption("options.ui.muc.highlight-words").toStringList() ); d->lw_nickColors->clear(); - QStringList::ConstIterator it = opt->gcNickColors.begin(); - for ( ; it != opt->gcNickColors.end(); ++it) - addNickColor( *it ); + + foreach(QString col, PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList()) { + addNickColor(col); + } d->le_newHighlightWord->setText(""); d->le_newNickColor->setText("#FFFFFF"); src/options/opt_groupchat.cpp @@ -5,7 +5,6 @@ class QWidget; class QListWidgetItem; -struct Options; class OptionsTabGroupchat : public OptionsTab { @@ -14,8 +13,8 @@ public: OptionsTabGroupchat(QObject *parent); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); void setData(PsiCon *, QWidget *); bool stretchable() const { return true; } src/options/opt_groupchat.h @@ -4,6 +4,7 @@ #include "applicationinfo.h" #include "psiiconset.h" #include "psicon.h" +#include "psioptions.h" #include <QDir> #include <qcheckbox.h> @@ -396,7 +397,7 @@ QWidget *OptionsTabIconsetSystem::widget() return w; } -void OptionsTabIconsetSystem::applyOptions(Options *opt) +void OptionsTabIconsetSystem::applyOptions() { if ( !w || thread ) return; @@ -405,16 +406,15 @@ void OptionsTabIconsetSystem::applyOptions(Options *opt) const Iconset *is = d->iss_system->iconset(); if ( is ) { QFileInfo fi( is->fileName() ); - opt->systemIconset = fi.fileName(); + PsiOptions::instance()->setOption("options.iconsets.system", fi.fileName()); } } -void OptionsTabIconsetSystem::restoreOptions(const Options *opt) +void OptionsTabIconsetSystem::restoreOptions() { if ( !w || thread ) return; - o = (Options *)opt; IconsetSystemUI *d = (IconsetSystemUI *)w; d->iss_system->clear(); QStringList loaded; @@ -460,7 +460,7 @@ bool OptionsTabIconsetSystem::event(QEvent *e) d->iss_system->insert(*i); QFileInfo fi( i->fileName() ); - if ( fi.fileName() == o->systemIconset ) + if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.system").toString() ) d->iss_system->setItemSelected(d->iss_system->lastItem(), true); delete i; @@ -552,15 +552,15 @@ QWidget *OptionsTabIconsetEmoticons::widget() return w; } -void OptionsTabIconsetEmoticons::applyOptions(Options *opt) +void OptionsTabIconsetEmoticons::applyOptions() { if ( !w || thread ) return; IconsetEmoUI *d = (IconsetEmoUI *)w; - opt->useEmoticons = d->ck_useEmoticons->isChecked(); + PsiOptions::instance()->setOption("options.ui.emoticons.use-emoticons", d->ck_useEmoticons->isChecked()); - opt->emoticons.clear(); + QStringList list; for (int row = 0; row < d->iss_emoticons->count(); row++) { IconWidgetItem *item = (IconWidgetItem *)d->iss_emoticons->item(row); @@ -568,19 +568,20 @@ void OptionsTabIconsetEmoticons::applyOptions(Options *opt) const Iconset *is = item->iconset(); if ( is ) { QFileInfo fi( is->fileName() ); - opt->emoticons << fi.fileName(); + list << fi.fileName(); } } } + PsiOptions::instance()->setOption("options.iconsets.emoticons", list); } -void OptionsTabIconsetEmoticons::restoreOptions(const Options *opt) +void OptionsTabIconsetEmoticons::restoreOptions() { if ( !w || thread ) return; IconsetEmoUI *d = (IconsetEmoUI *)w; - d->ck_useEmoticons->setChecked( opt->useEmoticons ); + d->ck_useEmoticons->setChecked( PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool() ); // fill in the iconset view d->iss_emoticons->clear(); @@ -773,54 +774,82 @@ QWidget *OptionsTabIconsetRoster::widget() return w; } -void OptionsTabIconsetRoster::applyOptions(Options *opt) +void OptionsTabIconsetRoster::applyOptions() { if ( !w || thread ) return; IconsetRosterUI *d = (IconsetRosterUI *)w; - opt->useTransportIconsForContacts = d->ck_useTransportIconsForContacts->isChecked(); + PsiOptions::instance()->setOption("options.ui.contactlist.use-transport-icons", d->ck_useTransportIconsForContacts->isChecked()); // roster - default { const Iconset *is = d->iss_defRoster->iconset(); if ( is ) { QFileInfo fi( is->fileName() ); - opt->defaultRosterIconset = fi.fileName(); + PsiOptions::instance()->setOption("options.iconsets.status", fi.fileName()); } } // roster - services { - opt->serviceRosterIconset.clear(); - + // can't add or remove entries, so just update it. QTreeWidgetItemIterator it( d->tw_isServices ); while(*it) { - opt->serviceRosterIconset[(*it)->data(0, Qt::UserRole).toString()] = (*it)->data(1, Qt::UserRole).toString(); + PsiOptions::instance()->setOption( + PsiOptions::instance()->mapLookup("options.iconsets.service-status", (*it)->data(0, Qt::UserRole).toString())+".iconset", + (*it)->data(1, Qt::UserRole).toString()); ++it; } } // roster - custom { - opt->customRosterIconset.clear(); - + // gather new data + QMap<QString, QString> newdata; + QTreeWidgetItemIterator it( d->tw_customRoster ); while(*it) { - opt->customRosterIconset[(*it)->data(0, Qt::UserRole).toString()] = (*it)->data(1, Qt::UserRole).toString(); + newdata[(*it)->data(0, Qt::UserRole).toString()] = (*it)->data(1, Qt::UserRole).toString(); ++it; } + + // remove deleted ones + QStringList previousIdx = PsiOptions::instance()->getChildOptionNames("options.iconsets.custom-status", true, true); + QMap<QString,QString> previous; // (regexp, base) + foreach(QString base, previousIdx) { + previous[PsiOptions::instance()->getOption(base + ".regexp").toString()] = base; + } + foreach(QString todel, previous.keys().toSet() - newdata.keys().toSet()) { + QString base = previous[todel]; + PsiOptions::instance()->removeOption(base, true); + } + // update/add all others + foreach(QString regexp, newdata.keys()) { + QString base; + if (previous.contains(regexp)) { + base = previous[regexp]; + } else { + int idx = 0; + do { + base = "options.iconsets.custom-status" ".a" + QString::number(idx); + idx++; + } while (previousIdx.contains(base)); + previous[regexp] = base; + PsiOptions::instance()->setOption(base + ".regexp", regexp); + } + PsiOptions::instance()->setOption(base + ".iconset", newdata[regexp]); + } } } -void OptionsTabIconsetRoster::restoreOptions(const Options *opt) +void OptionsTabIconsetRoster::restoreOptions() { if ( !w || thread ) return; - o = (Options *)opt; IconsetRosterUI *d = (IconsetRosterUI *)w; - d->ck_useTransportIconsForContacts->setChecked( opt->useTransportIconsForContacts ); + d->ck_useTransportIconsForContacts->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-transport-icons").toBool() ); d->iss_defRoster->clear(); d->iss_servicesRoster->clear(); @@ -867,7 +896,7 @@ bool OptionsTabIconsetRoster::event(QEvent *e) // roster - default d->iss_defRoster->insert(*i); - if ( fi.fileName() == o->defaultRosterIconset ) + if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.status")) d->iss_defRoster->setItemSelected(d->iss_defRoster->lastItem(), true); // roster - service @@ -889,7 +918,10 @@ bool OptionsTabIconsetRoster::event(QEvent *e) while(*it) { QTreeWidgetItem *i = *it; if ( !i->data(0, Qt::UserRole).toString().isEmpty() ) { - Iconset *iss = PsiIconset::instance()->roster[o->serviceRosterIconset[i->data(0, Qt::UserRole).toString()]]; + Iconset *iss = PsiIconset::instance()->roster[ + PsiOptions::instance()->getOption( + PsiOptions::instance()->mapLookup( + "options.iconsets.service-status",i->data(0, Qt::UserRole).toString())+".iconset").toString()]; if ( iss ) { i->setText(1, iss->name()); QFileInfo fi ( iss->fileName() ); @@ -904,15 +936,17 @@ bool OptionsTabIconsetRoster::event(QEvent *e) { // Then, fill the QListView QTreeWidgetItem *last = 0; - QMap<QString, QString>::ConstIterator it = o->customRosterIconset.begin(); - for ( ; it != o->customRosterIconset.end(); ++it) { + QStringList customicons = PsiOptions::instance()->getChildOptionNames("options.iconsets.custom-status", true, true); + foreach(QString base, customicons) { + QString regexp = PsiOptions::instance()->getOption(base + ".regexp").toString(); + QString icoset = PsiOptions::instance()->getOption(base + ".iconset").toString(); QTreeWidgetItem *item = new QTreeWidgetItem(d->tw_customRoster, last); last = item; - item->setText(0, clipCustomText(it.key())); // RegExp - item->setData(0, Qt::UserRole, it.key()); + item->setText(0, clipCustomText(regexp)); + item->setData(0, Qt::UserRole, regexp); - Iconset *iss = PsiIconset::instance()->roster[it.data()]; + Iconset *iss = PsiIconset::instance()->roster[icoset]; if ( iss ) { item->setText(1, iss->name()); QFileInfo fi ( iss->fileName() ); src/options/opt_iconset.cpp @@ -6,7 +6,6 @@ #include <QEvent> class QWidget; -struct Options; class QListWidgetItem; class IconsetLoadThread; class QTreeWidgetItem; @@ -19,8 +18,8 @@ public: ~OptionsTabIconsetSystem(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); bool stretchable() const { return true; } private slots: @@ -36,7 +35,6 @@ private: int numIconsets, iconsetsLoaded; IconsetLoadThread *thread; - Options *o; }; class OptionsTabIconsetEmoticons : public OptionsTab @@ -47,8 +45,8 @@ public: ~OptionsTabIconsetEmoticons(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); bool stretchable() const { return true; } private slots: @@ -74,8 +72,8 @@ public: ~OptionsTabIconsetRoster(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); bool stretchable() const { return true; } private slots: @@ -104,7 +102,6 @@ private: int numIconsets, iconsetsLoaded; IconsetLoadThread *thread; - Options *o; }; #endif src/options/opt_iconset.h @@ -4,7 +4,6 @@ #include "optionstab.h" class QWidget; -struct Options; class OptionsTabPlugins : public OptionsTab { src/options/opt_plugins.h @@ -106,8 +106,7 @@ QWidget *OptionsTabShortcuts::widget() * \brief applyOptions, if options have changed, they will be applied by calling this function * \param opt, unused, totally ignored */ -void OptionsTabShortcuts::applyOptions(Options *opt) { - Q_UNUSED(opt); +void OptionsTabShortcuts::applyOptions() { if ( !w ) return; @@ -166,9 +165,8 @@ void OptionsTabShortcuts::applyOptions(Options *opt) { * \brief restoreOptions, reads in the currently set options * \param opt, unused, totally ignored */ -void OptionsTabShortcuts::restoreOptions(const Options *opt) +void OptionsTabShortcuts::restoreOptions() { - Q_UNUSED(opt); if ( !w ) return; src/options/opt_shortcuts.cpp @@ -36,8 +36,8 @@ public: ~OptionsTabShortcuts(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); typedef enum Kind { TopLevelItem = 1, src/options/opt_shortcuts.h @@ -3,6 +3,7 @@ #include "iconwidget.h" #include "iconset.h" #include "applicationinfo.h" +#include "psioptions.h" #include <qbuttongroup.h> #include <qwhatsthis.h> @@ -128,23 +129,30 @@ QWidget *OptionsTabSound::widget() return w; } -void OptionsTabSound::applyOptions(Options *opt) +void OptionsTabSound::applyOptions() { if ( !w ) return; OptSoundUI *d = (OptSoundUI *)w; - opt->player = d->le_player->text(); - opt->noAwaySound = !d->ck_awaySound->isChecked(); - opt->noGCSound = !d->ck_gcSound->isChecked(); - - int n = 0; - foreach(QLineEdit* le, sounds_) { - opt->onevent[n++] = le->text(); - } + PsiOptions::instance()->setOption("options.ui.notifications.sounds.unix-sound-player", d->le_player->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.silent-while-away", !d->ck_awaySound->isChecked()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.notify-every-muc-message", d->ck_gcSound->isChecked()); + + PsiOptions::instance()->setOption("options.ui.notifications.sounds.incoming-message", d->le_oeMessage->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.new-chat", d->le_oeChat1->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.chat-message", d->le_oeChat2->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.system-message", d->le_oeSystem->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.incoming-headline", d->le_oeHeadline->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.contact-online", d->le_oeOnline->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.contact-offline", d->le_oeOffline->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.outgoing-chat", d->le_oeSend->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.incoming-file-transfer", d->le_oeIncomingFT->text()); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.completed-file-transfer", d->le_oeFTComplete->text()); + } -void OptionsTabSound::restoreOptions(const Options *opt) +void OptionsTabSound::restoreOptions() { if ( !w ) return; @@ -156,16 +164,22 @@ void OptionsTabSound::restoreOptions(const Options *opt) #elif defined(Q_WS_MAC) d->le_player->setText(tr("Mac OS Sound")); #else - d->le_player->setText( opt->player ); + d->le_player->setText( PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString() ); #endif - d->ck_awaySound->setChecked( !opt->noAwaySound ); - d->ck_gcSound->setChecked( !opt->noGCSound ); - - int n = 0; - foreach(QLineEdit* le, sounds_) { - le->setText(opt->onevent[n++]); - } + d->ck_awaySound->setChecked( !PsiOptions::instance()->getOption("options.ui.notifications.sounds.silent-while-away").toBool() ); + d->ck_gcSound->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() ); + + d->le_oeMessage->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-message").toString()); + d->le_oeChat1->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.new-chat").toString()); + d->le_oeChat2->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.chat-message").toString()); + d->le_oeSystem->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.system-message").toString()); + d->le_oeHeadline->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-headline").toString()); + d->le_oeOnline->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.contact-online").toString()); + d->le_oeOffline->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.contact-offline").toString()); + d->le_oeSend->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.outgoing-chat").toString()); + d->le_oeIncomingFT->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-file-transfer").toString()); + d->le_oeFTComplete->setText(PsiOptions::instance()->getOption("options.ui.notifications.sounds.completed-file-transfer").toString()); } void OptionsTabSound::setData(PsiCon *, QWidget *p) @@ -175,12 +189,12 @@ void OptionsTabSound::setData(PsiCon *, QWidget *p) void OptionsTabSound::chooseSoundEvent(QAbstractButton* b) { - if(option.lastPath.isEmpty()) - option.lastPath = QDir::homeDirPath(); - QString str = QFileDialog::getOpenFileName(option.lastPath, tr("Sound (*.wav)"), parentWidget, "", tr("Choose a sound file")); + if(PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString().isEmpty()) + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = QDir::homeDirPath(); + QString str = QFileDialog::getOpenFileName(PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString(), tr("Sound (*.wav)"), parentWidget, "", tr("Choose a sound file")); if(!str.isEmpty()) { QFileInfo fi(str); - option.lastPath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = fi.dirPath(); modify_buttons_[b]->setText(str); emit dataChanged(); } @@ -193,22 +207,17 @@ void OptionsTabSound::previewSoundEvent(QAbstractButton* b) void OptionsTabSound::soundReset() { - Options opt; - opt.onevent[eMessage] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - opt.onevent[eChat1] = ApplicationInfo::resourcesDir() + "/sound/chat1.wav"; - opt.onevent[eChat2] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - opt.onevent[eHeadline] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - opt.onevent[eSystem] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - opt.onevent[eOnline] = ApplicationInfo::resourcesDir() + "/sound/online.wav"; - opt.onevent[eOffline] = ApplicationInfo::resourcesDir() + "/sound/offline.wav"; - opt.onevent[eSend] = ApplicationInfo::resourcesDir() + "/sound/send.wav"; - opt.onevent[eIncomingFT] = ApplicationInfo::resourcesDir() + "/sound/ft_incoming.wav"; - opt.onevent[eFTComplete] = ApplicationInfo::resourcesDir() + "/sound/ft_complete.wav"; - - int n = 0; - foreach(QLineEdit* le, sounds_) { - le->setText(opt.onevent[n++]); - } - + OptSoundUI *d = (OptSoundUI *)w; + + d->le_oeMessage->setText(ApplicationInfo::resourcesDir() + "/sound/chat2.wav"); + d->le_oeChat1->setText(ApplicationInfo::resourcesDir() + "/sound/chat1.wav"); + d->le_oeChat2->setText(ApplicationInfo::resourcesDir() + "/sound/chat2.wav"); + d->le_oeSystem->setText(ApplicationInfo::resourcesDir() + "/sound/chat2.wav"); + d->le_oeHeadline->setText(ApplicationInfo::resourcesDir() + "/sound/chat2.wav"); + d->le_oeOnline->setText(ApplicationInfo::resourcesDir() + "/sound/online.wav"); + d->le_oeOffline->setText(ApplicationInfo::resourcesDir() + "/sound/offline.wav"); + d->le_oeSend->setText(ApplicationInfo::resourcesDir() + "/sound/send.wav"); + d->le_oeIncomingFT->setText(ApplicationInfo::resourcesDir() + "/sound/ft_incoming.wav"); + d->le_oeFTComplete->setText(ApplicationInfo::resourcesDir() + "/sound/ft_complete.wav"); emit dataChanged(); } src/options/opt_sound.cpp @@ -6,7 +6,6 @@ #include "optionstab.h" class QWidget; -struct Options; class QLineEdit; class QButtonGroup; class QAbstractButton; @@ -19,8 +18,8 @@ public: ~OptionsTabSound(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); private slots: void chooseSoundEvent(QAbstractButton*); src/options/opt_sound.h @@ -1,6 +1,7 @@ #include "opt_status.h" #include "common.h" #include "iconwidget.h" +#include "psioptions.h" #include <qbuttongroup.h> #include <QMessageBox> @@ -31,12 +32,10 @@ OptionsTabStatus::OptionsTabStatus(QObject *parent) : OptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status") { w = 0; - o = new Options; } OptionsTabStatus::~OptionsTabStatus() { - delete o; } QWidget *OptionsTabStatus::widget() @@ -104,28 +103,52 @@ QWidget *OptionsTabStatus::widget() return w; } -void OptionsTabStatus::applyOptions(Options *opt) +void OptionsTabStatus::applyOptions() { if ( !w ) return; OptStatusUI *d = (OptStatusUI *)w; - opt->asAway = d->sb_asAway->value(); - opt->asXa = d->sb_asXa->value(); - opt->asOffline = d->sb_asOffline->value(); - opt->use_asAway = d->ck_asAway->isChecked(); - opt->use_asXa = d->ck_asXa->isChecked(); - opt->use_asOffline = d->ck_asOffline->isChecked(); - opt->asMessage = d->te_asMessage->text(); + PsiOptions::instance()->setOption("options.status.auto-away.away-after", d->sb_asAway->value()); + PsiOptions::instance()->setOption("options.status.auto-away.not-availible-after", d->sb_asXa->value()); + PsiOptions::instance()->setOption("options.status.auto-away.offline-after", d->sb_asOffline->value()); + PsiOptions::instance()->setOption("options.status.auto-away.use-away", d->ck_asAway->isChecked()); + PsiOptions::instance()->setOption("options.status.auto-away.use-not-availible", d->ck_asXa->isChecked()); + PsiOptions::instance()->setOption("options.status.auto-away.use-offline", d->ck_asOffline->isChecked()); + PsiOptions::instance()->setOption("options.status.auto-away.message", d->te_asMessage->text()); - opt->sp = o->sp; - - opt->askOnline = d->ck_askOnline->isChecked(); - opt->askOffline = d->ck_askOffline->isChecked(); + + foreach (QString name, deletedPresets) { + QString base = PsiOptions::instance()->mapLookup("options.status.presets", name); + PsiOptions::instance()->removeOption(base , true); + } + deletedPresets.clear(); + foreach (QString name, dirtyPresets.toList() + newPresets.keys()) { + StatusPreset sp; + if (newPresets.contains(name)) { + sp = newPresets[name]; + } else { + sp = presets[name]; + } + PsiOptions *o = PsiOptions::instance(); + QString base = o->mapPut("options.status.presets", sp.name()); + o->setOption(base+".message",sp.message()); + o->setOption(base+".status",XMPP::Status(sp.status()).typeString()); + o->setOption(base+".force-priority", sp.priority().hasValue()); + if (sp.priority().hasValue()) { + o->setOption(base+".priority", sp.priority().value()); + } + } + dirtyPresets.clear(); + presets.unite(newPresets); + newPresets.clear(); + + PsiOptions::instance()->setOption("options.status.ask-for-message-on-online", d->ck_askOnline->isChecked()); + PsiOptions::instance()->setOption("options.status.ask-for-message-on-offline", d->ck_askOffline->isChecked()); } -void OptionsTabStatus::restoreOptions(const Options *opt) +void OptionsTabStatus::restoreOptions() { if ( !w ) return; @@ -133,37 +156,52 @@ void OptionsTabStatus::restoreOptions(const Options *opt) OptStatusUI *d = (OptStatusUI *)w; d->sb_asAway->setMinValue(0); - d->sb_asAway->setValue( opt->asAway ); + d->sb_asAway->setValue( PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() ); d->sb_asXa->setMinValue(0); - d->sb_asXa->setValue( opt->asXa ); + d->sb_asXa->setValue( PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() ); d->sb_asOffline->setMinValue(0); - d->sb_asOffline->setValue( opt->asOffline ); - /*if (opt->asAway <= 0 ) - opt->use_asAway = FALSE; - if (opt->asXa <= 0 ) - opt->use_asXa = FALSE; + d->sb_asOffline->setValue( PsiOptions::instance()->getOption("options.status.auto-away.offline-after").toInt() ); + /*if (PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() <= 0 ) + PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() = FALSE; + if (PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() <= 0 ) + PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() = FALSE; if(d->opt.asOffline <= 0) - opt->use_asOffline = FALSE;*/ - d->ck_asAway->setChecked( opt->use_asAway ); - d->ck_asXa->setChecked( opt->use_asXa ); - d->ck_asOffline->setChecked( opt->use_asOffline ); - d->te_asMessage->setText( opt->asMessage ); - - o->sp = opt->sp; - d->cb_preset->clear(); - QStringList presets; - foreach(StatusPreset p, option.sp) { - presets += p.name(); + PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() = FALSE;*/ + d->ck_asAway->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() ); + d->ck_asXa->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() ); + d->ck_asOffline->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() ); + d->te_asMessage->setText( PsiOptions::instance()->getOption("options.status.auto-away.message").toString() ); + + + QStringList presetNames; + + foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) { + QString base = PsiOptions::instance()->mapLookup("options.status.presets", name.toString()); + StatusPreset sp; + sp.setName(name.toString()); + sp.setMessage(PsiOptions::instance()->getOption(base+".message").toString()); + if (PsiOptions::instance()->getOption(base+".force-priority").toBool()) { + sp.setPriority(PsiOptions::instance()->getOption(base+".priority").toInt()); + } + + XMPP::Status status; + status.setType(PsiOptions::instance()->getOption(base+".status").toString()); + sp.setStatus(status.type()); + + presets[name.toString()] = sp; + presetNames += name.toString(); } - d->cb_preset->insertStringList(presets); + + + d->cb_preset->insertStringList(presetNames); if(d->cb_preset->count() >= 1) { d->cb_preset->setCurrentIndex(0); selectStatusPreset(0); } - d->ck_askOnline->setChecked( opt->askOnline ); - d->ck_askOffline->setChecked( opt->askOffline ); + d->ck_askOnline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool() ); + d->ck_askOffline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool() ); } void OptionsTabStatus::setData(PsiCon *, QWidget *parentDialog) @@ -194,7 +232,16 @@ void OptionsTabStatus::selectStatusPreset(int x) d->pb_spDelete->setEnabled(true); - StatusPreset preset = o->sp[d->cb_preset->text(x)]; + StatusPreset preset; + QString name = d->cb_preset->text(x); + + if (newPresets.contains(name)) { + preset = newPresets[name]; + } else { + preset = presets[name]; + } + + d->te_sp->setText(preset.message()); d->te_sp->setEnabled(true); if (preset.priority().hasValue()) @@ -228,18 +275,20 @@ void OptionsTabStatus::newStatusPreset() CAP(tr("New Status Preset")), tr("Please enter a name for the new status preset:"), QLineEdit::Normal, text, &ok, parentWidget); - if(!ok) + if(!ok) { return; + } - if(text.isEmpty()) + if(text.isEmpty()) { QMessageBox::information(parentWidget, tr("Error"), tr("Can't create a blank preset!")); - else if(o->sp.contains(text)) + } else if(presets.contains(text) || newPresets.contains(text)) { QMessageBox::information(parentWidget, tr("Error"), tr("You already have a preset with that name!")); - else + } else { break; + } } - o->sp[text].setName(text); + newPresets[text].setName(text); d->cb_preset->insertItem(text); d->cb_preset->setCurrentItem(d->cb_preset->count()-1); selectStatusPreset(d->cb_preset->count()-1); @@ -257,7 +306,14 @@ void OptionsTabStatus::removeStatusPreset() emit dataChanged(); - o->sp.remove(d->cb_preset->text(id)); + QString name = d->cb_preset->text(id); + + if (newPresets.contains(name)) { + newPresets.remove(name); + } else { + deletedPresets += d->cb_preset->text(id); + presets.remove(d->cb_preset->text(id)); + } d->cb_preset->removeItem(id); // select a new entry if possible @@ -280,12 +336,23 @@ void OptionsTabStatus::changeStatusPreset() if(id == -1) return; - o->sp[d->cb_preset->text(id)].setMessage(d->te_sp->text()); + StatusPreset sp; + sp.setMessage(d->te_sp->text()); if (d->le_sp_priority->text().isEmpty()) - o->sp[d->cb_preset->text(id)].clearPriority(); + sp.clearPriority(); else - o->sp[d->cb_preset->text(id)].setPriority(d->le_sp_priority->text().toInt()); - o->sp[d->cb_preset->text(id)].setStatus(combomap[d->cb_sp_status->currentItem()]); + sp.setPriority(d->le_sp_priority->text().toInt()); + sp.setStatus(combomap[d->cb_sp_status->currentItem()]); + QString name = d->cb_preset->text(id); + + sp.setName(name); + if (newPresets.contains(name)) { + newPresets[name] = sp; + } else { + dirtyPresets += name; + presets[name] = sp; + } + emit dataChanged(); } src/options/opt_status.cpp @@ -1,10 +1,14 @@ #ifndef OPT_STATUS_H #define OPT_STATUS_H +#include <QMap> +#include <QSet> +#include <QStringList> + #include "optionstab.h" +#include "statuspreset.h" class QWidget; -struct Options; class OptionsTabStatus : public OptionsTab { @@ -14,8 +18,8 @@ public: ~OptionsTabStatus(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); void setData(PsiCon *, QWidget *parentDialog); //bool stretchable() const { return true; } @@ -28,7 +32,10 @@ private slots: private: QWidget *w, *parentWidget; - Options *o; + QMap<QString, StatusPreset> presets; + QSet<QString> dirtyPresets; + QStringList deletedPresets; + QMap<QString, StatusPreset> newPresets; }; #endif src/options/opt_status.h @@ -6,6 +6,7 @@ #include "psitoolbar.h" #include "iconaction.h" #include "psiactionlist.h" +#include "psioptions.h" #include "ui_opt_lookfeel_toolbars.h" #include "ui_ui_positiontoolbar.h" @@ -38,7 +39,7 @@ class PositionOptionsTabToolbars : public QDialog, public Ui::PositionToolbarUI { Q_OBJECT public: - PositionOptionsTabToolbars(QWidget *parent, Options::ToolbarPrefs *, int); + PositionOptionsTabToolbars(QWidget *parent, ToolbarPrefs *, int); ~PositionOptionsTabToolbars(); int n(); @@ -55,10 +56,10 @@ private slots: private: int id; - Options::ToolbarPrefs *tb; + ToolbarPrefs *tb; }; -PositionOptionsTabToolbars::PositionOptionsTabToolbars(QWidget *parent, Options::ToolbarPrefs *_tb, int _id) +PositionOptionsTabToolbars::PositionOptionsTabToolbars(QWidget *parent, ToolbarPrefs *_tb, int _id) : QDialog(parent) { setupUi(this); @@ -145,27 +146,31 @@ bool PositionOptionsTabToolbars::eventFilter(QObject *watched, QEvent *e) class OptionsTabToolbars::Private { public: - struct ToolbarItem { - QString group; - int index; - ToolbarItem() { - group = ""; - index = -1; - } - ToolbarItem( QString _w, int _i ) { - group = _w; - index = _i; - } - }; - - QMap<int, ToolbarItem> toolbars; - - PsiActionList::ActionsType class2id( QString name ) { +// struct ToolbarItem { +// QString group; +// int index; +// ToolbarItem() { +// group = ""; +// index = -1; +// } +// ToolbarItem( QString _w, int _i ) { +// group = _w; +// index = _i; +// } +// }; + + QMap<QString, ToolbarPrefs> toolbarsCurrent; + // hack: can't really assign real ids to new toolbars before apply + // So new toolbars will get "..%n" as name (is invalid in OptionsTree) + int newTBidx; + QMap<QString, ToolbarPrefs> toolbarsNew; + QSet<QString> toolbarsDirty; + QSet<QString> toolbarsDelete; + + + PsiActionList::ActionsType class2id() { int ret = (int)PsiActionList::Actions_Common; - - if ( name == "mainWin" ) - ret |= (int)PsiActionList::Actions_MainWin; - + ret |= (int)PsiActionList::Actions_MainWin; return (PsiActionList::ActionsType)ret; } }; @@ -176,8 +181,9 @@ OptionsTabToolbars::OptionsTabToolbars(QObject *parent) w = 0; p = new Private(); + p->newTBidx=0; + noDirty = false; - opt = new Options; } QWidget *OptionsTabToolbars::widget() @@ -253,7 +259,6 @@ QWidget *OptionsTabToolbars::widget() OptionsTabToolbars::~OptionsTabToolbars() { - delete opt; delete p; } @@ -289,59 +294,94 @@ void OptionsTabToolbars::setData(PsiCon * psi_, QWidget *parent_) } }*/ -void OptionsTabToolbars::applyOptions(Options *o) +void OptionsTabToolbars::applyOptions() { if ( !w ) - opt->toolbars = o->toolbars; + return; + + LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; + + PsiOptions *o = PsiOptions::instance(); + + + foreach (QString base, p->toolbarsDelete) { + o->removeOption(base, true); + // UI will auto updated by option change signal. + } + p->toolbarsDelete.clear(); + foreach (QString base, p->toolbarsDirty) { + ToolbarPrefs tb = p->toolbarsCurrent[base]; + // update options + PsiToolBar::structToOptions(base, &tb); + // UI will auto updated by option change signal. + } + p->toolbarsDirty.clear(); + + QStringList toolbarBases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true); + int idx = 0; + foreach (QString pseudoBase, p->toolbarsNew.keys()) { + ToolbarPrefs tb = p->toolbarsNew[pseudoBase]; + + // get a real base + QString base; + do { + base = "options.ui.contactlist.toolbars" ".a" + QString::number(idx++); + } while (toolbarBases.contains(base)); + toolbarBases += base; + PsiToolBar::structToOptions(base, &tb); + + // merge to current + p->toolbarsCurrent[base] = tb; + d->cb_toolbars->setItemData(d->cb_toolbars->findData(pseudoBase), base); + // update options + PsiToolBar::structToOptions(base, &tb); + // update ui + psi->addToolbar(base); + } + p->toolbarsNew.clear(); + + +/* old stuff // get current toolbars' positions QList<PsiToolBar*> toolbars = psi->toolbarList(); - for (int i = 0; i < opt->toolbars["mainWin"].count() && i < toolbars.count(); i++) { + for (int i = 0; i < LEGOPTS.toolbars["mainWin"].count() && i < toolbars.count(); i++) { //if ( toolbarPositionInProgress && posTbDlg->n() == (int)i ) // continue; - Options::ToolbarPrefs &tbPref = opt->toolbars["mainWin"][i]; - psi->getToolbarLocation(toolbars.at(i), tbPref.dock, tbPref.index, tbPref.nl, tbPref.extraOffset); - } - - // apply options - o->toolbars = opt->toolbars; - - doApply(); -} - -void OptionsTabToolbars::rebuildToolbarList() -{ - LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; - - d->cb_toolbars->clear(); - p->toolbars.clear(); - - QMap< QString, QList<Options::ToolbarPrefs> >::Iterator it = opt->toolbars.begin(); - for ( ; it != opt->toolbars.end(); ++it ) { - if ( p->toolbars.count() ) - d->cb_toolbars->insertItem( "---" ); // TODO: think of better separator - - int i = 0; - QList<Options::ToolbarPrefs>::Iterator it2 = it.data().begin(); - for ( ; it2 != it.data().end(); ++it2, ++i ) { - d->cb_toolbars->insertItem( (*it2).name ); - p->toolbars[d->cb_toolbars->count()-1] = Private::ToolbarItem( it.key(), i ); - } + Options::ToolbarPrefs &tbPref = LEGOPTS.toolbars["mainWin"][i]; + //psi->getToolbarLocation(toolbars.at(i), tbPref.dock, tbPref.index, tbPref.nl, tbPref.extraOffset); } +*/ } -void OptionsTabToolbars::restoreOptions(const Options *o) +void OptionsTabToolbars::restoreOptions() { if ( !w ) return; LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; - opt->toolbars = o->toolbars; - opt->hideMenubar = o->hideMenubar; - - rebuildToolbarList(); + PsiOptions *o = PsiOptions::instance(); + + QStringList toolbarBases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true); + + foreach(QString base, toolbarBases) { + ToolbarPrefs tb; + tb.name = o->getOption(base + ".name").toString(); + tb.on = o->getOption(base + ".visible").toBool(); + tb.locked = o->getOption(base + ".locked").toBool(); + tb.stretchable = o->getOption(base + ".stretchable").toBool(); + tb.dock = (Qt::Dock)o->getOption(base + ".dock.position").toInt(); //FIXME + tb.index = o->getOption(base + ".dock.index").toInt(); + tb.nl = o->getOption(base + ".dock.nl").toBool(); + tb.extraOffset = o->getOption(base + ".dock.extra-offset").toInt(); + tb.keys = o->getOption(base + ".actions").toStringList(); + + p->toolbarsCurrent[base] = tb; + d->cb_toolbars->addItem(tb.name, base); + } + if(d->cb_toolbars->count() > 0) { d->cb_toolbars->setCurrentIndex( 0 ); toolbarSelectionChanged( 0 ); @@ -358,8 +398,25 @@ void OptionsTabToolbars::toolbarAdd() int i = d->cb_toolbars->count(); - Options::ToolbarPrefs tb; - tb.name = QObject::tr("<unnamed>"); + ToolbarPrefs tb; + int j = 0; + bool ok; + do { + ok = true; + tb.name = QObject::tr("<unnamed%1>").arg(j++); + foreach(ToolbarPrefs other, p->toolbarsNew) { + if (other.name == tb.name) { + ok = false; + break; + } + } + if (ok) foreach(ToolbarPrefs other, p->toolbarsCurrent) { + if (other.name == tb.name) { + ok = false; + break; + } + } + } while (!ok); tb.on = false; tb.locked = false; tb.stretchable = false; @@ -372,9 +429,18 @@ void OptionsTabToolbars::toolbarAdd() tb.dirty = true; - opt->toolbars["mainWin"].append(tb); + QString base; + j=0; + do { + ok = true; + base = ".." + QString::number(j++); + } while (p->toolbarsNew.keys().contains(base)); + qDebug() << "allocted " << base << " for new toolbar"; + + p->toolbarsNew[base] = tb; + + d->cb_toolbars->addItem(tb.name, base); - rebuildToolbarList(); d->cb_toolbars->setCurrentIndex( d->cb_toolbars->count()-1 ); toolbarSelectionChanged( d->cb_toolbars->currentIndex() ); @@ -385,21 +451,24 @@ void OptionsTabToolbars::toolbarDelete() { LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; int n = d->cb_toolbars->currentIndex(); + + QString base = d->cb_toolbars->itemData(n).toString(); + qDebug() << "removing " << base; - { - int idx = p->toolbars[n].index; - QList<Options::ToolbarPrefs>::Iterator it = opt->toolbars[p->toolbars[n].group].begin(); - for (int i = 0; i < idx; i++) - ++it; - - noDirty = true; - opt->toolbars[p->toolbars[n].group].remove(it); - - toolbarSelectionChanged(-1); - rebuildToolbarList(); - noDirty = false; - toolbarSelectionChanged( d->cb_toolbars->currentIndex() ); + noDirty = true; + toolbarSelectionChanged(-1); + + if (p->toolbarsNew.contains(base)) { + p->toolbarsNew.remove(base); + } else { + p->toolbarsCurrent.remove(base); + p->toolbarsDelete += base; } + + d->cb_toolbars->removeItem(d->cb_toolbars->findData(base)); + + noDirty = false; + toolbarSelectionChanged( d->cb_toolbars->currentIndex() ); } void OptionsTabToolbars::addToolbarAction(QListWidget *parent, QString name, int toolbarId) @@ -429,12 +498,12 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) return; int n = item; - PsiToolBar *toolBar = 0; - if ( item != -1 ) - toolBar = psi->findToolBar( p->toolbars[n].group, p->toolbars[n].index ); +// PsiToolBar *toolBar = 0; +// if ( item != -1 ) +// toolBar = psi->findToolBar( p->toolbars[n].group, p->toolbars[n].index ); - bool customizeable = toolBar ? toolBar->isCustomizeable() : true; - bool moveable = toolBar ? toolBar->isMoveable() : true; + bool customizeable = true; + bool moveable = true; LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; bool enable = (item == -1) ? false: true; @@ -449,7 +518,7 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) d->tb_down->setEnabled( enable && customizeable ); d->tb_left->setEnabled( enable && customizeable ); d->tb_right->setEnabled( enable && customizeable ); - d->pb_deleteToolbar->setEnabled( enable && p->toolbars[n].group == "mainWin" ); + d->pb_deleteToolbar->setEnabled( enable ); d->cb_toolbars->setEnabled( enable ); d->tw_availActions->clear(); @@ -462,7 +531,15 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) noDirty = true; - Options::ToolbarPrefs tb = opt->toolbars[p->toolbars[n].group][p->toolbars[n].index]; + QString base = d->cb_toolbars->itemData(n).toString(); + ToolbarPrefs tb; + if (p->toolbarsNew.contains(base)) { + tb = p->toolbarsNew[base]; + } else { + tb = p->toolbarsCurrent[base]; + } + + d->le_toolbarName->setText( tb.name ); d->ck_toolbarOn->setChecked( tb.on ); d->ck_toolbarLocked->setChecked( tb.locked || !moveable ); @@ -473,7 +550,7 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) QTreeWidget *tw = d->tw_availActions; QTreeWidgetItem *lastRoot = 0; - foreach(ActionList* actionList, psi->actionList()->actionLists( p->class2id( p->toolbars[n].group ) )) { + foreach(ActionList* actionList, psi->actionList()->actionLists( p->class2id() )) { QTreeWidgetItem *root = new QTreeWidgetItem(tw, lastRoot); lastRoot = root; root->setText( 0, actionList->name() ); @@ -485,12 +562,13 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) QStringList::Iterator it2 = actionNames.begin(); for ( ; it2 != actionNames.end(); ++it2 ) { IconAction *action = actionList->action( *it2 ); - QTreeWidgetItem *item = new QTreeWidgetItem( root, last ); + QTreeWidgetItem *item = new QTreeWidgetItem( root, last ); last = item; QString n = actionName((QAction *)action); - if ( !action->whatsThis().isEmpty() ) + if ( !action->whatsThis().isEmpty() ) { n += " - " + action->whatsThis(); + } item->setText( 0, n ); item->setIcon( 0, action->iconSet() ); item->setData( 0, Qt::UserRole, action->name() ); @@ -501,7 +579,7 @@ void OptionsTabToolbars::toolbarSelectionChanged(int item) QStringList::Iterator it = tb.keys.begin(); for ( ; it != tb.keys.end(); ++it) { - addToolbarAction(d->lw_selectedActions, *it, p->class2id( p->toolbars[n].group ) ); + addToolbarAction(d->lw_selectedActions, *it, p->class2id()); } updateArrows(); @@ -520,10 +598,16 @@ void OptionsTabToolbars::rebuildToolbarKeys() int count = d->lw_selectedActions->count(); for (int i = 0; i < count; i++) { keys << d->lw_selectedActions->item(i)->data(Qt::UserRole).toString(); - } + } - opt->toolbars["mainWin"][n].keys = keys; - opt->toolbars["mainWin"][n].dirty = true; + QString base = d->cb_toolbars->itemData(n).toString(); + if (p->toolbarsNew.contains(base)) { + p->toolbarsNew[base].keys = keys; + } else { + p->toolbarsCurrent[base].keys = keys; + p->toolbarsDirty += base; + } + emit dataChanged(); } @@ -559,9 +643,18 @@ void OptionsTabToolbars::toolbarNameChanged() if ( !d->cb_toolbars->count() ) return; + QString name = d->le_toolbarName->text(); + int n = d->cb_toolbars->currentIndex(); - d->cb_toolbars->changeItem(d->le_toolbarName->text(), n); - opt->toolbars["mainWin"][n].name = d->le_toolbarName->text(); + QString base = d->cb_toolbars->itemData(n).toString(); + if (p->toolbarsNew.contains(base)) { + p->toolbarsNew[base].name = name; + } else { + p->toolbarsCurrent[base].name = name; + p->toolbarsDirty += base; + } + + d->cb_toolbars->setItemText(d->cb_toolbars->findData(base), name); emit dataChanged(); } @@ -609,7 +702,7 @@ void OptionsTabToolbars::toolbarAddAction() if ( !item || item->data(0, Qt::UserRole).toString().isEmpty() ) return; - addToolbarAction(d->lw_selectedActions, item->data(0, Qt::UserRole).toString(), p->class2id( p->toolbars[d->cb_toolbars->currentIndex()].group ) ); + addToolbarAction(d->lw_selectedActions, item->data(0, Qt::UserRole).toString(), p->class2id()); rebuildToolbarKeys(); updateArrows(); } @@ -636,13 +729,30 @@ void OptionsTabToolbars::toolbarDataChanged() if ( !d->cb_toolbars->count() ) return; int n = d->cb_toolbars->currentIndex(); + + + + QString base = d->cb_toolbars->itemData(n).toString(); + ToolbarPrefs tb; + if (p->toolbarsNew.contains(base)) { + tb = p->toolbarsNew[base]; + } else { + tb = p->toolbarsCurrent[base]; + p->toolbarsDirty += base; + } - opt->toolbars["mainWin"][n].dirty = true; - opt->toolbars["mainWin"][n].name = d->le_toolbarName->text(); - opt->toolbars["mainWin"][n].on = d->ck_toolbarOn->isChecked(); - opt->toolbars["mainWin"][n].locked = d->ck_toolbarLocked->isChecked(); - opt->toolbars["mainWin"][n].stretchable = d->ck_toolbarStretch->isChecked(); - + tb.dirty = true; + tb.name = d->le_toolbarName->text(); + tb.on = d->ck_toolbarOn->isChecked(); + tb.locked = d->ck_toolbarLocked->isChecked(); + tb.stretchable = d->ck_toolbarStretch->isChecked(); + + if (p->toolbarsNew.contains(base)) { + p->toolbarsNew[base] = tb; + } else { + p->toolbarsCurrent[base] = tb; + } + emit dataChanged(); } @@ -663,30 +773,30 @@ QString OptionsTabToolbars::actionName(const QAction *a) void OptionsTabToolbars::toolbarPosition() { +#if 0 + LEGOPTFIXME LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w; if ( !d->cb_toolbars->count() ) return; int n = d->cb_toolbars->currentIndex(); - PositionOptionsTabToolbars *posTbDlg = new PositionOptionsTabToolbars(w, &opt->toolbars["mainWin"][n], n); + PositionOptionsTabToolbars *posTbDlg = new PositionOptionsTabToolbars(w, &LEGOPTS.toolbars["mainWin"][n], n); connect(posTbDlg, SIGNAL(applyPressed()), SLOT(toolbarPositionApply())); posTbDlg->exec(); delete posTbDlg; +#endif } void OptionsTabToolbars::toolbarPositionApply() { +#if 0 + LEGOPTFIXME emit dataChanged(); - option.toolbars = opt->toolbars; - psi->buildToolbars(); -} - -void OptionsTabToolbars::doApply() -{ - option.toolbars = opt->toolbars; + LEGOPTS.toolbars = LEGOPTS.toolbars; psi->buildToolbars(); +#endif } void OptionsTabToolbars::selAct_selectionChanged(QListWidgetItem *) src/options/opt_toolbars.cpp @@ -5,7 +5,6 @@ class PsiCon; class PsiToolBar; -struct Options; class QAction; class IconButton; class QListWidget; @@ -18,10 +17,12 @@ public: OptionsTabToolbars(QObject* parent); ~OptionsTabToolbars(); + bool stretchable() const {return true;}; + //void setCurrentToolbar(PsiToolBar *); QWidget* widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options* opt); + void applyOptions(); + void restoreOptions(); private slots: void setData(PsiCon*, QWidget*); @@ -42,11 +43,8 @@ private slots: void selAct_selectionChanged(QListWidgetItem *); void avaAct_selectionChanged(QTreeWidgetItem *); - void doApply(); void toolbarPositionApply(); - void rebuildToolbarList(); - signals: void dataChanged(); @@ -55,7 +53,6 @@ private: QWidget *w; QWidget *parent; - Options *opt; PsiCon *psi; bool noDirty; IconButton *pb_apply; src/options/opt_toolbars.h @@ -4,7 +4,6 @@ #include "optionstab.h" class QWidget; -struct Options; class OptionsTabTree : public OptionsTab { src/options/opt_tree.h @@ -162,7 +162,7 @@ class OptionsDlg::Private : public QObject { Q_OBJECT public: - Private(OptionsDlg *dlg, PsiCon *_psi, const Options &_opt); + Private(OptionsDlg *dlg, PsiCon *_psi); public slots: void doApply(); @@ -181,7 +181,6 @@ private slots: public: OptionsDlg *dlg; PsiCon *psi; - Options opt; bool dirty, noDirty; Q3Dict<QWidget> id2widget; Q3PtrList<OptionsTab> tabs; @@ -189,11 +188,10 @@ public: QMap<QString, QByteArray> changedMap; }; -OptionsDlg::Private::Private(OptionsDlg *d, PsiCon *_psi, const Options &_opt) +OptionsDlg::Private::Private(OptionsDlg *d, PsiCon *_psi) { dlg = d; psi = _psi; - opt = _opt; // option noDirty = false; dirty = false; @@ -435,7 +433,7 @@ void OptionsDlg::Private::openTab(QString id) bool d = dirty; - opttab->restoreOptions( &opt ); // initialize widgets' values + opttab->restoreOptions(); // initialize widgets' values dirty = d; dlg->pb_apply->setEnabled( dirty ); @@ -525,10 +523,10 @@ void OptionsDlg::Private::doApply() for ( ; it.current(); ++it) { opttab = it.current(); - opttab->applyOptions( &opt ); + opttab->applyOptions(); } - emit dlg->applyOptions( opt ); + emit dlg->applyOptions(); dirty = false; dlg->pb_apply->setEnabled(false); @@ -538,12 +536,12 @@ void OptionsDlg::Private::doApply() // OptionsDlg //---------------------------------------------------------------------------- -OptionsDlg::OptionsDlg(PsiCon *psi, const Options &opt, QWidget *parent) +OptionsDlg::OptionsDlg(PsiCon *psi, QWidget *parent) : QDialog(parent) { setAttribute(Qt::WA_DeleteOnClose); setupUi(this); - d = new Private(this, psi, opt); + d = new Private(this, psi); setModal(false); d->psi->dialogRegister(this); src/options/optionsdlg.cpp @@ -5,19 +5,18 @@ #include <QDialog> class PsiCon; -struct Options; class OptionsDlg : public QDialog, public Ui::OptionsUI { Q_OBJECT public: - OptionsDlg(PsiCon *, const Options &, QWidget *parent = 0); + OptionsDlg(PsiCon *, QWidget *parent = 0); ~OptionsDlg(); void openTab(const QString& id); signals: - void applyOptions(const Options &); + void applyOptions(); private slots: void doOk(); src/options/optionsdlg.h @@ -75,11 +75,11 @@ PsiIcon *OptionsTab::psiIcon() const return (PsiIcon *)IconsetFactory::iconPtr( v_iconName ); } -void OptionsTab::applyOptions(Options *) +void OptionsTab::applyOptions() { } -void OptionsTab::restoreOptions(const Options *) +void OptionsTab::restoreOptions() { } @@ -106,7 +106,7 @@ class OptionsTabWidget : public QTabWidget public: OptionsTabWidget(QWidget *parent); void addTab(OptionsTab *); - void restoreOptions(const Options *); + void restoreOptions(); signals: void connectDataChanged(QWidget *); @@ -123,14 +123,12 @@ private: bool initialized; }; QMap<QWidget *, TabData> w2tab; - Options *opt; }; OptionsTabWidget::OptionsTabWidget(QWidget *parent) : QTabWidget(parent) { connect(this, SIGNAL(currentChanged(QWidget *)), SLOT(updateCurrent(QWidget *))); - opt = 0; } void OptionsTabWidget::addTab(OptionsTab *tab) @@ -174,11 +172,10 @@ void OptionsTabWidget::updateCurrent(QWidget *w) if ( !opttab->stretchable() ) vbox->addStretch(); - if ( opt ) { - emit noDirty(true); - opttab->restoreOptions(opt); - emit noDirty(false); - } + emit noDirty(true); + opttab->restoreOptions(); + emit noDirty(false); + emit connectDataChanged(tab); tab->show(); @@ -186,16 +183,11 @@ void OptionsTabWidget::updateCurrent(QWidget *w) } } -void OptionsTabWidget::restoreOptions(const Options *o) +void OptionsTabWidget::restoreOptions() { - bool doRestore = !opt; - opt = (Options *)o; - - if ( doRestore ) { - emit noDirty(true); - w2tab[currentPage()].tab->restoreOptions(opt); - emit noDirty(false); - } + emit noDirty(true); + w2tab[currentPage()].tab->restoreOptions(); + emit noDirty(false); } //---------------------------------------------------------------------------- @@ -257,23 +249,25 @@ QWidget *MetaOptionsTab::widget() return w; } -void MetaOptionsTab::applyOptions(Options *opt) +void MetaOptionsTab::applyOptions() { Q3PtrListIterator<OptionsTab> it(tabs); - for ( ; it.current(); ++it) - it.current()->applyOptions(opt); + for ( ; it.current(); ++it) { + it.current()->applyOptions(); + } } -void MetaOptionsTab::restoreOptions(const Options *opt) +void MetaOptionsTab::restoreOptions() { if ( w ) { OptionsTabWidget *d = (OptionsTabWidget *)w; - d->restoreOptions(opt); + d->restoreOptions(); } Q3PtrListIterator<OptionsTab> it(tabs); - for ( ; it.current(); ++it) - it.current()->restoreOptions(opt); + for ( ; it.current(); ++it) { + it.current()->restoreOptions(); + } } void MetaOptionsTab::setData(PsiCon *psi, QWidget *w) src/options/optionstab.cpp @@ -6,7 +6,6 @@ #include <q3ptrlist.h> #include <QByteArray> -struct Options; class PsiIcon; class QWidget; class PsiCon; @@ -41,8 +40,8 @@ signals: public slots: virtual void setData(PsiCon *, QWidget *parentDialog); - virtual void applyOptions(Options *opt); - virtual void restoreOptions(const Options *opt); + virtual void applyOptions(); + virtual void restoreOptions(); virtual void tabAdded(OptionsTab *tab); // called when tab 'tab' specifies this tab as parent private: @@ -59,8 +58,8 @@ public: ~MetaOptionsTab(); QWidget *widget(); - void applyOptions(Options *opt); - void restoreOptions(const Options *opt); + void applyOptions(); + void restoreOptions(); void setData(PsiCon *, QWidget *); bool stretchable() const { return true; } src/options/optionstab.h @@ -21,6 +21,7 @@ #include "profiledlg.h" #include "applicationinfo.h" #include "iconset.h" +#include "psioptions.h" #include <QLabel> #include <QComboBox> @@ -36,6 +37,7 @@ #include <Q3ButtonGroup> #include <QPixmap> #include "profiles.h" +#include "common.h" #include "iconwidget.h" #include <qpainter.h> @@ -331,11 +333,17 @@ void ProfileNewDlg::slotCreate() } // save config - UserProfile p; - p.prefs.defaultAction = bg_defAct->selected() == (Q3Button *)rb_message ? 0: 1; - p.prefs.useEmoticons = ck_useEmoticons->isChecked(); - p.toFile(pathToProfileConfig(name)); - + PsiOptions o; + + if (!o.load(":/options/newprofile.xml")) { + qWarning("ERROR: Failed to new profile default options"); + } + + + o.setOption("options.messages.default-outgoing-message-type" ,bg_defAct->selected() == (Q3Button *)rb_message ? "message": "chat"); + o.setOption("options.ui.emoticons.use-emoticons" ,ck_useEmoticons->isChecked()); + o.save(pathToProfile(name) + "/options.xml"); + accept(); } src/profiledlg.cpp @@ -33,6 +33,8 @@ #include "xmpp_roster.h" #include "xmpp_jid.h" +class OptionsTree; + class UserAccount { public: @@ -43,6 +45,9 @@ public: QDomElement toXml(QDomDocument &, const QString &tagName); void fromXml(const QDomElement &); + + void fromOptions(OptionsTree *o, QString base); + void toOptions(OptionsTree *o, QString base=QString()); QString name; QString jid, pass, host, resource, authid, realm; @@ -50,16 +55,13 @@ public: int port, priority; bool opt_enabled, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_log, opt_reconn, opt_ignoreSSLWarnings, opt_compress; XMPP::ClientStream::AllowPlainType allow_plain; - bool tog_offline, tog_away, tog_agents, tog_hidden, tog_self; bool req_mutual_auth; bool legacy_ssl_probe; bool opt_automatic_resource; int security_level; enum SSLFlag { SSL_No = 0, SSL_Yes = 1, SSL_Auto = 2, SSL_Legacy = 3 } ssl; - int proxy_index; - int proxy_type, proxy_port; - QString proxy_host, proxy_user, proxy_pass; + QString proxyID; XMPP::Roster roster; @@ -74,31 +76,34 @@ public: VarList keybind; XMPP::Jid dtProxy; + + QString optionsBase; + + + /* migration only */ + int proxy_index; + int proxy_type, proxy_port; + QString proxy_host, proxy_user, proxy_pass; + bool tog_offline, tog_away, tog_agents, tog_hidden, tog_self; }; typedef QList<UserAccount> UserAccountList; -class UserProfile +class OptionsMigration { public: - UserProfile(); - - void reset(); - bool toFile(const QString &); bool fromFile(const QString &); + + void lateMigration(); - QString progver; - UserAccountList acc; - Options prefs; - - QRect mwgeom; - QStringList recentGCList; - QStringList recentBrowseList; - QString lastStatusString; - bool useSound; + //QString progver; + UserAccountList accMigration; - ProxyItemList proxyList; + ProxyItemList proxyMigration; + +private: + lateMigrationOptions lateMigrationData; }; QString pathToProfile(const QString &); src/profiles.h @@ -36,8 +36,10 @@ //Added by qt3to4: #include <QHBoxLayout> #include <QList> +#include <QDebug> #include "common.h" #include "iconwidget.h" +#include "psioptions.h" static QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content) { @@ -143,6 +145,29 @@ ProxySettings::ProxySettings() useAuth = false; } +#define PASSWORDKEY "Cae1voo:ea}fae2OCai|f1il" + +void ProxySettings::toOptions(OptionsTree* o, QString base) const +{ + o->setOption(base + ".host", host); + o->setOption(base + ".port", port); + o->setOption(base + ".url", url); + o->setOption(base + ".useAuth", useAuth); + o->setOption(base + ".user", user); + o->setOption(base + ".pass", encodePassword(pass, PASSWORDKEY)); +} + +void ProxySettings::fromOptions(OptionsTree* o, QString base) +{ + host = o->getOption(base + ".host").toString(); + port = o->getOption(base + ".port").toInt(); + url = o->getOption(base + ".url").toString(); + useAuth = o->getOption(base + ".useAuth").toBool(); + user = o->getOption(base + ".user").toString(); + pass = decodePassword(o->getOption(base + ".pass").toString(), PASSWORDKEY); +} + + QDomElement ProxySettings::toXml(QDomDocument *doc) const { QDomElement e = doc->createElement("proxySettings"); @@ -303,7 +328,7 @@ public: int last; }; -ProxyDlg::ProxyDlg(const ProxyItemList &list, const QStringList &methods, int def, QWidget *parent) +ProxyDlg::ProxyDlg(const ProxyItemList &list, const QStringList &methods, const QString &def, QWidget *parent) : QDialog(parent) { setAttribute(Qt::WA_DeleteOnClose); @@ -331,12 +356,17 @@ ProxyDlg::ProxyDlg(const ProxyItemList &list, const QStringList &methods, int de cb_type->insertStringList(methods); connect(cb_type, SIGNAL(activated(int)), SLOT(cb_activated(int))); - for(ProxyItemList::ConstIterator it = d->list.begin(); it != d->list.end(); ++it) + int defIdx = -1; + int i = 0; + for(ProxyItemList::ConstIterator it = d->list.begin(); it != d->list.end(); ++it) { lbx_proxy->insertItem((*it).name); + if ((*it).id == def) defIdx= i; + ++i; + } if(!list.isEmpty()) { - if(def < 0) - def = 0; - lbx_proxy->setCurrentItem(def); + if(defIdx < 0) + defIdx = 0; + lbx_proxy->setCurrentItem(defIdx); selectCurrent(); } @@ -354,7 +384,7 @@ ProxyDlg::~ProxyDlg() void ProxyDlg::proxy_new() { ProxyItem s; - s.id = -1; // id of -1 means 'new' + s.id = ""; // id of "" means 'new' s.name = getUniqueName(); d->list += s; @@ -530,50 +560,57 @@ ProxyChooser::~ProxyChooser() delete d; } -int ProxyChooser::currentItem() const +QString ProxyChooser::currentItem() const { - return d->cb_proxy->currentItem(); + return d->cb_proxy->itemData(d->cb_proxy->currentItem()).toString(); } -void ProxyChooser::setCurrentItem(int x) +void ProxyChooser::setCurrentItem(const QString &id) { - d->cb_proxy->setCurrentItem(x); + d->cb_proxy->setCurrentItem(d->cb_proxy->findData(id)); } -void ProxyChooser::pm_settingsChanged() +void ProxyChooser::pm_settingsChangedApply() { - int x = d->cb_proxy->currentItem(); + disconnect(d->m, SIGNAL(settingsChanged()), this, SLOT(pm_settingsChangedApply())); + QString prev = currentItem(); buildComboBox(); - if(x >= 1) { - x = d->m->findOldIndex(x-1); - if(x == -1) - d->cb_proxy->setCurrentItem(0); - else - d->cb_proxy->setCurrentItem(x+1); + prev = d->m->lastEdited(); + int x = d->cb_proxy->findData(prev); + if(x == -1) { + d->cb_proxy->setCurrentItem(0); + } else { + d->cb_proxy->setCurrentItem(x); } - else { - x = d->m->lastEdited(); - if(x != -1) - d->cb_proxy->setCurrentItem(x+1); +} + + +void ProxyChooser::pm_settingsChanged() +{ + QString prev = currentItem(); + buildComboBox(); + int x = d->cb_proxy->findData(prev); + if(x == -1) { + d->cb_proxy->setCurrentItem(0); + } else { + d->cb_proxy->setCurrentItem(x); } } void ProxyChooser::buildComboBox() { d->cb_proxy->clear(); - d->cb_proxy->insertItem(tr("None")); + d->cb_proxy->addItem(tr("None"), ""); ProxyItemList list = d->m->itemList(); - for(ProxyItemList::ConstIterator it = list.begin(); it != list.end(); ++it) - d->cb_proxy->insertItem((*it).name); + foreach(ProxyItem pi, list) { + d->cb_proxy->addItem(pi.name, pi.id); + } } void ProxyChooser::doOpen() { - int x = d->cb_proxy->currentItem(); - if(x < 1) - x = -1; - else - --x; + QString x = d->cb_proxy->itemData(d->cb_proxy->currentItem()).toString(); + connect(d->m, SIGNAL(settingsChanged()), SLOT(pm_settingsChangedApply())); d->m->openDialog(x); } @@ -593,16 +630,24 @@ class ProxyManager::Private public: Private() {} - ProxyItemList list; QPointer<ProxyDlg> pd; QList<int> prevMap; - int lastEdited; + QString lastEdited; + OptionsTree *o; + + void itemToOptions(ProxyItem pi) { + QString base = "proxies." + pi.id; + pi.settings.toOptions( o, base); + o->setOption(base + ".name", pi.name); + o->setOption(base + ".type", pi.type); + } }; -ProxyManager::ProxyManager(QObject *parent) -:QObject(parent) +ProxyManager::ProxyManager(OptionsTree *opt, QObject *parent) + : QObject(parent) { d = new Private; + d->o = opt; } ProxyManager::~ProxyManager() @@ -617,23 +662,36 @@ ProxyChooser *ProxyManager::createProxyChooser(QWidget *parent) ProxyItemList ProxyManager::itemList() const { - return d->list; + QList<ProxyItem> proxies; + QString opt = "proxies"; + QStringList keys = d->o->getChildOptionNames(opt, true, true); + foreach(QString key, keys) { + proxies += getItem(key.mid(opt.length()+1)); + } + return proxies; } -const ProxyItem & ProxyManager::getItem(int x) const +ProxyItem ProxyManager::getItem(const QString &x) const { - return d->list[x]; + QString base = "proxies." + x; + ProxyItem pi; + pi.settings.fromOptions( d->o, base); + pi.name = d->o->getOption(base + ".name").toString(); + pi.type = d->o->getOption(base + ".type").toString(); + pi.id = x; + return pi; } -int ProxyManager::lastEdited() const +QString ProxyManager::lastEdited() const { return d->lastEdited; } -void ProxyManager::setItemList(const ProxyItemList &list) +void ProxyManager::migrateItemList(const ProxyItemList &list) { - d->list = list; - assignIds(); + foreach(ProxyItem pi, list) { + d->itemToOptions(pi); + } } QStringList ProxyManager::methodList() const @@ -645,12 +703,12 @@ QStringList ProxyManager::methodList() const return list; } -void ProxyManager::openDialog(int def) +void ProxyManager::openDialog(QString def) { if(d->pd) bringToFront(d->pd); else { - d->pd = new ProxyDlg(d->list, methodList(), def, 0); + d->pd = new ProxyDlg(itemList(), methodList(), def, 0); connect(d->pd, SIGNAL(applyList(const ProxyItemList &, int)), SLOT(pd_applyList(const ProxyItemList &, int))); d->pd->show(); } @@ -658,38 +716,34 @@ void ProxyManager::openDialog(int def) void ProxyManager::pd_applyList(const ProxyItemList &list, int x) { - d->list = list; - d->lastEdited = x; - - // grab old id list - d->prevMap.clear(); - for(ProxyItemList::ConstIterator it = d->list.begin(); it != d->list.end(); ++it) - d->prevMap += (*it).id; - assignIds(); // re-assign proper ids - - settingsChanged(); -} - -void ProxyManager::assignIds() -{ - int n = 0; - for(ProxyItemList::Iterator it = d->list.begin(); it != d->list.end(); ++it) - (*it).id = n++; -} - -int ProxyManager::findOldIndex(int x) const -{ - int newPos = 0; - bool found = false; - for(QList<int>::ConstIterator it = d->prevMap.begin(); it != d->prevMap.end(); ++it) { - if(*it == x) { - found = true; - break; + QSet<QString> current; + + QString opt = "proxies"; + QStringList old = d->o->getChildOptionNames(opt, true, true); + for (int i=0; i < old.size(); i++) { + old[i] = old[i].mid(opt.length()+1); + } + + // Update all + int idx = 0; + int i = 0; + foreach(ProxyItem pi, list) { + if (pi.id.isEmpty()) { + do { + pi.id = "a"+QString::number(idx++); + } while (old.contains(pi.id) || current.contains(pi.id)); } - ++newPos; + d->itemToOptions(pi); + current += pi.id; + + if (i++ == x) d->lastEdited = pi.id; } - if(found) - return newPos; - else - return -1; + + // and remove removed + foreach(QString key, old.toSet() - current) { + d->o->removeOption("proxies." + key, true); + emit proxyRemoved(key); + } + + settingsChanged(); } src/proxy.cpp @@ -26,6 +26,7 @@ #include "ui_proxy.h" +class OptionsTree; class QDomElement; class QDomDocument; @@ -61,6 +62,9 @@ public: bool useAuth; QString url; + + void toOptions(OptionsTree* o, QString base) const; + void fromOptions(OptionsTree* o, QString base); QDomElement toXml(QDomDocument *) const; bool fromXml(const QDomElement &); }; @@ -90,7 +94,7 @@ class ProxyDlg : public QDialog, public Ui::Proxy { Q_OBJECT public: - ProxyDlg(const ProxyItemList &, const QStringList &, int def, QWidget *parent=0); + ProxyDlg(const ProxyItemList &, const QStringList &, const QString &def, QWidget *parent=0); ~ProxyDlg(); signals: @@ -122,12 +126,13 @@ public: ProxyChooser(ProxyManager *, QWidget *parent=0, const char *name=0); ~ProxyChooser(); - int currentItem() const; - void setCurrentItem(int); + QString currentItem() const; + void setCurrentItem(const QString &item); void fixTabbing(QWidget *a, QWidget *b); private slots: void pm_settingsChanged(); + void pm_settingsChangedApply(); void doOpen(); private: @@ -142,7 +147,7 @@ class ProxyItem public: ProxyItem() {} - int id; // used to keep track of 'old' position in a list + QString id; QString name; QString type; ProxySettings settings; @@ -152,22 +157,23 @@ class ProxyManager : public QObject { Q_OBJECT public: - ProxyManager(QObject *parent=0); + ProxyManager(OptionsTree *o, QObject *parent=0); ~ProxyManager(); ProxyChooser *createProxyChooser(QWidget *parent=0); ProxyItemList itemList() const; - const ProxyItem & getItem(int) const; - int lastEdited() const; - void setItemList(const ProxyItemList &); + ProxyItem getItem(const QString &id) const; + QString lastEdited() const; + void migrateItemList(const ProxyItemList &); QStringList methodList() const; - int findOldIndex(int) const; +// int findOldIndex(int) const; signals: void settingsChanged(); + void proxyRemoved(QString); public slots: - void openDialog(int); + void openDialog(QString); private slots: void pd_applyList(const ProxyItemList &, int cur); @@ -175,8 +181,6 @@ private slots: private: class Private; Private *d; - - void assignIds(); }; #endif src/proxy.h @@ -40,6 +40,8 @@ #include "psioptions.h" #include "varlist.h" #include "atomicxmlfile.h" +#include "psitoolbar.h" +#include "optionstree.h" using namespace XMPP; using namespace XMLHelper; @@ -76,6 +78,28 @@ void migrateSizeEntry(const QDomElement& element, const QString& entry, const QS migrateEntry<QSize>(element, entry, option, readSizeEntry); } +void migrateStringEntry(const QDomElement& element, const QString& entry, const QString& option) +{ + migrateEntry<QString>(element, entry, option, readEntry); +} + +void migrateStringList(const QDomElement& element, const QString& entry, const QString& option) +{ + migrateEntry<QStringList>(element, entry, option, xmlToStringList); +} + +void migrateColorEntry(const QDomElement& element, const QString &entry, const QString &option) +{ + migrateEntry<QColor>(element, entry, option, readColorEntry); +} + +void migrateRectEntry(const QDomElement& element, const QString &entry, const QString &option) +{ + migrateEntry<QRect>(element, entry, option, readRectEntry); +} + + + UserAccount::UserAccount() { reset(); @@ -128,65 +152,192 @@ UserAccount::~UserAccount() { } -// FIXME: this should be a const function (as should other ::toXml functions) -QDomElement UserAccount::toXml(QDomDocument &doc, const QString &tagName) +void UserAccount::fromOptions(OptionsTree *o, QString base) { - QDomElement a = doc.createElement(tagName); - - setBoolAttribute(a, "enabled", opt_enabled); - setBoolAttribute(a, "auto", opt_auto); - setBoolAttribute(a, "showOffline", tog_offline); - setBoolAttribute(a, "showAway", tog_away); - setBoolAttribute(a, "showHidden", tog_hidden); - setBoolAttribute(a, "showAgents", tog_agents); - setBoolAttribute(a, "showSelf", tog_self); - setBoolAttribute(a, "keepAlive", opt_keepAlive); - setBoolAttribute(a, "compress", opt_compress); - setBoolAttribute(a, "require-mutual-auth", req_mutual_auth); - setBoolAttribute(a, "legacy-ssl-probe", legacy_ssl_probe); - setBoolAttribute(a, "automatic-resource", opt_automatic_resource); - setBoolAttribute(a, "log", opt_log); - setBoolAttribute(a, "reconn", opt_reconn); - setBoolAttribute(a, "ignoreSSLWarnings", opt_ignoreSSLWarnings); - //setBoolAttribute(a, "gpg", opt_gpg); - - //QString jid = user + '@' + vhost; - a.appendChild(textTag(doc, "name", name)); - a.appendChild(textTag(doc, "jid", jid)); + optionsBase = base; - QDomElement customauth = doc.createElement("custom-auth"); - setBoolAttribute(customauth, "use", customAuth); - QDomElement ac = textTag(doc, "authid", authid); - QDomElement re = textTag(doc, "realm", realm); - customauth.appendChild(ac); - customauth.appendChild(re); - a.appendChild(customauth); - - if(opt_pass) - a.appendChild(textTag(doc, "password", encodePassword(pass, jid) )); - a.appendChild(textTag(doc, "useHost", opt_host)); - a.appendChild(textTag(doc, "security-level", security_level)); - a.appendChild(textTag(doc, "ssl", ssl)); - a.appendChild(textTag(doc, "host", host)); - a.appendChild(textTag(doc, "port", QString::number(port))); - a.appendChild(textTag(doc, "resource", resource)); - a.appendChild(textTag(doc, "priority", QString::number(priority))); - if (!pgpSecretKey.isNull()) { - a.appendChild(textTag(doc, "pgpSecretKeyID", pgpSecretKey.keyId())); + reset(); + + opt_enabled = o->getOption(base + ".enabled").toBool(); + opt_auto = o->getOption(base + ".auto").toBool(); + opt_keepAlive = o->getOption(base + ".keep-alive").toBool(); + opt_compress = o->getOption(base + ".compress").toBool(); + req_mutual_auth = o->getOption(base + ".require-mutual-auth").toBool(); + legacy_ssl_probe = o->getOption(base + ".legacy-ssl-probe").toBool(); + opt_automatic_resource = o->getOption(base + ".automatic-resource").toBool(); + opt_log = o->getOption(base + ".log").toBool(); + opt_reconn = o->getOption(base + ".reconn").toBool(); + opt_ignoreSSLWarnings = o->getOption(base + ".ignore-SSL-warnings").toBool(); + + name = o->getOption(base + ".name").toString(); + jid = o->getOption(base + ".jid").toString(); + + customAuth = o->getOption(base + ".custom-auth.use").toBool(); + authid = o->getOption(base + ".custom-auth.authid").toString(); + realm = o->getOption(base + ".custom-auth.realm").toString(); + + // read password (we must do this after reading the jid, to decode properly) + QString tmp = o->getOption(base + ".password").toString(); + if(!tmp.isEmpty()) { + opt_pass = TRUE; + pass = decodePassword(tmp, jid); } - a.appendChild(textTag(doc, "allow-plain", allow_plain)); - QDomElement r = doc.createElement("roster"); - a.appendChild(r); - Roster::ConstIterator rit = roster.begin(); - for ( ; rit != roster.end(); ++rit) { - const RosterItem &i = *rit; - QDomElement tag = i.toXml(&doc); - r.appendChild(tag); + opt_host = o->getOption(base + ".use-host").toBool(); + security_level = o->getOption(base + ".security-level").toInt(); + + tmp = o->getOption(base + ".ssl").toString(); + if (tmp == "no") { + ssl = SSL_No; + } else if (tmp == "yes") { + ssl = SSL_Yes; + } else if (tmp == "auto") { + ssl = SSL_Auto; + } else if (tmp == "legacy") { + ssl = SSL_Legacy; + } else { + ssl = SSL_Yes; } + + host = o->getOption(base + ".host").toString(); + port = o->getOption(base + ".port").toInt(); + + resource = o->getOption(base + ".resource").toString(); + priority = o->getOption(base + ".priority").toInt(); + + QString pgpSecretKeyID = o->getOption(base + ".pgp-secret-key-id").toString(); + if (!pgpSecretKeyID.isEmpty()) { + QCA::KeyStoreEntry e = PGPUtil::instance().getSecretKeyStoreEntry(pgpSecretKeyID); + if (!e.isNull()) + pgpSecretKey = e.pgpSecretKey(); + } + + tmp = o->getOption(base + ".allow-plain").toString(); + if (tmp == "never") { + allow_plain = XMPP::ClientStream::NoAllowPlain; + } else if (tmp == "always") { + allow_plain = XMPP::ClientStream::AllowPlain; + } else if (tmp == "over encryped") { + allow_plain = XMPP::ClientStream::AllowPlainOverTLS; + } else { + allow_plain = XMPP::ClientStream::NoAllowPlain; + } + + QStringList rosterCache = o->getChildOptionNames(base + ".roster-cache", true, true); + foreach(QString rbase, rosterCache) { + RosterItem ri; + ri.setJid(Jid(o->getOption(rbase + ".jid").toString())); + ri.setName(o->getOption(rbase + ".name").toString()); + Subscription s; + s.fromString(o->getOption(rbase + ".subscription").toString()); + ri.setSubscription(s); + ri.setAsk(o->getOption(rbase + ".ask").toString()); + ri.setGroups(o->getOption(rbase + ".groups").toStringList()); + roster += ri; + } + + groupState.clear(); + QVariantList states = o->mapKeyList(base + ".group-state"); + foreach(QVariant k, states) { + GroupData gd; + QString sbase = o->mapLookup(base + ".group-state", k); + gd.open = o->getOption(sbase + ".open").toBool(); + gd.rank = o->getOption(sbase + ".rank").toInt(); + groupState.insert(k.toString(), gd); + } + + proxyID = o->getOption(base + ".proxy-id").toString(); + + keybind.fromOptions(o, base + ".pgp-key-bindings"); + + dtProxy = o->getOption(base + ".bytestreams-proxy").toString(); +} +void UserAccount::toOptions(OptionsTree *o, QString base) +{ + if (base.isEmpty()) { + base = optionsBase; + } + // clear old data away + o->removeOption(base, true); + + o->setOption(base + ".enabled", opt_enabled); + o->setOption(base + ".auto", opt_auto); + o->setOption(base + ".keep-alive", opt_keepAlive); + o->setOption(base + ".compress", opt_compress); + o->setOption(base + ".require-mutual-auth", req_mutual_auth); + o->setOption(base + ".legacy-ssl-probe", legacy_ssl_probe); + o->setOption(base + ".automatic-resource", opt_automatic_resource); + o->setOption(base + ".log", opt_log); + o->setOption(base + ".reconn", opt_reconn); + o->setOption(base + ".ignore-SSL-warnings", opt_ignoreSSLWarnings); + + o->setOption(base + ".name", name); + o->setOption(base + ".jid", jid); + + o->setOption(base + ".custom-auth.use", customAuth); + o->setOption(base + ".custom-auth.authid", authid); + o->setOption(base + ".custom-auth.realm", realm); + + if(opt_pass) { + o->setOption(base + ".password", encodePassword(pass, jid)); + } else { + o->setOption(base + ".password", ""); + } + o->setOption(base + ".use-host", opt_host); + o->setOption(base + ".security-level", security_level); + switch (ssl) { + case SSL_No: + o->setOption(base + ".ssl", "no"); + break; + case SSL_Yes: + o->setOption(base + ".ssl", "yes"); + break; + case SSL_Auto: + o->setOption(base + ".ssl", "auto"); + break; + case SSL_Legacy: + o->setOption(base + ".ssl", "legacy"); + break; + default: + qFatal("unknown ssl enum value in UserAccount::toOptions"); + } + o->setOption(base + ".host", host); + o->setOption(base + ".port", port); + o->setOption(base + ".resource", resource); + o->setOption(base + ".priority", priority); + if (!pgpSecretKey.isNull()) { + o->setOption(base + ".pgp-secret-key-id", pgpSecretKey.keyId()); + } else { + o->setOption(base + ".pgp-secret-key-id", ""); + } + switch (allow_plain) { + case XMPP::ClientStream::NoAllowPlain: + o->setOption(base + ".allow-plain", "never"); + break; + case XMPP::ClientStream::AllowPlain: + o->setOption(base + ".allow-plain", "always"); + break; + case XMPP::ClientStream::AllowPlainOverTLS: + o->setOption(base + ".allow-plain", "over encryped"); + break; + default: + qFatal("unknown allow_plain enum value in UserAccount::toOptions"); + } + + int idx = 0; + foreach(RosterItem ri, roster) { + QString rbase = base + ".roster-cache.a" + QString::number(idx++); + o->setOption(rbase + ".jid", ri.jid().full()); + o->setOption(rbase + ".name", ri.name()); + o->setOption(rbase + ".subscription", ri.subscription().toString()); + o->setOption(rbase + ".ask", ri.ask()); + o->setOption(rbase + ".groups", ri.groups()); + } + // now we check for redundant entries - QStringList groupList, removeList; + QStringList groupList; + QSet<QString> removeList; groupList << "/\\/" + name + "\\/\\"; // account name is a very 'special' group // special groups that should also have their state remembered @@ -194,58 +345,34 @@ QDomElement UserAccount::toXml(QDomDocument &doc, const QString &tagName) groupList << qApp->translate("ContactProfile", "Agents/Transports"); // first, add all groups' names to groupList - rit = roster.begin(); - for ( ; rit != roster.end(); ++rit) { - const RosterItem &i = *rit; + foreach(RosterItem i, roster) { groupList += i.groups(); } // now, check if there's groupState name entry in groupList - QMap<QString, GroupData>::Iterator git = groupState.begin(); - for ( ; git != groupState.end(); ++git) { - bool found = false; - - QStringList::Iterator it = groupList.begin(); - for ( ; it != groupList.end(); ++it) - if ( git.key() == *it ) { - found = true; - break; - } - - if ( !found ) - removeList << git.key(); + foreach(QString group, groupState.keys()) { + if (!groupList.contains(group)) { + removeList << group; + } } // remove redundant groups - QStringList::Iterator it = removeList.begin(); - for ( ; it != removeList.end(); ++it) - groupState.remove( *it ); + foreach(QString group, removeList) { + groupState.remove( group ); + } // and finally, save the data - QDomElement gs = doc.createElement("groupState"); - a.appendChild(gs); - git = groupState.begin(); - for ( ; git != groupState.end(); ++git) { - //if ( !git.data().open || git.data().rank ) { // don't save unnecessary entries (the default is 'true' to open, and '0' to rank) - QDomElement group = doc.createElement("group"); - group.setAttribute("name", git.key()); - group.setAttribute("open", git.data().open ? "true" : "false"); - group.setAttribute("rank", QString::number(git.data().rank)); - gs.appendChild(group); - //} + foreach(QString group, groupState.keys()) { + QString groupBase = o->mapPut(base + ".group-state", group); + o->setOption(groupBase + ".open", groupState[group].open); + o->setOption(groupBase + ".rank", groupState[group].rank); } + + o->setOption(base + ".proxy-id", proxyID); - a.appendChild(textTag(doc, "proxyindex", QString::number(proxy_index))); - //a.appendChild(textTag(doc, "proxytype", QString::number(proxy_type))); - //a.appendChild(textTag(doc, "proxyhost", proxy_host)); - //a.appendChild(textTag(doc, "proxyport", QString::number(proxy_port))); - //a.appendChild(textTag(doc, "proxyuser", proxy_user)); - //a.appendChild(textTag(doc, "proxypass", encodePassword(proxy_pass, jid))); - - a.appendChild(keybind.toXml(doc, "pgpkeybindings")); - a.appendChild(textTag(doc, "dtProxy", dtProxy.full())); - - return a; + keybind.toOptions(o, base + ".pgp-key-bindings"); + o->setOption(base + ".bytestreams-proxy", dtProxy.full()); + } void UserAccount::fromXml(const QDomElement &a) @@ -399,12 +526,9 @@ void UserAccount::fromXml(const QDomElement &a) dtProxy = str; } -UserProfile::UserProfile() -{ - reset(); -} - -void UserProfile::reset() +#if 0 + LEGOPTFIXME +void OptionsMigration::reset() { bool nix, win, mac; nix = win = mac = FALSE; @@ -426,154 +550,143 @@ void UserProfile::reset() proxyList.clear(); acc.clear(); - // prefs - prefs.useleft = FALSE; - prefs.singleclick = FALSE; - prefs.hideMenubar = FALSE; - prefs.defaultAction = 1; - prefs.delChats = dcHour; - prefs.browser = 0; - prefs.alwaysOnTop = FALSE; - prefs.keepSizes = TRUE; - prefs.ignoreHeadline = FALSE; - prefs.ignoreNonRoster = FALSE; - prefs.excludeGroupChatsFromIgnore = TRUE; - prefs.useDock = true; - prefs.dockDCstyle = win ? TRUE: FALSE; - prefs.dockHideMW = FALSE; - prefs.dockToolMW = FALSE; + // LEGOPTP + LEGOPTP.useleft = FALSE; + LEGOPTP.singleclick = FALSE; + LEGOPTP.hideMenubar = FALSE; + LEGOPTP.defaultAction = 1; + LEGOPTP.delChats = dcHour; + LEGOPTP.browser = 0; + LEGOPTP.alwaysOnTop = FALSE; + LEGOPTP.keepSizes = TRUE; + LEGOPTP.ignoreHeadline = FALSE; + LEGOPTP.ignoreNonRoster = FALSE; + LEGOPTP.excludeGroupChatsFromIgnore = TRUE; + LEGOPTP.useDock = true; + LEGOPTP.dockDCstyle = win ? TRUE: FALSE; + LEGOPTP.dockHideMW = FALSE; + LEGOPTP.dockToolMW = FALSE; #ifdef Q_WS_MAC - prefs.alertStyle = 0; + LEGOPTP.alertStyle = 0; #else - prefs.alertStyle = 2; + LEGOPTP.alertStyle = 2; #endif - prefs.popupMsgs = FALSE; - prefs.popupChats = FALSE; - prefs.popupHeadlines = FALSE; - prefs.popupFiles = FALSE; - prefs.noAwayPopup = FALSE; - prefs.noUnlistedPopup = false; - prefs.raise = FALSE; - prefs.incomingAs = 0; - prefs.askOnline = FALSE; - prefs.askOffline = FALSE; - prefs.rosterAnim = TRUE; - prefs.autoVCardOnLogin = true; - prefs.xmlConsoleOnLogin = false; - prefs.asAway = 10; - prefs.asXa = 30; - prefs.asOffline = 0; - prefs.use_asAway = TRUE; - prefs.use_asXa = TRUE; - prefs.use_asOffline = FALSE; - prefs.asMessage = QObject::tr("Auto Status (idle)"); - prefs.scrollTo = TRUE; - prefs.useEmoticons = false; - prefs.alertOpenChats = true; - prefs.raiseChatWindow = false; - prefs.showSubjects = true; - prefs.showCounter = false; - prefs.chatSays = false; - prefs.showGroupCounts = true; - prefs.smallChats = false; - prefs.brushedMetal = false; - prefs.chatLineEdit = true; - prefs.useTabs = false; - prefs.usePerTabCloseButton = true; - prefs.putTabsAtBottom = false; - prefs.autoRosterSize = false; - prefs.autoRosterSizeGrowTop = false; - prefs.autoResolveNicksOnAdd = false; - prefs.chatBgImage = ""; - prefs.rosterBgImage = ""; - prefs.autoCopy = false; - prefs.useCaps = true; - prefs.useRC = false; - - prefs.sp.clear(); + LEGOPTP.popupMsgs = FALSE; + LEGOPTP.popupChats = FALSE; + LEGOPTP.popupHeadlines = FALSE; + LEGOPTP.popupFiles = FALSE; + LEGOPTP.noAwayPopup = FALSE; + LEGOPTP.noUnlistedPopup = false; + LEGOPTP.raise = FALSE; + LEGOPTP.incomingAs = 0; + LEGOPTP.askOnline = FALSE; + LEGOPTP.askOffline = FALSE; + LEGOPTP.rosterAnim = TRUE; + LEGOPTP.autoVCardOnLogin = true; + LEGOPTP.xmlConsoleOnLogin = false; + LEGOPTP.asAway = 10; + LEGOPTP.asXa = 30; + LEGOPTP.asOffline = 0; + LEGOPTP.use_asAway = TRUE; + LEGOPTP.use_asXa = TRUE; + LEGOPTP.use_asOffline = FALSE; + LEGOPTP.asMessage = QObject::tr("Auto Status (idle)"); + LEGOPTP.scrollTo = TRUE; + LEGOPTP.useEmoticons = false; + LEGOPTP.alertOpenChats = true; + LEGOPTP.raiseChatWindow = false; + LEGOPTP.showSubjects = true; + LEGOPTP.showCounter = false; + LEGOPTP.chatSays = false; + LEGOPTP.showGroupCounts = true; + LEGOPTP.smallChats = false; + LEGOPTP.brushedMetal = false; + LEGOPTP.chatLineEdit = true; + LEGOPTP.useTabs = false; + LEGOPTP.usePerTabCloseButton = true; + LEGOPTP.putTabsAtBottom = false; + LEGOPTP.autoRosterSize = false; + LEGOPTP.autoRosterSizeGrowTop = false; + LEGOPTP.autoResolveNicksOnAdd = false; + LEGOPTP.chatBgImage = ""; + LEGOPTP.rosterBgImage = ""; + LEGOPTP.autoCopy = false; + LEGOPTP.useCaps = true; + LEGOPTP.useRC = false; + + LEGOPTP.sp.clear(); QString name; name = QObject::tr("Away from desk"); - prefs.sp[name] = StatusPreset(name, QObject::tr("I am away from my desk. Leave a message."), STATUS_AWAY);; + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("I am away from my desk. Leave a message."), STATUS_AWAY);; name = QObject::tr("Showering"); - prefs.sp[name] = StatusPreset(name, QObject::tr("I'm in the shower. You'll have to wait for me to get out."), STATUS_AWAY); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("I'm in the shower. You'll have to wait for me to get out."), STATUS_AWAY); name = QObject::tr("Eating"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Out eating. Mmmm.. food."), STATUS_AWAY); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Out eating. Mmmm.. food."), STATUS_AWAY); name = QObject::tr("Sleep"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Sleep is good. Zzzzz"),STATUS_DND); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Sleep is good. Zzzzz"),STATUS_DND); name = QObject::tr("Work"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Can't chat. Gotta work."), STATUS_DND); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Can't chat. Gotta work."), STATUS_DND); name = QObject::tr("Air"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Stepping out to get some fresh air."), STATUS_AWAY); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Stepping out to get some fresh air."), STATUS_AWAY); name = QObject::tr("Movie"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Out to a movie. Is that OK with you?"), STATUS_AWAY); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Out to a movie. Is that OK with you?"), STATUS_AWAY); name = QObject::tr("Secret"); - prefs.sp[name] = StatusPreset(name, QObject::tr("I'm not available right now and that's all you need to know."), STATUS_XA); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("I'm not available right now and that's all you need to know."), STATUS_XA); name = QObject::tr("Out for the night"); - prefs.sp[name] = StatusPreset(name, QObject::tr("Out for the night."), STATUS_AWAY); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("Out for the night."), STATUS_AWAY); name = QObject::tr("Greece"); - prefs.sp[name] = StatusPreset(name, QObject::tr("I have gone to a far away place. I will be back someday!"), STATUS_XA); - prefs.recentStatus.clear(); - - prefs.color[cOnline] = QColor("#000000"); - prefs.color[cListBack] = QColor("#FFFFFF"); - prefs.color[cAway] = QColor("#004BB4"); - prefs.color[cDND] = QColor("#7E0000"); - prefs.color[cOffline] = QColor("#646464"); - prefs.color[cStatus] = QColor("#808080"); - prefs.color[cProfileFore] = QColor("#FFFFFF"); - prefs.color[cProfileBack] = QColor("#969696"); - prefs.color[cGroupFore] = QColor("#5A5A5A"); - prefs.color[cGroupBack] = QColor("#F0F0F0"); - prefs.color[cAnimFront] = QColor("#000000"); - prefs.color[cAnimBack] = QColor("#969696"); - - prefs.font[fRoster] = QApplication::font().toString(); - prefs.font[fMessage] = QApplication::font().toString(); - prefs.font[fChat] = QApplication::font().toString(); + LEGOPTP.sp[name] = StatusPreset(name, QObject::tr("I have gone to a far away place. I will be back someday!"), STATUS_XA); + LEGOPTP.recentStatus.clear(); + + LEGOPTP.color[cOnline] = QColor("#000000"); + LEGOPTP.color[cListBack] = QColor("#FFFFFF"); + LEGOPTP.color[cAway] = QColor("#004BB4"); + LEGOPTP.color[cDND] = QColor("#7E0000"); + LEGOPTP.color[cOffline] = QColor("#646464"); + LEGOPTP.color[cStatus] = QColor("#808080"); + LEGOPTP.color[cProfileFore] = QColor("#FFFFFF"); + LEGOPTP.color[cProfileBack] = QColor("#969696"); + LEGOPTP.color[cGroupFore] = QColor("#5A5A5A"); + LEGOPTP.color[cGroupBack] = QColor("#F0F0F0"); + LEGOPTP.color[cAnimFront] = QColor("#000000"); + LEGOPTP.color[cAnimBack] = QColor("#969696"); + + LEGOPTP.font[fRoster] = QApplication::font().toString(); + LEGOPTP.font[fMessage] = QApplication::font().toString(); + LEGOPTP.font[fChat] = QApplication::font().toString(); { QFont font = QApplication::font(); font.setPointSize( font.pointSize() - 2 ); - prefs.font[fPopup] = font.toString(); + LEGOPTP.font[fPopup] = font.toString(); } + LEGOPTP.clNewHeadings = false; + LEGOPTP.outlineHeadings = false; + + LEGOPTP.player = "play"; + LEGOPTP.noAwaySound = FALSE; + + LEGOPTP.onevent[eMessage] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; + LEGOPTP.onevent[eChat1] = ApplicationInfo::resourcesDir() + "/sound/chat1.wav"; + LEGOPTP.onevent[eChat2] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; + LEGOPTP.onevent[eSystem] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; + LEGOPTP.onevent[eHeadline] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; + LEGOPTP.onevent[eOnline] = ApplicationInfo::resourcesDir() + "/sound/online.wav"; + LEGOPTP.onevent[eOffline] = ApplicationInfo::resourcesDir() + "/sound/offline.wav"; + LEGOPTP.onevent[eSend] = ApplicationInfo::resourcesDir() + "/sound/send.wav"; + LEGOPTP.onevent[eIncomingFT] = ApplicationInfo::resourcesDir() + "/sound/ft_incoming.wav"; + LEGOPTP.onevent[eFTComplete] = ApplicationInfo::resourcesDir() + "/sound/ft_complete.wav"; + + + LEGOPTP.sizeEventDlg = EventDlg::defaultSize(); + LEGOPTP.sizeChatDlg = ChatDlg::defaultSize(); + LEGOPTP.sizeTabDlg = ChatDlg::defaultSize(); //TODO: no! - // calculate the small font size - const int minimumFontSize = 7; - prefs.smallFontSize = qApp->font().pointSize(); - prefs.smallFontSize -= 2; - if ( prefs.smallFontSize < minimumFontSize ) - prefs.smallFontSize = minimumFontSize; - FancyLabel::setSmallFontSize( prefs.smallFontSize ); - - prefs.clNewHeadings = false; - prefs.outlineHeadings = false; - - prefs.player = "play"; - prefs.noAwaySound = FALSE; - - prefs.onevent[eMessage] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - prefs.onevent[eChat1] = ApplicationInfo::resourcesDir() + "/sound/chat1.wav"; - prefs.onevent[eChat2] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - prefs.onevent[eSystem] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - prefs.onevent[eHeadline] = ApplicationInfo::resourcesDir() + "/sound/chat2.wav"; - prefs.onevent[eOnline] = ApplicationInfo::resourcesDir() + "/sound/online.wav"; - prefs.onevent[eOffline] = ApplicationInfo::resourcesDir() + "/sound/offline.wav"; - prefs.onevent[eSend] = ApplicationInfo::resourcesDir() + "/sound/send.wav"; - prefs.onevent[eIncomingFT] = ApplicationInfo::resourcesDir() + "/sound/ft_incoming.wav"; - prefs.onevent[eFTComplete] = ApplicationInfo::resourcesDir() + "/sound/ft_complete.wav"; - - // Added by Kiko 020621: sets up the default certificate store - prefs.trustCertStoreDir = ApplicationInfo::resourcesDir() + "/certs"; - - prefs.sizeEventDlg = EventDlg::defaultSize(); - prefs.sizeChatDlg = ChatDlg::defaultSize(); - prefs.sizeTabDlg = ChatDlg::defaultSize(); //TODO: no! - - prefs.jidComplete = true; - prefs.grabUrls = false; - prefs.noGCSound = true; + LEGOPTP.jidComplete = true; + LEGOPTP.grabUrls = false; + LEGOPTP.noGCSound = true; // toolbars - prefs.toolbars.clear(); + LEGOPTP.toolbars.clear(); Options::ToolbarPrefs tbDef; tbDef.name = QString::null; @@ -625,107 +738,104 @@ void UserProfile::reset() tb[2].index = 0; for ( i = 0; i < sizeof(tb)/sizeof(Options::ToolbarPrefs); i++ ) - prefs.toolbars["mainWin"].append( tb[i] ); + LEGOPTP.toolbars["mainWin"].append( tb[i] ); } // groupchat - prefs.gcHighlighting = true; - prefs.gcHighlights.clear(); + LEGOPTP.gcHighlighting = true; + LEGOPTP.gcHighlights.clear(); - prefs.gcNickColoring = true; - prefs.gcNickColors.clear(); + LEGOPTP.gcNickColoring = true; + LEGOPTP.gcNickColors.clear(); - prefs.gcNickColors << "Blue"; - prefs.gcNickColors << "Green"; - prefs.gcNickColors << "Orange"; - prefs.gcNickColors << "Purple"; - prefs.gcNickColors << "Red"; + LEGOPTP.gcNickColors << "Blue"; + LEGOPTP.gcNickColors << "Green"; + LEGOPTP.gcNickColors << "Orange"; + LEGOPTP.gcNickColors << "Purple"; + LEGOPTP.gcNickColors << "Red"; // popups - prefs.ppIsOn = false; - prefs.ppOnline = true; - prefs.ppOffline = true; - prefs.ppStatus = false; - prefs.ppMessage = true; - prefs.ppChat = true; - prefs.ppHeadline = true; - prefs.ppFile = true; - prefs.ppJidClip = 25; - prefs.ppStatusClip = -1; - prefs.ppTextClip = 300; - prefs.ppHideTime = 10000; // 10 sec - prefs.ppBorderColor = QColor (0x52, 0x97, 0xF9); + LEGOPTP.ppIsOn = false; + LEGOPTP.ppOnline = true; + LEGOPTP.ppOffline = true; + LEGOPTP.ppStatus = false; + LEGOPTP.ppMessage = true; + LEGOPTP.ppChat = true; + LEGOPTP.ppHeadline = true; + LEGOPTP.ppFile = true; + LEGOPTP.ppJidClip = 25; + LEGOPTP.ppStatusClip = -1; + LEGOPTP.ppTextClip = 300; + LEGOPTP.ppHideTime = 10000; // 10 sec + LEGOPTP.ppBorderColor = QColor (0x52, 0x97, 0xF9); // Bouncing of the dock (Mac OS X) - prefs.bounceDock = Options::BounceForever; + LEGOPTP.bounceDock = Options::BounceForever; // lockdown - prefs.lockdown.roster = false; - prefs.lockdown.services = false; + LEGOPTP.lockdown.roster = false; + LEGOPTP.lockdown.services = false; - prefs.useTransportIconsForContacts = false; + LEGOPTP.useTransportIconsForContacts = false; // iconsets - prefs.systemIconset = "default"; - prefs.emoticons = QStringList("default"); - prefs.defaultRosterIconset = "default"; + LEGOPTP.systemIconset = "default"; + LEGOPTP.emoticons = QStringList("default"); + LEGOPTP.defaultRosterIconset = "default"; - prefs.serviceRosterIconset.clear(); - prefs.serviceRosterIconset["transport"] = "crystal-service.jisp"; - prefs.serviceRosterIconset["aim"] = "crystal-aim.jisp"; - prefs.serviceRosterIconset["gadugadu"] = "crystal-gadugadu.jisp"; - prefs.serviceRosterIconset["icq"] = "crystal-icq.jisp"; - prefs.serviceRosterIconset["msn"] = "crystal-msn.jisp"; - prefs.serviceRosterIconset["yahoo"] = "crystal-yahoo.jisp"; - prefs.serviceRosterIconset["sms"] = "crystal-sms.jisp"; + LEGOPTP.serviceRosterIconset.clear(); + LEGOPTP.serviceRosterIconset["transport"] = "crystal-service.jisp"; + LEGOPTP.serviceRosterIconset["aim"] = "crystal-aim.jisp"; + LEGOPTP.serviceRosterIconset["gadugadu"] = "crystal-gadugadu.jisp"; + LEGOPTP.serviceRosterIconset["icq"] = "crystal-icq.jisp"; + LEGOPTP.serviceRosterIconset["msn"] = "crystal-msn.jisp"; + LEGOPTP.serviceRosterIconset["yahoo"] = "crystal-yahoo.jisp"; + LEGOPTP.serviceRosterIconset["sms"] = "crystal-sms.jisp"; - prefs.customRosterIconset.clear(); + LEGOPTP.customRosterIconset.clear(); // roster sorting - prefs.rosterContactSortStyle = Options::ContactSortStyle_Status; - prefs.rosterGroupSortStyle = Options::GroupSortStyle_Alpha; - prefs.rosterAccountSortStyle = Options::AccountSortStyle_Alpha; + LEGOPTP.rosterContactSortStyle = Options::ContactSortStyle_Status; + LEGOPTP.rosterGroupSortStyle = Options::GroupSortStyle_Alpha; + LEGOPTP.rosterAccountSortStyle = Options::AccountSortStyle_Alpha; // disco dialog - prefs.discoItems = false; - prefs.discoInfo = true; + LEGOPTP.discoItems = false; + LEGOPTP.discoInfo = true; // auto-auth - prefs.autoAuth = false; + LEGOPTP.autoAuth = false; // Notify authorization - prefs.notifyAuth = false; + LEGOPTP.notifyAuth = false; // message events - prefs.messageEvents = true; - prefs.inactiveEvents = false; + LEGOPTP.messageEvents = true; + LEGOPTP.inactiveEvents = false; // event priority - prefs.eventPriorityHeadline = 0; - prefs.eventPriorityChat = 1; - prefs.eventPriorityMessage = 1; - prefs.eventPriorityAuth = 2; - prefs.eventPriorityFile = 3; - prefs.eventPriorityFile = 2; + LEGOPTP.eventPriorityHeadline = 0; + LEGOPTP.eventPriorityChat = 1; + LEGOPTP.eventPriorityMessage = 1; + LEGOPTP.eventPriorityAuth = 2; + LEGOPTP.eventPriorityFile = 3; + LEGOPTP.eventPriorityFile = 2; // Last used path remembering - prefs.lastPath = QDir::homeDirPath(); - prefs.lastSavePath = QDir::homeDirPath(); + LEGOPTP.lastPath = QDir::homeDirPath(); + LEGOPTP.lastSavePath = QDir::homeDirPath(); // data transfer - prefs.dtPort = 8010; - prefs.dtExternal = ""; + LEGOPTP.dtPort = 8010; + LEGOPTP.dtExternal = ""; - // advanced widget - GAdvancedWidget::setStickEnabled( false ); //until this is bugless - GAdvancedWidget::setStickToWindows( false ); //again - GAdvancedWidget::setStickAt( 5 ); } +#endif -static Options::ToolbarPrefs loadToolbarData( const QDomElement &e ) +static ToolbarPrefs loadToolbarData( const QDomElement &e ) { QDomElement tb_prefs = e; - Options::ToolbarPrefs tb; + ToolbarPrefs tb; readEntry(tb_prefs, "name", &tb.name); readBoolEntry(tb_prefs, "on", &tb.on); @@ -765,492 +875,8 @@ static Options::ToolbarPrefs loadToolbarData( const QDomElement &e ) return tb; } -bool UserProfile::toFile(const QString &fname) -{ - QDomDocument doc; - - QDomElement base = doc.createElement("psiconf"); - base.setAttribute("version", "1.0"); - doc.appendChild(base); - - base.appendChild(textTag(doc, "progver", ApplicationInfo::version())); - base.appendChild(textTag(doc, "geom", mwgeom)); - base.appendChild(stringListToXml(doc, "recentGCList", recentGCList)); - base.appendChild(stringListToXml(doc, "recentBrowseList", recentBrowseList)); - base.appendChild(textTag(doc, "lastStatusString", lastStatusString)); - base.appendChild(textTag(doc, "useSound", useSound)); - - QDomElement accs = doc.createElement("accounts"); - base.appendChild(accs); - for(UserAccountList::Iterator ai = acc.begin(); ai != acc.end(); ++ai) - accs.appendChild((*ai).toXml(doc, "account")); - - QDomElement prox = doc.createElement("proxies"); - base.appendChild(prox); - for(ProxyItemList::Iterator pi = proxyList.begin(); pi != proxyList.end(); ++pi) { - const ProxyItem &p = *pi; - QDomElement i = doc.createElement("proxy"); - i.appendChild(textTag(doc, "name", p.name)); - i.appendChild(textTag(doc, "type", p.type)); - i.appendChild(p.settings.toXml(&doc)); - prox.appendChild(i); - } - - QDomElement p = doc.createElement("preferences"); - base.appendChild(p); - - { - QDomElement p_general = doc.createElement("general"); - p.appendChild(p_general); - - { - QDomElement p_roster = doc.createElement("roster"); - p_general.appendChild(p_roster); - - p_roster.appendChild(textTag(doc, "useleft", prefs.useleft)); - p_roster.appendChild(textTag(doc, "rosterBgImage", prefs.rosterBgImage)); - p_roster.appendChild(textTag(doc, "singleclick", prefs.singleclick)); - p_roster.appendChild(textTag(doc, "hideMenubar", prefs.hideMenubar)); - p_roster.appendChild(textTag(doc, "defaultAction", prefs.defaultAction)); - p_roster.appendChild(textTag(doc, "useTransportIconsForContacts", prefs.useTransportIconsForContacts)); - - { - QDomElement sorting = doc.createElement("sortStyle"); - p_roster.appendChild(sorting); - - QString name = "status"; - if ( prefs.rosterContactSortStyle == Options::ContactSortStyle_Alpha ) - name = "alpha"; - sorting.appendChild(textTag(doc, "contact", name)); - - name = "alpha"; - if ( prefs.rosterGroupSortStyle == Options::GroupSortStyle_Rank ) - name = "rank"; - sorting.appendChild(textTag(doc, "group", name)); - - name = "alpha"; - if ( prefs.rosterAccountSortStyle == Options::AccountSortStyle_Rank ) - name = "rank"; - sorting.appendChild(textTag(doc, "account", name)); - } - } - - { - QDomElement p_misc = doc.createElement("misc"); - p_general.appendChild(p_misc); - - p_misc.appendChild(textTag(doc, "chatBgImage", prefs.chatBgImage)); - p_misc.appendChild(textTag(doc, "smallChats", prefs.smallChats)); - p_misc.appendChild(textTag(doc, "brushedMetal", prefs.brushedMetal)); - p_misc.appendChild(textTag(doc, "chatLineEdit", prefs.chatLineEdit)); - p_misc.appendChild(textTag(doc, "useTabs", prefs.useTabs)); - p_misc.appendChild(textTag(doc, "usePerTabCloseButton", prefs.usePerTabCloseButton)); - p_misc.appendChild(textTag(doc, "putTabsAtBottom", prefs.putTabsAtBottom)); - p_misc.appendChild(textTag(doc, "autoRosterSize", prefs.autoRosterSize)); - p_misc.appendChild(textTag(doc, "autoRosterSizeGrowTop", prefs.autoRosterSizeGrowTop)); - p_misc.appendChild(textTag(doc, "autoResolveNicksOnAdd", prefs.autoResolveNicksOnAdd)); - p_misc.appendChild(textTag(doc, "delChats", prefs.delChats)); - p_misc.appendChild(textTag(doc, "browser", prefs.browser)); - p_misc.appendChild(textTag(doc, "alwaysOnTop", prefs.alwaysOnTop)); - p_misc.appendChild(textTag(doc, "keepSizes", prefs.keepSizes)); - p_misc.appendChild(textTag(doc, "ignoreHeadline", prefs.ignoreHeadline)); - p_misc.appendChild(textTag(doc, "ignoreNonRoster", prefs.ignoreNonRoster)); - p_misc.appendChild(textTag(doc, "excludeGroupChatIgnore", prefs.excludeGroupChatsFromIgnore)); - p_misc.appendChild(textTag(doc, "scrollTo", prefs.scrollTo)); - p_misc.appendChild(textTag(doc, "useEmoticons", prefs.useEmoticons)); - p_misc.appendChild(textTag(doc, "alertOpenChats", prefs.alertOpenChats)); - p_misc.appendChild(textTag(doc, "raiseChatWindow", prefs.raiseChatWindow)); - p_misc.appendChild(textTag(doc, "showSubjects", prefs.showSubjects)); - p_misc.appendChild(textTag(doc, "showCounter", prefs.showCounter)); - p_misc.appendChild(textTag(doc, "chatSays", prefs.chatSays)); - p_misc.appendChild(textTag(doc, "showGroupCounts", prefs.showGroupCounts)); - p_misc.appendChild(textTag(doc, "jidComplete", prefs.jidComplete)); - p_misc.appendChild(textTag(doc, "grabUrls", prefs.grabUrls)); - p_misc.appendChild(textTag(doc, "messageEvents", prefs.messageEvents)); - p_misc.appendChild(textTag(doc, "inactiveEvents", prefs.inactiveEvents)); - p_misc.appendChild(textTag(doc, "lastPath", prefs.lastPath)); - p_misc.appendChild(textTag(doc, "lastSavePath", prefs.lastSavePath)); - p_misc.appendChild(textTag(doc, "autoCopy", prefs.autoCopy)); - p_misc.appendChild(textTag(doc, "useCaps", prefs.useCaps)); - p_misc.appendChild(textTag(doc, "rc", prefs.useRC)); - } - { - QDomElement p_dock = doc.createElement("dock"); - p_general.appendChild(p_dock); - - p_dock.appendChild(textTag(doc, "useDock", prefs.useDock)); - p_dock.appendChild(textTag(doc, "dockDCstyle", prefs.dockDCstyle)); - p_dock.appendChild(textTag(doc, "dockHideMW", prefs.dockHideMW)); - p_dock.appendChild(textTag(doc, "dockToolMW", prefs.dockToolMW)); - } - /*{ - QDomElement p_sec = doc.createElement("security"); - p_general.appendChild(p_sec); - - p_sec.appendChild(textTag(doc, "pgp", prefs.pgp)); - }*/ - } - - // Added by Kiko 020621: stores SSL cert chain validation configuration - { - QDomElement p_ssl = doc.createElement("ssl"); - p.appendChild(p_ssl); - - p_ssl.appendChild(textTag(doc, "trustedcertstoredir", prefs.trustCertStoreDir)); - } - - { - QDomElement p_events = doc.createElement("events"); - p.appendChild(p_events); - - p_events.appendChild(textTag(doc, "alertstyle", prefs.alertStyle)); - p_events.appendChild(textTag(doc, "autoAuth", prefs.autoAuth)); - p_events.appendChild(textTag(doc, "notifyAuth", prefs.notifyAuth)); - - - { - QDomElement p_receive = doc.createElement("receive"); - p_events.appendChild(p_receive); - - p_receive.appendChild(textTag(doc, "popupMsgs", prefs.popupMsgs)); - p_receive.appendChild(textTag(doc, "popupChats", prefs.popupChats)); - p_receive.appendChild(textTag(doc, "popupHeadlines", prefs.popupHeadlines)); - p_receive.appendChild(textTag(doc, "popupFiles", prefs.popupFiles)); - p_receive.appendChild(textTag(doc, "noAwayPopup", prefs.noAwayPopup)); - p_receive.appendChild(textTag(doc, "noUnlistedPopup", prefs.noUnlistedPopup)); - p_receive.appendChild(textTag(doc, "raise", prefs.raise)); - p_receive.appendChild(textTag(doc, "incomingAs", prefs.incomingAs)); - } - { - QDomElement p_priority = doc.createElement("priority"); - p_events.appendChild(p_priority); - - p_priority.appendChild(textTag(doc, "message", prefs.eventPriorityMessage)); - p_priority.appendChild(textTag(doc, "chat", prefs.eventPriorityChat)); - p_priority.appendChild(textTag(doc, "headline", prefs.eventPriorityHeadline)); - p_priority.appendChild(textTag(doc, "auth", prefs.eventPriorityAuth)); - p_priority.appendChild(textTag(doc, "file", prefs.eventPriorityFile)); - p_priority.appendChild(textTag(doc, "rosterx", prefs.eventPriorityRosterExchange)); - } - } - - { - QDomElement p_pres = doc.createElement("presence"); - p.appendChild(p_pres); - - { - QDomElement tag = doc.createElement("misc"); - p_pres.appendChild(tag); - - tag.appendChild(textTag(doc, "askOnline", prefs.askOnline)); - tag.appendChild(textTag(doc, "askOffline", prefs.askOffline)); - tag.appendChild(textTag(doc, "rosterAnim", prefs.rosterAnim)); - tag.appendChild(textTag(doc, "autoVCardOnLogin", prefs.autoVCardOnLogin)); - tag.appendChild(textTag(doc, "xmlConsoleOnLogin", prefs.xmlConsoleOnLogin)); - } - { - QDomElement tag = doc.createElement("autostatus"); - p_pres.appendChild(tag); - - QDomElement e; - - e = textTag(doc, "away", prefs.asAway); - setBoolAttribute(e, "use", prefs.use_asAway); - tag.appendChild(e); - - e = textTag(doc, "xa", prefs.asXa); - setBoolAttribute(e, "use", prefs.use_asXa); - tag.appendChild(e); - - e = textTag(doc, "offline", prefs.asOffline); - setBoolAttribute(e, "use", prefs.use_asOffline); - tag.appendChild(e); - - tag.appendChild(textTag(doc, "message", prefs.asMessage)); - } - { - // Status presets - QDomElement p_statuspresets = doc.createElement("statuspresets"); - p_pres.appendChild(p_statuspresets); - foreach (StatusPreset p, prefs.sp) { - p_statuspresets.appendChild(p.toXml(doc)); - } - } - { - p_pres.appendChild(stringListToXml(doc, "recentstatus",prefs.recentStatus)); - } - } - - { - QDomElement p_lnf = doc.createElement("lookandfeel"); - p.appendChild(p_lnf); - - p_lnf.appendChild(textTag(doc, "newHeadings", prefs.clNewHeadings)); - p_lnf.appendChild(textTag(doc, "outline-headings", prefs.outlineHeadings)); - - { - QDomElement tag = doc.createElement("colors"); - p_lnf.appendChild(tag); - - tag.appendChild(textTag(doc, "online", prefs.color[cOnline].name() )); - tag.appendChild(textTag(doc, "listback", prefs.color[cListBack].name() )); - tag.appendChild(textTag(doc, "away", prefs.color[cAway].name() )); - tag.appendChild(textTag(doc, "dnd", prefs.color[cDND].name() )); - tag.appendChild(textTag(doc, "offline", prefs.color[cOffline].name() )); - tag.appendChild(textTag(doc, "status", prefs.color[cStatus].name() )); - tag.appendChild(textTag(doc, "profilefore", prefs.color[cProfileFore].name() )); - tag.appendChild(textTag(doc, "profileback", prefs.color[cProfileBack].name() )); - tag.appendChild(textTag(doc, "groupfore", prefs.color[cGroupFore].name() )); - tag.appendChild(textTag(doc, "groupback", prefs.color[cGroupBack].name() )); - tag.appendChild(textTag(doc, "animfront", prefs.color[cAnimFront].name() )); - tag.appendChild(textTag(doc, "animback", prefs.color[cAnimBack].name() )); - } - - { - QDomElement tag = doc.createElement("fonts"); - p_lnf.appendChild(tag); - - tag.appendChild(textTag(doc, "roster", prefs.font[fRoster] )); - tag.appendChild(textTag(doc, "message", prefs.font[fMessage] )); - tag.appendChild(textTag(doc, "chat", prefs.font[fChat] )); - tag.appendChild(textTag(doc, "popup", prefs.font[fPopup] )); - } - } - - { - QDomElement p_sound = doc.createElement("sound"); - p.appendChild(p_sound); - - p_sound.appendChild(textTag(doc, "player", prefs.player)); - p_sound.appendChild(textTag(doc, "noawaysound", prefs.noAwaySound)); - p_sound.appendChild(textTag(doc, "noGCSound", prefs.noGCSound)); - - { - QDomElement p_onevent = doc.createElement("onevent"); - p_sound.appendChild(p_onevent); - - p_onevent.appendChild(textTag(doc, "message", prefs.onevent[eMessage])); - p_onevent.appendChild(textTag(doc, "chat1", prefs.onevent[eChat1])); - p_onevent.appendChild(textTag(doc, "chat2", prefs.onevent[eChat2])); - p_onevent.appendChild(textTag(doc, "system", prefs.onevent[eSystem])); - p_onevent.appendChild(textTag(doc, "headline", prefs.onevent[eHeadline])); - p_onevent.appendChild(textTag(doc, "online", prefs.onevent[eOnline])); - p_onevent.appendChild(textTag(doc, "offline", prefs.onevent[eOffline])); - p_onevent.appendChild(textTag(doc, "send", prefs.onevent[eSend])); - p_onevent.appendChild(textTag(doc, "incoming_ft", prefs.onevent[eIncomingFT])); - p_onevent.appendChild(textTag(doc, "ft_complete", prefs.onevent[eFTComplete])); - } - } - - { - QDomElement p_sizes = doc.createElement("sizes"); - p.appendChild(p_sizes); - - p_sizes.appendChild(textTag(doc, "eventdlg", prefs.sizeEventDlg)); - p_sizes.appendChild(textTag(doc, "chatdlg", prefs.sizeChatDlg)); - p_sizes.appendChild(textTag(doc, "tabdlg", prefs.sizeTabDlg)); - } - - { - QDomElement p_toolbars = doc.createElement("toolbars"); - p.appendChild(p_toolbars); - - QMap< QString, QList<Options::ToolbarPrefs> >::Iterator itBars = prefs.toolbars.begin(); - for ( ; itBars != prefs.toolbars.end(); ++itBars ) { - QList<Options::ToolbarPrefs> toolbars = itBars.data(); - QDomElement p_bars = doc.createElement( itBars.key() ); - p_toolbars.appendChild( p_bars ); - - QList<Options::ToolbarPrefs>::Iterator it = toolbars.begin(); - for ( ; it != toolbars.end(); ++it) { - Options::ToolbarPrefs tb = *it; - if ( tb.keys.size() || - !tb.name.isEmpty() ) - { - QDomElement tb_prefs = doc.createElement("toolbar"); - p_bars.appendChild(tb_prefs); - - tb_prefs.appendChild(textTag(doc, "name", tb.name)); - tb_prefs.appendChild(textTag(doc, "on", tb.on)); - tb_prefs.appendChild(textTag(doc, "locked", tb.locked)); - tb_prefs.appendChild(textTag(doc, "stretchable", tb.stretchable)); - tb_prefs.appendChild(stringListToXml(doc, "keys", tb.keys)); - - QDomElement tb_position = doc.createElement("position"); - tb_prefs.appendChild(tb_position); - - QString dockStr; - Qt::Dock dock = tb.dock; - if (dock == Qt::DockTop) - dockStr = "DockTop"; - else if (dock == Qt::DockBottom) - dockStr = "DockBottom"; - else if (dock == Qt::DockLeft) - dockStr = "DockLeft"; - else if (dock == Qt::DockRight) - dockStr = "DockRight"; - else if (dock == Qt::DockMinimized) - dockStr = "DockMinimized"; - else if (dock == Qt::DockTornOff) - dockStr = "DockTornOff"; - else if (dock == Qt::DockUnmanaged) - dockStr = "DockUnmanaged"; - - tb_position.appendChild(textTag(doc, "dock", dockStr)); - tb_position.appendChild(textTag(doc, "index", tb.index)); - tb_position.appendChild(textTag(doc, "nl", tb.nl)); - tb_position.appendChild(textTag(doc, "extraOffset", tb.extraOffset)); - } - } - } - } - - { - QDomElement pp = doc.createElement("popups"); - p.appendChild(pp); - pp.appendChild(textTag(doc, "on", prefs.ppIsOn)); - pp.appendChild(textTag(doc, "online", prefs.ppOnline)); - pp.appendChild(textTag(doc, "offline", prefs.ppOffline)); - pp.appendChild(textTag(doc, "statusChange", prefs.ppStatus)); - pp.appendChild(textTag(doc, "message", prefs.ppMessage)); - pp.appendChild(textTag(doc, "chat", prefs.ppChat)); - pp.appendChild(textTag(doc, "headline", prefs.ppHeadline)); - pp.appendChild(textTag(doc, "file", prefs.ppFile)); - pp.appendChild(textTag(doc, "jidClip", prefs.ppJidClip)); - pp.appendChild(textTag(doc, "statusClip", prefs.ppStatusClip)); - pp.appendChild(textTag(doc, "textClip", prefs.ppTextClip)); - pp.appendChild(textTag(doc, "hideTime", prefs.ppHideTime)); - pp.appendChild(textTag(doc, "borderColor", prefs.ppBorderColor.name())); - } - - { - // Bouncing dock (on Mac OS X) - QDomElement dock = doc.createElement("dock"); - p.appendChild(dock); - switch (prefs.bounceDock) { - case Options::NoBounce : - dock.setAttribute("bounce", "never"); - break; - case Options::BounceOnce : - dock.setAttribute("bounce", "once"); - break; - case Options::BounceForever : - dock.setAttribute("bounce", "forever"); - break; - default: - break; - } - } - - { - //group chat - QDomElement gc = doc.createElement("groupchat"); - p.appendChild(gc); - gc.appendChild(stringListToXml(doc, "highlightwords", prefs.gcHighlights)); - gc.appendChild(stringListToXml(doc, "nickcolors", prefs.gcNickColors)); - gc.appendChild(textTag(doc, "nickcoloring", prefs.gcNickColoring)); - gc.appendChild(textTag(doc, "highlighting", prefs.gcHighlighting)); - } - - { - QDomElement p_lockdown = doc.createElement("lockdown"); - p.appendChild(p_lockdown); - p_lockdown.appendChild(textTag(doc, "roster", prefs.lockdown.roster)); - p_lockdown.appendChild(textTag(doc, "services", prefs.lockdown.services)); - } - - { - QDomElement is = doc.createElement("iconset"); - p.appendChild(is); - - // system - is.appendChild(textTag(doc, "system", prefs.systemIconset)); - - // roster - default - QDomElement is_roster = doc.createElement("roster"); - is.appendChild(is_roster); - is_roster.appendChild(textTag(doc, "default", prefs.defaultRosterIconset)); - - { - // roster - service - QDomElement roster_service = doc.createElement("service"); - is_roster.appendChild(roster_service); - - QMap<QString, QString>::iterator it = prefs.serviceRosterIconset.begin(); - for ( ; it != prefs.serviceRosterIconset.end(); ++it) { - QDomElement item = doc.createElement("item"); - roster_service.appendChild(item); - - item.setAttribute("service", it.key()); - item.setAttribute("iconset", it.data()); - } - } - - { - // roster - custom - QDomElement roster_custom = doc.createElement("custom"); - is_roster.appendChild(roster_custom); - - QMap<QString, QString>::iterator it = prefs.customRosterIconset.begin(); - for ( ; it != prefs.customRosterIconset.end(); ++it) { - QDomElement item = doc.createElement("item"); - roster_custom.appendChild(item); - - item.setAttribute("regExp", it.key()); - item.setAttribute("iconset", it.data()); - } - } - - { - // emoticons - QDomElement is_emoticons = doc.createElement("emoticons"); - is.appendChild(is_emoticons); - - QStringList::Iterator it = prefs.emoticons.begin(); - for ( ; it != prefs.emoticons.end(); ++it) - is_emoticons.appendChild(textTag(doc, "item", *it)); - } - } - - { - // disco dialog - QDomElement p_disco = doc.createElement("disco"); - p.appendChild(p_disco); - - p_disco.appendChild( textTag(doc, "items", prefs.discoItems ) ); - p_disco.appendChild( textTag(doc, "info", prefs.discoInfo ) ); - } - - { - // data transfer - QDomElement p_dt = doc.createElement("dt"); - p.appendChild(p_dt); - p_dt.appendChild( textTag(doc, "port", prefs.dtPort ) ); - p_dt.appendChild( textTag(doc, "external", prefs.dtExternal ) ); - } - - { - // advanced widget - QDomElement p_advWidget = doc.createElement("advancedWidget"); - p.appendChild(p_advWidget); - - QDomElement stick = doc.createElement("sticky"); - p_advWidget.appendChild(stick); - - setBoolAttribute(stick, "enabled", GAdvancedWidget::stickEnabled()); - stick.appendChild( textTag(doc, "offset", GAdvancedWidget::stickAt()) ); - stick.appendChild( textTag(doc, "stickToWindows", GAdvancedWidget::stickToWindows()) ); - } - - AtomicXmlFile f(fname); - if (!f.saveDocument(doc)) - return false; - - return true; -} - -bool UserProfile::fromFile(const QString &fname) +bool OptionsMigration::fromFile(const QString &fname) { QString confver; QDomDocument doc; @@ -1269,11 +895,11 @@ bool UserProfile::fromFile(const QString &fname) readEntry(base, "progver", &progver); - readRectEntry(base, "geom", &mwgeom); - xmlToStringList(base, "recentGCList", &recentGCList); - xmlToStringList(base, "recentBrowseList", &recentBrowseList); - readEntry(base, "lastStatusString", &lastStatusString); - readBoolEntry(base, "useSound", &useSound); + migrateRectEntry(base, "geom", "options.ui.contactlist.saved-window-geometry"); + migrateStringList(base, "recentGCList", "options.muc.recent-joins.jids"); + migrateStringList(base, "recentBrowseList", "options.ui.service-discovery.recent-jids"); + migrateStringEntry(base, "lastStatusString", "options.status.last-message"); + migrateBoolEntry(base, "useSound", "options.ui.notifications.sounds.enable"); bool found; QDomElement accs = findSubTag(base, "accounts", &found); @@ -1286,13 +912,13 @@ bool UserProfile::fromFile(const QString &fname) if(a.tagName() == "account") { UserAccount ua; ua.fromXml(a); - acc.append(ua); + accMigration.append(ua); } } } // convert old proxy config into new - for(UserAccountList::Iterator it = acc.begin(); it != acc.end(); ++it) { + for(UserAccountList::Iterator it = accMigration.begin(); it != accMigration.end(); ++it) { UserAccount &a = *it; if(a.proxy_type > 0) { ProxyItem p; @@ -1303,9 +929,9 @@ bool UserProfile::fromFile(const QString &fname) p.settings.useAuth = !a.proxy_user.isEmpty(); p.settings.user = a.proxy_user; p.settings.pass = a.proxy_pass; - proxyList.append(p); + proxyMigration.append(p); - a.proxy_index = proxyList.count(); // 1 and up are proxies + a.proxy_index = proxyMigration.count(); // 1 and up are proxies } } @@ -1324,10 +950,39 @@ bool UserProfile::fromFile(const QString &fname) QDomElement pset = e.elementsByTagName("proxySettings").item(0).toElement(); if(!pset.isNull()) p.settings.fromXml(pset); - proxyList.append(p); + proxyMigration.append(p); } } + // assign storage IDs to proxies and update accounts + for (int i=0; i < proxyMigration.size(); i++) { + proxyMigration[i].id = "a"+QString::number(i); + } + for (int i=0; i < accMigration.size(); i++) { + if (accMigration[i].proxy_index != 0) { + accMigration[i].proxyID = proxyMigration[accMigration[i].proxy_index].id; + } + } + + + + PsiOptions::instance()->setOption("options.ui.contactlist.show.offline-contacts", true); + PsiOptions::instance()->setOption("options.ui.contactlist.show.away-contacts", true); + PsiOptions::instance()->setOption("options.ui.contactlist.show.hidden-contacts-group", true); + PsiOptions::instance()->setOption("options.ui.contactlist.show.agent-contacts", true); + PsiOptions::instance()->setOption("options.ui.contactlist.show.self-contact", true); + + for (int i=0; i < accMigration.size(); i++) { + if (!accMigration[i].opt_enabled) continue; + PsiOptions::instance()->setOption("options.ui.contactlist.show.offline-contacts", accMigration[i].tog_offline); + PsiOptions::instance()->setOption("options.ui.contactlist.show.away-contacts", accMigration[i].tog_away); + PsiOptions::instance()->setOption("options.ui.contactlist.show.hidden-contacts-group", accMigration[i].tog_hidden); + PsiOptions::instance()->setOption("options.ui.contactlist.show.agent-contacts", accMigration[i].tog_agents); + PsiOptions::instance()->setOption("options.ui.contactlist.show.self-contact", accMigration[i].tog_self); + break; + } + + QDomElement p = findSubTag(base, "preferences", &found); if(found) { bool found; @@ -1338,73 +993,96 @@ bool UserProfile::fromFile(const QString &fname) QDomElement p_roster = findSubTag(p_general, "roster", &found); if(found) { - readEntry(p_roster, "rosterBgImage", &prefs.rosterBgImage); - readBoolEntry(p_roster, "useleft", &prefs.useleft); - readBoolEntry(p_roster, "singleclick", &prefs.singleclick); - readBoolEntry(p_roster, "hideMenubar", &prefs.hideMenubar); - readNumEntry(p_roster, "defaultAction", &prefs.defaultAction); - readBoolEntry(p_roster, "useTransportIconsForContacts", &prefs.useTransportIconsForContacts); + migrateBoolEntry(p_roster, "useleft", "options.ui.contactlist.use-left-click"); + migrateBoolEntry(p_roster, "singleclick", "options.ui.contactlist.use-single-click"); + bool hideMenu; + readBoolEntry(p_roster, "hideMenubar", &hideMenu); + PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", !hideMenu); + int defaultAction; + readNumEntry(p_roster, "defaultAction", &defaultAction); + PsiOptions::instance()->setOption("options.messages.default-outgoing-message-type", defaultAction == 0 ? "message" : "chat"); + migrateBoolEntry(p_roster, "useTransportIconsForContacts", "options.ui.contactlist.use-transport-icons"); QDomElement sorting = findSubTag(p_roster, "sortStyle", &found); if(found) { QString name; + migrateStringEntry(sorting, "contact", "options.ui.contactlist.contact-sort-style"); + migrateStringEntry(sorting, "group", "options.ui.contactlist.group-sort-style"); + migrateStringEntry(sorting, "account", "options.ui.contactlist.account-sort-style"); + + /* FIXME readEntry(sorting, "contact", &name); if ( name == "alpha" ) - prefs.rosterContactSortStyle = Options::ContactSortStyle_Alpha; + lateMigrationData.rosterContactSortStyle = Options::ContactSortStyle_Alpha; else - prefs.rosterContactSortStyle = Options::ContactSortStyle_Status; + lateMigrationData.rosterContactSortStyle = Options::ContactSortStyle_Status; readEntry(sorting, "group", &name); if ( name == "rank" ) - prefs.rosterGroupSortStyle = Options::GroupSortStyle_Rank; + lateMigrationData.rosterGroupSortStyle = Options::GroupSortStyle_Rank; else - prefs.rosterGroupSortStyle = Options::GroupSortStyle_Alpha; + lateMigrationData.rosterGroupSortStyle = Options::GroupSortStyle_Alpha; readEntry(sorting, "account", &name); if ( name == "rank" ) - prefs.rosterAccountSortStyle = Options::AccountSortStyle_Rank; + lateMigrationData.rosterAccountSortStyle = Options::AccountSortStyle_Rank; else - prefs.rosterAccountSortStyle = Options::AccountSortStyle_Alpha; + lateMigrationData.rosterAccountSortStyle = Options::AccountSortStyle_Alpha; + */ } } QDomElement tag = findSubTag(p_general, "misc", &found); if(found) { - readEntry(tag, "chatBgImage", &prefs.chatBgImage); - readNumEntry(tag, "delChats", &prefs.delChats); - readNumEntry(tag, "browser", &prefs.browser); - readBoolEntry(tag, "alwaysOnTop", &prefs.alwaysOnTop); - readBoolEntry(tag, "keepSizes", &prefs.keepSizes); - readBoolEntry(tag, "ignoreHeadline", &prefs.ignoreHeadline); - readBoolEntry(tag, "ignoreNonRoster", &prefs.ignoreNonRoster); - readBoolEntry(tag, "excludeGroupChatIgnore", &prefs.excludeGroupChatsFromIgnore); - readBoolEntry(tag, "scrollTo", &prefs.scrollTo); - readBoolEntry(tag, "useEmoticons", &prefs.useEmoticons); - readBoolEntry(tag, "alertOpenChats", &prefs.alertOpenChats); - readBoolEntry(tag, "raiseChatWindow", &prefs.raiseChatWindow); - readBoolEntry(tag, "showSubjects", &prefs.showSubjects); - readBoolEntry(tag, "showGroupCounts", &prefs.showGroupCounts); - readBoolEntry(tag, "showCounter", &prefs.showCounter); - readBoolEntry(tag, "chatSays", &prefs.chatSays); - readBoolEntry(tag, "jidComplete", &prefs.jidComplete); - readBoolEntry(tag, "grabUrls", &prefs.grabUrls); - readBoolEntry(tag, "smallChats", &prefs.smallChats); - readBoolEntry(tag, "brushedMetal", &prefs.brushedMetal); - readBoolEntry(tag, "chatLineEdit", &prefs.chatLineEdit); - readBoolEntry(tag, "useTabs", &prefs.useTabs); - readBoolEntry(tag, "usePerTabCloseButton", &prefs.usePerTabCloseButton); - readBoolEntry(tag, "putTabsAtBottom", &prefs.putTabsAtBottom); - readBoolEntry(tag, "autoRosterSize", &prefs.autoRosterSize); - readBoolEntry(tag, "autoRosterSizeGrowTop", &prefs.autoRosterSizeGrowTop); - readBoolEntry(tag, "autoResolveNicksOnAdd", &prefs.autoResolveNicksOnAdd); - readBoolEntry(tag, "messageEvents", &prefs.messageEvents); - readBoolEntry(tag, "inactiveEvents", &prefs.inactiveEvents); - readEntry(tag, "lastPath", &prefs.lastPath); - readEntry(tag, "lastSavePath", &prefs.lastSavePath); - readBoolEntry(tag, "autoCopy", &prefs.autoCopy); - readBoolEntry(tag, "useCaps", &prefs.useCaps); - readBoolEntry(tag, "rc", &prefs.useRC); + int delafterint; + readNumEntry(tag, "delChats", &delafterint); + QString delafter; + switch (delafterint) { + case 0: + delafter = "instant"; + break; + case 1: + delafter = "hour"; + break; + case 2: + delafter = "day"; + break; + case 3: + delafter = "never"; + break; + } + PsiOptions::instance()->setOption("options.ui.chat.delete-contents-after", delafter); + migrateBoolEntry(tag, "alwaysOnTop", "options.ui.contactlist.always-on-top"); + migrateBoolEntry(tag, "keepSizes", "options.ui.remember-window-sizes"); + migrateBoolEntry(tag, "ignoreHeadline", "options.messages.ignore-headlines"); + migrateBoolEntry(tag, "ignoreNonRoster", "options.messages.ignore-non-roster-contacts"); + migrateBoolEntry(tag, "excludeGroupChatIgnore", "options.messages.exclude-muc-from-ignore"); + migrateBoolEntry(tag, "scrollTo", "options.ui.contactlist.ensure-contact-visible-on-event"); + migrateBoolEntry(tag, "useEmoticons", "options.ui.emoticons.use-emoticons"); + migrateBoolEntry(tag, "alertOpenChats", "options.ui.chat.alert-for-already-open-chats"); + migrateBoolEntry(tag, "raiseChatWindow", "options.ui.chat.raise-chat-windows-on-new-messages"); + migrateBoolEntry(tag, "showSubjects", "options.ui.message.show-subjects"); + migrateBoolEntry(tag, "showGroupCounts", "options.ui.contactlist.show-group-counts"); + migrateBoolEntry(tag, "showCounter", "options.ui.message.show-character-count"); + migrateBoolEntry(tag, "chatSays", "options.ui.chat.use-chat-says-style"); + migrateBoolEntry(tag, "jidComplete", "options.ui.message.use-jid-auto-completion"); + migrateBoolEntry(tag, "grabUrls", "options.ui.message.auto-grab-urls-from-clipboard"); + migrateBoolEntry(tag, "smallChats", "options.ui.chat.use-small-chats"); + migrateBoolEntry(tag, "brushedMetal", "options.ui.mac.use-brushed-metal-windows"); + migrateBoolEntry(tag, "chatLineEdit", "options.ui.chat.use-expanding-line-edit"); + migrateBoolEntry(tag, "useTabs", "options.ui.tabs.use-tabs"); + migrateBoolEntry(tag, "putTabsAtBottom", "options.ui.tabs.put-tabs-at-bottom"); + migrateBoolEntry(tag, "autoRosterSize", "options.ui.contactlist.automatically-resize-roster"); + migrateBoolEntry(tag, "autoRosterSizeGrowTop", "options.ui.contactlist.grow-roster-upwards"); + migrateBoolEntry(tag, "autoResolveNicksOnAdd", "options.contactlist.resolve-nicks-on-contact-add"); + migrateBoolEntry(tag, "messageEvents", "options.messages.send-composing-events"); + migrateBoolEntry(tag, "inactiveEvents", "options.messages.send-inactivity-events"); + migrateStringEntry(tag, "lastPath", "options.ui.last-used-open-path"); + migrateStringEntry(tag, "lastSavePath", "options.ui.last-used-save-path"); + migrateBoolEntry(tag, "autoCopy", "options.ui.automatically-copy-selected-text"); + migrateBoolEntry(tag, "useCaps", "options.service-discovery.enable-entity-capabilities"); + migrateBoolEntry(tag, "rc", "options.external-control.adhoc-remote-control.enable"); // Migrating for soft return option bool found; @@ -1423,10 +1101,10 @@ bool UserProfile::fromFile(const QString &fname) tag = findSubTag(p_general, "dock", &found); if(found) { - readBoolEntry(tag, "useDock", &prefs.useDock); - readBoolEntry(tag, "dockDCstyle", &prefs.dockDCstyle); - readBoolEntry(tag, "dockHideMW", &prefs.dockHideMW); - readBoolEntry(tag, "dockToolMW", &prefs.dockToolMW); + migrateBoolEntry(tag, "useDock", "options.ui.systemtray.enable"); + migrateBoolEntry(tag, "dockDCstyle", "options.ui.systemtray.use-double-click"); + migrateBoolEntry(tag, "dockHideMW", "options.contactlist.hide-on-start"); + migrateBoolEntry(tag, "dockToolMW", "options.contactlist.use-toolwindow"); } /*tag = findSubTag(p_general, "security", &found); @@ -1435,41 +1113,33 @@ bool UserProfile::fromFile(const QString &fname) }*/ } - // Added by Kiko 020621: retrieves SSL cert chain validation configuration - QDomElement p_ssl = findSubTag(p,"ssl",&found); - if(found) { - readEntry(p_ssl, "trustedcertstoredir", &prefs.trustCertStoreDir); - } QDomElement p_events = findSubTag(p, "events", &found); if(found) { bool found; - readNumEntry(p_events, "alertstyle", &prefs.alertStyle); - readBoolEntry(p_events, "autoAuth", &prefs.autoAuth); - readBoolEntry(p_events, "notifyAuth", &prefs.notifyAuth); + int alertstyle; + readNumEntry(p_events, "alertstyle", &alertstyle); + QString ase[3] = {"no", "blink", "animate"}; + PsiOptions::instance()->setOption("options.ui.notifications.alert-style", ase[alertstyle]); + migrateBoolEntry(p_events, "autoAuth", "options.subscriptions.automatically-allow-authorisation"); + migrateBoolEntry(p_events, "notifyAuth", "options.ui.notifications.successful-subscription"); QDomElement tag = findSubTag(p_events, "receive", &found); if(found) { - readBoolEntry(tag, "popupMsgs", &prefs.popupMsgs); - readBoolEntry(tag, "popupChats", &prefs.popupChats); - readBoolEntry(tag, "popupHeadlines", &prefs.popupHeadlines); - readBoolEntry(tag, "popupFiles", &prefs.popupFiles); - readBoolEntry(tag, "noAwayPopup", &prefs.noAwayPopup); - readBoolEntry(tag, "noUnlistedPopup", &prefs.noUnlistedPopup); - readBoolEntry(tag, "raise", &prefs.raise); - readNumEntry(tag, "incomingAs", &prefs.incomingAs); + migrateBoolEntry(tag, "popupMsgs", "options.ui.message.auto-popup"); + migrateBoolEntry(tag, "popupChats", "options.ui.chat.auto-popup"); + migrateBoolEntry(tag, "popupHeadlines", "options.ui.message.auto-popup-headlines"); + migrateBoolEntry(tag, "popupFiles", "options.ui.file-transfer.auto-popup"); + migrateBoolEntry(tag, "noAwayPopup", "options.ui.notifications.popup-dialogs.suppress-while-away"); + migrateBoolEntry(tag, "noUnlistedPopup", "options.ui.notifications.popup-dialogs.suppress-when-not-on-roster"); + migrateBoolEntry(tag, "raise", "options.ui.contactlist.raise-on-new-event"); + int force; + readNumEntry(tag, "incomingAs", &force); + QString fe[4] = {"no", "message", "chat", "current-open"}; + PsiOptions::instance()->setOption("options.messages.force-incoming-message-type", fe[force]); } - tag = findSubTag(p_events, "priority", &found); - if(found) { - readNumEntry(tag, "message", &prefs.eventPriorityMessage); - readNumEntry(tag, "chat", &prefs.eventPriorityChat); - readNumEntry(tag, "headline", &prefs.eventPriorityHeadline); - readNumEntry(tag, "auth", &prefs.eventPriorityAuth); - readNumEntry(tag, "file", &prefs.eventPriorityFile); - readNumEntry(tag, "rosterx", &prefs.eventPriorityRosterExchange); - } } QDomElement p_pres = findSubTag(p, "presence", &found); @@ -1478,89 +1148,87 @@ bool UserProfile::fromFile(const QString &fname) QDomElement tag = findSubTag(p_pres, "misc", &found); if(found) { - readBoolEntry(tag, "askOnline", &prefs.askOnline); - readBoolEntry(tag, "askOffline", &prefs.askOffline); - readBoolEntry(tag, "rosterAnim", &prefs.rosterAnim); - readBoolEntry(tag, "autoVCardOnLogin", &prefs.autoVCardOnLogin); - readBoolEntry(tag, "xmlConsoleOnLogin", &prefs.xmlConsoleOnLogin); + migrateBoolEntry(tag, "askOnline", "options.status.ask-for-message-on-online"); + migrateBoolEntry(tag, "askOffline", "options.status.ask-for-message-on-offline"); + migrateBoolEntry(tag, "rosterAnim", "options.ui.contactlist.use-status-change-animation"); + migrateBoolEntry(tag, "autoVCardOnLogin", "options.vcard.query-own-vcard-on-login"); + migrateBoolEntry(tag, "xmlConsoleOnLogin", "options.xml-console.enable-at-login"); } tag = findSubTag(p_pres, "autostatus", &found); if(found) { bool found; + bool use; QDomElement e; e = findSubTag(tag, "away", &found); if(found) { - if(e.hasAttribute("use")) - readBoolAttribute(e, "use", &prefs.use_asAway); - else - prefs.use_asAway = TRUE; + if(e.hasAttribute("use")) { + readBoolAttribute(e, "use", &use); + PsiOptions::instance()->setOption("options.status.auto-away.use-away", use); + } } e = findSubTag(tag, "xa", &found); if(found) { if(e.hasAttribute("use")) - readBoolAttribute(e, "use", &prefs.use_asXa); - else - prefs.use_asXa = TRUE; + readBoolAttribute(e, "use", &use); + PsiOptions::instance()->setOption("options.status.auto-away.use-not-availible", use); } e = findSubTag(tag, "offline", &found); if(found) { if(e.hasAttribute("use")) - readBoolAttribute(e, "use", &prefs.use_asOffline); - else - prefs.use_asOffline = TRUE; + readBoolAttribute(e, "use", &use); + PsiOptions::instance()->setOption("options.status.auto-away.use-offline", use); } - readNumEntry(tag, "away", &prefs.asAway); - readNumEntry(tag, "xa", &prefs.asXa); - readNumEntry(tag, "offline", &prefs.asOffline); + migrateIntEntry(tag, "away", "options.status.auto-away.away-after"); + migrateIntEntry(tag, "xa", "options.status.auto-away.not-availible-after"); + migrateIntEntry(tag, "offline", "options.status.auto-away.offline-after"); - readEntry(tag, "message", &prefs.asMessage); + migrateStringEntry(tag, "message", "options.status.auto-away.message"); } tag = findSubTag(p_pres, "statuspresets", &found); if(found) { - prefs.sp.clear(); + lateMigrationData.sp.clear(); for(QDomNode n = tag.firstChild(); !n.isNull(); n = n.nextSibling()) { StatusPreset preset(n.toElement()); if (!preset.name().isEmpty()) - prefs.sp[preset.name()] = preset; + lateMigrationData.sp[preset.name()] = preset; } } - xmlToStringList(p_pres, "recentstatus", &prefs.recentStatus); } QDomElement p_lnf = findSubTag(p, "lookandfeel", &found); if(found) { bool found; - readBoolEntry(p_lnf, "newHeadings", &prefs.clNewHeadings); - readBoolEntry(p_lnf, "outline-headings", &prefs.outlineHeadings); + migrateBoolEntry(p_lnf, "newHeadings", "options.ui.look.contactlist.use-slim-group-headings"); + migrateBoolEntry(p_lnf, "outline-headings", "options.ui.look.contactlist.use-outlined-group-headings"); migrateIntEntry(p_lnf, "chat-opacity", "options.ui.chat.opacity"); migrateIntEntry(p_lnf, "roster-opacity", "options.ui.contactlist.opacity"); QDomElement tag = findSubTag(p_lnf, "colors", &found); if(found) { - readColorEntry(tag, "online", &prefs.color[cOnline]); - readColorEntry(tag, "listback", &prefs.color[cListBack]); - readColorEntry(tag, "away", &prefs.color[cAway]); - readColorEntry(tag, "dnd", &prefs.color[cDND]); - readColorEntry(tag, "offline", &prefs.color[cOffline]); - readColorEntry(tag, "status", &prefs.color[cStatus]); - readColorEntry(tag, "groupfore", &prefs.color[cGroupFore]); - readColorEntry(tag, "groupback", &prefs.color[cGroupBack]); - readColorEntry(tag, "profilefore", &prefs.color[cProfileFore]); - readColorEntry(tag, "profileback", &prefs.color[cProfileBack]); - readColorEntry(tag, "animfront", &prefs.color[cAnimFront]); - readColorEntry(tag, "animback", &prefs.color[cAnimBack]); + migrateColorEntry(tag, "online", "options.ui.look.colors.contactlist.status.online"); + migrateColorEntry(tag, "listback", "options.ui.look.colors.contactlist.background"); + migrateColorEntry(tag, "away", "options.ui.look.colors.contactlist.status.away"); + migrateColorEntry(tag, "dnd", "options.ui.look.colors.contactlist.status.do-no-disturb"); + migrateColorEntry(tag, "offline", "options.ui.look.colors.contactlist.status.offline"); + migrateColorEntry(tag, "status", "options.ui.look.colors.contactlist.status-messages"); + migrateColorEntry(tag, "groupfore", "options.ui.look.colors.contactlist.grouping.header-foreground"); + migrateColorEntry(tag, "groupback", "options.ui.look.colors.contactlist.grouping.header-background"); + migrateColorEntry(tag, "profilefore", "options.ui.look.colors.contactlist.profile.header-foreground"); + migrateColorEntry(tag, "profileback", "options.ui.look.colors.contactlist.profile.header-background"); + migrateColorEntry(tag, "animfront", "options.ui.look.contactlist.status-change-animation.color1"); + migrateColorEntry(tag, "animback", "options.ui.look.contactlist.status-change-animation.color2"); } tag = findSubTag(p_lnf, "fonts", &found); if(found) { - readEntry(tag, "roster", &prefs.font[fRoster]); - readEntry(tag, "message", &prefs.font[fMessage]); - readEntry(tag, "chat", &prefs.font[fChat]); - readEntry(tag, "popup", &prefs.font[fPopup]); + migrateStringEntry(tag, "roster", "options.ui.look.font.contactlist"); + migrateStringEntry(tag, "message", "options.ui.look.font.message"); + migrateStringEntry(tag, "chat", "options.ui.look.font.chat"); + migrateStringEntry(tag, "popup", "options.ui.look.font.passive-popup"); } } @@ -1568,30 +1236,41 @@ bool UserProfile::fromFile(const QString &fname) if(found) { bool found; - readEntry(p_sound, "player", &prefs.player); - readBoolEntry(p_sound, "noawaysound", &prefs.noAwaySound); - readBoolEntry(p_sound, "noGCSound", &prefs.noGCSound); + QString oldplayer; + readEntry(p_sound, "player", &oldplayer); + // psi now auto detects "play" or "aplay" + // force auto detection on for old default and simple case of aplay on + // alsa enabled systems. + if (oldplayer != soundDetectPlayer() && oldplayer != "play") { + PsiOptions::instance()->setOption("options.ui.notifications.sounds.unix-sound-player", oldplayer); + } else { + PsiOptions::instance()->setOption("options.ui.notifications.sounds.unix-sound-player", ""); + } + migrateBoolEntry(p_sound, "noawaysound", "options.ui.notifications.sounds.silent-while-away"); + bool noGCSound; + readBoolEntry(p_sound, "noGCSound", &noGCSound); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.notify-every-muc-message", !noGCSound); QDomElement tag = findSubTag(p_sound, "onevent", &found); if(found) { - readEntry(tag, "message", &prefs.onevent[eMessage]); - readEntry(tag, "chat1", &prefs.onevent[eChat1]); - readEntry(tag, "chat2", &prefs.onevent[eChat2]); - readEntry(tag, "system", &prefs.onevent[eSystem]); - readEntry(tag, "headline", &prefs.onevent[eHeadline]); - readEntry(tag, "online", &prefs.onevent[eOnline]); - readEntry(tag, "offline", &prefs.onevent[eOffline]); - readEntry(tag, "send", &prefs.onevent[eSend]); - readEntry(tag, "incoming_ft", &prefs.onevent[eIncomingFT]); - readEntry(tag, "ft_complete", &prefs.onevent[eFTComplete]); + migrateStringEntry(tag, "message", "options.ui.notifications.sounds.incoming-message"); + migrateStringEntry(tag, "chat1", "options.ui.notifications.sounds.new-chat"); + migrateStringEntry(tag, "chat2", "options.ui.notifications.sounds.chat-message"); + migrateStringEntry(tag, "system", "options.ui.notifications.sounds.system-message"); + migrateStringEntry(tag, "headline", "options.ui.notifications.sounds.incoming-headline"); + migrateStringEntry(tag, "online", "options.ui.notifications.sounds.contact-online"); + migrateStringEntry(tag, "offline", "options.ui.notifications.sounds.contact-offline"); + migrateStringEntry(tag, "send", "options.ui.notifications.sounds.outgoing-chat"); + migrateStringEntry(tag, "incoming_ft", "options.ui.notifications.sounds.incoming-file-transfer"); + migrateStringEntry(tag, "ft_complete", "options.ui.notifications.sounds.completed-file-transfer"); } } QDomElement p_sizes = findSubTag(p, "sizes", &found); if(found) { - readSizeEntry(p_sizes, "eventdlg", &prefs.sizeEventDlg); + migrateSizeEntry(p_sizes, "eventdlg", "options.ui.message.size"); migrateSizeEntry(p_sizes, "chatdlg", "options.ui.chat.size"); - readSizeEntry(p_sizes, "tabdlg", &prefs.sizeTabDlg); + migrateSizeEntry(p_sizes, "tabdlg", "options.ui.tabs.size"); } @@ -1629,14 +1308,14 @@ bool UserProfile::fromFile(const QString &fname) if ( isGood ) { if ( tbGroup != "mainWin" || !mainWinCleared ) { - prefs.toolbars[tbGroup].clear(); + lateMigrationData.toolbars[tbGroup].clear(); if ( tbGroup == "mainWin" ) mainWinCleared = true; } if ( oldStyle ) { - Options::ToolbarPrefs tb = loadToolbarData( e ); - prefs.toolbars[tbGroup].append(tb); + ToolbarPrefs tb = loadToolbarData( e ); + lateMigrationData.toolbars[tbGroup].append(tb); } else { for(QDomNode nn = e.firstChild(); !nn.isNull(); nn = nn.nextSibling()) { @@ -1645,8 +1324,8 @@ bool UserProfile::fromFile(const QString &fname) continue; if ( ee.tagName() == "toolbar" ) { - Options::ToolbarPrefs tb = loadToolbarData( ee ); - prefs.toolbars[tbGroup].append(tb); + ToolbarPrefs tb = loadToolbarData( ee ); + lateMigrationData.toolbars[tbGroup].append(tb); } } } @@ -1657,8 +1336,8 @@ bool UserProfile::fromFile(const QString &fname) if ( progver == "0.9" || progver == "0.9-CVS" ) { // at first, we need to scan the options, to determine, whether event_notifier already available bool found = false; - QList<Options::ToolbarPrefs>::Iterator it = prefs.toolbars["mainWin"].begin(); - for ( ; it != prefs.toolbars["mainWin"].end(); ++it) { + QList<ToolbarPrefs>::Iterator it = lateMigrationData.toolbars["mainWin"].begin(); + for ( ; it != lateMigrationData.toolbars["mainWin"].end(); ++it) { QStringList::Iterator it2 = (*it).keys.begin(); for ( ; it2 != (*it).keys.end(); ++it2) { if ( *it2 == "event_notifier" ) { @@ -1669,7 +1348,7 @@ bool UserProfile::fromFile(const QString &fname) } if ( !found ) { - Options::ToolbarPrefs tb; + ToolbarPrefs tb; tb.name = QObject::tr("Event notifier"); tb.on = false; tb.locked = true; @@ -1677,7 +1356,7 @@ bool UserProfile::fromFile(const QString &fname) tb.keys << "event_notifier"; tb.dock = Qt::DockBottom; tb.index = 0; - prefs.toolbars["mainWin"].append(tb); + lateMigrationData.toolbars["mainWin"].append(tb); } } } @@ -1685,85 +1364,87 @@ bool UserProfile::fromFile(const QString &fname) //group chat QDomElement p_groupchat = findSubTag(p, "groupchat", &found); if (found) { - readBoolEntry(p_groupchat, "nickcoloring", &prefs.gcNickColoring); - readBoolEntry(p_groupchat, "highlighting", &prefs.gcHighlighting); - xmlToStringList(p_groupchat, "highlightwords", &prefs.gcHighlights); - xmlToStringList(p_groupchat, "nickcolors", &prefs.gcNickColors); + migrateBoolEntry(p_groupchat, "nickcoloring", "options.ui.muc.use-nick-coloring"); + migrateBoolEntry(p_groupchat, "highlighting", "options.ui.muc.use-highlighting"); + migrateStringList(p_groupchat, "highlightwords", "options.ui.muc.highlight-words"); + migrateStringList(p_groupchat, "nickcolors", "options.ui.look.colors.muc.nick-colors"); } // Bouncing dock icon (Mac OS X) QDomElement p_dock = findSubTag(p, "dock", &found); if(found) { + PsiOptions::instance()->setOption("options.ui.notifications.bounce-dock", p_dock.attribute("bounce")); + /* FIXME convert back to some modern enum? if (p_dock.attribute("bounce") == "once") { - prefs.bounceDock = Options::BounceOnce; + lateMigrationData.bounceDock = Options::BounceOnce; } else if (p_dock.attribute("bounce") == "forever") { - prefs.bounceDock = Options::BounceForever; + lateMigrationData.bounceDock = Options::BounceForever; } else if (p_dock.attribute("bounce") == "never") { - prefs.bounceDock = Options::NoBounce; - } + lateMigrationData.bounceDock = Options::NoBounce; + }*/ } QDomElement p_popup = findSubTag(p, "popups", &found); if(found) { - readBoolEntry(p_popup, "on", &prefs.ppIsOn); - readBoolEntry(p_popup, "online", &prefs.ppOnline); - readBoolEntry(p_popup, "offline", &prefs.ppOffline); - readBoolEntry(p_popup, "statusChange", &prefs.ppStatus); - readBoolEntry(p_popup, "message", &prefs.ppMessage); - readBoolEntry(p_popup, "chat", &prefs.ppChat); - readBoolEntry(p_popup, "headline", &prefs.ppHeadline); - readBoolEntry(p_popup, "file", &prefs.ppFile); - readNumEntry(p_popup, "jidClip", &prefs.ppJidClip); - readNumEntry(p_popup, "statusClip", &prefs.ppStatusClip); - readNumEntry(p_popup, "textClip", &prefs.ppTextClip); - readNumEntry(p_popup, "hideTime", &prefs.ppHideTime); - readColorEntry(p_popup, "borderColor", &prefs.ppBorderColor); + migrateBoolEntry(p_popup, "on", "options.ui.notifications.passive-popups.enabled"); + migrateBoolEntry(p_popup, "online", "options.ui.notifications.passive-popups.status.online"); + migrateBoolEntry(p_popup, "offline", "options.ui.notifications.passive-popups.status.offline"); + migrateBoolEntry(p_popup, "statusChange", "options.ui.notifications.passive-popups.status.other-changes"); + migrateBoolEntry(p_popup, "message", "options.ui.notifications.passive-popups.incoming-message"); + migrateBoolEntry(p_popup, "chat", "options.ui.notifications.passive-popups.incoming-chat"); + migrateBoolEntry(p_popup, "headline", "options.ui.notifications.passive-popups.incoming-headline"); + migrateBoolEntry(p_popup, "file", "options.ui.notifications.passive-popups.incoming-file-transfer"); + migrateIntEntry(p_popup, "jidClip", "options.ui.notifications.passive-popups.maximum-jid-length"); + migrateIntEntry(p_popup, "statusClip", "options.ui.notifications.passive-popups.maximum-status-length"); + migrateIntEntry(p_popup, "textClip", "options.ui.notifications.passive-popups.maximum-text-length"); + migrateIntEntry(p_popup, "hideTime", "options.ui.notifications.passive-popups.duration"); + migrateColorEntry(p_popup, "borderColor", "options.ui.look.colors.passive-popup.border"); } QDomElement p_lockdown = findSubTag(p, "lockdown", &found); if(found) { - readBoolEntry(p_lockdown, "roster", &prefs.lockdown.roster); - readBoolEntry(p_lockdown, "services", &prefs.lockdown.services); + migrateBoolEntry(p_lockdown, "roster", "options.ui.contactlist.lockdown-roster"); + migrateBoolEntry(p_lockdown, "services", "options.ui.contactlist.disable-service-discovery"); } QDomElement p_iconset = findSubTag(p, "iconset", &found); if(found) { - readEntry(p_iconset, "system", &prefs.systemIconset); + migrateStringEntry(p_iconset, "system", "options.iconsets.system"); QDomElement roster = findSubTag(p_iconset, "roster", &found); if (found) { - readEntry(roster, "default", &prefs.defaultRosterIconset); + migrateStringEntry(roster, "default", "options.iconsets.status"); QDomElement service = findSubTag(roster, "service", &found); if (found) { - prefs.serviceRosterIconset.clear(); + lateMigrationData.serviceRosterIconset.clear(); for (QDomNode n = service.firstChild(); !n.isNull(); n = n.nextSibling()) { QDomElement i = n.toElement(); if ( i.isNull() ) continue; - prefs.serviceRosterIconset[i.attribute("service")] = i.attribute("iconset"); + lateMigrationData.serviceRosterIconset[i.attribute("service")] = i.attribute("iconset"); } } QDomElement custom = findSubTag(roster, "custom", &found); if (found) { - prefs.customRosterIconset.clear(); + lateMigrationData.customRosterIconset.clear(); for (QDomNode n = custom.firstChild(); !n.isNull(); n = n.nextSibling()) { QDomElement i = n.toElement(); if ( i.isNull() ) continue; - prefs.customRosterIconset[i.attribute("regExp")] = i.attribute("iconset"); + lateMigrationData.customRosterIconset[i.attribute("regExp")] = i.attribute("iconset"); } } } QDomElement emoticons = findSubTag(p_iconset, "emoticons", &found); if (found) { - prefs.emoticons.clear(); + QStringList emoticons_list; for (QDomNode n = emoticons.firstChild(); !n.isNull(); n = n.nextSibling()) { QDomElement i = n.toElement(); if ( i.isNull() ) @@ -1771,9 +1452,10 @@ bool UserProfile::fromFile(const QString &fname) if ( i.tagName() == "item" ) { QString is = i.text(); - prefs.emoticons << is; + emoticons_list << is; } } + PsiOptions::instance()->setOption("options.iconsets.emoticons", emoticons_list); } } @@ -1785,14 +1467,14 @@ bool UserProfile::fromFile(const QString &fname) QDomElement p_disco = findSubTag(p, "disco", &found); if (found) { - readBoolEntry(p_disco, "items", &prefs.discoItems); - readBoolEntry(p_disco, "info", &prefs.discoInfo); + migrateBoolEntry(p_disco, "items", "options.ui.service-discovery.automatically-get-items"); + migrateBoolEntry(p_disco, "info", "options.ui.service-discovery.automatically-browse-into"); } QDomElement p_dt = findSubTag(p, "dt", &found); if (found) { - readNumEntry(p_dt, "port", &prefs.dtPort); - readEntry(p_dt, "external", &prefs.dtExternal); + migrateIntEntry(p_dt, "port", "options.p2p.bytestreams.listen-port"); + migrateStringEntry(p_dt, "external", "options.p2p.bytestreams.external-address"); } QDomElement p_globalAccel = findSubTag(p, "globalAccel", &found); @@ -1835,6 +1517,56 @@ bool UserProfile::fromFile(const QString &fname) return TRUE; } +void OptionsMigration::lateMigration() +{ + QStringList allSetOptions = PsiOptions::instance()->allOptionNames(); + + bool migrated=false; + foreach(QString opt, allSetOptions) { + if (opt.startsWith("options.status.presets.")) { + migrated = true; + } + } + if (!migrated) { + PsiOptions *o = PsiOptions::instance(); + //QMap<QString, QString> serviceRosterIconset; + QMapIterator<QString, QString> iSRI(lateMigrationData.serviceRosterIconset); + while (iSRI.hasNext()) { + iSRI.next(); + QString base = o->mapPut("options.iconsets.service-status", iSRI.key()); + o->setOption(base+".iconset", iSRI.value()); + } + + //QMap<QString, QString> customRosterIconset; + int idx=0; + QMapIterator<QString, QString> iCRI(lateMigrationData.customRosterIconset); + while (iSRI.hasNext()) { + iSRI.next(); + QString base = "options.iconsets.custom-status" ".a" + QString::number(idx++); + o->setOption(base+".regexp", iCRI.key()); + o->setOption(base+".iconset", iCRI.value()); + } + + //QMap<QString,StatusPreset> sp; // Status message presets. + foreach (StatusPreset sp, lateMigrationData.sp) { + QString base = o->mapPut("options.status.presets", sp.name()); + o->setOption(base+".message",sp.message()); + o->setOption(base+".status",XMPP::Status(sp.status()).typeString()); + o->setOption(base+".force-priority", sp.priority().hasValue()); + if (sp.priority().hasValue()) { + o->setOption(base+".priority", sp.priority().value()); + } + } + //QMap< QString, QList<ToolbarPrefs> > toolbars; + idx = 0; + QList<ToolbarPrefs> tbs = lateMigrationData.toolbars["mainWin"]; + foreach(ToolbarPrefs tb, tbs) { + QString base = "options.ui.contactlist.toolbars" ".a" + QString::number(idx++); + PsiToolBar::structToOptions(base, &tb); + } + } +} + QString pathToProfile(const QString &name) { src/psi_profiles.cpp @@ -293,7 +293,7 @@ public: PsiOptions *options; Client *client; ContactProfile *cp; - UserAccount acc, accnext; + UserAccount acc; Jid jid, nextJid; Status loginStatus; bool loginWithPriority; @@ -381,8 +381,9 @@ public: if (lastManualStatus_.isAvailable()) { if (lastManualStatus_.type() == XMPP::Status::DND) return true; - if ((lastManualStatus_.type() == XMPP::Status::Away || lastManualStatus_.type() == XMPP::Status::XA) && option.noAwayPopup) + if ((lastManualStatus_.type() == XMPP::Status::Away || lastManualStatus_.type() == XMPP::Status::XA) && PsiOptions::instance()->getOption("options.ui.notifications.popup-dialogs.suppress-while-away").toBool()) { return true; + } } return false; @@ -396,15 +397,15 @@ public slots: void loadQueue() { - bool soundEnabled = useSound; - useSound = false; // disable the sound and popups + bool soundEnabled = PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool(); + PsiOptions::instance()->setOption("options.ui.notifications.sounds.enable", false); // disable the sound and popups doPopups_ = false; QFileInfo fi( pathToProfileEvents() ); if ( fi.exists() ) eventQueue->fromFile(pathToProfileEvents()); - useSound = soundEnabled; + PsiOptions::instance()->setOption("options.ui.notifications.sounds.enable", soundEnabled); doPopups_ = true; } @@ -433,6 +434,11 @@ public slots: xmlRingbuf[xmlRingbufWrite].time = QDateTime::currentDateTime(); xmlRingbufWrite = (xmlRingbufWrite + 1) % xmlRingbuf.count(); } + + void pm_proxyRemoved(QString proxykey) + { + if (acc.proxyID == proxykey) acc.proxyID = ""; + } void vcardChanged(const Jid &j) { @@ -571,9 +577,9 @@ private: if (!lastManualStatus_.isAway()) { switch (autoAway) { case AutoAway_Away: - return Status(XMPP::Status::Away, option.asMessage, acc.priority); + return Status(XMPP::Status::Away, PsiOptions::instance()->getOption("options.status.auto-away.message").toString(), acc.priority); case AutoAway_XA: - return Status(XMPP::Status::XA, option.asMessage, acc.priority); + return Status(XMPP::Status::XA, PsiOptions::instance()->getOption("options.status.auto-away.message").toString(), acc.priority); case AutoAway_Offline: return Status(Status::Offline, loginStatus.status(), acc.priority); default: @@ -653,7 +659,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis d->client->setFileTransferEnabled(true); - setSendChatState(option.messageEvents); + setSendChatState(PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()); //connect(d->client, SIGNAL(connected()), SLOT(client_connected())); //connect(d->client, SIGNAL(handshaken()), SLOT(client_handshaken())); @@ -685,7 +691,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis // Caps manager d->capsManager = new CapsManager(d->client->jid(), capsRegistry, new IrisProtocol::DiscoInfoQuerier(d->client)); - d->capsManager->setEnabled(option.useCaps); + d->capsManager->setEnabled(PsiOptions::instance()->getOption("options.service-discovery.enable-entity-capabilities").toBool()); // Roster item exchange task d->rosterItemExchangeTask = new RosterItemExchangeTask(d->client->rootTask()); @@ -771,7 +777,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis d->rcSetStatusServer = 0; d->rcSetOptionsServer = 0; d->rcForwardServer = 0; - setRCEnabled(option.useRC); + setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool()); // Plugins #ifdef PSI_PLUGINS @@ -797,14 +803,13 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis } setUserAccount(acc); + connect(d->psi->proxy(), SIGNAL(proxyRemoved(QString)), d, SLOT(pm_proxyRemoved(QString))); d->contactList->link(this); connect(d->psi, SIGNAL(emitOptionsUpdate()), SLOT(optionsUpdate())); //connect(d->psi, SIGNAL(pgpToggled(bool)), SLOT(pgpToggled(bool))); connect(&PGPUtil::instance(), SIGNAL(pgpKeysUpdated()), SLOT(pgpKeysUpdated())); - d->psi->setToggles(d->acc.tog_offline, d->acc.tog_away, d->acc.tog_agents, d->acc.tog_hidden,d->acc.tog_self); - d->setEnabled(d->acc.opt_enabled); // Listen to the capabilities manager @@ -812,7 +817,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis //printf("PsiAccount: [%s] loaded\n", name().latin1()); d->xmlConsole = new XmlConsole(this); - if(option.xmlConsoleOnLogin && d->acc.opt_enabled) { + if(PsiOptions::instance()->getOption("options.xml-console.enable-at-login").toBool() && d->acc.opt_enabled) { this->showXmlConsole(); d->xmlConsole->enable(); } @@ -964,8 +969,6 @@ const QString & PsiAccount::name() const const UserAccount & PsiAccount::userAccount() const { - d->psi->getToggles(&d->acc.tog_offline, &d->acc.tog_away, &d->acc.tog_agents, &d->acc.tog_hidden,&d->acc.tog_self); - // save the roster and pgp key bindings d->acc.roster.clear(); d->acc.keybind.clear(); @@ -1166,8 +1169,8 @@ void PsiAccount::login() } AdvancedConnector::Proxy p; - if(d->acc.proxy_index > 0) { - const ProxyItem &pi = d->psi->proxy()->getItem(d->acc.proxy_index-1); + if(d->acc.proxyID != "") { + const ProxyItem &pi = d->psi->proxy()->getItem(d->acc.proxyID); if(pi.type == "http") // HTTP Connect p.setHttpConnect(pi.settings.host, pi.settings.port); else if(pi.type == "socks") // SOCKS @@ -1762,7 +1765,7 @@ void PsiAccount::incomingHttpAuthRequest(const PsiHttpAuthRequest &req) void PsiAccount::client_rosterItemAdded(const RosterItem &r) { - if ( r.isPush() && r.name().isEmpty() && option.autoResolveNicksOnAdd ) { + if ( r.isPush() && r.name().isEmpty() && PsiOptions::instance()->getOption("options.contactlist.resolve-nicks-on-contact-add").toBool() ) { // automatically resolve nickname from vCard, if newly added item doesn't have any VCardFactory::instance()->getVCard(r.jid(), d->client->rootTask(), this, SLOT(resolveContactName())); } @@ -1886,16 +1889,16 @@ void PsiAccount::client_resourceAvailable(const Jid &j, const Resource &r) u->setPresenceError(""); cpUpdate(*u, r.name(), true); - if(doAnim && option.rosterAnim) + if(doAnim && PsiOptions::instance()->getOption("options.ui.contactlist.use-status-change-animation").toBool()) d->cp->animateNick(u->jid()); } if(doSound) - playSound(option.onevent[eOnline]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.contact-online").toString()); #if !defined(Q_WS_MAC) || !defined(HAVE_GROWL) // Do the popup test earlier (to avoid needless JID lookups) - if ((popupType == PopupOnline && option.ppOnline) || (popupType == PopupStatusChange && option.ppStatus)) + if ((popupType == PopupOnline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool()) || (popupType == PopupStatusChange && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool())) #endif if(notifyOnlineOk && doPopup && !d->blockTransportPopupList->find(j, popupType == PopupOnline) && !d->noPopup(IncomingStanza)) { QString name; @@ -1907,7 +1910,7 @@ void PsiAccount::client_resourceAvailable(const Jid &j, const Resource &r) else if ( popupType == PopupStatusChange ) pt = PsiPopup::AlertStatusChange; - if ((popupType == PopupOnline && option.ppOnline) || (popupType == PopupStatusChange && option.ppStatus)) { + if ((popupType == PopupOnline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool()) || (popupType == PopupStatusChange && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool())) { PsiPopup *popup = new PsiPopup(pt, this); popup->setData(j, r, u); } @@ -1970,17 +1973,17 @@ void PsiAccount::client_resourceUnavailable(const Jid &j, const Resource &r) cpUpdate(*u, r.name(), true); } if(doSound) - playSound(option.onevent[eOffline]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.contact-offline").toString()); #if !defined(Q_WS_MAC) || !defined(HAVE_GROWL) // Do the popup test earlier (to avoid needless JID lookups) - if (option.ppOffline) + if (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool()) #endif if(doPopup && !d->blockTransportPopupList->find(j) && !d->noPopup(IncomingStanza)) { QString name; UserListItem *u = findFirstRelevant(j); - if (option.ppOffline) { + if (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool()) { PsiPopup *popup = new PsiPopup(PsiPopup::AlertOffline, this); popup->setData(j, r, u); } @@ -2047,7 +2050,7 @@ void PsiAccount::processIncomingMessage(const Message &_m) return; // skip headlines? - if(_m.type() == "headline" && option.ignoreHeadline) + if(_m.type() == "headline" && PsiOptions::instance()->getOption("options.messages.ignore-headlines").toBool()) return; if(_m.type() == "groupchat") { @@ -2076,9 +2079,9 @@ void PsiAccount::processIncomingMessage(const Message &_m) QList<UserListItem*> ul = findRelevant(m.from()); // ignore events from non-roster JIDs? - if (ul.isEmpty() && option.ignoreNonRoster) + if (ul.isEmpty() && PsiOptions::instance()->getOption("options.messages.ignore-non-roster-contacts").toBool()) { - if (option.excludeGroupChatsFromIgnore) + if (PsiOptions::instance()->getOption("options.messages.exclude-muc-from-ignore").toBool()) { GCMainDlg *w = findDialog<GCMainDlg*>(Jid(_m.from().userHost())); if(!w) @@ -2121,11 +2124,11 @@ void PsiAccount::processIncomingMessage(const Message &_m) // change the type? if (m.type() != "headline" && m.invite().isEmpty() && m.mucInvites().isEmpty()) { - if (option.incomingAs == 1) + if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "message") m.setType(""); - else if (option.incomingAs == 2) + else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "chat") m.setType("chat"); - else if (option.incomingAs == 3) { + else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "current-open") { if (c != NULL && !c->isHidden()) m.setType("chat"); else @@ -2350,7 +2353,7 @@ void PsiAccount::setStatusActual(const Status &_s) // Get the vcard const VCard *vcard = VCardFactory::instance()->vcard(d->jid); - if ( option.autoVCardOnLogin || !vcard || vcard->isEmpty() || vcard->nickName().isEmpty() ) + if ( PsiOptions::instance()->getOption("options.vcard.query-own-vcard-on-login").toBool() || !vcard || vcard->isEmpty() || vcard->nickName().isEmpty() ) VCardFactory::instance()->getVCard(d->jid, d->client->rootTask(), this, SLOT(slotCheckVCard())); else { d->nickFromVCard = true; @@ -2415,11 +2418,11 @@ void PsiAccount::secondsIdle(int seconds) { int minutes = seconds / 60; - if(option.use_asOffline && option.asOffline > 0 && minutes >= option.asOffline) + if(PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() && PsiOptions::instance()->getOption("options.status.auto-away.offline-after").toInt() > 0 && minutes >= PsiOptions::instance()->getOption("options.status.auto-away.offline-after").toInt()) d->setAutoAway(Private::AutoAway_Offline); - else if(option.use_asXa && option.asXa > 0 && minutes >= option.asXa) + else if(PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() && PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() > 0 && minutes >= PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt()) d->setAutoAway(Private::AutoAway_XA); - else if(option.use_asAway && option.asAway > 0 && minutes >= option.asAway) + else if(PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() && PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() > 0 && minutes >= PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt()) d->setAutoAway(Private::AutoAway_Away); else d->setAutoAway(Private::AutoAway_None); @@ -2438,7 +2441,7 @@ void PsiAccount::playSound(const QString &str) return; // no away sounds? - if(option.noAwaySound && (s == STATUS_AWAY || s == STATUS_XA)) + if(PsiOptions::instance()->getOption("options.ui.notifications.sounds.silent-while-away").toBool() && (s == STATUS_AWAY || s == STATUS_XA)) return; d->psi->playSound(str); @@ -2914,7 +2917,7 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j) * only way */ //TODO: This doesn't work as expected atm, it doesn't seem to reparent the tabset QWidget *window=c; - if ( option.useTabs ) + if ( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() ) window = d->tabManager->getManagingTabs(c); if(window && window->isHidden()) { const QPixmap *pp = c->icon(); @@ -2937,11 +2940,11 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j) void PsiAccount::changeStatus(int x) { - if(x == STATUS_OFFLINE && !option.askOffline) { + if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) { setStatus(Status(Status::Offline, "Logged out", 0)); } else { - if(x == STATUS_ONLINE && !option.askOnline) { + if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) { setStatus(Status()); } else if(x == STATUS_INVISIBLE){ @@ -3054,16 +3057,16 @@ void PsiAccount::actionSetMood() void PsiAccount::actionSetAvatar() { while(1) { - if(option.lastPath.isEmpty()) - option.lastPath = QDir::homeDirPath(); - QString str = QFileDialog::getOpenFileName(0,tr("Choose a file"),option.lastPath, tr("Images (*.png *.xpm *.jpg *.PNG *.XPM *.JPG)")); + if(PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString().isEmpty()) + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = QDir::homeDirPath(); + QString str = QFileDialog::getOpenFileName(0,tr("Choose a file"),PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString(), tr("Images (*.png *.xpm *.jpg *.PNG *.XPM *.JPG)")); if(!str.isEmpty()) { QFileInfo fi(str); if(!fi.exists()) { QMessageBox::critical(0, tr("Error"), tr("The file specified does not exist.")); continue; } - option.lastPath = fi.dirPath(); + PsiOptions::instance()->getOption("options.ui.last-used-open-path").toString() = fi.dirPath(); avatarFactory()->setSelfAvatar(str); } break; @@ -3084,7 +3087,7 @@ void PsiAccount::actionDefault(const Jid &j) if(d->eventQueue->count(u->jid()) > 0) openNextEvent(*u, UserAction); else { - if(option.defaultAction == 0) + if(PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message") actionSendMessage(u->jid()); else actionOpenChat(u->jid()); @@ -3437,7 +3440,7 @@ void PsiAccount::dj_sendMessage(const Message &m, bool log) UserListItem *u = findFirstRelevant(m.to()); Message nm = m; - if(option.incomingAs == 3) { + if(PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "current-open") { if(u) { switch(u->lastMessageType()) { case 0: nm.setType(""); break; @@ -3472,7 +3475,7 @@ void PsiAccount::dj_sendMessage(const Message &m, bool log) // don't sound when sending groupchat messages or message events if(m.type() != "groupchat" && !m.body().isEmpty()) - playSound(option.onevent[eSend]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.outgoing-chat").toString()); // auto close an open messagebox (if non-chat) if(m.type() != "chat" && !m.body().isEmpty()) { @@ -3738,7 +3741,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) // Pass message events to chat window if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) { - if (option.messageEvents) { + if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) { ChatDlg *c = findChatDialog(e->from()); if (!c) { c = findChatDialog(e->jid()); @@ -3763,8 +3766,8 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) //or in a window if( c && ( d->tabManager->isChatTabbed(c) || !c->isHidden() ) ) { c->incomingMessage(m); - playSound(option.onevent[eChat2]); - if(option.alertOpenChats && !c->isActiveTab()) { + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.chat-message").toString()); + if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab()) { // to alert the chat also, we put it in the queue me->setSentToChatWindow(true); } @@ -3773,7 +3776,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) } else { bool firstChat = !d->eventQueue->hasChats(e->from()); - playSound(option.onevent[firstChat ? eChat1: eChat2]); + playSound(PsiOptions::instance()->getOption(firstChat ? "options.ui.notifications.sounds.new-chat": "options.ui.notifications.sounds.chat-message").toString()); } if (putToQueue) { @@ -3782,19 +3785,19 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) } } // /chat else if (m.type() == "headline") { - playSound(option.onevent[eHeadline]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-headline").toString()); doPopup = true; popupType = PsiPopup::AlertHeadline; } // /headline else if (m.type() == "") { - playSound(option.onevent[eMessage]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-message").toString()); if (m.type() == "") { doPopup = true; popupType = PsiPopup::AlertMessage; } } // /"" else - playSound(option.onevent[eSystem]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.system-message").toString()); if(m.type() == "error") { // FIXME: handle message errors @@ -3808,10 +3811,10 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) #endif } else if(e->type() == PsiEvent::HttpAuth) { - playSound(option.onevent[eSystem]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.system-message").toString()); } else if(e->type() == PsiEvent::File) { - playSound(option.onevent[eIncomingFT]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.incoming-file-transfer").toString()); doPopup = true; popupType = PsiPopup::AlertFile; } @@ -3827,14 +3830,14 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) return; } re->setRosterExchangeItems(items); - playSound(option.onevent[eSystem]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.system-message").toString()); } else if (e->type() == PsiEvent::Auth) { - playSound(option.onevent[eSystem]); + playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.system-message").toString()); AuthEvent *ae = (AuthEvent *)e; if(ae->authType() == "subscribe") { - if(option.autoAuth) { + if(PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorisation").toBool()) { // Check if we want to request auth as well UserListItem *u = d->userList.find(ae->from()); if (!u || (u->subscription().type() != Subscription::Both && u->subscription().type() != Subscription::To)) { @@ -3847,7 +3850,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) } } else if(ae->authType() == "subscribed") { - if(!option.notifyAuth) + if(!PsiOptions::instance()->getOption("options.ui.notifications.successful-subscription").toBool()) putToQueue = false; } else if(ae->authType() == "unsubscribe") { @@ -3866,10 +3869,10 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType) r = *(u->priority()); } - if ((popupType == PsiPopup::AlertChat && option.ppChat) || - (popupType == PsiPopup::AlertMessage && option.ppMessage) || - (popupType == PsiPopup::AlertHeadline && option.ppHeadline) || - (popupType == PsiPopup::AlertFile && option.ppFile)) + if ((popupType == PsiPopup::AlertChat && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool()) || + (popupType == PsiPopup::AlertMessage && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) || + (popupType == PsiPopup::AlertHeadline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool()) || + (popupType == PsiPopup::AlertFile && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool())) { PsiPopup *popup = new PsiPopup(popupType, this); popup->setData(j, r, u, e); @@ -3939,7 +3942,7 @@ void PsiAccount::queueEvent(PsiEvent* e, ActivationType activationType) d->eventQueue->enqueue(e); updateReadNext(e->jid()); - if(option.raise) + if(PsiOptions::instance()->getOption("options.ui.contactlist.raise-on-new-event").toBool()) d->psi->raiseMainwin(); // udpate the roster @@ -3955,23 +3958,23 @@ void PsiAccount::queueEvent(PsiEvent* e, ActivationType activationType) MessageEvent *me = (MessageEvent *)e; const Message &m = me->message(); if (m.type() == "chat") - doPopup = option.popupChats; + doPopup = PsiOptions::instance()->getOption("options.ui.chat.auto-popup").toBool(); else if (m.type() == "headline") - doPopup = option.popupHeadlines; + doPopup = PsiOptions::instance()->getOption("options.ui.message.auto-popup-headlines").toBool(); else - doPopup = option.popupMsgs; + doPopup = PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool(); } else if (e->type() == PsiEvent::File) { - doPopup = option.popupFiles; + doPopup = PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool(); } else { - doPopup = option.popupMsgs; + doPopup = PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool(); } // Popup if (doPopup) { UserListItem *u = find(e->jid()); - if (u && (!option.noUnlistedPopup || u->inList())) + if (u && (!PsiOptions::instance()->getOption("options.ui.notifications.popup-dialogs.suppress-when-not-on-roster").toBool() || u->inList())) openNextEvent(*u, activationType); } @@ -4151,7 +4154,7 @@ void PsiAccount::openChat(const Jid& j, ActivationType activationType) void PsiAccount::chatMessagesRead(const Jid &j) { - if(option.alertOpenChats) { + if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) { processChats(j); } } @@ -4644,16 +4647,16 @@ void PsiAccount::optionsUpdate() #endif // Chat states - setSendChatState(option.messageEvents); + setSendChatState(PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()); // Remote Controlling - setRCEnabled(option.useRC); + setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool()); // Roster item exchange - d->rosterItemExchangeTask->setIgnoreNonRoster(option.ignoreNonRoster); + d->rosterItemExchangeTask->setIgnoreNonRoster(PsiOptions::instance()->getOption("options.messages.ignore-non-roster-contacts").toBool()); // Caps manager - d->capsManager->setEnabled(option.useCaps); + d->capsManager->setEnabled(PsiOptions::instance()->getOption("options.service-discovery.enable-entity-capabilities").toBool()); } src/psiaccount.cpp @@ -20,6 +20,7 @@ #include "psiactionlist.h" #include "iconset.h" +#include "psioptions.h" #include <qobject.h> @@ -172,13 +173,13 @@ void PsiActionList::Private::createMainWin() { IconAction *add_act = 0; - if (!option.lockdown.roster) + if (!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()) add_act = new MAction(IconsetFactory::icon("psi/addContact"), tr("&Add a contact"), 0, psi, this); IconAction *lw_act = new MAction(IconsetFactory::icon("psi/xml"), tr("&XML Console"), 2, psi, this); IconAction *actDisco = 0; - if(!option.lockdown.services) + if(!PsiOptions::instance()->getOption("options.ui.contactlist.disable-service-discovery").toBool()) actDisco = new MAction(IconsetFactory::icon("psi/disco"), tr("Service &Discovery"), 3, psi, this); // IconAction *actReadme = new IconAction (tr("ReadMe"), tr("&ReadMe"), 0, this); src/psiactionlist.cpp @@ -20,7 +20,6 @@ #include "psicon.h" #include "psiaccount.h" -#include "common.h" #include "iconaction.h" #include "stretchwidget.h" #include "psiiconset.h" @@ -86,12 +85,12 @@ void PsiChatDlg::initUi() list << 96; ui_.splitter->setSizes(list); - smallChat_ = option.smallChats; + smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool(); } void PsiChatDlg::updateCountVisibility() { - if (option.showCounter && !smallChat_) { + if (PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && !smallChat_) { ui_.lb_count->show(); } else { @@ -124,7 +123,7 @@ void PsiChatDlg::setLooks() } else { ui_.toolbar->hide(); - ui_.tb_emoticons->setVisible(option.useEmoticons); + ui_.tb_emoticons->setVisible(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()); ui_.tb_actions->show(); } } @@ -308,7 +307,7 @@ void PsiChatDlg::updateAvatar() void PsiChatDlg::optionsUpdate() { - smallChat_ = option.smallChats; + smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool(); ChatDlg::optionsUpdate(); } @@ -385,7 +384,7 @@ void PsiChatDlg::appendNormalMessage(SpooledType spooled, const QDateTime& time, QString color = colorString(local, spooled); QString timestr = chatView()->formatTimeStamp(time); - if (option.chatSays) { + if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) { chatView()->appendText(QString("").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(whoNick(local)) + "" + txt); } else { src/psichatdlg.cpp @@ -123,7 +123,7 @@ public: public slots: void playSound(QString file) { - if ( file.isEmpty() || !useSound ) + if ( file.isEmpty() || !PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool() ) return; soundPlay(file); @@ -191,17 +191,31 @@ public: void saveProfile(UserAccountList acc) { - pro.recentGCList = recentGCList; - pro.recentBrowseList = recentBrowseList; - pro.lastStatusString = lastStatusString; - pro.useSound = useSound; - pro.prefs = option; - if ( proxy ) - pro.proxyList = proxy->itemList(); - - pro.acc = acc; - - pro.toFile(pathToProfileConfig(activeProfile)); + // clear it + accountTree.removeOption("accounts", true); + // save accounts with known base + QSet<QString> cbases; + foreach(UserAccount ua, acc) { + if (!ua.optionsBase.isEmpty()) { + ua.toOptions(&accountTree); + cbases += ua.optionsBase; + } + } + // save new accounts + int idx = 0; + foreach(UserAccount ua, acc) { + if (ua.optionsBase.isEmpty()) { + QString base; + do { + base = "accounts.a"+QString::number(idx++); + } while (cbases.contains(base)); + cbases += base; + ua.toOptions(&accountTree, base); + } + } + QFile accountsFile(pathToProfile( activeProfile ) + "/accounts.xml"); + accountTree.saveOptions(accountsFile.fileName(), "accounts", ApplicationInfo::optionsNS(), ApplicationInfo::version());; + } void updateIconSelect() @@ -220,13 +234,13 @@ public: PsiCon* psi; PsiContactList* contactList; - UserProfile pro; - QString lastStatusString; + OptionsMigration optionsMigration; + OptionsTree accountTree; MainWin *mainwin; Idle idle; QList<item_dialog*> dialogList; int eventId; - QStringList recentGCList, recentBrowseList, recentNodeList; + QStringList recentNodeList; // FIXME move this to options system? EDB *edb; S5BServer *s5bServer; ProxyManager *proxy; @@ -252,8 +266,6 @@ PsiCon::PsiCon() d = new Private(this); d->tabManager = new TabManager(this); - d->lastStatusString = ""; - useSound = true; d->mainwin = 0; d->ftwin = 0; @@ -303,6 +315,21 @@ bool PsiCon::init() connect(d->contactList, SIGNAL(accountActivityChanged()), SIGNAL(accountActivityChanged())); connect(d->contactList, SIGNAL(saveAccounts()), SLOT(saveAccounts())); + // do some backuping in case we are about to start migration from config.xml+options.xml + // to options.xml only. + QString backupfile = optionsFile() + "-preOptionsMigration"; + if (QFile::exists(pathToProfileConfig(activeProfile)) + && QFile::exists(optionsFile()) + && !QFile::exists(backupfile)) { + QFile::copy(optionsFile(), backupfile); + } + + // advanced widget + GAdvancedWidget::setStickEnabled( false ); //until this is bugless + GAdvancedWidget::setStickToWindows( false ); //again + GAdvancedWidget::setStickAt( 5 ); + + // To allow us to upgrade from old hardcoded options gracefully, be careful about the order here PsiOptions *options=PsiOptions::instance(); //load the system-wide defaults, if they exist @@ -316,9 +343,23 @@ bool PsiCon::init() d->tuneController = new CombinedTuneController(); #endif + // calculate the small font size + const int minimumFontSize = 7; + common_smallFontSize = qApp->font().pointSize(); + common_smallFontSize -= 2; + if ( common_smallFontSize < minimumFontSize ) + common_smallFontSize = minimumFontSize; + FancyLabel::setSmallFontSize( common_smallFontSize ); + + + if (!QFile::exists(optionsFile()) && !QFile::exists(pathToProfileConfig(activeProfile))) { + if (!options->load(":/options/newprofile.xml")) { + qWarning("ERROR: Failed to new profile default options"); + } + } + // load the old profile - d->pro.reset(); - d->pro.fromFile(pathToProfileConfig(activeProfile)); + d->optionsMigration.fromFile(pathToProfileConfig(activeProfile)); //load the new profile //Save every time an option is changed @@ -329,22 +370,38 @@ bool PsiCon::init() options->setOption("trigger-save",false); options->setOption("trigger-save",true); - connect(options, SIGNAL(optionChanged(const QString&)), SLOT(optionsUpdate())); + // do some late migration work + d->optionsMigration.lateMigration(); + + QFile accountsFile(pathToProfile( activeProfile ) + "/accounts.xml"); + bool accountMigration = false; + if (!accountsFile.exists()) { + accountMigration = true; + int idx = 0; + foreach(UserAccount a, d->optionsMigration.accMigration) { + QString base = "accounts.a"+QString::number(idx++); + a.toOptions(&d->accountTree, base); + } + } else { + d->accountTree.loadOptions(accountsFile.fileName(), "accounts", ApplicationInfo::optionsNS()); + } + + // proxy + d->proxy = new ProxyManager(&d->accountTree, this); + if (accountMigration) d->proxy->migrateItemList(d->optionsMigration.proxyMigration); + connect(d->proxy, SIGNAL(settingsChanged()), SLOT(proxy_settingsChanged())); + + connect(options, SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&))); QDir profileDir( pathToProfile( activeProfile ) ); profileDir.rmdir( "info" ); // remove unused dir - d->recentGCList = d->pro.recentGCList; - d->recentBrowseList = d->pro.recentBrowseList; - d->lastStatusString = d->pro.lastStatusString; - useSound = d->pro.useSound; - option = d->pro.prefs; // first thing, try to load the iconset if( !PsiIconset::instance()->loadAll() ) { - //option.iconset = "stellar"; - //if(!is.load(option.iconset)) { + //LEGOPTS.iconset = "stellar"; + //if(!is.load(LEGOPTS.iconset)) { QMessageBox::critical(0, tr("Error"), tr("Unable to load iconset! Please make sure Psi is properly installed.")); return false; //} @@ -361,8 +418,8 @@ bool PsiCon::init() d->updateIconSelect(); // setup the main window - d->mainwin = new MainWin(option.alwaysOnTop, (option.useDock && option.dockToolMW), this, "psimain"); - d->mainwin->setUseDock(option.useDock); + d->mainwin = new MainWin(PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool(), (PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() && PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool()), this, "psimain"); + d->mainwin->setUseDock(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()); connect(d->mainwin, SIGNAL(closeProgram()), SLOT(closeProgram())); connect(d->mainwin, SIGNAL(changeProfile()), SLOT(changeProfile())); @@ -379,9 +436,10 @@ bool PsiCon::init() connect(this, SIGNAL(emitOptionsUpdate()), d->mainwin->cvlist, SLOT(optionsUpdate())); - d->mainwin->restoreSavedGeometry(d->pro.mwgeom); - - if(!(option.useDock && option.dockHideMW)) + QRect geom = PsiOptions::instance()->getOption("options.ui.contactlist.saved-window-geometry").toRect(); + if (geom.isValid()) d->mainwin->restoreSavedGeometry(geom); + + if(!(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() && PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool())) d->mainwin->show(); d->ftwin = new FileTransDlg(this); @@ -392,35 +450,6 @@ bool PsiCon::init() d->s5bServer = new S5BServer; s5b_init(); - // proxy - d->proxy = new ProxyManager(this); - d->proxy->setItemList(d->pro.proxyList); - connect(d->proxy, SIGNAL(settingsChanged()), SLOT(proxy_settingsChanged())); - - // Disable accounts if necessary, and overwrite locked properties - if (PsiOptions::instance()->getOption("options.ui.account.single").toBool() || !PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) { - bool haveEnabled = false; - for(UserAccountList::Iterator it = d->pro.acc.begin(); it != d->pro.acc.end(); ++it) { - // With single accounts, only modify the first account - if (PsiOptions::instance()->getOption("options.ui.account.single").toBool()) { - if (!haveEnabled) { - haveEnabled = it->opt_enabled; - if (it->opt_enabled) { - if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) - it->jid = JIDUtil::accountFromString(Jid(it->jid).user()).bare(); - } - } - else - it->opt_enabled = false; - } - else { - // Overwirte locked properties - if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) - it->jid = JIDUtil::accountFromString(Jid(it->jid).user()).bare(); - } - } - } - // Connect to the system monitor SystemWatch* sw = SystemWatch::instance(); connect(sw, SIGNAL(sleep()), this, SLOT(doSleep())); @@ -474,8 +503,45 @@ bool PsiCon::init() registerCaps("mr", QStringList("urn:xmpp:receipts")); // load accounts - d->contactList->loadAccounts(d->pro.acc); + { + QList<UserAccount> accs; + QStringList bases = d->accountTree.getChildOptionNames("accounts", true, true); + foreach (QString base, bases) { + UserAccount ua; + ua.fromOptions(&d->accountTree, base); + accs += ua; + } + + // Disable accounts if necessary, and overwrite locked properties + if (PsiOptions::instance()->getOption("options.ui.account.single").toBool() || !PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) { + bool haveEnabled = false; + for(UserAccountList::Iterator it = accs.begin(); it != accs.end(); ++it) { + // With single accounts, only modify the first account + if (PsiOptions::instance()->getOption("options.ui.account.single").toBool()) { + if (!haveEnabled) { + haveEnabled = it->opt_enabled; + if (it->opt_enabled) { + if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) + it->jid = JIDUtil::accountFromString(Jid(it->jid).user()).bare(); + } + } + else + it->opt_enabled = false; + } + else { + // Overwirte locked properties + if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) + it->jid = JIDUtil::accountFromString(Jid(it->jid).user()).bare(); + } + } + } + + d->contactList->loadAccounts(accs); + } + checkAccountsEmpty(); + + // try autologin if needed foreach(PsiAccount* account, d->contactList->accounts()) { account->autoLogin(); @@ -524,6 +590,11 @@ void PsiCon::deinit() delete d->ftwin; if(d->mainwin) { + // shut down mainwin + if (!d->mainwin->isHidden() && !d->mainwin->isMinimized()) { + PsiOptions::instance()->setOption("options.ui.contactlist.saved-window-geometry", d->mainwin->saveableGeometry()); + } + delete d->mainwin; d->mainwin = 0; } @@ -535,11 +606,6 @@ void PsiCon::deinit() d->saveProfile(acc); } -void PsiCon::optionsUpdate() -{ - // Global shortcuts - setShortcuts(); -} void PsiCon::setShortcuts() { @@ -720,7 +786,7 @@ AccountsComboBox *PsiCon::accountsComboBox(QWidget *parent, bool online_only) return acb; } -void PsiCon::createAccount(const QString &name, const Jid &j, const QString &pass, bool opt_host, const QString &host, int port, bool legacy_ssl_probe, UserAccount::SSLFlag ssl, int proxy) +void PsiCon::createAccount(const QString &name, const Jid &j, const QString &pass, bool opt_host, const QString &host, int port, bool legacy_ssl_probe, UserAccount::SSLFlag ssl, QString proxy) { d->contactList->createAccount(name, j, pass, opt_host, host, port, legacy_ssl_probe, ssl, proxy); } @@ -746,30 +812,30 @@ void PsiCon::removeAccount(PsiAccount *pa) void PsiCon::statusMenuChanged(int x) { - if(x == STATUS_OFFLINE && !option.askOffline) { + if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) { setGlobalStatus(Status(Status::Offline, "Logged out", 0)); - if(option.useDock == true) + if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true) d->mainwin->setTrayToolTip(Status(Status::Offline, "", 0)); } else { - if(x == STATUS_ONLINE && !option.askOnline) { + if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) { setGlobalStatus(Status()); - if(option.useDock == true) + if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true) d->mainwin->setTrayToolTip(Status()); } else if(x == STATUS_INVISIBLE){ Status s("","",0,true); s.setIsInvisible(true); setGlobalStatus(s); - if(option.useDock == true) + if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true) d->mainwin->setTrayToolTip(s); } else { // Create a dialog with the last status message - StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, d->lastStatusString)); + StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, PsiOptions::instance()->getOption("options.status.last-message").toString())); connect(w, SIGNAL(set(const XMPP::Status &, bool)), SLOT(setStatusFromDialog(const XMPP::Status &, bool))); connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus())); - if(option.useDock == true) + if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true) connect(w, SIGNAL(set(const XMPP::Status &, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool))); w->show(); } @@ -778,7 +844,7 @@ void PsiCon::statusMenuChanged(int x) void PsiCon::setStatusFromDialog(const Status &s, bool withPriority) { - d->lastStatusString = s.status(); + PsiOptions::instance()->setOption("options.status.last-message", s.status()); setGlobalStatus(s, withPriority); } @@ -821,10 +887,6 @@ void PsiCon::pa_updatedAccount() void PsiCon::saveAccounts() { UserAccountList acc = d->contactList->getUserAccountList(); - - d->pro.proxyList = d->proxy->itemList(); - //d->pro.acc = acc; - //d->pro.toFile(pathToProfileConfig(activeProfile)); d->saveProfile(acc); } @@ -857,35 +919,14 @@ void PsiCon::updateMainwinStatus() } } -void PsiCon::setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self) -{ - if(d->contactList->enabledAccounts().count() > 1) - return; - - d->mainwin->cvlist->setShowOffline(tog_offline); - d->mainwin->cvlist->setShowAway(tog_away); - d->mainwin->cvlist->setShowAgents(tog_agents); - d->mainwin->cvlist->setShowHidden(tog_hidden); - d->mainwin->cvlist->setShowSelf(tog_self); -} - -void PsiCon::getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self) -{ - *tog_offline = d->mainwin->cvlist->isShowOffline(); - *tog_away = d->mainwin->cvlist->isShowAway(); - *tog_agents = d->mainwin->cvlist->isShowAgents(); - *tog_hidden = d->mainwin->cvlist->isShowHidden(); - *tog_self = d->mainwin->cvlist->isShowSelf(); -} - void PsiCon::doOptions() { OptionsDlg *w = (OptionsDlg *)dialogFind("OptionsDlg"); if(w) bringToFront(w); else { - w = new OptionsDlg(this, option); - connect(w, SIGNAL(applyOptions(const Options &)), SLOT(slotApplyOptions(const Options &))); + w = new OptionsDlg(this); + connect(w, SIGNAL(applyOptions()), SLOT(slotApplyOptions())); w->show(); } } @@ -897,7 +938,7 @@ void PsiCon::doFileTransDlg() void PsiCon::checkAccountsEmpty() { - if (d->pro.acc.count() == 0) { + if (d->contactList->accounts().count() == 0) { promptUserToCreateAccount(); } } @@ -992,52 +1033,37 @@ void PsiCon::doToolbars() bringToFront(w); } else { - w = new OptionsDlg(this, option); + w = new OptionsDlg(this); connect(w, SIGNAL(applyOptions(const Options &)), SLOT(slotApplyOptions(const Options &))); w->openTab("toolbars"); w->show(); } } -void PsiCon::slotApplyOptions(const Options &opt) +void PsiCon::optionChanged(const QString& option) { - Options oldOpt = option; - bool notifyRestart = true; - - option = opt; - -#ifndef Q_WS_MAC - if (option.hideMenubar) { - // check if all toolbars are disabled - bool toolbarsVisible = false; - QList<Options::ToolbarPrefs>::ConstIterator it = option.toolbars["mainWin"].begin(); - for ( ; it != option.toolbars["mainWin"].end() && !toolbarsVisible; ++it) { - toolbarsVisible = toolbarsVisible || (*it).on; - } - - // Check whether it is legal to disable the menubar - if ( !toolbarsVisible ) { - QMessageBox::warning(0, tr("Warning"), - tr("You can not disable all toolbars and the menubar. If you do so, you will be unable to enable them back, when you'll change your mind.\n" - " \n" - "If you really-really want to disable all toolbars and the menubar, you need to edit the config.xml file by hand."), - tr("I understand")); - option.hideMenubar = false; - } + // Global shortcuts + setShortcuts(); + + if (option == "options.ui.notifications.alert-style") { + alertIconUpdateAlertStyle(); } -#endif - - if ( option.useTabs != oldOpt.useTabs ) { + + if ( option == "options.ui.tabs.use-tabs") { QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart.")); - notifyRestart = false; + //notifyRestart = false; + } + + // update s5b + if(option == "options.p2p.bytestreams.listen-port") { + s5b_init(); } +/* LEGOPTFIXME // change icon set - if ( option.systemIconset != oldOpt.systemIconset || - option.emoticons != oldOpt.emoticons || - option.defaultRosterIconset != oldOpt.defaultRosterIconset || - operator!=(option.serviceRosterIconset,oldOpt.serviceRosterIconset) || - operator!=(option.customRosterIconset,oldOpt.customRosterIconset) ) + if ( "options.iconsets.system" "options.iconsets.emoticons" "options.iconsets.status" || + operator!=(LEGOPTS.serviceRosterIconset,oldOpt.serviceRosterIconset) || + operator!=(LEGOPTS.customRosterIconset,oldOpt.customRosterIconset) ) { if ( notifyRestart && PsiIconset::instance()->optionsChanged(&oldOpt) ) QMessageBox::information(0, tr("Information"), tr("The complete iconset update will happen on next Psi start.")); @@ -1048,38 +1074,43 @@ void PsiCon::slotApplyOptions(const Options &opt) // flush the QPixmapCache QPixmapCache::clear(); } +*/ +} - if ( oldOpt.alertStyle != option.alertStyle ) - alertIconUpdateAlertStyle(); +void PsiCon::slotApplyOptions() +{ + bool notifyRestart = true; + + PsiOptions *o = PsiOptions::instance(); - d->mainwin->buildToolbars(); +#ifndef Q_WS_MAC + if (!PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool()) { + // check if all toolbars are disabled + bool toolbarsVisible = false; + QStringList bases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true); + foreach(QString base, bases) { + toolbarsVisible = toolbarsVisible || o->getOption( base + ".visible").toBool(); + } - /*// change pgp engine - if(option.pgp != oldpgp) { - if(d->pgp) { - delete d->pgp; - d->pgp = 0; - pgpToggled(false); + // Check whether it is legal to disable the menubar + if ( !toolbarsVisible ) { + QMessageBox::warning(0, tr("Warning"), + tr("You can not disable all toolbars and the menubar. If you do so, you will be unable to enable them back, when you'll change your mind."), + tr("I understand")); + PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", true); } - pgp_init(option.pgp); - }*/ + } +#endif - // update s5b - if(oldOpt.dtPort != option.dtPort) - s5b_init(); updateS5BServerAddresses(); // mainwin stuff - d->mainwin->setWindowOpts(option.alwaysOnTop, (option.useDock && option.dockToolMW)); - d->mainwin->setUseDock(option.useDock); + d->mainwin->setWindowOpts(PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool(), (PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() && PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool())); + d->mainwin->setUseDock(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()); + // notify about options change emitOptionsUpdate(); - - // save just the options - //d->pro.prefs = option; - //d->pro.toFile(pathToProfileConfig(activeProfile)); - d->saveProfile(d->pro.acc); } int PsiCon::getId() @@ -1136,7 +1167,7 @@ void PsiCon::recvNextEvent() void PsiCon::playSound(const QString &str) { - if(str.isEmpty() || !useSound) + if(str.isEmpty() || !PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool()) return; soundPlay(str); @@ -1147,50 +1178,59 @@ void PsiCon::raiseMainwin() d->mainwin->showNoFocus(); } -const QStringList & PsiCon::recentGCList() const +QStringList PsiCon::recentGCList() const { - return d->recentGCList; + return PsiOptions::instance()->getOption("options.muc.recent-joins.jids").toStringList(); } void PsiCon::recentGCAdd(const QString &str) { + QStringList recentList = recentGCList(); + // remove it if we have it - for(QStringList::Iterator it = d->recentGCList.begin(); it != d->recentGCList.end(); ++it) { + for(QStringList::Iterator it = recentList.begin(); it != recentList.end(); ++it) { if(*it == str) { - d->recentGCList.remove(it); + recentList.remove(it); break; } } // put it in the front - d->recentGCList.prepend(str); + recentList.prepend(str); // trim the list if bigger than 10 - while(d->recentGCList.count() > PsiOptions::instance()->getOption("options.muc.recent-joins.maximum").toInt()) - d->recentGCList.remove(d->recentGCList.fromLast()); + while(recentList.count() > PsiOptions::instance()->getOption("options.muc.recent-joins.maximum").toInt()) { + recentList.remove(recentList.fromLast()); + } + + PsiOptions::instance()->setOption("options.muc.recent-joins.jids", recentList); } -const QStringList & PsiCon::recentBrowseList() const +QStringList PsiCon::recentBrowseList() const { - return d->recentBrowseList; + return PsiOptions::instance()->getOption("options.ui.service-discovery.recent-jids").toStringList(); } void PsiCon::recentBrowseAdd(const QString &str) { + QStringList recentList = recentBrowseList(); // remove it if we have it - for(QStringList::Iterator it = d->recentBrowseList.begin(); it != d->recentBrowseList.end(); ++it) { + for(QStringList::Iterator it = recentList.begin(); it != recentList.end(); ++it) { if(*it == str) { - d->recentBrowseList.remove(it); + recentList.remove(it); break; } } // put it in the front - d->recentBrowseList.prepend(str); + recentList.prepend(str); // trim the list if bigger than 10 - while(d->recentBrowseList.count() > 10) - d->recentBrowseList.remove(d->recentBrowseList.fromLast()); + while(recentList.count() > 10) { + recentList.remove(recentList.fromLast()); + } + + PsiOptions::instance()->setOption("options.ui.service-discovery.recent-jids", recentList); } const QStringList & PsiCon::recentNodeList() const @@ -1218,19 +1258,6 @@ void PsiCon::recentNodeAdd(const QString &str) void PsiCon::proxy_settingsChanged() { - // properly index accounts - foreach(PsiAccount* account, d->contactList->accounts()) { - UserAccount acc = account->userAccount(); - if(acc.proxy_index > 0) { - int x = d->proxy->findOldIndex(acc.proxy_index-1); - if(x == -1) - acc.proxy_index = 0; - else - acc.proxy_index = x+1; - account->setUserAccount(acc); - } - } - saveAccounts(); } @@ -1287,7 +1314,7 @@ void PsiCon::processEvent(PsiEvent *e, ActivationType activationType) PsiAccount* account = e->account(); XMPP::Jid from = e->from(); - if ( option.alertOpenChats && sentToChatWindow ) { + if ( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && sentToChatWindow ) { // Message already displayed, need only to pop up chat dialog, so that // it will be read (or marked as read) ChatDlg *c = account->findChatDialog(from); @@ -1321,7 +1348,7 @@ void PsiCon::processEvent(PsiEvent *e, ActivationType activationType) void PsiCon::mainWinGeomChanged(QRect saveableGeometry) { if (!saveableGeometry.isNull()) - d->pro.mwgeom = saveableGeometry; + PsiOptions::instance()->setOption("options.ui.contactlist.saved-window-geometry", saveableGeometry); } void PsiCon::updateS5BServerAddresses() @@ -1356,17 +1383,17 @@ void PsiCon::updateS5BServerAddresses() slist += (*hit).toString(); // add external - if(!option.dtExternal.isEmpty()) { + if(!PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString().isEmpty()) { bool found = false; for(QStringList::ConstIterator sit = slist.begin(); sit != slist.end(); ++sit) { const QString &s = *sit; - if(s == option.dtExternal) { + if(s == PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString()) { found = true; break; } } if(!found) - slist += option.dtExternal; + slist += PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString(); } // set up the server @@ -1378,9 +1405,9 @@ void PsiCon::s5b_init() if(d->s5bServer->isActive()) d->s5bServer->stop(); - if (option.dtPort) { - if(!d->s5bServer->start(option.dtPort)) { - QMessageBox::warning(0, tr("Warning"), tr("Unable to bind to port %1 for Data Transfer.\nThis may mean you are already running another instance of Psi. You may experience problems sending and/or receiving files.").arg(option.dtPort)); + if (PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) { + if(!d->s5bServer->start(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt())) { + QMessageBox::warning(0, tr("Warning"), tr("Unable to bind to port %1 for Data Transfer.\nThis may mean you are already running another instance of Psi. You may experience problems sending and/or receiving files.").arg(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt())); } } } @@ -1403,31 +1430,11 @@ void PsiCon::doWakeup() } } - -QList<PsiToolBar*> PsiCon::toolbarList() const +void PsiCon::addToolbar(const QString &base) { - return d->mainwin->toolbars; + d->mainwin->addToolbar(base); } -PsiToolBar *PsiCon::findToolBar(QString group, int index) -{ - PsiToolBar *toolBar = 0; - - if (( group == "mainWin" ) && (index < d->mainwin->toolbars.size())) - toolBar = d->mainwin->toolbars.at(index); - - return toolBar; -} - -void PsiCon::buildToolbars() -{ - d->mainwin->buildToolbars(); -} - -bool PsiCon::getToolbarLocation(Q3DockWindow* dw, Qt::Dock& dock, int& index, bool& nl, int& extraOffset) const -{ - return d->mainwin->getLocation(dw, dock, index, nl, extraOffset); -} PsiActionList *PsiCon::actionList() const { @@ -1464,7 +1471,6 @@ QString PsiCon::optionsFile() const void PsiCon::forceSavePreferences() { - slotApplyOptions(option); PsiOptions::instance()->save(optionsFile()); } src/psicon.cpp @@ -84,7 +84,7 @@ public: QMenuBar* defaultMenuBar() const; - void createAccount(const QString &name, const Jid &j="", const QString &pass="", bool opt_host=false, const QString &host="", int port=5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl=UserAccount::SSL_Auto, int proxy=0); + void createAccount(const QString &name, const Jid &j="", const QString &pass="", bool opt_host=false, const QString &host="", int port=5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl=UserAccount::SSL_Auto, QString proxy=""); PsiAccount *createAccount(const UserAccount &); //void createAccount(const QString &, const QString &host="", int port=5222, bool ssl=false, const QString &user="", const QString &pass=""); void removeAccount(PsiAccount *); @@ -93,9 +93,9 @@ public: AccountsComboBox *accountsComboBox(QWidget *parent=0, bool online_only = false); - const QStringList & recentGCList() const; + QStringList recentGCList() const; void recentGCAdd(const QString &); - const QStringList & recentBrowseList() const; + QStringList recentBrowseList() const; void recentBrowseAdd(const QString &); const QStringList & recentNodeList() const; void recentNodeAdd(const QString &); @@ -103,12 +103,9 @@ public: EventDlg *createEventDlg(const QString &, PsiAccount *); void updateContactGlobal(PsiAccount *, const Jid &); - QList<PsiToolBar*> toolbarList() const; - PsiToolBar *findToolBar(QString group, int index); PsiActionList *actionList() const; - void buildToolbars(); - bool getToolbarLocation(Q3DockWindow* dw, Qt::Dock& dock, int& index, bool& nl, int& extraOffset) const; + void addToolbar(const QString &base); IconSelectPopup *iconSelectPopup() const; void processEvent(PsiEvent*, ActivationType activationType); @@ -140,7 +137,7 @@ public slots: void statusMenuChanged(int); void pa_updatedActivity(); void pa_updatedAccount(); - void slotApplyOptions(const Options &); + void slotApplyOptions(); void queueChanged(); void recvNextEvent(); void setStatusFromDialog(const XMPP::Status &, bool withPriority); @@ -154,7 +151,7 @@ public slots: private slots: void saveAccounts(); void saveCapabilities(); - void optionsUpdate(); + void optionChanged(const QString& option); void forceSavePreferences(); void startBounce(); @@ -168,8 +165,6 @@ private: void setShortcuts(); friend class PsiAccount; // FIXME - void setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self); - void getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self); void promptUserToCreateAccount(); QString optionsFile() const; src/psicon.h @@ -99,7 +99,7 @@ PsiAccount *PsiContactList::defaultAccount() const /** * Creates new PsiAccount based on some initial settings. This is used by AccountAddDlg. */ -void PsiContactList::createAccount(const QString& name, const Jid& j, const QString& pass, bool opt_host, const QString& host, int port, bool legacy_ssl_probe, UserAccount::SSLFlag ssl, int proxy, bool modify) +void PsiContactList::createAccount(const QString& name, const Jid& j, const QString& pass, bool opt_host, const QString& host, int port, bool legacy_ssl_probe, UserAccount::SSLFlag ssl, QString proxyID, bool modify) { UserAccount acc; acc.name = name; @@ -114,7 +114,7 @@ void PsiContactList::createAccount(const QString& name, const Jid& j, const QStr acc.host = host; acc.port = port; acc.ssl = ssl; - acc.proxy_index = proxy; + acc.proxyID = proxyID; acc.legacy_ssl_probe = legacy_ssl_probe; PsiAccount *pa = loadAccount(acc); @@ -205,9 +205,9 @@ void PsiContactList::loadAccounts(const UserAccountList &list) UserAccountList PsiContactList::getUserAccountList() const { UserAccountList acc; - foreach(PsiAccount* account, accounts_) + foreach(PsiAccount* account, accounts_) { acc += account->userAccount(); - + } return acc; } @@ -243,7 +243,7 @@ PsiAccount *PsiContactList::tryQueueLowestEventId(bool includeDND) { PsiAccount *low = 0; int low_id = 0; - int low_prior = option.EventPriorityDontCare; + int low_prior = EventPriorityDontCare; foreach(PsiAccount *account, enabledAccounts_) { int n = account->eventQueue()->nextId(); src/psicontactlist.cpp @@ -50,7 +50,7 @@ public: UserAccountList getUserAccountList() const; - void createAccount(const QString& name, const Jid& j = "", const QString& pass = "", bool opt_host = false, const QString& host = "", int port = 5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl = UserAccount::SSL_Auto, int proxy = 0, bool modify = true); + void createAccount(const QString& name, const Jid& j = "", const QString& pass = "", bool opt_host = false, const QString& host = "", int port = 5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl = UserAccount::SSL_Auto, QString proxyID = "", bool modify = true); void createAccount(const UserAccount&); void removeAccount(PsiAccount*); void setAccountEnabled(PsiAccount*, bool enabled = TRUE); src/psicontactlist.h @@ -31,6 +31,17 @@ #include "applicationinfo.h" #include "psicontactlist.h" #include "atomicxmlfile.h" +#include "psioptions.h" + +// FIXME renames those +const int eventPriorityHeadline = 0; +const int eventPriorityChat = 1; +const int eventPriorityMessage = 1; +const int eventPriorityAuth = 2; +//const int eventPriorityFile = 3; +const int eventPriorityFile = 2; +const int eventPriorityRosterExchange = 0; // LEGOPTFIXME: was uninitialised + using namespace XMPP; using namespace XMLHelper; @@ -176,7 +187,7 @@ bool PsiEvent::fromXml(PsiCon *psi, PsiAccount *account, const QDomElement *e) int PsiEvent::priority() const { - return Options::EventPriorityDontCare; + return EventPriorityDontCare; } QString PsiEvent::description() const @@ -300,11 +311,11 @@ bool MessageEvent::fromXml(PsiCon *psi, PsiAccount *account, const QDomElement * int MessageEvent::priority() const { if ( v_m.type() == "headline" ) - return option.eventPriorityHeadline; + return eventPriorityHeadline; else if ( v_m.type() == "chat" ) - return option.eventPriorityChat; + return eventPriorityChat; - return option.eventPriorityMessage; + return eventPriorityMessage; } QString MessageEvent::description() const @@ -403,7 +414,7 @@ bool AuthEvent::fromXml(PsiCon *psi, PsiAccount *account, const QDomElement *e) int AuthEvent::priority() const { - return option.eventPriorityAuth; + return eventPriorityAuth; } QString AuthEvent::description() const @@ -450,7 +461,7 @@ FileEvent::FileEvent(const FileEvent &from) int FileEvent::priority() const { - return option.eventPriorityFile; + return eventPriorityFile; } Jid FileEvent::from() const @@ -525,7 +536,7 @@ RosterExchangeEvent::RosterExchangeEvent(const Jid &j, const RosterExchangeItems int RosterExchangeEvent::priority() const { - return option.eventPriorityRosterExchange; + return eventPriorityRosterExchange; } Jid RosterExchangeEvent::from() const @@ -575,7 +586,7 @@ QString RosterExchangeEvent::description() const int StatusEvent::priority() const { - return option.eventPriorityChat; + return eventPriorityChat; } Jid StatusEvent::from() const src/psievent.cpp @@ -27,7 +27,6 @@ #include <QStringList> #include <QCoreApplication> -#include "common.h" #include "psiaccount.h" #include "avatars.h" #include "growlnotifier.h" src/psigrowlnotifier.cpp @@ -25,6 +25,8 @@ #include "anim.h" #include "applicationinfo.h" +#include "psioptions.h" + #include <QFileInfo> #include <Q3Dict> #include <Q3PtrList> @@ -119,7 +121,7 @@ public: PsiIcon *icon = (PsiIcon *)IconsetFactory::iconPtr(iconName); // second level -- transport icon - if ( jid.user().isEmpty() || option.useTransportIconsForContacts ) { + if ( jid.user().isEmpty() || PsiOptions::instance()->getOption("options.ui.contactlist.use-transport-icons").toBool() ) { QMap<QString, QRegExp> services; services["aim"] = QRegExp("^aim"); services["gadugadu"] = QRegExp("^gg"); @@ -130,14 +132,14 @@ public: bool found = false; - QMap<QString, QRegExp>::Iterator it = services.begin(); - for ( ; it != services.end(); ++it) { - QRegExp rx = it.data(); - if ( rx.search(jid.host()) != -1 ) { - // get the iconset name of the current service - QMap<QString, QString>::Iterator it2 = option.serviceRosterIconset.find(it.key()); - if ( it2 != option.serviceRosterIconset.end() ) { - Iconset *is = psi->roster.find(it2.data()); + + foreach(QVariant serviceV, PsiOptions::instance()->mapKeyList("options.iconsets.service-status")) { + QString service = serviceV.toString(); + if (services.contains(service)) { + if (services[service].search(jid.host()) != -1 ) { + Iconset *is = psi->roster.find( + PsiOptions::instance()->getOption( + PsiOptions::instance()->mapLookup("options.iconsets.service-status", service)+".iconset").toString()); if ( is ) { PsiIcon *i = (PsiIcon *)is->icon(iconName); if ( i ) { @@ -149,24 +151,30 @@ public: } } } + // let's try the default transport iconset then... if ( !found && jid.user().isEmpty() ) { - Iconset *is = psi->roster.find(option.serviceRosterIconset["transport"]); - if ( is ) { - PsiIcon *i = (PsiIcon *)is->icon(iconName); - if ( i ) - icon = i; + if (PsiOptions::instance()->mapKeyList("options.iconsets.service-status").contains("transport")) { + Iconset *is = psi->roster.find( + PsiOptions::instance()->getOption( + PsiOptions::instance()->mapLookup("options.iconsets.service-status", "transport")+".iconset").toString()); + if ( is ) { + PsiIcon *i = (PsiIcon *)is->icon(iconName); + if ( i ) + icon = i; + } } } } // third level -- custom icons - QMap<QString, QString>::Iterator it = option.customRosterIconset.begin(); - for ( ; it != option.customRosterIconset.end(); ++it) { - QRegExp rx = QRegExp(it.key()); + + QStringList customicons = PsiOptions::instance()->getChildOptionNames("options.iconsets.custom-status", true, true); + foreach(QString base, customicons) { + QRegExp rx = QRegExp(PsiOptions::instance()->getOption(base + ".regexp").toString()); if ( rx.search(jid.userHost()) != -1 ) { - Iconset *is = psi->roster.find(it.data()); + Iconset *is = psi->roster.find(PsiOptions::instance()->getOption(base + ".iconset").toString()); if ( is ) { PsiIcon *i = (PsiIcon *)is->icon(iconName); if ( i ) @@ -183,9 +191,9 @@ public: Iconset def; *ok = def.load(":/iconsets/system/default"); - if ( option.systemIconset != "default" ) { + if ( PsiOptions::instance()->getOption("options.iconsets.system").toString() != "default" ) { Iconset is; - is.load ( iconsetPath("system/" + option.systemIconset) ); + is.load ( iconsetPath("system/" + PsiOptions::instance()->getOption("options.iconsets.system").toString()) ); loadIconset(&def, &is); } @@ -200,9 +208,9 @@ public: Iconset *def = new Iconset; *ok = def->load (":/iconsets/roster/default"); - if ( option.defaultRosterIconset != "default" ) { + if ( PsiOptions::instance()->getOption("options.iconsets.status").toString() != "default" ) { Iconset is; - is.load ( iconsetPath("roster/" + option.defaultRosterIconset) ); + is.load ( iconsetPath("roster/" + PsiOptions::instance()->getOption("options.iconsets.status").toString()) ); loadIconset(def, &is); } @@ -216,7 +224,7 @@ public: { Q3PtrList<Iconset> emo; - foreach(QString name, option.emoticons) { + foreach(QString name, PsiOptions::instance()->getOption("options.iconsets.emoticons").toStringList()) { Iconset *is = new Iconset; if ( is->load ( iconsetPath("emoticons/" + name) ) ) { PsiIconset::removeAnimation(is); @@ -267,34 +275,35 @@ bool PsiIconset::loadAll() // default roster iconset Iconset *def = d->defaultRosterIconset(&ok); def->addToFactory(); - roster.insert (option.defaultRosterIconset, def); + roster.insert (PsiOptions::instance()->getOption("options.iconsets.status").toString(), def); // load only necessary roster iconsets - QStringList rosterIconsets; + QSet<QString> rosterIconsets; - QMap<QString, QString>::Iterator it = option.serviceRosterIconset.begin(); - for ( ; it != option.serviceRosterIconset.end(); ++it) - if ( rosterIconsets.findIndex( it.data() ) == -1 ) - rosterIconsets << it.data(); + foreach(QVariant service, PsiOptions::instance()->mapKeyList("options.iconsets.service-status")) { + rosterIconsets << PsiOptions::instance()->getOption( + PsiOptions::instance()->mapLookup("options.iconsets.service-status", service)+".iconset").toString(); + } - it = option.customRosterIconset.begin(); - for ( ; it != option.customRosterIconset.end(); ++it) - if ( rosterIconsets.findIndex( it.data() ) == -1 ) - rosterIconsets << it.data(); + QStringList customicons = PsiOptions::instance()->getChildOptionNames("options.iconsets.custom-status", true, true); + foreach(QString base, customicons) { + rosterIconsets << PsiOptions::instance()->getOption(base + ".iconset").toString(); + } - QStringList::Iterator it2 = rosterIconsets.begin(); - for ( ; it2 != rosterIconsets.end(); ++it2) { - if ( *it2 == option.defaultRosterIconset ) + foreach(QString it2, rosterIconsets) { + if ( it2 == PsiOptions::instance()->getOption("options.iconsets.status").toString()) { continue; + } Iconset *is = new Iconset; - if ( is->load (d->iconsetPath("roster/" + *it2)) ) { + if ( is->load (d->iconsetPath("roster/" + it2)) ) { is->addToFactory (); d->stripFirstAnimFrame( *is ); - roster.insert (*it2, is); + roster.insert (it2, is); } - else + else { delete is; + } } // load emoticons @@ -304,12 +313,13 @@ bool PsiIconset::loadAll() return ok; } -bool PsiIconset::optionsChanged(const Options *old) +bool PsiIconset::optionsChanged() { +/* LEGOPTFIXME bool ok = loadSystem(); // default roster iconset - if ( old->defaultRosterIconset != option.defaultRosterIconset ) { + if ( old->defaultRosterIconset != PsiOptions::instance()->getOption("options.iconsets.status").toString() ) { Iconset *newDef = d->defaultRosterIconset(&ok); Iconset *oldDef = roster[old->defaultRosterIconset]; d->loadIconset( oldDef, newDef ); @@ -318,27 +328,27 @@ bool PsiIconset::optionsChanged(const Options *old) roster.remove(old->defaultRosterIconset); roster.setAutoDelete(true); - roster.insert (option.defaultRosterIconset, oldDef); + roster.insert (PsiOptions::instance()->getOption("options.iconsets.status").toString(), oldDef); delete newDef; } // service&custom roster iconsets - if ( operator!=(old->serviceRosterIconset,option.serviceRosterIconset) || operator!=(old->customRosterIconset,option.customRosterIconset)) { + if ( operator!=(old->serviceRosterIconset,LEGOPTS.serviceRosterIconset) || operator!=(old->customRosterIconset,LEGOPTS.customRosterIconset)) { QStringList rosterIconsets; - QMap<QString, QString>::Iterator it = option.serviceRosterIconset.begin(); - for ( ; it != option.serviceRosterIconset.end(); ++it) + QMap<QString, QString>::Iterator it = LEGOPTS.serviceRosterIconset.begin(); + for ( ; it != LEGOPTS.serviceRosterIconset.end(); ++it) if ( rosterIconsets.findIndex( it.data() ) == -1 ) rosterIconsets << it.data(); - it = option.customRosterIconset.begin(); - for ( ; it != option.customRosterIconset.end(); ++it) + it = LEGOPTS.customRosterIconset.begin(); + for ( ; it != LEGOPTS.customRosterIconset.end(); ++it) if ( rosterIconsets.findIndex( it.data() ) == -1 ) rosterIconsets << it.data(); QStringList::Iterator it2 = rosterIconsets.begin(); for ( ; it2 != rosterIconsets.end(); ++it2) { - if ( *it2 == option.defaultRosterIconset ) + if ( *it2 == PsiOptions::instance()->getOption("options.iconsets.status").toString() ) continue; Iconset *is = new Iconset; @@ -364,7 +374,7 @@ bool PsiIconset::optionsChanged(const Options *old) Q3DictIterator<Iconset> it3 ( roster ); for ( ; it3.current(); ++it3) { QString name = it3.currentKey(); - if ( name == option.defaultRosterIconset ) + if ( name == PsiOptions::instance()->getOption("options.iconsets.status").toString() ) continue; it2 = rosterIconsets.find( name ); @@ -379,12 +389,12 @@ bool PsiIconset::optionsChanged(const Options *old) } // load emoticons - if ( old->emoticons != option.emoticons ) { + if ( old->emoticons != PsiOptions::instance()->getOption("options.iconsets.emoticons").toStringList() ) { emoticons.clear(); emoticons = d->emoticons(); } - return old->defaultRosterIconset != option.defaultRosterIconset; + return old->defaultRosterIconset != PsiOptions::instance()->getOption("options.iconsets.status").toString();*/ } PsiIcon *PsiIconset::event2icon(PsiEvent *e) @@ -483,16 +493,14 @@ PsiIcon PsiIconset::status(const XMPP::Status &s) PsiIcon *PsiIconset::transportStatusPtr(QString name, int s) { PsiIcon *icon = 0; - - QMap<QString, QString>::Iterator it = option.serviceRosterIconset.begin(); - for ( ; it != option.serviceRosterIconset.end(); ++it) { - if (name == it.key()) { - Iconset *is = roster.find(it.data()); - if ( is ) { - icon = (PsiIcon *)is->icon(status2name(s)); - if ( icon ) - break; - } + + QVariantList serviceicons = PsiOptions::instance()->mapKeyList("options.iconsets.service-status"); + if (serviceicons.contains(name)) { + Iconset *is = roster.find( + PsiOptions::instance()->getOption( + PsiOptions::instance()->mapLookup("options.iconsets.service-status", name)+".iconset").toString()); + if ( is ) { + icon = (PsiIcon *)is->icon(status2name(s)); } } src/psiiconset.cpp @@ -29,7 +29,6 @@ class PsiEvent; class UserListItem; -struct Options; namespace XMPP { class Status; class Jid; @@ -43,7 +42,7 @@ public: bool loadSystem(); bool loadAll(); - bool optionsChanged(const Options *old); // returns 'true' if Psi needs to be restarted + bool optionsChanged(); Q3Dict<Iconset> roster; Q3PtrList<Iconset> emoticons; src/psiiconset.h @@ -43,7 +43,7 @@ public: bool save(QString file); void autoSave(bool autoSave, QString autoFile = ""); -private: +// don't call this normally PsiOptions(); private slots: src/psioptions.h @@ -116,7 +116,7 @@ void PsiPopup::Private::init(const PsiIcon *_titleIcon, QString titleText, PsiAc account = acc; display = true; - if ( !option.ppIsOn ) + if ( !PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool() ) return; if ( !psiPopupList ) @@ -134,8 +134,8 @@ void PsiPopup::Private::init(const PsiIcon *_titleIcon, QString titleText, PsiAc else titleIcon = new PsiIcon(*_titleIcon); - FancyPopup::setHideTimeout( option.ppHideTime ); - FancyPopup::setBorderColor( option.ppBorderColor ); + FancyPopup::setHideTimeout( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.duration").toInt() ); + FancyPopup::setBorderColor( PsiOptions::instance()->getOption("options.ui.look.colors.passive-popup.border").value<QColor>() ); popup = new FancyPopup(titleText, titleIcon, lastPopup, false); connect(popup, SIGNAL(clicked(int)), SLOT(popupClicked(int))); @@ -175,10 +175,10 @@ void PsiPopup::Private::eventDestroyed() QString PsiPopup::Private::clipText(QString text) { - if ( option.ppTextClip > 0 ) { + if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() > 0 ) { // richtext will give us trouble here - if ( ((int)text.length()) > option.ppTextClip ) { - text = text.left( option.ppTextClip ); + if ( ((int)text.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() ) { + text = text.left( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() ); // delete last unclosed tag /*if ( text.find("</") > text.find(">") ) { @@ -208,7 +208,7 @@ QBoxLayout *PsiPopup::Private::createContactInfo(const PsiIcon *icon, QString te QLabel *textLabel = new QLabel(popup); QFont font; - font.fromString( option.font[fPopup] ); + font.fromString( PsiOptions::instance()->getOption("options.ui.look.font.passive-popup").toString() ); textLabel->setFont(font); textLabel->setWordWrap(false); @@ -318,15 +318,15 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c QString text; QString jid = j.full(); - if ( option.ppJidClip > 0 && ((int)jid.length()) > option.ppJidClip ) - jid = jid.left( option.ppJidClip ) + "..."; + if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() > 0 && ((int)jid.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() ) + jid = jid.left( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() ) + "..."; QString status; - if ( option.ppStatusClip != 0 ) + if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() != 0 ) status = r.status().status(); - if ( option.ppStatusClip > 0 ) - if ( ((int)status.length()) > option.ppStatusClip ) - status = status.left ( option.ppStatusClip ) + "..."; + if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() > 0 ) + if ( ((int)status.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() ) + status = status.left ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() ) + "..."; QString name; if ( u && !u->name().isEmpty() ) { @@ -340,7 +340,7 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c } if (!name.isEmpty()) { - if ( !option.ppJidClip ) + if ( !PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() ) name = "" + Qt::escape(name) + ""; else name = "" + Qt::escape(name) + " <" + Qt::escape(jid) + ">" + ""; @@ -349,7 +349,7 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c name = "<" + Qt::escape(jid) + ">"; QString statusString = TextUtil::plain2rich(status); - if ( option.useEmoticons ) + if ( PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool() ) statusString = TextUtil::emoticonify(statusString); if( PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() ) statusString = TextUtil::legacyFormat(statusString); @@ -371,7 +371,7 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c } // show popup - if ( d->popupType != AlertHeadline && (d->popupType != AlertFile || !option.popupFiles) ) + if ( d->popupType != AlertHeadline && (d->popupType != AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) ) setData(icon, contactText); else if ( d->popupType == AlertHeadline ) { QVBoxLayout *vbox = new QVBoxLayout(0); @@ -387,7 +387,7 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c QLabel *messageLabel = new QLabel(d->popup); QFont font = messageLabel->font(); - font.setPointSize(option.smallFontSize); + font.setPointSize(common_smallFontSize); messageLabel->setFont(font); messageLabel->setWordWrap(true); @@ -414,7 +414,7 @@ void PsiPopup::show() return; } - if ( !d->id.isEmpty() /*&& option.ppNoDupes*/ ) { + if ( !d->id.isEmpty() /*&& LEGOPTS.ppNoDupes*/ ) { foreach (PsiPopup *pp, *psiPopupList) { if ( d->id == pp->id() && pp->popup() ) { pp->popup()->restartHideTimer(); src/psipopup.cpp @@ -26,10 +26,12 @@ //Added by qt3to4: #include <QContextMenuEvent> #include <Q3PtrList> +#include <Q3MainWindow> #include "psicon.h" #include "iconset.h" #include "psicon.h" #include "iconaction.h" +#include "psioptions.h" #include "options/opt_toolbars.h" //---------------------------------------------------------------------------- @@ -43,10 +45,10 @@ public: bool customizeable, moveable; PsiActionList::ActionsType type; - QString group; - int groupIndex; PsiCon *psi; Q3PtrList<IconAction> uniqueActions; + QString base; + bool dirty; }; PsiToolBar::Private::Private() @@ -54,6 +56,7 @@ PsiToolBar::Private::Private() customizeable = true; moveable = true; psi = 0; + dirty = false; uniqueActions.setAutoDelete( true ); } @@ -61,11 +64,31 @@ PsiToolBar::Private::Private() // PsiToolBar //---------------------------------------------------------------------------- +PsiToolBar *PsiToolBar::fromOptions(const QString &base, Q3MainWindow* mainWindow, PsiCon* psi, PsiActionList::ActionsType t) +{ + PsiToolBar *tb = 0; + + tb = new PsiToolBar(PsiOptions::instance()->getOption(base + ".name").toString(), + mainWindow, psi); + mainWindow->moveDockWindow ( tb, + (Qt::Dock)PsiOptions::instance()->getOption(base + ".dock.position").toInt(), // LEGOPTFIXME + PsiOptions::instance()->getOption(base + ".dock.nl").toBool(), + PsiOptions::instance()->getOption(base + ".dock.index").toInt(), + PsiOptions::instance()->getOption(base + ".dock.extra-offset").toInt() ); + + tb->setType(t); + tb->initialize( base, false ); + return tb; +} + + PsiToolBar::PsiToolBar(const QString& label, Q3MainWindow* mainWindow, PsiCon* psi) : Q3ToolBar(label, mainWindow, (QWidget*)mainWindow) { d = new Private(); d->psi = psi; + connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&))); + connect(PsiOptions::instance(), SIGNAL(optionRemoved(const QString&)),SLOT(optionRemoved(const QString&))); } PsiToolBar::~PsiToolBar() @@ -73,25 +96,51 @@ PsiToolBar::~PsiToolBar() delete d; } -bool PsiToolBar::isCustomizeable() const -{ - return d->customizeable; -} -void PsiToolBar::setCustomizeable( bool b ) +void PsiToolBar::optionChanged(const QString& option) { - d->customizeable = b; + if (d->dirty) return; + if (!option.startsWith(d->base + ".")) return; + + d->dirty = true; + // collapse all updates until next mainloop iteration... + QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection); } -bool PsiToolBar::isMoveable() const +void PsiToolBar::update() { - return d->moveable; + d->dirty = false; + clear(); + initialize( d->base, false ); } -void PsiToolBar::setMoveable( bool b ) +void PsiToolBar::optionRemoved(const QString& option) { - d->moveable = b; + if (d->base == option || d->base.startsWith(option+".")) { + deleteLater(); + } } + + +// bool PsiToolBar::isCustomizeable() const +// { +// return d->customizeable; +// } +// +// void PsiToolBar::setCustomizeable( bool b ) +// { +// d->customizeable = b; +// } +// +// bool PsiToolBar::isMoveable() const +// { +// return d->moveable; +// } +// +// void PsiToolBar::setMoveable( bool b ) +// { +// d->moveable = b; +// } void PsiToolBar::contextMenuEvent(QContextMenuEvent *e) { @@ -115,39 +164,26 @@ PsiActionList::ActionsType PsiToolBar::type() const return d->type; } -QString PsiToolBar::group() const -{ - return d->group; -} - -int PsiToolBar::groupIndex() const -{ - return d->groupIndex; -} - -void PsiToolBar::setGroup( QString group, int index ) -{ - d->group = group; - d->groupIndex = index; -} - void PsiToolBar::setType( PsiActionList::ActionsType type ) { d->type = PsiActionList::ActionsType( PsiActionList::ActionsType( type ) | PsiActionList::Actions_Common ); } -void PsiToolBar::initialize( Options::ToolbarPrefs &tbPref, bool createUniqueActions ) +void PsiToolBar::initialize( QString base, bool createUniqueActions ) { + d->base = base; d->uniqueActions.clear(); - setHorizontallyStretchable( tbPref.stretchable ); - setVerticallyStretchable( tbPref.stretchable ); +// PsiOptions::instance()->getOption(base + ".").toString() + + setHorizontallyStretchable(PsiOptions::instance()->getOption(base + ".stretchable").toBool()); + setVerticallyStretchable(PsiOptions::instance()->getOption(base + ".stretchable").toBool()); - setMovingEnabled ( !tbPref.locked ); + setMovingEnabled (!PsiOptions::instance()->getOption(base + ".locked").toBool()); if ( d->psi ) { ActionList actions = d->psi->actionList()->suitableActions( d->type ); - QStringList keys = tbPref.keys; + QStringList keys = PsiOptions::instance()->getOption(base + ".actions").toStringList(); for (int j = 0; j < keys.size(); j++) { IconAction *action = actions.action( keys[j] ); @@ -163,17 +199,33 @@ void PsiToolBar::initialize( Options::ToolbarPrefs &tbPref, bool createUniqueAct action->addTo( this ); emit registerAction( action ); } - else + else { qWarning("PsiToolBar::initialize(): action %s not found!", keys[j].latin1()); + } } } - else + else { qWarning("PsiToolBar::initialize(): psi is NULL!"); + } - if ( tbPref.on ) + if (PsiOptions::instance()->getOption(base + ".visible").toBool()) { show(); - else + } else { hide(); + } +} + - tbPref.dirty = false; +void PsiToolBar::structToOptions(const QString &base, ToolbarPrefs *tb) +{ + PsiOptions *o = PsiOptions::instance(); + o->setOption(base+".name",tb->name); + o->setOption(base+".visible",tb->on); + o->setOption(base+".locked",tb->locked); + o->setOption(base+".stretchable",tb->stretchable); + o->setOption(base+".actions",tb->keys); + o->setOption(base+".dock.position",tb->dock); // LEGOPTFIXME + o->setOption(base+".dock.index",tb->index); + o->setOption(base+".dock.nl",tb->nl); + o->setOption(base+".dock.extra-offset",tb->extraOffset); } src/psitoolbar.cpp @@ -34,25 +34,29 @@ class PsiToolBar : public Q3ToolBar Q_OBJECT public: + static PsiToolBar *fromOptions(const QString &base, Q3MainWindow* mainWindow, PsiCon* psi, PsiActionList::ActionsType t); + static void structToOptions(const QString &base, ToolbarPrefs *s); + PsiToolBar(const QString& label, Q3MainWindow* mainWindow, PsiCon* psi); ~PsiToolBar(); PsiActionList::ActionsType type() const; void setType( PsiActionList::ActionsType ); - void initialize( Options::ToolbarPrefs &, bool createUniqueActions ); + void initialize( QString base, bool createUniqueActions ); - QString group() const; - int groupIndex() const; - void setGroup( QString group, int index ); - - bool isCustomizeable() const; +/* bool isCustomizeable() const; void setCustomizeable( bool ); bool isMoveable() const; - void setMoveable( bool ); + void setMoveable( bool );*/ signals: void registerAction( IconAction * ); + +public slots: + void optionChanged(const QString& option); + void update(); + void optionRemoved(const QString& option); protected: void contextMenuEvent(QContextMenuEvent *e); src/psitoolbar.h @@ -6,8 +6,8 @@ #include "psitrayicon.h" #include "trayicon.h" #include "iconset.h" -#include "common.h" // options #include "alerticon.h" +#include "psioptions.h" // TODO: remove the QPoint parameter from the signals when we finally move // to the new system. @@ -212,7 +212,7 @@ void PsiTrayIcon::animate() if ( !icon_ ) return; - QString cachedName = "PsiTray/" + option.defaultRosterIconset + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() ); + QString cachedName = "PsiTray/" + PsiOptions::instance()->getOption("options.iconsets.status").toString() + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() ); QPixmap p; if ( !QPixmapCache::find(cachedName, p) ) { @@ -229,7 +229,7 @@ void PsiTrayIcon::animate() if ( !icon_ ) return; - QString cachedName = "PsiTray/" + option.defaultRosterIconset + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() ); + QString cachedName = "PsiTray/" + PsiOptions::instance()->getOption("options.iconsets.status").toString() + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() ); QPixmap p; if ( !QPixmapCache::find(cachedName, p) ) { src/psitrayicon.cpp @@ -18,7 +18,6 @@ * */ -#include "common.h" #include "iconaction.h" #include "psiaccount.h" #include "psiactionlist.h" @@ -173,7 +172,7 @@ AHCommand RCSetOptionsServer::execute(const AHCommand& c, const Jid&) sounds_field.setType(XData::Field::Field_Boolean); sounds_field.setLabel(QObject::tr("Play sounds")); sounds_field.setVar("sounds"); - sounds_field.setValue(QStringList((useSound ? "1" : "0"))); + sounds_field.setValue(QStringList((PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool() ? "1" : "0"))); sounds_field.setRequired(false); fields += sounds_field; @@ -181,7 +180,7 @@ AHCommand RCSetOptionsServer::execute(const AHCommand& c, const Jid&) auto_offline_field.setType(XData::Field::Field_Boolean); auto_offline_field.setLabel(QObject::tr("Automatically go offline when idle")); auto_offline_field.setVar("auto-offline"); - auto_offline_field.setValue(QStringList((option.use_asOffline ? "1" : "0"))); + auto_offline_field.setValue(QStringList((PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() ? "1" : "0"))); auto_offline_field.setRequired(false); fields += auto_offline_field; @@ -189,7 +188,7 @@ AHCommand RCSetOptionsServer::execute(const AHCommand& c, const Jid&) auto_auth_field.setType(XData::Field::Field_Boolean); auto_auth_field.setLabel(QObject::tr("Auto-authorize contacts")); auto_auth_field.setVar("auto-auth"); - auto_auth_field.setValue(QStringList((option.autoAuth ? "1" : "0"))); + auto_auth_field.setValue(QStringList((PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorisation").toBool() ? "1" : "0"))); auto_auth_field.setRequired(false); fields += auto_auth_field; @@ -197,7 +196,7 @@ AHCommand RCSetOptionsServer::execute(const AHCommand& c, const Jid&) auto_open_field.setType(XData::Field::Field_Boolean); auto_open_field.setLabel(QObject::tr("Auto-open new messages")); auto_open_field.setVar("auto-open"); - auto_open_field.setValue(QStringList((option.popupMsgs ? "1" : "0"))); + auto_open_field.setValue(QStringList((PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool() ? "1" : "0"))); auto_open_field.setRequired(false); fields += auto_open_field; @@ -220,23 +219,23 @@ AHCommand RCSetOptionsServer::execute(const AHCommand& c, const Jid&) else if (fl[i].var() == "auto-offline") { QString v = fl[i].value().first(); if (v == "1") - option.use_asOffline = true; + PsiOptions::instance()->setOption("options.status.auto-away.use-offline", (bool) true); else if (v == "0") - option.use_asOffline = false; + PsiOptions::instance()->setOption("options.status.auto-away.use-offline", (bool) false); } else if (fl[i].var() == "auto-auth") { QString v = fl[i].value().first(); if (v == "1") - option.autoAuth = true; + PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorisation", (bool) true); else if (v == "0") - option.autoAuth = false; + PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorisation", (bool) false); } else if (fl[i].var() == "auto-open") { QString v = fl[i].value().first(); if (v == "1") - option.popupMsgs = true; + PsiOptions::instance()->setOption("options.ui.message.auto-popup", (bool) true); else if (v == "0") - option.popupMsgs = false; + PsiOptions::instance()->setOption("options.ui.message.auto-popup", (bool) false); } } return AHCommand::completedReply(c); src/rc.cpp @@ -164,8 +164,8 @@ void StatusSetDlg::init() d->cb_preset = new QComboBox(this); d->cb_preset->insertItem(tr("<None>")); QStringList presets; - foreach(StatusPreset p, option.sp) { - presets += p.name(); + foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) { + presets += name.toString(); } presets.sort(); d->cb_preset->insertStringList(presets); @@ -234,7 +234,7 @@ void StatusSetDlg::doButton() QMessageBox::information(this, tr("Error"), tr("Can't create a blank preset!")); } - else if(option.sp.contains(text)) { + else if(PsiOptions::instance()->mapKeyList("options.status.presets").contains(text)) { QMessageBox::information(this, tr("Error"), tr("You already have a preset with that name!")); } @@ -242,10 +242,16 @@ void StatusSetDlg::doButton() break; } // Store preset - option.sp[text] = StatusPreset(text,d->te->text()); - if (!d->le_priority->text().isEmpty()) - option.sp[text].setPriority(d->le_priority->text().toInt()); - option.sp[text].setStatus((XMPP::Status::Type) d->cb_type->itemData(d->cb_type->currentIndex()).toInt()); + QString base = PsiOptions::instance()->mapPut("options.status.presets", text); + PsiOptions::instance()->setOption(base+".message", d->te->text()); + if (!d->le_priority->text().isEmpty()) { + PsiOptions::instance()->setOption(base+".force-priority", true); + PsiOptions::instance()->setOption(base+".priority", d->le_priority->text().toInt()); + } else { + PsiOptions::instance()->setOption(base+".force-priority", false); + } + PsiOptions::instance()->setOption(base+".status", XMPP::Status((XMPP::Status::Type) d->cb_type->itemData(d->cb_type->currentIndex()).toInt()).typeString()); + } // Set status @@ -265,16 +271,19 @@ void StatusSetDlg::chooseStatusPreset(int x) if(x < 1) return; - StatusPreset preset = option.sp[d->cb_preset->text(x)]; - d->te->setText(preset.message()); - if (preset.priority().hasValue()) - d->le_priority->setText(QString::number(preset.priority().value())); - else + QString base = PsiOptions::instance()->mapLookup("options.status.presets", d->cb_preset->text(x)); + d->te->setText(PsiOptions::instance()->getOption(base+".message").toString()); + if (PsiOptions::instance()->getOption(base+".force-priority").toBool()) { + d->le_priority->setText(QString::number(PsiOptions::instance()->getOption(base+".priority").toInt())); + } else { d->le_priority->clear(); + } + XMPP::Status status; + status.setType(PsiOptions::instance()->getOption(base+".status").toString()); int n; for(n = 0; n < d->cb_type->count(); ++n) { - if(preset.status() == d->cb_type->itemData(n).toInt()) { + if(status.type() == d->cb_type->itemData(n).toInt()) { d->cb_type->setCurrentItem(n); break; } src/statusdlg.cpp @@ -21,7 +21,6 @@ #include "tabbablewidget.h" #include "tabmanager.h" #include "tabdlg.h" -#include "common.h" #include "jidutil.h" #include "groupchatdlg.h" #include <QTimer> src/tabs/tabbablewidget.cpp @@ -22,7 +22,6 @@ #include "iconwidget.h" #include "iconset.h" -#include "common.h" #include "psicon.h" #include <qmenubar.h> #include <qcursor.h> @@ -127,7 +126,7 @@ TabDlg::TabDlg(TabManager* tabManager, TabDlgDelegate *delegate) delegate_->create(this); } - if (option.brushedMetal) { + if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) { setAttribute(Qt::WA_MacMetalStyle); } @@ -163,7 +162,9 @@ TabDlg::TabDlg(TabManager* tabManager, TabDlgDelegate *delegate) setShortcuts(); - resize(option.sizeTabDlg); + if (PsiOptions::instance()->getOption("options.ui.tabs.size").toSize().isValid()) { + resize(PsiOptions::instance()->getOption("options.ui.tabs.size").toSize()); + } } TabDlg::~TabDlg() { @@ -187,8 +188,8 @@ void TabDlg::resizeEvent(QResizeEvent *e) { AdvancedWidget<QWidget>::resizeEvent(e); - if (option.keepSizes) - option.sizeTabDlg = e->size(); + if (PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool()) + PsiOptions::instance()->getOption("options.ui.tabs.size").toSize() = e->size(); // delegate may want to act on resize event if (delegate_) { @@ -284,7 +285,7 @@ void TabDlg::setLooks() setWindowIcon(IconsetFactory::icon("psi/start-chat").icon()); #endif tabWidget_->setTabPosition(QTabWidget::Top); - if (option.putTabsAtBottom) + if (PsiOptions::instance()->getOption("options.ui.tabs.put-tabs-at-bottom").toBool()) tabWidget_->setTabPosition(QTabWidget::Bottom); setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100); src/tabs/tabdlg.cpp @@ -6,6 +6,7 @@ #include "tabbablewidget.h" #include "groupchatdlg.h" #include "chatdlg.h" +#include "psioptions.h" TabManager::TabManager(PsiCon* psiCon, QObject *parent) : QObject(parent) @@ -35,7 +36,7 @@ TabDlg* TabManager::getTabs() bool TabManager::shouldBeTabbed(QWidget *widget) { - if (!option.useTabs) { + if (!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) { return false; } if (qobject_cast<ChatDlg*> (widget)) { src/tabs/tabmanager.cpp @@ -27,7 +27,6 @@ #include "psioptions.h" #include "psicon.h" -#include "common.h" void TipDlg::show(PsiCon* psi) { src/tipdlg.cpp @@ -3,7 +3,6 @@ #include <QStringList> #include <Q3PtrList> -#include "common.h" #include "iconset.h" #include "psiiconset.h" src/unittest/psiiconset/testpsiiconset.cpp @@ -3,7 +3,6 @@ #include <QTimer> #include <QtCrypto> -#include "common.h" #include "psipopup.h" #include "iconset.h" #include "psicon.h" // for PsiCon src/unittest/psipopup/testpsipopup.cpp @@ -581,7 +581,7 @@ QString UserListItem::makeBareTip(bool trim, bool doLinkify) const s = TextUtil::plain2rich(s); if ( doLinkify ) s = TextUtil::linkify(s); - if( option.useEmoticons && !doLinkify ) + if( PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool() && !doLinkify ) s = TextUtil::emoticonify(s); if( !doLinkify && PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() ) s = TextUtil::legacyFormat(s); src/userlist.cpp @@ -24,6 +24,7 @@ #include <QDomDocument> #include "varlist.h" +#include "optionstree.h" VarList::VarList() :QList<VarListItem>() @@ -38,6 +39,26 @@ QStringList VarList::varsToStringList() return list; } +void VarList::fromOptions(OptionsTree *o, QString base) +{ + QStringList bases = o->getChildOptionNames( base, true, true); + foreach(QString ibase, bases) { + QString var = o->getOption(ibase + ".key").toString(); + QString val = o->getOption(ibase + ".data").toString(); + set(var, val); + } +} + +void VarList::toOptions(OptionsTree *o, QString base) +{ + o->removeOption(base, true); + foreach(VarListItem item, *this) { + QString ibase = o->mapPut(base, item.key()); + o->setOption(ibase + ".data", item.data()); + } +} + + QDomElement VarList::toXml(QDomDocument &doc, const QString &tagName) { QDomElement base = doc.createElement(tagName); src/varlist.cpp @@ -27,6 +27,7 @@ class QDomDocument; class QDomElement; class QStringList; +class OptionsTree; class VarListItem { @@ -57,6 +58,10 @@ public: VarList::Iterator findByNum(int); QStringList varsToStringList(); + + void fromOptions(OptionsTree *o, QString base); + void toOptions(OptionsTree *o, QString base); + QDomElement toXml(QDomDocument &doc, const QString &tagName); void fromXml(const QDomElement &); }; src/varlist.h @@ -35,7 +35,7 @@ //---------------------------------------------------------------------------- WbDlg::WbDlg(const Jid &target, const QString &session, const Jid &ownJid, bool groupChat, PsiAccount *pa) { - if ( option.brushedMetal ) + if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) setAttribute(Qt::WA_MacMetalStyle); groupChat_ = groupChat; @@ -192,7 +192,7 @@ WbDlg::WbDlg(const Jid &target, const QString &session, const Jid &ownJid, bool setWindowOpacity(double(qMax(MINIMUM_OPACITY, PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt())) / 100); - resize(option.sizeChatDlg); + resize(LEGOPTS.sizeChatDlg); } WbDlg::~WbDlg() { @@ -216,7 +216,7 @@ void WbDlg::incomingWbElement(const QDomElement &wb, const Jid &sender) ++pending_; updateCaption(); doFlash(true); - if(option.raiseChatWindow) + if(PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool()) bringToFront(this, false); } keepOpen_ = true; @@ -335,9 +335,9 @@ void WbDlg::activated() { } void WbDlg::keyPressEvent(QKeyEvent *e) { - if(e->key() == Qt::Key_Escape && !option.useTabs) + if(e->key() == Qt::Key_Escape && !PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) close(); - else if(e->key() == Qt::Key_W && e->state() & Qt::ControlButton && !option.useTabs) + else if(e->key() == Qt::Key_W && e->state() & Qt::ControlButton && !PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) close(); else e->ignore(); @@ -356,19 +356,19 @@ void WbDlg::closeEvent(QCloseEvent *e) { } // destroy the dialog if delChats is dcClose - if(option.delChats == dcClose) + if(PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "instant") endSession(); else { - if(option.delChats == dcHour) + if(PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "hour") setSelfDestruct(60); - else if(option.delChats == dcDay) + else if(PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "day") setSelfDestruct(60 * 24); } } void WbDlg::resizeEvent(QResizeEvent *e) { - if(option.keepSizes) - option.sizeChatDlg = e->size(); + if(PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool()) + LEGOPTS.sizeChatDlg = e->size(); } void WbDlg::showEvent(QShowEvent *) { src/wbdlg.cpp @@ -93,11 +93,11 @@ void WbManager::messageReceived(const Message &message) { if (w) { // PsiPopup::PopupType popupType = PsiPopup::AlertNone; // bool doPopup = false; - pa_->playSound(option.onevent[eChat2]); - // if(!w->isActiveWindow() || option.alertOpenChats) { + pa_->playSound(PsiOptions::instance()->getOption("options.ui.notifications.sounds.chat-message").toString()); + // if(!w->isActiveWindow() || PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) { // popupType = PsiPopup::AlertChat; - // if(option.popupChats) { - // if(!option.noUnlistedPopup && message.type() != "groupchat") { + // if(PsiOptions::instance()->getOption("options.ui.chat.auto-popup").toBool()) { + // if(!PsiOptions::instance()->getOption("options.ui.notifications.popup-dialogs.suppress-when-not-on-roster").toBool() && message.type() != "groupchat") { // // don't popup wb's from unlisted contacts // if(!pa_->find(message.from())) // return; @@ -105,10 +105,10 @@ void WbManager::messageReceived(const Message &message) { w->show(); // } // } - if(option.raiseChatWindow) { + if(PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool()) { bringToFront(w); } - // if ((popupType == PsiPopup::AlertChat && option.ppChat) /*&& makeSTATUS(status()) != STATUS_DND*/) { + // if ((popupType == PsiPopup::AlertChat && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool()) /*&& makeSTATUS(status()) != STATUS_DND*/) { // PsiPopup *popup = new PsiPopup(popupType, pa_); // popup->setData(j, r, u, e); // } @@ -178,7 +178,7 @@ WbDlg* WbManager::negotiateSession(const Message &message) { if(session.isEmpty()) return 0; - if(option.ignoreNonRoster && message.type() != "groupchat") { + if(PsiOptions::instance()->getOption("options.messages.ignore-non-roster-contacts").toBool() && message.type() != "groupchat") { // Ignore the message if contact not in roster if(!pa_->find(message.from())) { qDebug("Whiteboard invitation received from contact that is not in roster."); src/wbmanager.cpp 719e1a7ad7896239b7f83d7a538bd280cc2e357c Martin H textshell-I1QKlO@neutronstar.dyndns.org http://github.com/psi-im/psi/commit/c2fb1244f09f804ca64c7f0b9aaa86379920eb98 c2fb1244f09f804ca64c7f0b9aaa86379920eb98

2008-01-11T16:45:25-08:00

Migration from options stored in config.xml to options.xml and account.xml And all that got clumped into this patch because of interdepencies or because it could take advantage of the clean migration point. 8fa9017398bdeadb2aa6fa5bcc5b9b97719d690c Martin H textshell-I1QKlO@neutronstar.dyndns.org