From 4262cbcd15a5247ed17bf1770bb83af0ac0263b6 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@googlemail.com>
Date: Tue, 15 Mar 2011 20:53:47 +0100
Subject: [PATCH] New Setting: Show notices in server window. Closes #47.

---
 application/res/values/settings.xml              |  3 +++
 application/res/values/strings.xml               |  2 ++
 application/res/xml/preferences.xml              |  5 +++++
 application/src/org/yaaic/irc/IRCConnection.java | 12 +++++++++---
 application/src/org/yaaic/model/Settings.java    | 13 +++++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/application/res/values/settings.xml b/application/res/values/settings.xml
index 5666c8d..b210835 100644
--- a/application/res/values/settings.xml
+++ b/application/res/values/settings.xml
@@ -35,4 +35,7 @@
 
     <string name="key_sound_highlight">sound_highlight</string>
     <string name="default_sound_highlight">false</string>
+
+    <string name="key_notice_server_window">notice_server_window</string>
+    <string name="default_notice_server_window">false</string>
 </resources>
diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml
index 850dd68..fd2e3ea 100644
--- a/application/res/values/strings.xml
+++ b/application/res/values/strings.xml
@@ -194,4 +194,6 @@
     <string name="settings_voice_recognition_desc">Show button for voice recognition</string>
     <string name="settings_joinpartquit_title">Show join, part and quit</string>
     <string name="settings_joinpartquit_desc">Show join, part and quit messages in channels</string>
+    <string name="settings_noticeserverwindow_title">Notices server window</string>
+    <string name="settings_noticeserverwindow_desc">Show notices in server window</string>
 </resources>
diff --git a/application/res/xml/preferences.xml b/application/res/xml/preferences.xml
index 1bed452..71632c2 100644
--- a/application/res/xml/preferences.xml
+++ b/application/res/xml/preferences.xml
@@ -70,6 +70,11 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:summary="@string/settings_joinpartquit_desc"
             android:key="@string/key_show_joinpartquit"
             android:defaultValue="@string/default_show_joinpartquit" />
+        <CheckBoxPreference
+            android:title="@string/settings_noticeserverwindow_title"
+            android:summary="@string/settings_noticeserverwindow_desc"
+            android:key="@string/key_notice_server_window"
+            android:defaultValue="@string/default_notice_server_window" />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/settings_highlight">
diff --git a/application/src/org/yaaic/irc/IRCConnection.java b/application/src/org/yaaic/irc/IRCConnection.java
index 4a61fe3..82d79fb 100644
--- a/application/src/org/yaaic/irc/IRCConnection.java
+++ b/application/src/org/yaaic/irc/IRCConnection.java
@@ -486,11 +486,17 @@ public class IRCConnection extends PircBot
         notice = Colors.removeFormattingAndColors(notice);
 
         // Post notice to currently selected conversation
-        Conversation conversation = server.getConversation(server.getSelectedConversation());
+        Conversation conversation;
 
-        if (conversation == null) {
-            // Fallback: Use ServerInfo view
+        if (service.getSettings().showNoticeInServerWindow()) {
             conversation = server.getConversation(ServerInfo.DEFAULT_NAME);
+        } else {
+            conversation = server.getConversation(server.getSelectedConversation());
+
+            if (conversation == null) {
+                // Fallback: Use ServerInfo view
+                conversation = server.getConversation(ServerInfo.DEFAULT_NAME);
+            }
         }
 
         Message message = new Message("-" + sourceNick + "- " + notice);
diff --git a/application/src/org/yaaic/model/Settings.java b/application/src/org/yaaic/model/Settings.java
index c20e052..889a788 100644
--- a/application/src/org/yaaic/model/Settings.java
+++ b/application/src/org/yaaic/model/Settings.java
@@ -208,4 +208,17 @@ public class Settings
             Boolean.parseBoolean(resources.getString(R.string.default_show_joinpartquit))
         );
     }
+
+    /**
+     * Should notices be shown in the server window instead in the focused window?
+     *
+     * @return True if notices should be shown in the server window
+     */
+    public boolean showNoticeInServerWindow()
+    {
+        return preferences.getBoolean(
+            resources.getString(R.string.key_notice_server_window),
+            Boolean.parseBoolean(resources.getString(R.string.default_notice_server_window))
+        );
+    }
 }