From: Darren <darren@darrenwhitlen.com>
Date: Mon, 5 Nov 2012 21:11:26 +0000 (+0000)
Subject: Client: Settings window; show_join_parts setting
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=93fa049cd950f08351941d0d71980fa3cb033cc0;p=KiwiIRC.git

Client: Settings window; show_join_parts setting
---

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 4d56172..d9abe58 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -14,7 +14,7 @@ a img { border:none; }
     color: #555555;
 }
 
-#kiwi, #kiwi input, #kiwi textarea {
+#kiwi, #kiwi input, #kiwi button, #kiwi textarea {
     font-family:Arial, Helvetica, sans-serif;
     font-size:14px; line-height:1.4em;
 }
@@ -255,6 +255,16 @@ a img { border:none; }
 
 
 
+#kiwi .settings {
+    width:900px;
+    margin:1em auto;
+}
+#kiwi .settings table td {
+    padding:0.5em 1em;
+}
+
+
+
 
 /**
  * Reusable componants
diff --git a/client/assets/dev/app.js b/client/assets/dev/app.js
index 6b887bc..5155b00 100644
--- a/client/assets/dev/app.js
+++ b/client/assets/dev/app.js
@@ -16,14 +16,15 @@ _kiwi.applets = {};
  */
 _kiwi.global = {
 	settings: undefined,
-	utils: undefined, // Re-usable methods
-	gateway: undefined,
-	user: undefined,
-	server: undefined,
+	plugins: undefined,
+	utils: undefined, // TODO: Re-usable methods
+	gateway: undefined, // TODO: Access to gateway
+	user: undefined, // TODO: Limited user methods
+	server: undefined, // TODO: Limited server methods
 	command: undefined,  // The control box
 
 	// TODO: think of a better term for this as it will also refer to queries
-	channels: undefined,
+	channels: undefined, // TODO: Limited access to panels list
 
 	// Entry point to start the kiwi application
 	start: function (opts) {
diff --git a/client/assets/dev/applet_settings.js b/client/assets/dev/applet_settings.js
index cbb6405..926e498 100644
--- a/client/assets/dev/applet_settings.js
+++ b/client/assets/dev/applet_settings.js
@@ -9,13 +9,15 @@
 
             this.$el = $($('#tmpl_applet_settings').html());
 
-            this.$el.find('.theme').val(settings.get('theme'));
+            this.$el.find('.setting-theme').val(settings.get('theme'));
+            this.$el.find('.setting-scrollback').val(settings.get('scrollback'));
         },
         
         saveSettings: function () {
             var settings = _kiwi.global.settings;
 
-            settings.set('theme', $('.theme', this.$el).val());
+            settings.set('theme', $('.setting-theme', this.$el).val());
+            settings.set('scrollback', $('.setting-scrollback', this.$el).val());
 
             settings.save();
         }
diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index b1961e8..ede9c72 100644
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -119,13 +119,30 @@
     </script>
 
     <script type="text/html" id="tmpl_applet_settings">
-        <div>
-            <select class="theme">
-                <option value="default">Default</option>
-                <option value="relaxed">Relaxed</option>
-                <option value="cli">CLI</option>
-            </select>
-            <button class="save">Save</button>
+        <div class="settings">
+            ​<table>
+                <tr>
+                    <td>Theme</td>
+                    <td>
+                        <select class="setting-theme">
+                            <option value="default">Default</option>
+                            <option value="relaxed">Relaxed</option>
+                            <option value="cli">CLI</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Scrollback</td>
+                    <td><input type="text" class="setting-scrollback" value="150" /></td>
+                </tr>
+
+                <tr>
+                    <td>Auto-reconnect</td>
+                    <td><input type="checkbox" class="setting-reconnect" /></td>
+                </tr>
+            </table>
+
+            <button class="save">Save</button>​​​​​​​​​
         </div>
     </script>
 
diff --git a/client/assets/dev/model_channel.js b/client/assets/dev/model_channel.js
index 90f11a1..76931d7 100644
--- a/client/assets/dev/model_channel.js
+++ b/client/assets/dev/model_channel.js
@@ -15,10 +15,20 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
 
         members = this.get("members");
         members.bind("add", function (member) {
+            var show_message = _kiwi.global.settings.get('show_join_parts');
+            if (show_message === false) {
+                return;
+            }
+            
             this.addMsg(' ', '== ' + member.displayNick(true) + ' has joined', 'action join');
         }, this);
 
         members.bind("remove", function (member, members, options) {
+            var show_message = _kiwi.global.settings.get('show_join_parts');
+            if (show_message === false) {
+                return;
+            }
+
             var msg = (options.message) ? '(' + options.message + ')' : '';
 
             if (options.type === 'quit') {