From 03e521c024c1df4cf0d0f6c5bac703a0747e4387 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 27 Oct 2012 15:51:34 +0000 Subject: [PATCH] Moved settings for private chat from NotifyPage to ChatPage. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5728 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/settings/ChatPage.cpp | 18 ++ retroshare-gui/src/gui/settings/ChatPage.ui | 221 +++++++++++------- .../src/gui/settings/NotifyPage.cpp | 14 -- retroshare-gui/src/gui/settings/NotifyPage.ui | 63 ++--- retroshare-gui/src/lang/retroshare_de.qm | Bin 409076 -> 407936 bytes retroshare-gui/src/lang/retroshare_de.ts | 26 ++- retroshare-gui/src/lang/retroshare_en.ts | 32 ++- 7 files changed, 216 insertions(+), 158 deletions(-) diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 88ac01760..3b1e650b0 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "ChatPage.h" #include "gui/chat/ChatStyle.h" #include "gui/notifyqt.h" @@ -156,6 +157,17 @@ ChatPage::save(QString &/*errmsg*/) } } + uint chatflags = 0; + + if (ui.chat_NewWindow->isChecked()) + chatflags |= RS_CHAT_OPEN; + if (ui.chat_Focus->isChecked()) + chatflags |= RS_CHAT_FOCUS; + if (ui.chat_tabbedWindow->isChecked()) + chatflags |= RS_CHAT_TABBED_WINDOW; + + Settings->setChatFlags(chatflags); + return true; } @@ -197,6 +209,12 @@ ChatPage::load() std::string nick ; rsMsgs->getDefaultNickNameForChatLobby(nick) ; ui.chatLobbyNick_LE->setText(QString::fromUtf8(nick.c_str())) ; + + uint chatflags = Settings->getChatFlags(); + + ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN); + ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS); + ui.chat_tabbedWindow->setChecked(chatflags & RS_CHAT_TABBED_WINDOW); } void ChatPage::on_pushButtonChangeChatFont_clicked() diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index d4ce4b03a..04089e517 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -20,20 +20,20 @@ General - + - - - - 0 - 0 - - - - Chat Settings - - - + + + + + + 0 + 0 + + + + Chat Settings + @@ -139,6 +139,15 @@ + + + + + + + Chat Lobby + + @@ -147,7 +156,7 @@ - + @@ -176,87 +185,121 @@ + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Private Chat + + - - - Qt::Vertical + + + Open Window for new chat - - - 20 - 40 - + + + + + + Grab Focus when chat arrives - + + + + + + Use a single tabbed window + + - - - - - Chat Font + + + + + + Chat Font + + + + 2 - - - 2 - - - 0 - - - 0 - - - 0 - - - 2 - - - - - Change Chat Font - - - - - - - - 0 - 0 - - - - Chat Font: - - - - - - - Font Preview - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - + + 2 + + + 0 + + + 0 + + + 0 + + + + + Change Chat Font + + + + + + + + 0 + 0 + + + + Chat Font: + + + + + + + Font Preview + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index a2baf8a2e..cab8564f3 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -126,16 +126,8 @@ NotifyPage::save(QString &/*errmsg*/) { /* extract from rsNotify the flags */ - uint chatflags = 0; uint messageflags = 0; - if (ui.chat_NewWindow->isChecked()) - chatflags |= RS_CHAT_OPEN; - if (ui.chat_Focus->isChecked()) - chatflags |= RS_CHAT_FOCUS; - if (ui.chat_tabbedWindow->isChecked()) - chatflags |= RS_CHAT_TABBED_WINDOW; - if (ui.message_ConnectAttempt->isChecked()) messageflags |= RS_MESSAGE_CONNECT_ATTEMPT; @@ -147,7 +139,6 @@ NotifyPage::save(QString &/*errmsg*/) Settings->setNotifyFlags(getNotifyFlags()); Settings->setNewsFeedFlags(getNewsFlags()); - Settings->setChatFlags(chatflags); Settings->setMessageFlags(messageflags); Settings->setDisplayTrayChatLobby(ui.systray_ChatLobby->isChecked()); @@ -174,7 +165,6 @@ void NotifyPage::load() /* extract from rsNotify the flags */ uint notifyflags = Settings->getNotifyFlags(); uint newsflags = Settings->getNewsFeedFlags(); - uint chatflags = Settings->getChatFlags(); uint messageflags = Settings->getMessageFlags(); ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT); @@ -194,10 +184,6 @@ void NotifyPage::load() ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT); ui.notify_Security->setChecked(newsflags & RS_FEED_TYPE_SECURITY); - ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN); - ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS); - ui.chat_tabbedWindow->setChecked(chatflags & RS_CHAT_TABBED_WINDOW); - ui.message_ConnectAttempt->setChecked(messageflags & RS_MESSAGE_CONNECT_ATTEMPT); ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat()); diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui index 8a143f67b..5f4631529 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.ui +++ b/retroshare-gui/src/gui/settings/NotifyPage.ui @@ -144,22 +144,22 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -363,34 +363,17 @@ - - - Private Chat + + + Qt::Vertical - - - - - Open Window for new chat - - - - - - - Grab Focus when chat arrives - - - - - - - Use a single tabbed window - - - - - + + + 20 + 40 + + + diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index b18b0816ef4dfe8e792b4dd5b6b2f59e10a9f6c0..8ac5dac0d25162d0f1ea5a804c27c8106f60fbae 100644 GIT binary patch delta 22089 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 Oo1?fnDJ6n;-2OiTi!9Lq delta 22187 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⪚XES8m*x#zoX8wcVypo;G#^Kx#Ea+_Y6xa8^(Rr?-BH#AG={fB* zvD+J*t?~SXaGf-$ffU!At&cTC9`S|K_r(jMbLE^p(F@N{G;{X3h&N0)p3TUg4gT+Ns*Ph?VR`nyEib8bJC@uFgP~n zXrhbRwF0^C=2T5$DqBBalFOs3>oDbcP+BOO)Bf8HUsn{r%-! zo6pq?Z%A;iodp|RDbu;>2m%h@E6&X)Iv~;+peVXE)A_D7ID**lw$3fhMnT0E*4dt% z5g|AQlaD$hF0X}#bUL@8Vyl(9q9|(o=iEN+EP7|WoZH{vp~~lLoZGXGq1^7=?#dce zN_OrD>4?sd=8B?nKWEg`6lCds>pWA$xjzF>TRwQ^Jb0xS@n^G~hmYn2pz-a_tG6fP4r@76Toqx`e>+o)zJ$r1sq=i2BA;;78JOzpfdWVY zXWD~gA7b90@lXa?$y;It0U^`Oc@a;-CZkoiG2x<~%B#UrU4|G`r^f znp~aa_EXMp^E%-9(KF5;mbS!9MV-HUA|3Fo9`Z)deywcKMHG%M+Bs=-bg9cxPQMQaNhPC+yZR|CT;x$0|dci8^<%T{h$!i$AX`II|n;gLaOM^*?7 z>N{k3?~%bnLhFVO2@ML{IBVs~V1I63c_oY+j4g%-2ZaWX2+O{zz{(L1m|Kk7eRh7( zY`doxWB26peprEPAuGR>6xqU7U8}URba6E(754j@DP~GZQJ;l9OYN;L$DAl7hG=0! dZUwCzRZ8TTU7@UqsZdtl9U0SVqpZE={{Vk)S(E?( diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index ec58d697e..7aa7d2051 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -1210,6 +1210,22 @@ Bitte wähle einen zum Chatten aus. Enable Emoticons Private Chat Emoticons für privaten Chat + + Open Window for new chat + Fenster für neuen Chat öffnen + + + Grab Focus when chat arrives + Fokus auf neues Chatfenster legen + + + Use a single tabbed window + Ein Fenster mit Tabs verwenden + + + Chat Lobby + Chatlobby + ChatStyle @@ -4135,6 +4151,10 @@ p, li { white-space: pre-wrap; } You can't reply an Anonymous Author Du kannst einem anonymen Autor nicht antworten + + Search this forum... + + ForumsFillThread @@ -7806,15 +7826,15 @@ Rechtsklick und als Freund hinzufügen um zu verbinden. Open Window for new chat - Fenster für neuen Chat öffnen + Fenster für neuen Chat öffnen Grab Focus when chat arrives - Fokus auf neues Chatfenster legen + Fokus auf neues Chatfenster legen Use a single tabbed window - Ein Fenster mit Tabs verwenden + Ein Fenster mit Tabs verwenden Group chat diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index af2b3e01a..69a7c2880 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -1178,6 +1178,22 @@ Please choose one of it to chat with. Enable Emoticons Private Chat + + Open Window for new chat + + + + Grab Focus when chat arrives + + + + Use a single tabbed window + + + + Chat Lobby + + ChatStyle @@ -4071,6 +4087,10 @@ p, li { white-space: pre-wrap; } You can't reply an Anonymous Author + + Search this forum... + + ForumsFillThread @@ -7635,18 +7655,6 @@ Right-click and select 'make friend' to be able to connect. Private Chat - - Open Window for new chat - - - - Grab Focus when chat arrives - - - - Use a single tabbed window - - Group chat